simplify frontend document and folder memoization.

frontend/src/documents/data/useDocumentsWorkspace.ts

@@ -458,15 +458,12 @@ const useDocumentsWorkspace = ({
     tenantIdRef.current = currentTenantId;
   }, [currentTenantId, tenantIdRef]);
 
-  const tagLookupById = useMemo(() => {
+  const tagLookupById = new Map();
-    const map = new Map();
+  tags.forEach((tag) => {
-    tags.forEach((tag) => {
+    if (tag?.id) {
-      if (tag?.id) {
+      tagLookupById.set(tag.id, tag);
-        map.set(tag.id, tag);
+    }
-      }
+  });
-    });
-    return map;
-  }, [tags]);
 
   const tagsState = {
     ...tagsStateRaw,

frontend/src/documents/features/selection/SelectionFolderMenu.tsx

@@ -106,17 +106,8 @@ const SelectionFolderMenu: React.FC<SelectionFolderMenuProps> = ({
         return { nodeMap: nMap, parentMap: pMap };
     }, [folderTree]);
 
-    const currentChildren = useMemo(() => {
-        const currentFolder = currentFolderId ? nodeMap.get(currentFolderId) : null;
-        return currentFolder ? currentFolder.children || [] : folderTree;
-    }, [currentFolderId, nodeMap, folderTree]);
-
     const currentFolder = currentFolderId ? nodeMap.get(currentFolderId) : null;
 
-    // Filter items based on search query
-    // If searching, we might want to show flattened results matching the query?
-    // Or just filter current level?
-    // Usually, search implies searching the whole tree.
     const isSearching = query.trim().length > 0;
 
     const displayedItems = useMemo(() => {
@@ -130,8 +121,10 @@ const SelectionFolderMenu: React.FC<SelectionFolderMenuProps> = ({
             });
             return results;
         }
-        return currentChildren;
+        return currentFolderId
-    }, [isSearching, query, currentChildren, nodeMap]);
+            ? (nodeMap.get(currentFolderId)?.children || [])
+            : folderTree;
+    }, [isSearching, query, currentFolderId, nodeMap, folderTree]);
 
     const handleTriggerClick = useCallback(() => {
         if (disabled) {

frontend/src/documents/logic/useDocumentsPanelProps.ts

@@ -1,4 +1,3 @@
-import { useMemo } from 'react';
 import type { WorkspaceSelectionValue } from '../../app/WorkspaceSelectionContext';
 import type { Identifier } from '../../types/identifiers';
 
@@ -115,107 +114,57 @@ const useDocumentsPanelProps = (props: UseDocumentsPanelPropsArgs) => {
     selectionValue,
   } = props;
 
-  return useMemo(
+  return {
-    () => ({
+    currentFolderName,
-      currentFolderName,
+    breadcrumbs,
-      breadcrumbs,
+    onRefresh: refreshCurrentFolder,
-      onRefresh: refreshCurrentFolder,
+    subfolders: currentSubfolders,
-      subfolders: currentSubfolders,
+    documents,
-      documents,
+    searchQuery,
-      searchQuery,
+    searchResultIds,
-      searchResultIds,
+    selectedFolder,
-      selectedFolder,
+    onFolderSelect: selectFolder,
-      onFolderSelect: selectFolder,
+    onFolderDrop: folderClickHandlers.onDrop,
-      onFolderDrop: folderClickHandlers.onDrop,
+    onFolderDragOver: folderClickHandlers.onDragOver,
-      onFolderDragOver: folderClickHandlers.onDragOver,
+    onFolderDragLeave: folderClickHandlers.onDragLeave,
-      onFolderDragLeave: folderClickHandlers.onDragLeave,
+    onFolderDragStart: handleFolderDragStart,
-      onFolderDragStart: handleFolderDragStart,
+    onFolderDragEnd: handleFolderDragEnd,
-      onFolderDragEnd: handleFolderDragEnd,
+    draggedFolderId,
-      draggedFolderId,
+    onFolderRename: handleFolderRename,
-      onFolderRename: handleFolderRename,
+    onDocumentRename: handleDocumentTitleUpdate,
-      onDocumentRename: handleDocumentTitleUpdate,
+    focusedRowKey,
-      focusedRowKey,
+    draggingDocumentIds: draggedDocumentIds,
-      draggingDocumentIds: draggedDocumentIds,
+    onDocumentDragStart: handleDocumentDragStart,
-      onDocumentDragStart: handleDocumentDragStart,
+    onDocumentDragEnd: handleDocumentDragEnd,
-      onDocumentDragEnd: handleDocumentDragEnd,
+    isSearchLoading: searchLoading,
-      isSearchLoading: searchLoading,
+    tagLookupById,
-      tagLookupById,
+    activeTagFilters,
-      activeTagFilters,
+    activeCorrespondentFilters,
-      activeCorrespondentFilters,
+    activeCorrespondentIds: activeCorrespondentFilters,
-      activeCorrespondentIds: activeCorrespondentFilters,
+    ensureAssetUrl,
-      ensureAssetUrl,
+    getDocumentAsset,
-      getDocumentAsset,
+    onDocumentTagAttach: handleDocumentTagAttach,
-      onDocumentTagAttach: handleDocumentTagAttach,
+    onDocumentTagDetach: handleDocumentTagDetach,
-      onDocumentTagDetach: handleDocumentTagDetach,
+    viewMode: documentsViewMode,
-      viewMode: documentsViewMode,
+    sortField: documentsSortField,
-      sortField: documentsSortField,
+    sortDirection: documentsSortDirection,
-      sortDirection: documentsSortDirection,
+    onSortFieldChange: handleDocumentsSortFieldChange,
-      onSortFieldChange: handleDocumentsSortFieldChange,
+    onSortDirectionToggle: handleDocumentsSortDirectionToggle,
-      onSortDirectionToggle: handleDocumentsSortDirectionToggle,
+    onViewModeChange: handleDocumentsViewModeChange,
-      onViewModeChange: handleDocumentsViewModeChange,
+    onDeleteSelection: handleDeleteSelection,
-      onDeleteSelection: handleDeleteSelection,
+    onEntryPointer: handleEntryPointerCore,
-      onEntryPointer: handleEntryPointerCore,
+    tags,
-      tags,
+    correspondents,
-      correspondents,
+    documentLookup,
-      documentLookup,
+    onBulkTagAdd: handleBulkTagAddFromDetail,
-      onBulkTagAdd: handleBulkTagAddFromDetail,
+    onBulkTagRemove: handleBulkTagRemoveFromDetail,
-      onBulkTagRemove: handleBulkTagRemoveFromDetail,
+    onBulkCorrespondentAdd: handleBulkCorrespondentAdd,
-      onBulkCorrespondentAdd: handleBulkCorrespondentAdd,
+    onBulkCorrespondentRemove: handleBulkCorrespondentRemove,
-      onBulkCorrespondentRemove: handleBulkCorrespondentRemove,
+    onBulkReanalyze: handleBulkSelectionReanalyze,
-      onBulkReanalyze: handleBulkSelectionReanalyze,
+    folderOptions,
-      folderOptions,
+    onMoveDocumentsToFolder: moveDocumentsToFolder,
-      onMoveDocumentsToFolder: moveDocumentsToFolder,
+    selectionValue,
-      selectionValue,
+  };
-    }),
-    [
-      activeCorrespondentFilters,
-      breadcrumbs,
-      correspondents,
-      currentFolderName,
-      currentSubfolders,
-      documents,
-      documentsSortDirection,
-      documentsSortField,
-      documentsViewMode,
-      searchQuery,
-      documentLookup,
-      draggedDocumentIds,
-      draggedFolderId,
-      focusedRowKey,
-      folderClickHandlers,
-      handleBulkCorrespondentAdd,
-      handleBulkCorrespondentRemove,
-      handleBulkSelectionReanalyze,
-      handleBulkTagAddFromDetail,
-      handleBulkTagRemoveFromDetail,
-      handleDeleteSelection,
-      handleDocumentDragEnd,
-      handleDocumentDragStart,
-      handleDocumentTagAttach,
-      handleDocumentTagDetach,
-      handleDocumentTitleUpdate,
-      handleDocumentsSortDirectionToggle,
-      handleDocumentsSortFieldChange,
-      handleDocumentsViewModeChange,
-      handleEntryPointerCore,
-      handleFolderDragEnd,
-      handleFolderDragStart,
-      handleFolderRename,
-      moveDocumentsToFolder,
-      refreshCurrentFolder,
-      searchLoading,
-      searchResultIds,
-      selectedFolder,
-      selectFolder,
-      tagLookupById,
-      activeTagFilters,
-      tags,
-      ensureAssetUrl,
-      getDocumentAsset,
-      folderOptions,
-      selectionValue,
-    ],
-  );
 };
 
 export default useDocumentsPanelProps;

frontend/src/viewer/logic/useDetailWorkspace.ts

@@ -178,48 +178,26 @@ const useDetailWorkspace = ({
     closeDetailPanel();
   }, [closeDetailPanel]);
 
-  const detailPanelProps = useMemo(
+  const detailPanelProps = {
-    () => ({
+    document: detailPanelDocument,
-      document: detailPanelDocument,
+    tags,
-      tags,
+    tagLookupById,
-      tagLookupById,
+    onTagAdd: handleDocumentTagAdd,
-      onTagAdd: handleDocumentTagAdd,
+    onTagRemove: handleDocumentTagDetach,
-      onTagRemove: handleDocumentTagDetach,
+    onOpenPreview: openDocumentPreview,
-      onOpenPreview: openDocumentPreview,
+    activePreviewId,
-      activePreviewId,
+    onUpdateTitle: handleDocumentTitleUpdate,
-      onUpdateTitle: handleDocumentTitleUpdate,
+    onUpdateIssued: handleDocumentIssuedUpdate,
-      onUpdateIssued: handleDocumentIssuedUpdate,
+    ensureAssetUrl,
-      ensureAssetUrl,
+    getDocumentAsset: getAsset,
-      getDocumentAsset: getAsset,
+    correspondents,
-      correspondents,
+    onCorrespondentAdd: handleCorrespondentAdd,
-      onCorrespondentAdd: handleCorrespondentAdd,
+    onCorrespondentRemove: handleCorrespondentRemove,
-      onCorrespondentRemove: handleCorrespondentRemove,
+    onFolderNavigate: selectFolder,
-      onFolderNavigate: selectFolder,
+    onClose: handleDetailPanelClose,
-      onClose: handleDetailPanelClose,
+    resolveFolderPath,
-      resolveFolderPath,
+    folderNodes,
-      folderNodes,
+  };
-    }),
-    [
-      activePreviewId,
-      correspondents,
-      detailPanelDocument,
-      ensureAssetUrl,
-      getAsset,
-      handleCorrespondentAdd,
-      handleCorrespondentRemove,
-      handleDetailPanelClose,
-      handleDocumentTagAdd,
-      handleDocumentIssuedUpdate,
-      handleDocumentTitleUpdate,
-      handleDocumentTagDetach,
-      folderNodes,
-      openDocumentPreview,
-      resolveFolderPath,
-      selectFolder,
-      tags,
-      tagLookupById,
-    ],
-  );
 
   return {
     detailPanelProps,