focus on rightclick

kat-tax · Feb 15, 2025 · b1837d8 · b1837d8
1 parent 43c31e5
commit b1837d8
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 23 deletions.
diff --git a/client/src/media/dir/hooks/use-entry-hfs.ts b/client/src/media/dir/hooks/use-entry-hfs.ts
@@ -21,7 +21,7 @@ export function useEntryHfs({item, cmd, opt, tmp}: EntryHfsProps) {
   const put = usePut();
 
   // Spatial navigation
-  const {focused, ref: refFoc} = useFocusable({
+  const {focused, ref: refFoc, focusSelf: foc} = useFocusable({
     onFocus: (_lay, _props, e) => tmp
       ? undefined
       : cmd.select(item, e.event as unknown as GestureResponderEvent),
@@ -93,5 +93,6 @@ export function useEntryHfs({item, cmd, opt, tmp}: EntryHfsProps) {
     cmd: $.bind(cmd, item),
     opt: {...opt, focused, dropping},
     ref: [refDnd, refFoc],
+    foc,
   };
 }
diff --git a/client/src/media/dir/hooks/use-entry-torrent.ts b/client/src/media/dir/hooks/use-entry-torrent.ts
@@ -15,7 +15,7 @@ export function useEntryTorrent({item, cmd, opt}: EntryTorrentProps) {
   const [dragging, setDragging] = useState(false);
 
   // Spatial navigation
-  const {focused, ref: refFoc} = useFocusable({
+  const {focused, ref: refFoc, focusSelf: foc} = useFocusable({
     onEnterPress: () => cmd.download(item),
   });
 
@@ -40,5 +40,6 @@ export function useEntryTorrent({item, cmd, opt}: EntryTorrentProps) {
     cmd: $.bind(cmd, item),
     opt: {...opt, focused, dragging},
     ref: [refDnd, refFoc],
+    foc,
   };
 }
diff --git a/client/src/media/dir/hooks/use-entry-zip.ts b/client/src/media/dir/hooks/use-entry-zip.ts
@@ -15,7 +15,7 @@ export function useEntryZip({item, cmd, opt}: EntryZipProps) {
   const [dragging, setDragging] = useState(false);
 
   // Spatial navigation
-  const {focused, ref: refFoc} = useFocusable({
+  const {focused, ref: refFoc, focusSelf: foc} = useFocusable({
     onEnterPress: () => cmd.extract(item),
   });
 
@@ -40,5 +40,6 @@ export function useEntryZip({item, cmd, opt}: EntryZipProps) {
     cmd: $.bind(cmd, item),
     opt: {...opt, focused, dragging},
     ref: [refDnd, refFoc],
+    foc,
   };
 }
diff --git a/client/src/media/dir/stacks/entry-hfs.tsx b/client/src/media/dir/stacks/entry-hfs.tsx
@@ -15,15 +15,15 @@ export interface EntryHfsProps {
 export function EntryHfs(props: EntryHfsProps) {
   const {item, tmp} = props;
   const {name, size, isFile} = item;
-  const {ext, cmd, opt, ref} = useEntryHfs(props);
+  const {ext, cmd, opt, ref, foc} = useEntryHfs(props);
   const dir = !isFile;
 
   return (
     <Touch
       refs={ref}
       onPress={cmd.select}
       onDoublePress={dir ? () => cmd.open(true) : undefined}>
-      <MenuHfs {...{item, cmd}} on={open => open && ref[0]?.current?.focus()}>
+      <MenuHfs {...{item, cmd}} on={() => foc()}>
         <ListRow {...{name, size, ext, dir, tmp, opt}} img={cmd.thumbnail}/>
       </MenuHfs>
     </Touch>

diff --git a/client/src/media/dir/stacks/entry-torrent.tsx b/client/src/media/dir/stacks/entry-torrent.tsx
@@ -14,7 +14,7 @@ export interface EntryTorrentProps {
 export function EntryTorrent(props: EntryTorrentProps) {
   const {item} = props;
   const {name, length} = item;
-  const {ext, cmd, opt, ref} = useEntryTorrent(props);
+  const {ext, cmd, opt, ref, foc} = useEntryTorrent(props);
   const size = length;
   const dir = false;
 
@@ -23,7 +23,7 @@ export function EntryTorrent(props: EntryTorrentProps) {
       refs={ref}
       onPress={cmd.download}
       onDoublePress={dir ? cmd.download : undefined}>
-      <MenuTorrent {...{item, cmd, on: open => open && ref[0]?.current?.focus()}}>
+      <MenuTorrent {...{item, cmd}} on={() => foc()}>
         <ListRow {...{name, size, ext, dir, opt}}/>
       </MenuTorrent>
     </Touch>

diff --git a/client/src/media/dir/stacks/entry-zip.tsx b/client/src/media/dir/stacks/entry-zip.tsx
@@ -14,14 +14,14 @@ export interface EntryZipProps {
 export function EntryZip(props: EntryZipProps) {
   const {item} = props;
   const {name, size, dir} = item;
-  const {ext, cmd, opt, ref} = useEntryZip(props);
+  const {ext, cmd, opt, ref, foc} = useEntryZip(props);
 
   return (
     <Touch
       refs={ref}
       onPress={cmd.extract}
       onDoublePress={dir ? cmd.extract : undefined}>
-      <MenuZip {...{item, cmd, on: open => open && ref[0]?.current?.focus()}}>
+      <MenuZip {...{item, cmd}} on={() => foc()}>
         <ListRow {...{name, size, ext, dir, opt, tmp: true}}/>
       </MenuZip>
     </Touch>

diff --git a/client/src/media/dir/stacks/menu-torrent.tsx b/client/src/media/dir/stacks/menu-torrent.tsx
@@ -2,8 +2,8 @@ import {useMemo} from 'react';
 import {useLingui} from '@lingui/react/macro';
 import {MenuContext} from 'app/stacks/float';
 
-import type {TorrentFileEntry} from 'media/dir/types/torrent';
 import type {useEntryTorrent} from 'media/dir/hooks/use-entry-torrent';
+import type {TorrentFileEntry} from 'media/dir/types/torrent';
 
 export interface MenuTorrentProps extends React.PropsWithChildren {
   item: TorrentFileEntry,
@@ -14,6 +14,7 @@ export interface MenuTorrentProps extends React.PropsWithChildren {
 export function MenuTorrent(props: MenuTorrentProps) {
   const {item, cmd, on} = props;
   const {t} = useLingui();
+
   return (
     <MenuContext label={item.name} onOpenChange={on} items={useMemo(() => [
       {

diff --git a/client/src/media/dir/stacks/menu-zip.tsx b/client/src/media/dir/stacks/menu-zip.tsx
@@ -2,8 +2,8 @@ import {useMemo} from 'react';
 import {useLingui} from '@lingui/react/macro';
 import {MenuContext} from 'app/stacks/float';
 
-import type {ZipFileEntry} from 'media/dir/types/zip';
 import type {useEntryZip} from 'media/dir/hooks/use-entry-zip';
+import type {ZipFileEntry} from 'media/dir/types/zip';
 
 export interface MenuZipProps extends React.PropsWithChildren {
   item: ZipFileEntry,
@@ -14,6 +14,7 @@ export interface MenuZipProps extends React.PropsWithChildren {
 export function MenuZip(props: MenuZipProps) {
   const {item, cmd, on} = props;
   const {t} = useLingui();
+
   return (
     <MenuContext label={item.name} onOpenChange={on} items={useMemo(() => [
       {

diff --git a/translations/ar.po b/translations/ar.po
@@ -166,7 +166,7 @@ msgstr "المستندات"
 msgid "Documents"
 msgstr "المستندات"
 
-#: ../../client/src/media/dir/stacks/menu-hfs.tsx:44
+#: ../../client/src/media/dir/stacks/menu-torrent.tsx:23
 msgid "Download"
 msgstr "تحميل"
 
@@ -194,7 +194,7 @@ msgstr "أدخل اسم المجلد"
 msgid "Enter name"
 msgstr "أدخل الاسم"
 
-#: ../../client/src/media/hooks/use-media-controls.ts:101
+#: ../../client/src/media/dir/stacks/menu-zip.tsx:23
 msgid "Extract"
 msgstr "استخراج"
 

diff --git a/translations/en.po b/translations/en.po
@@ -166,7 +166,7 @@ msgstr "Docs"
 msgid "Documents"
 msgstr "Documents"
 
-#: ../../client/src/media/dir/stacks/menu-hfs.tsx:44
+#: ../../client/src/media/dir/stacks/menu-torrent.tsx:23
 msgid "Download"
 msgstr "Download"
 
@@ -194,7 +194,7 @@ msgstr "Enter folder name"
 msgid "Enter name"
 msgstr "Enter name"
 
-#: ../../client/src/media/hooks/use-media-controls.ts:101
+#: ../../client/src/media/dir/stacks/menu-zip.tsx:23
 msgid "Extract"
 msgstr "Extract"
 

diff --git a/translations/es.po b/translations/es.po
@@ -166,7 +166,7 @@ msgstr "Documentos"
 msgid "Documents"
 msgstr "Documentos"
 
-#: ../../client/src/media/dir/stacks/menu-hfs.tsx:44
+#: ../../client/src/media/dir/stacks/menu-torrent.tsx:23
 msgid "Download"
 msgstr "Descargar"
 
@@ -194,7 +194,7 @@ msgstr "Ingresa nombre de carpeta"
 msgid "Enter name"
 msgstr "Ingresa nombre"
 
-#: ../../client/src/media/hooks/use-media-controls.ts:101
+#: ../../client/src/media/dir/stacks/menu-zip.tsx:23
 msgid "Extract"
 msgstr "Extraer"
 

diff --git a/translations/ja.po b/translations/ja.po
@@ -166,7 +166,7 @@ msgstr "ドキュメント"
 msgid "Documents"
 msgstr "ドキュメント"
 
-#: ../../client/src/media/dir/stacks/menu-hfs.tsx:44
+#: ../../client/src/media/dir/stacks/menu-torrent.tsx:23
 msgid "Download"
 msgstr "ダウンロード"
 
@@ -194,7 +194,7 @@ msgstr "フォルダ名を入力"
 msgid "Enter name"
 msgstr "名前を入力"
 
-#: ../../client/src/media/hooks/use-media-controls.ts:101
+#: ../../client/src/media/dir/stacks/menu-zip.tsx:23
 msgid "Extract"
 msgstr "抽出"
 

diff --git a/translations/ko.po b/translations/ko.po
@@ -166,7 +166,7 @@ msgstr "문서"
 msgid "Documents"
 msgstr "문서"
 
-#: ../../client/src/media/dir/stacks/menu-hfs.tsx:44
+#: ../../client/src/media/dir/stacks/menu-torrent.tsx:23
 msgid "Download"
 msgstr "다운로드"
 
@@ -194,7 +194,7 @@ msgstr "폴더 이름 입력"
 msgid "Enter name"
 msgstr "이름 입력"
 
-#: ../../client/src/media/hooks/use-media-controls.ts:101
+#: ../../client/src/media/dir/stacks/menu-zip.tsx:23
 msgid "Extract"
 msgstr "추출"
 

diff --git a/translations/ru.po b/translations/ru.po
@@ -166,7 +166,7 @@ msgstr "Документы"
 msgid "Documents"
 msgstr "Документы"
 
-#: ../../client/src/media/dir/stacks/menu-hfs.tsx:44
+#: ../../client/src/media/dir/stacks/menu-torrent.tsx:23
 msgid "Download"
 msgstr "Скачать"
 
@@ -194,7 +194,7 @@ msgstr "Введите имя папки"
 msgid "Enter name"
 msgstr "Введите имя"
 
-#: ../../client/src/media/hooks/use-media-controls.ts:101
+#: ../../client/src/media/dir/stacks/menu-zip.tsx:23
 msgid "Extract"
 msgstr "Извлечь"