@tooee/ask 0.1.16 → 0.1.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/Ask.d.ts CHANGED
@@ -3,6 +3,6 @@ import type { AskOptions } from "./types.js";
3
3
  interface AskProps extends AskOptions {
4
4
  actions?: ActionDefinition[];
5
5
  }
6
- export declare function Ask({ title, prompt, placeholder, defaultValue, multiline, actions }: AskProps): import("react").ReactNode;
6
+ export declare function Ask({ title, prompt, placeholder, defaultValue, multiline, actions, }: AskProps): import("react").ReactNode;
7
7
  export {};
8
8
  //# sourceMappingURL=Ask.d.ts.map
package/dist/Ask.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Ask.d.ts","sourceRoot":"","sources":["../src/Ask.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,UAAU,QAAS,SAAQ,UAAU;IACnC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;CAC7B;AAED,wBAAgB,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,QAAQ,6BA+K7F"}
1
+ {"version":3,"file":"Ask.d.ts","sourceRoot":"","sources":["../src/Ask.tsx"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAQ5C,UAAU,QAAS,SAAQ,UAAU;IACnC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;CAC7B;AAED,wBAAgB,GAAG,CAAC,EAClB,KAAK,EACL,MAAM,EACN,WAAW,EACX,YAAY,EACZ,SAAgB,EAChB,OAAO,GACR,EAAE,QAAQ,6BAgNV"}
package/dist/Ask.js CHANGED
@@ -6,13 +6,15 @@ import { AppLayout } from "@tooee/layout";
6
6
  import { useHasOverlay } from "@tooee/overlays";
7
7
  import { ThemePicker, useTheme } from "@tooee/themes";
8
8
  import { useThemeCommands, useQuitCommand, usePasteCommands } from "@tooee/shell";
9
- import { useMode, useSetMode, useCommand, useActions, useProvideCommandContext, useCommandContext, } from "@tooee/commands";
10
- export function Ask({ title, prompt, placeholder, defaultValue, multiline, actions }) {
9
+ import { useMode, useSetMode, useActions, useProvideCommandContext, useCommandContext, } from "@tooee/commands";
10
+ import { appendAtCursor, handleEditBufferVimMotion, openLineAtCursor, } from "./vim-motions.js";
11
+ export function Ask({ title, prompt, placeholder, defaultValue, multiline = true, actions, }) {
11
12
  const renderer = useRenderer();
12
13
  const [value, setValue] = useState(defaultValue ?? "");
13
14
  const textareaRef = useRef(null);
14
15
  const inputRef = useRef(null);
15
16
  const didPositionInitialCursorRef = useRef(false);
17
+ const vimMotionStateRef = useRef({ pendingG: false });
16
18
  const { invoke } = useCommandContext();
17
19
  const { theme } = useTheme();
18
20
  const { name: themeName, picker: themePicker } = useThemeCommands();
@@ -25,7 +27,13 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
25
27
  const mode = useMode();
26
28
  const setMode = useSetMode();
27
29
  const hasOverlay = useHasOverlay();
28
- const inputFocused = mode === "insert" && !hasOverlay;
30
+ const inputFocused = (mode === "insert" || mode === "cursor") && !hasOverlay;
31
+ const cursorStyle = mode === "cursor" ? { style: "block", blinking: false } : { style: "line", blinking: true };
32
+ const cursorColor = mode === "cursor" ? theme.accent : theme.primary;
33
+ const preventCursorModeEditorInput = (event) => {
34
+ if (mode === "cursor")
35
+ event.preventDefault();
36
+ };
29
37
  useEffect(() => {
30
38
  if (didPositionInitialCursorRef.current || !defaultValue)
31
39
  return;
@@ -53,22 +61,6 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
53
61
  usePasteCommands({
54
62
  getTarget: () => (multiline ? textareaRef.current : inputRef.current),
55
63
  });
56
- useCommand({
57
- id: "ask:insert-mode-a",
58
- title: "Insert mode",
59
- hotkey: "a",
60
- modes: ["cursor"],
61
- handler: () => setMode("insert"),
62
- hidden: true,
63
- });
64
- useCommand({
65
- id: "ask:insert-mode-i",
66
- title: "Insert mode",
67
- hotkey: "i",
68
- modes: ["cursor"],
69
- handler: () => setMode("insert"),
70
- hidden: true,
71
- });
72
64
  useKeyboard((key) => {
73
65
  if (hasOverlay)
74
66
  return;
@@ -79,8 +71,44 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
79
71
  // In cursor mode, escape does nothing - use 'q' to quit
80
72
  return;
81
73
  }
74
+ if (mode === "cursor") {
75
+ const target = multiline ? textareaRef.current : inputRef.current;
76
+ if (key.name === "i" || key.raw === "i") {
77
+ key.preventDefault();
78
+ vimMotionStateRef.current.pendingG = false;
79
+ setMode("insert");
80
+ return;
81
+ }
82
+ if (key.name === "a" || key.raw === "a") {
83
+ key.preventDefault();
84
+ vimMotionStateRef.current.pendingG = false;
85
+ appendAtCursor(target);
86
+ setMode("insert");
87
+ return;
88
+ }
89
+ if (multiline && ((key.name === "o" && key.shift) || key.raw === "O")) {
90
+ key.preventDefault();
91
+ vimMotionStateRef.current.pendingG = false;
92
+ openLineAtCursor(target, "above");
93
+ setMode("insert");
94
+ return;
95
+ }
96
+ if (multiline && (key.name === "o" || key.raw === "o")) {
97
+ key.preventDefault();
98
+ vimMotionStateRef.current.pendingG = false;
99
+ openLineAtCursor(target, "below");
100
+ setMode("insert");
101
+ return;
102
+ }
103
+ if (handleEditBufferVimMotion(key, target, vimMotionStateRef.current))
104
+ return;
105
+ }
106
+ else {
107
+ vimMotionStateRef.current.pendingG = false;
108
+ }
82
109
  if (key.name === "return") {
83
110
  if (multiline ? key.shift : true) {
111
+ key.preventDefault();
84
112
  handleSubmit();
85
113
  }
86
114
  return;
@@ -108,6 +136,6 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
108
136
  { label: "Theme:", value: themeName },
109
137
  { label: "", value: hintParts.join(" ") },
110
138
  ],
111
- }, scrollProps: { focused: false }, overlay: themePicker.isOpen ? (_jsx(ThemePicker, { entries: themePicker.entries, currentTheme: themeName, onSelect: themePicker.confirm, onClose: themePicker.close, onNavigate: themePicker.preview })) : undefined, children: _jsx("box", { flexDirection: "column", alignItems: "center", justifyContent: "center", style: { flexGrow: 1 }, onMouseDown: handleMouseDown, children: _jsxs("box", { flexDirection: "column", width: "100%", maxWidth: 80, style: { flexGrow: 1, padding: 1 }, children: [prompt && (_jsx("text", { fg: theme.text, style: { marginBottom: 1 }, children: _jsx("strong", { children: prompt }) })), multiline ? (_jsx("textarea", { ref: textareaRef, focused: inputFocused, initialValue: defaultValue, placeholder: placeholder, textColor: theme.text, placeholderColor: theme.textMuted, backgroundColor: "transparent", onSubmit: handleSubmit, style: { flexGrow: 1 } })) : (_jsx("input", { ref: inputRef, focused: inputFocused, value: value, onInput: setValue, onSubmit: handleSubmit, placeholder: placeholder, textColor: theme.text, placeholderColor: theme.textMuted, cursorColor: theme.primary, backgroundColor: "transparent" }))] }) }) }));
139
+ }, scrollProps: { focused: false }, overlay: themePicker.isOpen ? (_jsx(ThemePicker, { entries: themePicker.entries, currentTheme: themeName, onSelect: themePicker.confirm, onClose: themePicker.close, onNavigate: themePicker.preview })) : undefined, children: _jsx("box", { flexDirection: "column", alignItems: "center", justifyContent: "center", style: { flexGrow: 1 }, onMouseDown: handleMouseDown, children: _jsxs("box", { flexDirection: "column", width: "100%", maxWidth: 80, style: { flexGrow: 1, padding: 1 }, children: [prompt && (_jsx("text", { fg: theme.text, style: { marginBottom: 1 }, children: _jsx("strong", { children: prompt }) })), multiline ? (_jsx("textarea", { ref: textareaRef, focused: inputFocused, initialValue: defaultValue, placeholder: placeholder, textColor: theme.text, placeholderColor: theme.textMuted, cursorColor: cursorColor, cursorStyle: cursorStyle, backgroundColor: "transparent", onSubmit: handleSubmit, onKeyDown: preventCursorModeEditorInput, onPaste: preventCursorModeEditorInput, style: { flexGrow: 1 } })) : (_jsx("input", { ref: inputRef, focused: inputFocused, value: value, onInput: setValue, onSubmit: handleSubmit, placeholder: placeholder, textColor: theme.text, placeholderColor: theme.textMuted, cursorColor: cursorColor, cursorStyle: cursorStyle, backgroundColor: "transparent", onKeyDown: preventCursorModeEditorInput, onPaste: preventCursorModeEditorInput }))] }) }) }));
112
140
  }
113
141
  //# sourceMappingURL=Ask.js.map
package/dist/Ask.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Ask.js","sourceRoot":"","sources":["../src/Ask.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Ask.js","sourceRoot":"","sources":["../src/Ask.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"AskOverlay.d.ts","sourceRoot":"","sources":["../src/AskOverlay.tsx"],"names":[],"mappings":"AAOA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjD,QAAQ,EAAE,MAAM,IAAI,CAAA;CACrB;AAED,wBAAgB,UAAU,CAAC,EACzB,MAAM,EACN,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,QAAQ,GACT,EAAE,eAAe,6BAkIjB"}
1
+ {"version":3,"file":"AskOverlay.d.ts","sourceRoot":"","sources":["../src/AskOverlay.tsx"],"names":[],"mappings":"AAoBA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjD,QAAQ,EAAE,MAAM,IAAI,CAAA;CACrB;AAED,wBAAgB,UAAU,CAAC,EACzB,MAAM,EACN,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,QAAQ,GACT,EAAE,eAAe,6BA2KjB"}
@@ -4,6 +4,7 @@ import { useKeyboard } from "@opentui/react";
4
4
  import { readPrimaryText } from "@tooee/clipboard";
5
5
  import { useTheme } from "@tooee/themes";
6
6
  import { useMode, useSetMode } from "@tooee/commands";
7
+ import { appendAtCursor, handleEditBufferVimMotion, openLineAtCursor, } from "./vim-motions.js";
7
8
  export function AskOverlay({ prompt, multiline, defaultValue, onSubmit, onCancel, }) {
8
9
  const { theme } = useTheme();
9
10
  const mode = useMode();
@@ -12,7 +13,14 @@ export function AskOverlay({ prompt, multiline, defaultValue, onSubmit, onCancel
12
13
  const textareaRef = useRef(null);
13
14
  const inputRef = useRef(null);
14
15
  const didPositionInitialCursorRef = useRef(false);
15
- const inputFocused = mode === "insert";
16
+ const vimMotionStateRef = useRef({ pendingG: false });
17
+ const inputFocused = mode === "insert" || mode === "cursor";
18
+ const cursorStyle = mode === "cursor" ? { style: "block", blinking: false } : { style: "line", blinking: true };
19
+ const cursorColor = mode === "cursor" ? theme.accent : theme.primary;
20
+ const preventCursorModeEditorInput = (event) => {
21
+ if (mode === "cursor")
22
+ event.preventDefault();
23
+ };
16
24
  useEffect(() => {
17
25
  if (didPositionInitialCursorRef.current || !defaultValue)
18
26
  return;
@@ -41,11 +49,39 @@ export function AskOverlay({ prompt, multiline, defaultValue, onSubmit, onCancel
41
49
  onCancel();
42
50
  return;
43
51
  }
44
- if (key.name === "i" || key.name === "a" || key.raw === "i" || key.raw === "a") {
52
+ const target = multiline ? textareaRef.current : inputRef.current;
53
+ if (key.name === "i" || key.raw === "i") {
54
+ key.preventDefault();
55
+ vimMotionStateRef.current.pendingG = false;
56
+ setMode("insert");
57
+ return;
58
+ }
59
+ if (key.name === "a" || key.raw === "a") {
60
+ key.preventDefault();
61
+ vimMotionStateRef.current.pendingG = false;
62
+ appendAtCursor(target);
63
+ setMode("insert");
64
+ return;
65
+ }
66
+ if (multiline && ((key.name === "o" && key.shift) || key.raw === "O")) {
67
+ key.preventDefault();
68
+ vimMotionStateRef.current.pendingG = false;
69
+ openLineAtCursor(target, "above");
70
+ setMode("insert");
71
+ return;
72
+ }
73
+ if (multiline && (key.name === "o" || key.raw === "o")) {
45
74
  key.preventDefault();
75
+ vimMotionStateRef.current.pendingG = false;
76
+ openLineAtCursor(target, "below");
46
77
  setMode("insert");
47
78
  return;
48
79
  }
80
+ if (handleEditBufferVimMotion(key, target, vimMotionStateRef.current))
81
+ return;
82
+ }
83
+ else {
84
+ vimMotionStateRef.current.pendingG = false;
49
85
  }
50
86
  if (key.name === "return") {
51
87
  if (multiline ? key.shift : true) {
@@ -69,6 +105,6 @@ export function AskOverlay({ prompt, multiline, defaultValue, onSubmit, onCancel
69
105
  }, [multiline]);
70
106
  const submitHint = multiline ? "Shift+Enter submit" : "Enter submit";
71
107
  const hintText = mode === "insert" ? `${submitHint} Esc commands` : `i insert q quit ${submitHint}`;
72
- return (_jsxs("box", { position: "absolute", left: "20%", right: "20%", top: "20%", bottom: "20%", flexDirection: "column", backgroundColor: theme.backgroundPanel, border: true, borderColor: theme.borderActive, onMouseDown: handleMouseDown, children: [_jsx("box", { height: 1, paddingLeft: 1, paddingRight: 1, backgroundColor: theme.backgroundElement, children: _jsx("text", { content: prompt, fg: theme.accent }) }), _jsx("box", { flexDirection: "column", style: { flexGrow: 1, paddingLeft: 1, paddingRight: 1 }, children: multiline ? (_jsx("textarea", { ref: textareaRef, focused: inputFocused, initialValue: defaultValue, textColor: theme.text, placeholderColor: theme.textMuted, backgroundColor: "transparent", onSubmit: handleSubmit, style: { flexGrow: 1 } })) : (_jsx("input", { ref: inputRef, focused: inputFocused, value: value, onInput: setValue, onSubmit: handleSubmit, textColor: theme.text, placeholderColor: theme.textMuted, cursorColor: theme.primary, backgroundColor: "transparent" })) }), _jsx("box", { height: 1, paddingLeft: 1, paddingRight: 1, backgroundColor: theme.backgroundElement, children: _jsx("text", { content: hintText, fg: theme.textMuted }) })] }));
108
+ return (_jsxs("box", { position: "absolute", left: "20%", right: "20%", top: "20%", bottom: "20%", flexDirection: "column", backgroundColor: theme.backgroundPanel, border: true, borderColor: theme.borderActive, onMouseDown: handleMouseDown, children: [_jsx("box", { height: 1, paddingLeft: 1, paddingRight: 1, backgroundColor: theme.backgroundElement, children: _jsx("text", { content: prompt, fg: theme.accent }) }), _jsx("box", { flexDirection: "column", style: { flexGrow: 1, paddingLeft: 1, paddingRight: 1 }, children: multiline ? (_jsx("textarea", { ref: textareaRef, focused: inputFocused, initialValue: defaultValue, textColor: theme.text, placeholderColor: theme.textMuted, cursorColor: cursorColor, cursorStyle: cursorStyle, backgroundColor: "transparent", onSubmit: handleSubmit, onKeyDown: preventCursorModeEditorInput, onPaste: preventCursorModeEditorInput, style: { flexGrow: 1 } })) : (_jsx("input", { ref: inputRef, focused: inputFocused, value: value, onInput: setValue, onSubmit: handleSubmit, textColor: theme.text, placeholderColor: theme.textMuted, cursorColor: cursorColor, cursorStyle: cursorStyle, backgroundColor: "transparent", onKeyDown: preventCursorModeEditorInput, onPaste: preventCursorModeEditorInput })) }), _jsx("box", { height: 1, paddingLeft: 1, paddingRight: 1, backgroundColor: theme.backgroundElement, children: _jsx("text", { content: hintText, fg: theme.textMuted }) })] }));
73
109
  }
74
110
  //# sourceMappingURL=AskOverlay.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"AskOverlay.js","sourceRoot":"","sources":["../src/AskOverlay.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AskOverlay.js","sourceRoot":"","sources":["../src/AskOverlay.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ import type { InputRenderable, KeyEvent, TextareaRenderable } from "@opentui/core";
2
+ type EditableMotionTarget = Pick<InputRenderable | TextareaRenderable, "moveCursorLeft" | "moveCursorRight" | "moveCursorUp" | "moveCursorDown" | "gotoLineHome" | "gotoLineEnd" | "gotoBufferHome" | "gotoBufferEnd" | "moveWordForward" | "moveWordBackward">;
3
+ export type EditableInsertTarget = Pick<InputRenderable | TextareaRenderable, "cursorOffset" | "insertText" | "moveCursorRight" | "plainText">;
4
+ export interface VimMotionState {
5
+ pendingG: boolean;
6
+ }
7
+ export declare function appendAtCursor(target: EditableInsertTarget | null | undefined): void;
8
+ export declare function openLineAtCursor(target: EditableInsertTarget | null | undefined, position: "above" | "below"): void;
9
+ export declare function handleEditBufferVimMotion(key: KeyEvent, target: EditableMotionTarget | null | undefined, state: VimMotionState): boolean;
10
+ export {};
11
+ //# sourceMappingURL=vim-motions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vim-motions.d.ts","sourceRoot":"","sources":["../src/vim-motions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElF,KAAK,oBAAoB,GAAG,IAAI,CAC9B,eAAe,GAAG,kBAAkB,EAClC,gBAAgB,GAChB,iBAAiB,GACjB,cAAc,GACd,gBAAgB,GAChB,cAAc,GACd,aAAa,GACb,gBAAgB,GAChB,eAAe,GACf,iBAAiB,GACjB,kBAAkB,CACrB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,eAAe,GAAG,kBAAkB,EACpC,cAAc,GAAG,YAAY,GAAG,iBAAiB,GAAG,WAAW,CAChE,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAEpF;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,EAC/C,QAAQ,EAAE,OAAO,GAAG,OAAO,GAC1B,IAAI,CAkBN;AAiBD,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,EAC/C,KAAK,EAAE,cAAc,GACpB,OAAO,CAwDT"}
@@ -0,0 +1,86 @@
1
+ export function appendAtCursor(target) {
2
+ target?.moveCursorRight();
3
+ }
4
+ export function openLineAtCursor(target, position) {
5
+ if (!target)
6
+ return;
7
+ const text = target.plainText;
8
+ const cursorOffset = target.cursorOffset;
9
+ const currentLineStart = text.lastIndexOf("\n", Math.max(0, cursorOffset - 1)) + 1;
10
+ const currentLineEndIndex = text.indexOf("\n", cursorOffset);
11
+ const currentLineEnd = currentLineEndIndex === -1 ? text.length : currentLineEndIndex;
12
+ if (position === "above") {
13
+ target.cursorOffset = currentLineStart;
14
+ target.insertText("\n");
15
+ target.cursorOffset = currentLineStart;
16
+ return;
17
+ }
18
+ target.cursorOffset = currentLineEnd;
19
+ target.insertText("\n");
20
+ }
21
+ function consume(key) {
22
+ key.preventDefault();
23
+ return true;
24
+ }
25
+ function isPlainKey(key, name) {
26
+ return (!key.ctrl &&
27
+ !key.meta &&
28
+ !key.option &&
29
+ (key.name === name || key.raw === name) &&
30
+ (!key.shift || key.raw === name));
31
+ }
32
+ export function handleEditBufferVimMotion(key, target, state) {
33
+ if (!target || key.ctrl || key.meta || key.option) {
34
+ state.pendingG = false;
35
+ return false;
36
+ }
37
+ if (state.pendingG) {
38
+ state.pendingG = false;
39
+ if (isPlainKey(key, "g")) {
40
+ target.gotoBufferHome();
41
+ return consume(key);
42
+ }
43
+ }
44
+ if (isPlainKey(key, "h") || key.name === "left") {
45
+ target.moveCursorLeft();
46
+ return consume(key);
47
+ }
48
+ if (isPlainKey(key, "l") || key.name === "right") {
49
+ target.moveCursorRight();
50
+ return consume(key);
51
+ }
52
+ if (isPlainKey(key, "j") || key.name === "down") {
53
+ target.moveCursorDown();
54
+ return consume(key);
55
+ }
56
+ if (isPlainKey(key, "k") || key.name === "up") {
57
+ target.moveCursorUp();
58
+ return consume(key);
59
+ }
60
+ if (isPlainKey(key, "0") || key.name === "home") {
61
+ target.gotoLineHome();
62
+ return consume(key);
63
+ }
64
+ if (isPlainKey(key, "$") || key.name === "end") {
65
+ target.gotoLineEnd();
66
+ return consume(key);
67
+ }
68
+ if (isPlainKey(key, "w")) {
69
+ target.moveWordForward();
70
+ return consume(key);
71
+ }
72
+ if (isPlainKey(key, "b")) {
73
+ target.moveWordBackward();
74
+ return consume(key);
75
+ }
76
+ if ((key.name === "g" && key.shift) || key.raw === "G") {
77
+ target.gotoBufferEnd();
78
+ return consume(key);
79
+ }
80
+ if (isPlainKey(key, "g")) {
81
+ state.pendingG = true;
82
+ return consume(key);
83
+ }
84
+ return false;
85
+ }
86
+ //# sourceMappingURL=vim-motions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vim-motions.js","sourceRoot":"","sources":["../src/vim-motions.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tooee/ask",
3
- "version": "0.1.16",
3
+ "version": "0.1.17",
4
4
  "description": "Terminal text input gathering",
5
5
  "keywords": [
6
6
  "cli",
@@ -36,12 +36,12 @@
36
36
  "typecheck": "tsc --noEmit"
37
37
  },
38
38
  "dependencies": {
39
- "@tooee/clipboard": "0.1.16",
40
- "@tooee/commands": "0.1.16",
41
- "@tooee/layout": "0.1.16",
42
- "@tooee/overlays": "0.1.16",
43
- "@tooee/shell": "0.1.16",
44
- "@tooee/themes": "0.1.16"
39
+ "@tooee/clipboard": "0.1.17",
40
+ "@tooee/commands": "0.1.17",
41
+ "@tooee/layout": "0.1.17",
42
+ "@tooee/overlays": "0.1.17",
43
+ "@tooee/shell": "0.1.17",
44
+ "@tooee/themes": "0.1.17"
45
45
  },
46
46
  "devDependencies": {
47
47
  "@opentui/core": "^0.2.15",
package/src/Ask.tsx CHANGED
@@ -1,5 +1,12 @@
1
1
  import { useState, useRef, useCallback, useEffect } from "react"
2
- import type { TextareaRenderable, InputRenderable, MouseEvent } from "@opentui/core"
2
+ import type {
3
+ TextareaRenderable,
4
+ InputRenderable,
5
+ MouseEvent,
6
+ KeyEvent,
7
+ PasteEvent,
8
+ CursorStyleOptions,
9
+ } from "@opentui/core"
3
10
  import { useKeyboard, useRenderer } from "@opentui/react"
4
11
  import { readPrimaryText } from "@tooee/clipboard"
5
12
  import { AppLayout } from "@tooee/layout"
@@ -9,24 +16,37 @@ import { useThemeCommands, useQuitCommand, usePasteCommands } from "@tooee/shell
9
16
  import {
10
17
  useMode,
11
18
  useSetMode,
12
- useCommand,
13
19
  useActions,
14
20
  useProvideCommandContext,
15
21
  useCommandContext,
16
22
  } from "@tooee/commands"
17
23
  import type { ActionDefinition } from "@tooee/commands"
18
24
  import type { AskOptions } from "./types.js"
25
+ import {
26
+ appendAtCursor,
27
+ handleEditBufferVimMotion,
28
+ openLineAtCursor,
29
+ type VimMotionState,
30
+ } from "./vim-motions.js"
19
31
 
20
32
  interface AskProps extends AskOptions {
21
33
  actions?: ActionDefinition[]
22
34
  }
23
35
 
24
- export function Ask({ title, prompt, placeholder, defaultValue, multiline, actions }: AskProps) {
36
+ export function Ask({
37
+ title,
38
+ prompt,
39
+ placeholder,
40
+ defaultValue,
41
+ multiline = true,
42
+ actions,
43
+ }: AskProps) {
25
44
  const renderer = useRenderer()
26
45
  const [value, setValue] = useState(defaultValue ?? "")
27
46
  const textareaRef = useRef<TextareaRenderable>(null)
28
47
  const inputRef = useRef<InputRenderable>(null)
29
48
  const didPositionInitialCursorRef = useRef(false)
49
+ const vimMotionStateRef = useRef<VimMotionState>({ pendingG: false })
30
50
  const { invoke } = useCommandContext()
31
51
 
32
52
  const { theme } = useTheme()
@@ -41,7 +61,14 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
41
61
  const mode = useMode()
42
62
  const setMode = useSetMode()
43
63
  const hasOverlay = useHasOverlay()
44
- const inputFocused = mode === "insert" && !hasOverlay
64
+ const inputFocused = (mode === "insert" || mode === "cursor") && !hasOverlay
65
+ const cursorStyle: CursorStyleOptions =
66
+ mode === "cursor" ? { style: "block", blinking: false } : { style: "line", blinking: true }
67
+ const cursorColor = mode === "cursor" ? theme.accent : theme.primary
68
+
69
+ const preventCursorModeEditorInput = (event: KeyEvent | PasteEvent) => {
70
+ if (mode === "cursor") event.preventDefault()
71
+ }
45
72
 
46
73
  useEffect(() => {
47
74
  if (didPositionInitialCursorRef.current || !defaultValue) return
@@ -75,23 +102,6 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
75
102
  getTarget: () => (multiline ? textareaRef.current : inputRef.current),
76
103
  })
77
104
 
78
- useCommand({
79
- id: "ask:insert-mode-a",
80
- title: "Insert mode",
81
- hotkey: "a",
82
- modes: ["cursor"],
83
- handler: () => setMode("insert"),
84
- hidden: true,
85
- })
86
- useCommand({
87
- id: "ask:insert-mode-i",
88
- title: "Insert mode",
89
- hotkey: "i",
90
- modes: ["cursor"],
91
- handler: () => setMode("insert"),
92
- hidden: true,
93
- })
94
-
95
105
  useKeyboard((key) => {
96
106
  if (hasOverlay) return
97
107
  if (key.name === "escape") {
@@ -101,8 +111,43 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
101
111
  // In cursor mode, escape does nothing - use 'q' to quit
102
112
  return
103
113
  }
114
+ if (mode === "cursor") {
115
+ const target = multiline ? textareaRef.current : inputRef.current
116
+ if (key.name === "i" || key.raw === "i") {
117
+ key.preventDefault()
118
+ vimMotionStateRef.current.pendingG = false
119
+ setMode("insert")
120
+ return
121
+ }
122
+ if (key.name === "a" || key.raw === "a") {
123
+ key.preventDefault()
124
+ vimMotionStateRef.current.pendingG = false
125
+ appendAtCursor(target)
126
+ setMode("insert")
127
+ return
128
+ }
129
+ if (multiline && ((key.name === "o" && key.shift) || key.raw === "O")) {
130
+ key.preventDefault()
131
+ vimMotionStateRef.current.pendingG = false
132
+ openLineAtCursor(target, "above")
133
+ setMode("insert")
134
+ return
135
+ }
136
+ if (multiline && (key.name === "o" || key.raw === "o")) {
137
+ key.preventDefault()
138
+ vimMotionStateRef.current.pendingG = false
139
+ openLineAtCursor(target, "below")
140
+ setMode("insert")
141
+ return
142
+ }
143
+ if (handleEditBufferVimMotion(key, target, vimMotionStateRef.current)) return
144
+ } else {
145
+ vimMotionStateRef.current.pendingG = false
146
+ }
147
+
104
148
  if (key.name === "return") {
105
149
  if (multiline ? key.shift : true) {
150
+ key.preventDefault()
106
151
  handleSubmit()
107
152
  }
108
153
  return
@@ -174,8 +219,12 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
174
219
  placeholder={placeholder}
175
220
  textColor={theme.text}
176
221
  placeholderColor={theme.textMuted}
222
+ cursorColor={cursorColor}
223
+ cursorStyle={cursorStyle}
177
224
  backgroundColor="transparent"
178
225
  onSubmit={handleSubmit}
226
+ onKeyDown={preventCursorModeEditorInput}
227
+ onPaste={preventCursorModeEditorInput}
179
228
  style={{ flexGrow: 1 }}
180
229
  />
181
230
  ) : (
@@ -188,8 +237,11 @@ export function Ask({ title, prompt, placeholder, defaultValue, multiline, actio
188
237
  placeholder={placeholder}
189
238
  textColor={theme.text}
190
239
  placeholderColor={theme.textMuted}
191
- cursorColor={theme.primary}
240
+ cursorColor={cursorColor}
241
+ cursorStyle={cursorStyle}
192
242
  backgroundColor="transparent"
243
+ onKeyDown={preventCursorModeEditorInput}
244
+ onPaste={preventCursorModeEditorInput}
193
245
  />
194
246
  )}
195
247
  </box>
@@ -1,9 +1,22 @@
1
1
  import { useState, useRef, useCallback, useEffect } from "react"
2
- import type { TextareaRenderable, InputRenderable, MouseEvent } from "@opentui/core"
2
+ import type {
3
+ TextareaRenderable,
4
+ InputRenderable,
5
+ MouseEvent,
6
+ KeyEvent,
7
+ PasteEvent,
8
+ CursorStyleOptions,
9
+ } from "@opentui/core"
3
10
  import { useKeyboard } from "@opentui/react"
4
11
  import { readPrimaryText } from "@tooee/clipboard"
5
12
  import { useTheme } from "@tooee/themes"
6
13
  import { useMode, useSetMode } from "@tooee/commands"
14
+ import {
15
+ appendAtCursor,
16
+ handleEditBufferVimMotion,
17
+ openLineAtCursor,
18
+ type VimMotionState,
19
+ } from "./vim-motions.js"
7
20
 
8
21
  export interface AskOverlayProps {
9
22
  prompt: string
@@ -28,8 +41,16 @@ export function AskOverlay({
28
41
  const textareaRef = useRef<TextareaRenderable>(null)
29
42
  const inputRef = useRef<InputRenderable>(null)
30
43
  const didPositionInitialCursorRef = useRef(false)
44
+ const vimMotionStateRef = useRef<VimMotionState>({ pendingG: false })
31
45
 
32
- const inputFocused = mode === "insert"
46
+ const inputFocused = mode === "insert" || mode === "cursor"
47
+ const cursorStyle: CursorStyleOptions =
48
+ mode === "cursor" ? { style: "block", blinking: false } : { style: "line", blinking: true }
49
+ const cursorColor = mode === "cursor" ? theme.accent : theme.primary
50
+
51
+ const preventCursorModeEditorInput = (event: KeyEvent | PasteEvent) => {
52
+ if (mode === "cursor") event.preventDefault()
53
+ }
33
54
 
34
55
  useEffect(() => {
35
56
  if (didPositionInitialCursorRef.current || !defaultValue) return
@@ -62,11 +83,37 @@ export function AskOverlay({
62
83
  onCancel()
63
84
  return
64
85
  }
65
- if (key.name === "i" || key.name === "a" || key.raw === "i" || key.raw === "a") {
86
+ const target = multiline ? textareaRef.current : inputRef.current
87
+ if (key.name === "i" || key.raw === "i") {
88
+ key.preventDefault()
89
+ vimMotionStateRef.current.pendingG = false
90
+ setMode("insert")
91
+ return
92
+ }
93
+ if (key.name === "a" || key.raw === "a") {
94
+ key.preventDefault()
95
+ vimMotionStateRef.current.pendingG = false
96
+ appendAtCursor(target)
97
+ setMode("insert")
98
+ return
99
+ }
100
+ if (multiline && ((key.name === "o" && key.shift) || key.raw === "O")) {
101
+ key.preventDefault()
102
+ vimMotionStateRef.current.pendingG = false
103
+ openLineAtCursor(target, "above")
104
+ setMode("insert")
105
+ return
106
+ }
107
+ if (multiline && (key.name === "o" || key.raw === "o")) {
66
108
  key.preventDefault()
109
+ vimMotionStateRef.current.pendingG = false
110
+ openLineAtCursor(target, "below")
67
111
  setMode("insert")
68
112
  return
69
113
  }
114
+ if (handleEditBufferVimMotion(key, target, vimMotionStateRef.current)) return
115
+ } else {
116
+ vimMotionStateRef.current.pendingG = false
70
117
  }
71
118
 
72
119
  if (key.name === "return") {
@@ -124,8 +171,12 @@ export function AskOverlay({
124
171
  initialValue={defaultValue}
125
172
  textColor={theme.text}
126
173
  placeholderColor={theme.textMuted}
174
+ cursorColor={cursorColor}
175
+ cursorStyle={cursorStyle}
127
176
  backgroundColor="transparent"
128
177
  onSubmit={handleSubmit}
178
+ onKeyDown={preventCursorModeEditorInput}
179
+ onPaste={preventCursorModeEditorInput}
129
180
  style={{ flexGrow: 1 }}
130
181
  />
131
182
  ) : (
@@ -137,8 +188,11 @@ export function AskOverlay({
137
188
  onSubmit={handleSubmit}
138
189
  textColor={theme.text}
139
190
  placeholderColor={theme.textMuted}
140
- cursorColor={theme.primary}
191
+ cursorColor={cursorColor}
192
+ cursorStyle={cursorStyle}
141
193
  backgroundColor="transparent"
194
+ onKeyDown={preventCursorModeEditorInput}
195
+ onPaste={preventCursorModeEditorInput}
142
196
  />
143
197
  )}
144
198
  </box>
@@ -0,0 +1,128 @@
1
+ import type { InputRenderable, KeyEvent, TextareaRenderable } from "@opentui/core"
2
+
3
+ type EditableMotionTarget = Pick<
4
+ InputRenderable | TextareaRenderable,
5
+ | "moveCursorLeft"
6
+ | "moveCursorRight"
7
+ | "moveCursorUp"
8
+ | "moveCursorDown"
9
+ | "gotoLineHome"
10
+ | "gotoLineEnd"
11
+ | "gotoBufferHome"
12
+ | "gotoBufferEnd"
13
+ | "moveWordForward"
14
+ | "moveWordBackward"
15
+ >
16
+
17
+ export type EditableInsertTarget = Pick<
18
+ InputRenderable | TextareaRenderable,
19
+ "cursorOffset" | "insertText" | "moveCursorRight" | "plainText"
20
+ >
21
+
22
+ export interface VimMotionState {
23
+ pendingG: boolean
24
+ }
25
+
26
+ export function appendAtCursor(target: EditableInsertTarget | null | undefined): void {
27
+ target?.moveCursorRight()
28
+ }
29
+
30
+ export function openLineAtCursor(
31
+ target: EditableInsertTarget | null | undefined,
32
+ position: "above" | "below",
33
+ ): void {
34
+ if (!target) return
35
+
36
+ const text = target.plainText
37
+ const cursorOffset = target.cursorOffset
38
+ const currentLineStart = text.lastIndexOf("\n", Math.max(0, cursorOffset - 1)) + 1
39
+ const currentLineEndIndex = text.indexOf("\n", cursorOffset)
40
+ const currentLineEnd = currentLineEndIndex === -1 ? text.length : currentLineEndIndex
41
+
42
+ if (position === "above") {
43
+ target.cursorOffset = currentLineStart
44
+ target.insertText("\n")
45
+ target.cursorOffset = currentLineStart
46
+ return
47
+ }
48
+
49
+ target.cursorOffset = currentLineEnd
50
+ target.insertText("\n")
51
+ }
52
+
53
+ function consume(key: KeyEvent): true {
54
+ key.preventDefault()
55
+ return true
56
+ }
57
+
58
+ function isPlainKey(key: KeyEvent, name: string): boolean {
59
+ return (
60
+ !key.ctrl &&
61
+ !key.meta &&
62
+ !key.option &&
63
+ (key.name === name || key.raw === name) &&
64
+ (!key.shift || key.raw === name)
65
+ )
66
+ }
67
+
68
+ export function handleEditBufferVimMotion(
69
+ key: KeyEvent,
70
+ target: EditableMotionTarget | null | undefined,
71
+ state: VimMotionState,
72
+ ): boolean {
73
+ if (!target || key.ctrl || key.meta || key.option) {
74
+ state.pendingG = false
75
+ return false
76
+ }
77
+
78
+ if (state.pendingG) {
79
+ state.pendingG = false
80
+ if (isPlainKey(key, "g")) {
81
+ target.gotoBufferHome()
82
+ return consume(key)
83
+ }
84
+ }
85
+
86
+ if (isPlainKey(key, "h") || key.name === "left") {
87
+ target.moveCursorLeft()
88
+ return consume(key)
89
+ }
90
+ if (isPlainKey(key, "l") || key.name === "right") {
91
+ target.moveCursorRight()
92
+ return consume(key)
93
+ }
94
+ if (isPlainKey(key, "j") || key.name === "down") {
95
+ target.moveCursorDown()
96
+ return consume(key)
97
+ }
98
+ if (isPlainKey(key, "k") || key.name === "up") {
99
+ target.moveCursorUp()
100
+ return consume(key)
101
+ }
102
+ if (isPlainKey(key, "0") || key.name === "home") {
103
+ target.gotoLineHome()
104
+ return consume(key)
105
+ }
106
+ if (isPlainKey(key, "$") || key.name === "end") {
107
+ target.gotoLineEnd()
108
+ return consume(key)
109
+ }
110
+ if (isPlainKey(key, "w")) {
111
+ target.moveWordForward()
112
+ return consume(key)
113
+ }
114
+ if (isPlainKey(key, "b")) {
115
+ target.moveWordBackward()
116
+ return consume(key)
117
+ }
118
+ if ((key.name === "g" && key.shift) || key.raw === "G") {
119
+ target.gotoBufferEnd()
120
+ return consume(key)
121
+ }
122
+ if (isPlainKey(key, "g")) {
123
+ state.pendingG = true
124
+ return consume(key)
125
+ }
126
+
127
+ return false
128
+ }