hotkey fixes

hero-org · Sep 25, 2023 · 9592914 · 9592914
1 parent 1b050e5
commit 9592914
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/common/components/NewPostEntry.tsx b/src/common/components/NewPostEntry.tsx
@@ -105,7 +105,7 @@ export default function NewPostEntry({ draftIdx, onPost, hideChannel }: NewPostE
     }
   }
 
-  const ref = useHotkeys('meta+enter', onSubmitPost, [draft]);
+  const ref = useHotkeys('meta+enter', onSubmitPost, [draft], { enableOnFormTags: true });
 
   // const listener = (event: KeyboardEvent) => {
   //   if (event.key === "Enter" && event.metaKey) {

diff --git a/src/common/components/SelectableListWithHotkeys.tsx b/src/common/components/SelectableListWithHotkeys.tsx
@@ -35,12 +35,13 @@ export const SelectableListWithHotkeys = ({ data, renderRow, selectedIdx, setSel
   useHotkeys(['o', Key.Enter], () => {
     onSelect(selectedIdx);
   }, [selectedIdx], {
+    enabled: isActive
   })
 
   useHotkeys('shift+o', () => {
     onExpand(selectedIdx);
   }, [selectedIdx], {
-    enabled: onExpand !== undefined
+    enabled: onExpand !== undefined && isActive
   })
 
   useHotkeys(['j', Key.ArrowDown], () => {

diff --git a/src/pages/Feed/index.tsx b/src/pages/Feed/index.tsx
@@ -163,7 +163,7 @@ export default function Feed() {
       renderRow={(item: any, idx: number) => renderRow(item, idx)}
       onExpand={onOpenLinkInCast}
       onSelect={onSelectCast}
-      disableScroll={showCastThreadView || showReplyModal || showEmbedsModal}
+      isActive={!(showCastThreadView || showReplyModal || showEmbedsModal)}
     />
   )