Merge branch 'preview-fixes'

the1812 · Feb 20, 2024 · c5852f8 · c5852f8
2 parents fdc05db + 60b427f
commit c5852f8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/registry/lib/components/utils/keymap/actions.ts b/registry/lib/components/utils/keymap/actions.ts
@@ -244,8 +244,18 @@ export const builtInActions: Record<string, KeyBindingAction> = {
       if (!activeElement || !(activeElement instanceof HTMLTextAreaElement)) {
         return null
       }
-      const sendButton = (activeElement.nextElementSibling ??
-        activeElement.parentElement.nextElementSibling) as HTMLButtonElement
+      const sendButton = (() => {
+        const candidates = [
+          () => activeElement.nextElementSibling,
+          () => activeElement.parentElement.nextElementSibling,
+          () => dq('.reply-box:focus-within .reply-box-send'),
+        ]
+        const match = candidates.find(fn => fn() !== null)
+        if (match) {
+          return match() as HTMLElement
+        }
+        return null
+      })()
       if (!sendButton) {
         return null
       }