diff --git a/packages/tui/src/component/prompt/index.tsx b/packages/tui/src/component/prompt/index.tsx index d10d2b67262..075f037dcc5 100644 --- a/packages/tui/src/component/prompt/index.tsx +++ b/packages/tui/src/component/prompt/index.tsx @@ -48,7 +48,7 @@ import { useConnected } from "../use-connected" import { useToast } from "../../ui/toast" import { createFadeIn } from "../../util/signal" import { DialogSkill } from "../dialog-skill" -import { useConfig } from "../../config" +import { useConfig, useCursorStyle } from "../../config" import { usePromptMove } from "./move" import { promptFilesForServer, resolvePastedAttachments } from "./local-attachment" import { locationKey, useData } from "../../context/data" @@ -207,6 +207,7 @@ export function Prompt(props: PromptProps) { const currentLocation = useLocation() const args = useArgs() const config = useConfig().data + const cursorStyle = useCursorStyle() const dialog = useDialog() const toast = useToast() const status = createMemo(() => data.session.status(props.sessionID ?? "")) @@ -353,7 +354,6 @@ export function Prompt(props: PromptProps) { createEffect(() => { if (!input || input.isDestroyed) return input.cursorColor = disabled() ? theme.background.raised.base : theme.text.base - input.cursorStyle = config.cursor }) const [store, setStore] = createStore<{ @@ -1774,7 +1774,7 @@ export function Prompt(props: PromptProps) { focusedTextColor={muted() ? theme.text.muted : theme.text.base} minHeight={1} maxHeight={maxHeight()} - cursorStyle={{ ...config.cursor }} + cursorStyle={cursorStyle()} onContentChange={() => { const value = input.plainText setStore("prompt", "text", value) @@ -1833,7 +1833,6 @@ export function Prompt(props: PromptProps) { // setTimeout is a workaround and needs to be addressed properly if (!input || input.isDestroyed) return input.cursorColor = disabled() ? theme.background.raised.base : theme.text.base - input.cursorStyle = config.cursor }, 0) }} onMouseDown={(r: MouseEvent) => { diff --git a/packages/tui/src/config/index.tsx b/packages/tui/src/config/index.tsx index a37021f904f..8af86e01faa 100644 --- a/packages/tui/src/config/index.tsx +++ b/packages/tui/src/config/index.tsx @@ -3,7 +3,7 @@ export * as Config from "." import { createBindingLookup } from "@opentui/keymap/extras" import { Vcs } from "@opencode/schema/vcs" import { Schema } from "effect" -import { createContext, onCleanup, type JSX, useContext } from "solid-js" +import { createContext, createMemo, onCleanup, type JSX, useContext } from "solid-js" import { createStore, reconcile } from "solid-js/store" import { safeWatch } from "../util/watch" import path from "path" @@ -378,6 +378,15 @@ export function useConfig() { return value } +/** + * The configured textarea cursor, replaced only when the cursor config changes. A fresh object on every render effect + * would restyle the textarea whenever an unrelated prop changes, discarding a style a plugin set on it. + */ +export function useCursorStyle() { + const config = useConfig() + return createMemo(() => ({ style: config.data.cursor.style, blinking: config.data.cursor.blinking })) +} + /** Reactive accessor for the temporary "new-designs" experiment. */ export function useNewDesigns() { const config = useConfig() diff --git a/packages/tui/src/routes/session/form.tsx b/packages/tui/src/routes/session/form.tsx index aa9944c4e26..675067ff0c4 100644 --- a/packages/tui/src/routes/session/form.tsx +++ b/packages/tui/src/routes/session/form.tsx @@ -18,7 +18,7 @@ import { SplitBorder } from "../../ui/border" import { useToast } from "../../ui/toast" import { Keymap } from "../../context/keymap" import { useInteractivity } from "../../context/interactivity" -import { useConfig } from "../../config" +import { useCursorStyle } from "../../config" import { errorMessage } from "../../util/error" import { formCustom, @@ -64,7 +64,7 @@ export function FormPrompt(props: { form: FormWithLocation }) { const keymap = Keymap.use() const enabled = useInteractivity() const active = () => enabled() && keymap.mode.current() === FORM_MODE - const config = useConfig().data + const cursorStyle = useCursorStyle() const clipboard = useClipboard() const toast = useToast() const configuredFields = props.form.fields.filter(isFormAnswerField) @@ -885,7 +885,7 @@ export function FormPrompt(props: { form: FormWithLocation }) {