feat: image pasting

This commit is contained in:
Brooklyn Nicholson
2026-04-09 13:45:23 -05:00
parent b2ea9b4176
commit 00e1d42b9e
7 changed files with 160 additions and 237 deletions

View File

@@ -4,13 +4,9 @@ import { useEffect, useRef, useState } from 'react'
function wordLeft(s: string, p: number) {
let i = p - 1
while (i > 0 && /\s/.test(s[i]!)) {
i--
}
while (i > 0 && /\s/.test(s[i]!)) {i--}
while (i > 0 && !/\s/.test(s[i - 1]!)) {
i--
}
while (i > 0 && !/\s/.test(s[i - 1]!)) {i--}
return Math.max(0, i)
}
@@ -18,13 +14,9 @@ function wordLeft(s: string, p: number) {
function wordRight(s: string, p: number) {
let i = p
while (i < s.length && !/\s/.test(s[i]!)) {
i++
}
while (i < s.length && !/\s/.test(s[i]!)) {i++}
while (i < s.length && /\s/.test(s[i]!)) {
i++
}
while (i < s.length && /\s/.test(s[i]!)) {i++}
return i
}
@@ -35,13 +27,21 @@ const INV_OFF = ESC + '[27m'
const DIM = ESC + '[2m'
const DIM_OFF = ESC + '[22m'
const PRINTABLE = /^[ -~\u00a0-\uffff]+$/
const BRACKET_PASTE = new RegExp(`${ESC}\\[20[01]~`, 'g')
const BRACKET_PASTE = new RegExp(`${ESC}?\\[20[01]~`, 'g')
export interface PasteEvent {
bracketed?: boolean
cursor: number
hotkey?: boolean
text: string
value: string
}
interface Props {
value: string
onChange: (v: string) => void
onSubmit?: (v: string) => void
onPaste?: (data: { cursor: number; text: string; value: string }) => { cursor: number; value: string } | null
onPaste?: (e: PasteEvent) => { cursor: number; value: string } | null
placeholder?: string
focus?: boolean
}
@@ -77,16 +77,9 @@ export function TextInput({ value, onChange, onPaste, onSubmit, placeholder = ''
}
}, [value])
useEffect(
() => () => {
if (pasteTimer.current) {
clearTimeout(pasteTimer.current)
}
},
[]
)
useEffect(() => () => { if (pasteTimer.current) {clearTimeout(pasteTimer.current)} }, [])
// ── Buffer ops (synchronous, ref-based — no stale closures) ─────
// ── Buffer ops (synchronous, ref-based) ─────────────────────────
const commit = (next: string, nextCur: number, track = true) => {
const prev = vRef.current
@@ -95,10 +88,7 @@ export function TextInput({ value, onChange, onPaste, onSubmit, placeholder = ''
if (track && next !== prev) {
undoStack.current.push({ cursor: curRef.current, value: prev })
if (undoStack.current.length > 200) {
undoStack.current.shift()
}
if (undoStack.current.length > 200) {undoStack.current.shift()}
redoStack.current = []
}
@@ -115,59 +105,58 @@ export function TextInput({ value, onChange, onPaste, onSubmit, placeholder = ''
const swap = (from: typeof undoStack, to: typeof redoStack) => {
const entry = from.current.pop()
if (!entry) {
return
}
if (!entry) {return}
to.current.push({ cursor: curRef.current, value: vRef.current })
commit(entry.value, entry.cursor, false)
}
const emitPaste = (e: PasteEvent) => {
const handled = onPasteRef.current?.(e)
if (handled) {commit(handled.value, handled.cursor)}
return !!handled
}
const flushPaste = () => {
const pasted = pasteBuf.current
const text = pasteBuf.current
const at = pastePos.current
pasteBuf.current = ''
pasteTimer.current = null
if (!pasted) {
return
}
if (!text) {return}
const v = vRef.current
const handled = onPasteRef.current?.({ cursor: at, text: pasted, value: v })
if (handled) {
return commit(handled.value, handled.cursor)
}
if (PRINTABLE.test(pasted)) {
commit(v.slice(0, at) + pasted + v.slice(at), at + pasted.length)
if (!emitPaste({ cursor: at, text, value: vRef.current }) && PRINTABLE.test(text)) {
commit(vRef.current.slice(0, at) + text + vRef.current.slice(at), at + text.length)
}
}
// ── Input handler (reads only from refs) ────────────────────────
const insert = (v: string, c: number, s: string) => v.slice(0, c) + s + v.slice(c)
// ── Input handler ───────────────────────────────────────────────
useInput(
(inp, k) => {
if (
k.upArrow ||
k.downArrow ||
(k.ctrl && inp === 'c') ||
k.tab ||
(k.shift && k.tab) ||
k.pageUp ||
k.pageDown ||
k.escape
) {
// Paste hotkeys — single owner, no competing listeners in App
if ((k.ctrl || k.meta) && inp.toLowerCase() === 'v') {
emitPaste({ cursor: curRef.current, hotkey: true, text: '', value: vRef.current })
return
}
// Keys handled by App.useInput
if (
k.upArrow || k.downArrow ||
(k.ctrl && inp === 'c') ||
k.tab || (k.shift && k.tab) ||
k.pageUp || k.pageDown ||
k.escape
) {return}
if (k.return) {
if (k.shift || k.meta) {
commit(vRef.current.slice(0, curRef.current) + '\n' + vRef.current.slice(curRef.current), curRef.current + 1)
} else {
onSubmitRef.current?.(vRef.current)
}
;(k.shift || k.meta)
? commit(insert(vRef.current, curRef.current, '\n'), curRef.current + 1)
: onSubmitRef.current?.(vRef.current)
return
}
@@ -176,78 +165,46 @@ export function TextInput({ value, onChange, onPaste, onSubmit, placeholder = ''
let v = vRef.current
const mod = k.ctrl || k.meta
if (k.ctrl && inp === 'z') {
return swap(undoStack, redoStack)
}
if (k.ctrl && inp === 'z') {return swap(undoStack, redoStack)}
if ((k.ctrl && inp === 'y') || (k.meta && k.shift && inp === 'z')) {
return swap(redoStack, undoStack)
}
if ((k.ctrl && inp === 'y') || (k.meta && k.shift && inp === 'z')) {return swap(redoStack, undoStack)}
if (k.home || (k.ctrl && inp === 'a')) {
c = 0
} else if (k.end || (k.ctrl && inp === 'e')) {
c = v.length
} else if (k.leftArrow) {
c = mod ? wordLeft(v, c) : Math.max(0, c - 1)
} else if (k.rightArrow) {
c = mod ? wordRight(v, c) : Math.min(v.length, c + 1)
} else if ((k.backspace || k.delete) && c > 0) {
if (mod) {
const t = wordLeft(v, c)
v = v.slice(0, t) + v.slice(c)
c = t
} else {
v = v.slice(0, c - 1) + v.slice(c)
c--
}
} else if (k.ctrl && inp === 'w' && c > 0) {
const t = wordLeft(v, c)
v = v.slice(0, t) + v.slice(c)
c = t
} else if (k.ctrl && inp === 'u') {
v = v.slice(c)
c = 0
} else if (k.ctrl && inp === 'k') {
v = v.slice(0, c)
} else if (k.meta && inp === 'b') {
c = wordLeft(v, c)
} else if (k.meta && inp === 'f') {
c = wordRight(v, c)
} else if (inp.length > 0) {
if (k.home || (k.ctrl && inp === 'a')) {c = 0}
else if (k.end || (k.ctrl && inp === 'e')) {c = v.length}
else if (k.leftArrow) {c = mod ? wordLeft(v, c) : Math.max(0, c - 1)}
else if (k.rightArrow) {c = mod ? wordRight(v, c) : Math.min(v.length, c + 1)}
else if ((k.backspace || k.delete) && c > 0) {
if (mod) { const t = wordLeft(v, c); v = v.slice(0, t) + v.slice(c); c = t }
else { v = v.slice(0, c - 1) + v.slice(c); c-- }
}
else if (k.ctrl && inp === 'w' && c > 0) { const t = wordLeft(v, c); v = v.slice(0, t) + v.slice(c); c = t }
else if (k.ctrl && inp === 'u') { v = v.slice(c); c = 0 }
else if (k.ctrl && inp === 'k') {v = v.slice(0, c)}
else if (k.meta && inp === 'b') {c = wordLeft(v, c)}
else if (k.meta && inp === 'f') {c = wordRight(v, c)}
else if (inp.length > 0) {
const bracketed = inp.includes('[200~')
const raw = inp.replace(BRACKET_PASTE, '').replace(/\r\n/g, '\n').replace(/\r/g, '\n')
if (!raw) {
return
}
if (bracketed && emitPaste({ bracketed: true, cursor: c, text: raw, value: v })) {return}
if (raw === '\n') {
return commit(v.slice(0, c) + '\n' + v.slice(c), c + 1)
}
if (!raw) {return}
if (raw === '\n') {return commit(insert(v, c, '\n'), c + 1)}
if (raw.length > 1 || raw.includes('\n')) {
if (!pasteBuf.current) {
pastePos.current = c
}
if (!pasteBuf.current) {pastePos.current = c}
pasteBuf.current += raw
if (pasteTimer.current) {
clearTimeout(pasteTimer.current)
}
if (pasteTimer.current) {clearTimeout(pasteTimer.current)}
pasteTimer.current = setTimeout(flushPaste, 50)
return
}
if (PRINTABLE.test(raw)) {
v = v.slice(0, c) + raw + v.slice(c)
c += raw.length
} else {
return
}
} else {
return
}
if (PRINTABLE.test(raw)) { v = v.slice(0, c) + raw + v.slice(c); c += raw.length }
else {return}
} else {return}
commit(v, c)
},
@@ -256,17 +213,16 @@ export function TextInput({ value, onChange, onPaste, onSubmit, placeholder = ''
// ── Render ──────────────────────────────────────────────────────
if (!focus) {
return <Text>{value || (placeholder ? DIM + placeholder + DIM_OFF : '')}</Text>
}
if (!focus) {return <Text>{value || (placeholder ? DIM + placeholder + DIM_OFF : '')}</Text>}
if (!value && placeholder) {
return <Text>{INV + (placeholder[0] ?? ' ') + INV_OFF + DIM + placeholder.slice(1) + DIM_OFF}</Text>
}
const rendered =
[...value].map((ch, i) => (i === cur ? INV + ch + INV_OFF : ch)).join('') +
(cur === value.length ? INV + ' ' + INV_OFF : '')
return <Text>{rendered}</Text>
return (
<Text>
{[...value].map((ch, i) => (i === cur ? INV + ch + INV_OFF : ch)).join('') +
(cur === value.length ? INV + ' ' + INV_OFF : '')}
</Text>
)
}