This commit is contained in:
2025-11-04 00:48:37 +01:00
parent 01fd774b18
commit f523e5651b
3 changed files with 166 additions and 182 deletions
+5 -164
View File
@@ -3133,165 +3133,6 @@ const AppLayout = () => {
],
);
const handleDocumentListFocus = useCallback(() => {
if (focusedRowKey && navigableRowKeys.includes(focusedRowKey)) {
return;
}
let resolvedKey = null;
for (let index = selectedEntries.length - 1; index >= 0; index -= 1) {
const candidate = selectedEntries[index];
if (navigableRowKeys.includes(candidate)) {
resolvedKey = candidate;
break;
}
}
if (!resolvedKey && navigableRows.length) {
resolvedKey = navigableRows[0].key;
}
if (!resolvedKey) {
return;
}
if (selectedEntries.length === 0) {
return;
}
setFocusedRowKey(resolvedKey);
if (!selectedEntries.includes(resolvedKey) && selectedEntries.length > 0) {
applySelection([resolvedKey], { anchor: resolvedKey, interactedKeys: [resolvedKey] });
}
}, [
focusedRowKey,
navigableRowKeys,
selectedEntries,
navigableRows,
applySelection,
setFocusedRowKey,
]);
const handleDocumentListKeyDown = useCallback(
(event) => {
const { key, shiftKey } = event;
const triggers = ['ArrowUp', 'ArrowDown', 'Home', 'End', 'Enter', ' ', 'Space', 'Spacebar'];
if (!triggers.includes(key)) {
return;
}
if (!navigableRows.length) {
return;
}
event.preventDefault();
let activeKey =
focusedRowKey && navigableRowKeys.includes(focusedRowKey)
? focusedRowKey
: null;
let initializedFromEmptyState = false;
if (!activeKey) {
for (let index = selectedEntries.length - 1; index >= 0; index -= 1) {
const candidate = selectedEntries[index];
if (navigableRowKeys.includes(candidate)) {
activeKey = candidate;
break;
}
}
}
if (!activeKey) {
if (key === 'ArrowUp') {
const lastKey = navigableRowKeys[navigableRowKeys.length - 1];
if (!lastKey) {
return;
}
activeKey = lastKey;
} else {
activeKey = navigableRowKeys[0];
}
setFocusedRowKey(activeKey);
initializedFromEmptyState = true;
}
let currentIndex = navigableRowKeys.indexOf(activeKey);
if (key === 'Enter' || key === ' ' || key === 'Space' || key === 'Spacebar') {
const row = currentIndex === -1 ? navigableRows[0] : navigableRows[currentIndex];
if (!row) {
return;
}
handleEntrySelection(row.key, event);
if (row.type === 'folder') {
selectFolder(row.id);
} else if (row.type === 'document') {
openDocumentPreview(row.id);
}
return;
}
let nextIndex = currentIndex;
if (key === 'ArrowDown') {
if (initializedFromEmptyState && selectedEntries.length === 0) {
handleEntrySelection(activeKey, {
shiftKey,
preventDefault: () => {},
});
return;
}
nextIndex = currentIndex === -1 ? 0 : Math.min(currentIndex + 1, navigableRows.length - 1);
} else if (key === 'ArrowUp') {
if (initializedFromEmptyState && selectedEntries.length === 0) {
handleEntrySelection(activeKey, {
shiftKey,
preventDefault: () => {},
});
return;
}
nextIndex = currentIndex === -1 ? navigableRows.length - 1 : Math.max(currentIndex - 1, 0);
} else if (key === 'Home') {
nextIndex = 0;
} else if (key === 'End') {
nextIndex = navigableRows.length - 1;
}
if (nextIndex === -1 || nextIndex >= navigableRows.length) {
return;
}
if (nextIndex === currentIndex && key !== 'Home' && key !== 'End') {
return;
}
const targetRow = navigableRows[nextIndex];
if (!targetRow) {
return;
}
setFocusedRowKey(targetRow.key);
handleEntrySelection(targetRow.key, {
shiftKey,
preventDefault: () => {},
});
},
[
navigableRows,
navigableRowKeys,
focusedRowKey,
selectedEntries,
handleEntrySelection,
selectFolder,
openDocumentPreview,
setFocusedRowKey,
],
);
useEffect(() => {
if (!previewDocumentId) return;
const handleKeyDown = (event) => {
@@ -4728,8 +4569,7 @@ const AppLayout = () => {
isSearchLoading: searchLoading,
tagLookupById,
activeCorrespondentIds: activeCorrespondentFilters,
onDocumentListFocus: handleDocumentListFocus,
onDocumentListKeyDown: handleDocumentListKeyDown,
selectedEntries,
onFocusedRowChange: setFocusedRowKey,
ensureAssetUrl,
getDocumentAsset,
@@ -4741,6 +4581,7 @@ const AppLayout = () => {
onClearSelection: clearDocumentSelection,
onDeleteSelection: handleDeleteSelection,
onEntryPointer: handleEntryPointer,
onEntrySelection: handleEntrySelection,
tags,
correspondents,
documentLookup,
@@ -4764,14 +4605,14 @@ const AppLayout = () => {
folderClickHandlers,
handleDocumentDragEnd,
handleDocumentDragStart,
handleDocumentListFocus,
handleDocumentListKeyDown,
handleDocumentTagDrop,
handleDocumentTitleUpdate,
handleDocumentsViewModeChange,
handleFolderDragEnd,
handleFolderDragStart,
handleFolderRename,
handleEntryPointer,
handleEntrySelection,
handleDeleteSelection,
isFilterActive,
openDocumentPreview,
@@ -4780,12 +4621,12 @@ const AppLayout = () => {
searchResults,
selectFolder,
selectedDocumentIds,
selectedEntries,
selectedFolderIds,
setFocusedRowKey,
tagLookupById,
toggleCorrespondentFilter,
toggleTagFilter,
handleEntryPointer,
ensureAssetUrl,
getDocumentAsset,
tags,