clean

2025-11-13 14:07:31 +01:00
parent 18558ab087
commit 62e44b5375
10 changed files with 152 additions and 132 deletions
@@ -4,6 +4,27 @@ import { createDocumentsTableHeaderActions } from '../documents/DocumentsPanel';
 import createWorkspaceSurfaceConfig from '../documents/workspaceHeader';
 import DocumentViewerPanel from '../preview/DocumentViewerPanel';
 import DesktopWorkspace from './DesktopWorkspace';
+import { useWorkspaceSelectionContext } from '../app/WorkspaceSelectionContext';
+
+type SelectionFloatingActionsBaseProps = Omit<React.ComponentProps<typeof SelectionFloatingActions>, 'selectionCount' | 'selectedDocumentIds' | 'selectedFolderIds'>;
+
+const SelectionFloatingActionsWithSelection: React.FC<SelectionFloatingActionsBaseProps> = (props) => {
+  const { selectedDocumentIds, selectedFolderIds } = useWorkspaceSelectionContext();
+  const documentIds = Array.isArray(selectedDocumentIds) ? selectedDocumentIds : [];
+  const folderIds = Array.isArray(selectedFolderIds) ? selectedFolderIds : [];
+  const selectionCount = documentIds.length + folderIds.length;
+  if (selectionCount === 0) {
+    return null;
+  }
+  return (
+    <SelectionFloatingActions
+      selectionCount={selectionCount}
+      selectedDocumentIds={documentIds}
+      selectedFolderIds={folderIds}
+      {...props}
+    />
+  );
+};

 type WorkspaceProps = Record<string, any>;

@@ -36,8 +57,6 @@ const createDesktopSurface = ({
    onRefresh,
    viewMode,
    onViewModeChange,
-    selectedDocumentIds,
-    selectedFolderIds,
    onDeleteSelection,
    onClearSelection,
    tags,
@@ -60,9 +79,6 @@ const createDesktopSurface = ({
    ? `${searchResults.length} matching document${searchResults.length === 1 ? '' : 's'}`
    : null;

-  const documentSelectionCount = Array.isArray(selectedDocumentIds) ? selectedDocumentIds.length : 0;
-  const folderSelectionCount = Array.isArray(selectedFolderIds) ? selectedFolderIds.length : 0;
-  const selectionCount = documentSelectionCount + folderSelectionCount;
  const actions = createDocumentsTableHeaderActions({
    viewMode: viewMode || 'desk',
    onViewModeChange,
@@ -71,28 +87,23 @@ const createDesktopSurface = ({
    onToggleIncludeDescendants: onToggleSearchIncludeDescendants,
  });

-  const floatingActions = selectionCount > 0
-    ? (
-        <SelectionFloatingActions
-          selectionCount={selectionCount}
-          selectedDocumentIds={selectedDocumentIds}
-          selectedFolderIds={selectedFolderIds}
-          documentLookup={documentLookup}
-          tags={tags}
-          tagLookupById={tagLookupById}
-          correspondents={correspondents}
-          onBulkTagAdd={onBulkTagAdd}
-          onBulkTagRemove={onBulkTagRemove}
-          onBulkCorrespondentAdd={onBulkCorrespondentAdd}
-          onBulkCorrespondentRemove={onBulkCorrespondentRemove}
-          onBulkReanalyze={onBulkReanalyze}
-          onDeleteSelection={onDeleteSelection}
-          onClearSelection={onClearSelection}
-          folderOptions={folderOptions}
-          onMoveDocumentsToFolder={onMoveDocumentsToFolder}
-        />
-      )
-    : null;
+  const floatingActions = (
+    <SelectionFloatingActionsWithSelection
+      documentLookup={documentLookup}
+      tags={tags}
+      tagLookupById={tagLookupById}
+      correspondents={correspondents}
+      onBulkTagAdd={onBulkTagAdd}
+      onBulkTagRemove={onBulkTagRemove}
+      onBulkCorrespondentAdd={onBulkCorrespondentAdd}
+      onBulkCorrespondentRemove={onBulkCorrespondentRemove}
+      onBulkReanalyze={onBulkReanalyze}
+      onDeleteSelection={onDeleteSelection}
+      onClearSelection={onClearSelection}
+      folderOptions={folderOptions}
+      onMoveDocumentsToFolder={onMoveDocumentsToFolder}
+    />
+  );

  const sidebarToggle = renderSidebarToggle ? renderSidebarToggle() : null;
  const detail = detailOpen && detailProps