@ifc-lite/viewer 1.28.0 → 1.28.1

package/src/components/viewer/MainToolbar.tsx

@@ -44,13 +44,14 @@ import {
   CalendarClock,
   Globe2,
   Move,
-  Settings,
   PenLine,
   Layers3,
   SquareStack,
   ChevronsUpDown,
   Undo2,
   Redo2,
+  Boxes,
+  Shapes,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Switch } from '@/components/ui/switch';
@@ -83,16 +84,10 @@ import { DataConnector } from './DataConnector';
 import { ExportChangesButton } from './ExportChangesButton';
 import { SearchInline } from './SearchInline';
 import { useFloorplanView } from '@/hooks/useFloorplanView';
-import { buildDesktopUpgradeUrl, hasDesktopFeatureAccess, type DesktopFeature } from '@/lib/desktop-product';
 import { recordRecentFiles, cacheFileBlobs } from '@/lib/recent-files';
 import { ThemeSwitch } from './ThemeSwitch';
 import { ExtensionToolbarSlot } from '@/components/extensions/ExtensionToolbarSlot';
 import { toast } from '@/components/ui/toast';
-import { navigateToPath } from '@/services/app-navigation';
-import { getStartupHarnessRequest, setActiveHarnessRequest, tryClaimStartupHarnessRequest } from '@/services/desktop-harness';
-import { logToDesktopTerminal } from '@/services/desktop-logger';
-import { openIfcFileDialog, type NativeFileHandle } from '@/services/file-dialog';
-import { isTauri } from '@/lib/platform';
 import {
   closeActiveAnalysisExtension,
   getAnalysisExtensionsSnapshot,
@@ -103,10 +98,6 @@ import {
 type Tool = 'select' | 'walk' | 'measure' | 'section' | 'annotate' | 'addElement' | 'split';
 type WorkspacePanel = 'script' | 'list' | 'bcf' | 'ids' | 'lens' | 'addElement' | string;
 
-function isNativeFileHandle(file: File | NativeFileHandle): file is NativeFileHandle {
-  return typeof (file as NativeFileHandle).path === 'string';
-}
-
 // #region FIX: Move ToolButton OUTSIDE MainToolbar to prevent recreation on every render
 // This fixes Radix UI Tooltip's asChild prop becoming stale during re-renders
 interface ToolButtonProps {
@@ -438,11 +429,9 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   // Listen for programmatic file-load requests (from command palette recent files)
   useEffect(() => {
     const handler = (e: Event) => {
-      const file = (e as CustomEvent<File | NativeFileHandle>).detail;
+      const file = (e as CustomEvent<File>).detail;
       if (file) {
-        recordRecentFiles([isNativeFileHandle(file)
-          ? { name: file.name, size: file.size, path: file.path, modifiedMs: file.modifiedMs ?? null }
-          : { name: file.name, size: file.size }]);
+        recordRecentFiles([{ name: file.name, size: file.size }]);
         void loadFile(file);
       }
     };
@@ -450,78 +439,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     return () => window.removeEventListener('ifc-lite:load-file', handler);
   }, [loadFile]);
 
-  useEffect(() => {
-    let cancelled = false;
-    const sleep = (ms: number) => new Promise((resolve) => globalThis.setTimeout(resolve, ms));
-
-    const waitForViewerToSettle = async (label: string) => {
-      const timeoutMs = 120_000;
-      const pollMs = 100;
-      const start = performance.now();
-      while (!cancelled) {
-        const state = useViewerStore.getState();
-        const meshCount = state.geometryResult?.meshes.length ?? 0;
-        if (!state.loading && meshCount > 0) {
-          void logToDesktopTerminal(
-            'info',
-            `[DesktopHarness] ${label} settled: loading=${state.loading} meshes=${meshCount} progress=${state.progress?.phase ?? 'none'}`
-          );
-          return;
-        }
-        if (performance.now() - start >= timeoutMs) {
-          throw new Error(`[DesktopHarness] Timed out waiting for ${label} to settle`);
-        }
-        await sleep(pollMs);
-      }
-    };
-
-    void (async () => {
-      void logToDesktopTerminal('info', '[DesktopHarness] MainToolbar startup harness effect running');
-      const request = await getStartupHarnessRequest();
-      if (!request || cancelled) {
-        void logToDesktopTerminal(
-          'info',
-          `[DesktopHarness] No startup harness request available (cancelled=${cancelled})`
-        );
-        return;
-      }
-      if (!tryClaimStartupHarnessRequest(request)) {
-        void logToDesktopTerminal('info', `[DesktopHarness] Startup harness request already claimed for ${request.file.path}`);
-        return;
-      }
-      void logToDesktopTerminal('info', `[DesktopHarness] Claimed startup harness request for ${request.file.path}`);
-      console.log(`[DesktopHarness] Auto-loading startup file: ${request.file.path}`);
-      if (!request.replaceFile) {
-        void logToDesktopTerminal('info', `[DesktopHarness] Calling loadFile for ${request.file.path}`);
-        await loadFile(request.file);
-        return;
-      }
-
-      void logToDesktopTerminal(
-        'info',
-        `[DesktopHarness] Running replacement sequence first=${request.file.path} second=${request.replaceFile.path}`
-      );
-      setActiveHarnessRequest(null);
-      await loadFile(request.file);
-      await waitForViewerToSettle(`first load ${request.file.name}`);
-      if (cancelled) {
-        return;
-      }
-
-      setActiveHarnessRequest({
-        ...request,
-        file: request.replaceFile,
-        replaceFile: undefined,
-      });
-      void logToDesktopTerminal('info', `[DesktopHarness] Calling replacement loadFile for ${request.replaceFile.path}`);
-      await loadFile(request.replaceFile);
-    })();
-
-    return () => {
-      cancelled = true;
-    };
-  }, [loadFile]);
-
   // Floorplan view
   const { availableStoreys, activateFloorplan } = useFloorplanView();
 
@@ -541,6 +458,10 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   const typeVisibility = useViewerStore((state) => state.typeVisibility);
   const toggleTypeVisibility = useViewerStore((state) => state.toggleTypeVisibility);
   const resetTypeVisibility = useViewerStore((state) => state.resetTypeVisibility);
+  // #957 follow-up: Model/Types 3D view switch — 'model' shows placed
+  // occurrences (default), 'types' shows the type-library shapes.
+  const typeViewMode = useViewerStore((state) => state.typeViewMode);
+  const setTypeViewMode = useViewerStore((state) => state.setTypeViewMode);
   // How many of the five class toggles are on — surfaced in the menu
   // header so the user sees scene state at a glance.
   const visibleClassCount = [
@@ -591,7 +512,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   const cesiumPlacementEditMode = useViewerStore((state) => state.cesiumPlacementEditMode);
   const setCesiumPlacementEditMode = useViewerStore((state) => state.setCesiumPlacementEditMode);
   const storeModels = useViewerStore((state) => state.models);
-  const desktopEntitlement = useViewerStore((state) => state.desktopEntitlement);
   const analysisExtensionState = useSyncExternalStore(
     subscribeAnalysisExtensions,
     getAnalysisExtensionsSnapshot,
@@ -609,7 +529,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     () => analysisExtensionState.extensions.filter((extension) => (extension.placement ?? 'right') === 'bottom'),
     [analysisExtensionState.extensions],
   );
-  const desktopShell = isTauri();
 
   // NOTE: The Class Visibility dropdown used to gate each toggle on whether
   // the loaded model actually contained that class (scanning meshes for
@@ -725,19 +644,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     goHomeFromStore();
   }, []);
 
-  const promptDesktopUpgrade = useCallback((featureLabel: string) => {
-    toast.info(`${featureLabel} is available with Desktop Pro`);
-    navigateToPath(buildDesktopUpgradeUrl());
-  }, []);
-
-  const requireDesktopFeature = useCallback((feature: DesktopFeature, label: string) => {
-    if (hasDesktopFeatureAccess(desktopEntitlement, feature)) {
-      return true;
-    }
-    promptDesktopUpgrade(label);
-    return false;
-  }, [desktopEntitlement, promptDesktopUpgrade]);
-
   const handleToggleBottomPanel = useCallback((panel: 'script' | 'list' | 'gantt') => {
     if (activeAnalysisExtension?.placement === 'bottom') {
       closeActiveAnalysisExtension();
@@ -768,15 +674,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     if (activeAnalysisExtension?.placement !== 'bottom') {
       closeActiveAnalysisExtension();
     }
-    if (panel === 'bcf' && !requireDesktopFeature('bcf_issue_management', 'BCF issue management')) {
-      return;
-    }
-    if (panel === 'ids' && !requireDesktopFeature('ids_validation', 'IDS validation')) {
-      return;
-    }
-    if (panel === 'extensions' && !requireDesktopFeature('extensions', 'Extensions')) {
-      return;
-    }
 
     const nextBcfVisible = panel === 'bcf' ? !bcfPanelVisible : false;
     const nextIdsVisible = panel === 'ids' ? !idsPanelVisible : false;
@@ -812,7 +709,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     extensionsPanelVisible,
     idsPanelVisible,
     lensPanelVisible,
-    requireDesktopFeature,
     setActiveTool,
     setBcfPanelVisible,
     setClashPanelVisible,
@@ -920,7 +816,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   }, [activeAnalysisExtension?.label, activeWorkspacePanels]);
 
   const handleScreenshot = useCallback(() => {
-    if (!requireDesktopFeature('exports', 'Exports')) return;
     const canvas = document.querySelector('canvas');
     if (!canvas) return;
     try {
@@ -934,10 +829,9 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
       console.error('Screenshot failed:', err);
       toast.error('Screenshot failed');
     }
-  }, [requireDesktopFeature]);
+  }, []);
 
   const handleExportCSV = useCallback((type: 'entities' | 'properties' | 'quantities' | 'spatial') => {
-    if (!requireDesktopFeature('exports', 'Exports')) return;
     if (!ifcDataStore) return;
     try {
       const exporter = new CSVExporter(ifcDataStore);
@@ -975,10 +869,9 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
       console.error('CSV export failed:', err);
       toast.error(`CSV export failed: ${err instanceof Error ? err.message : 'Unknown error'}`);
     }
-  }, [ifcDataStore, requireDesktopFeature]);
+  }, [ifcDataStore]);
 
   const handleExportJSON = useCallback(() => {
-    if (!requireDesktopFeature('exports', 'Exports')) return;
     if (!ifcDataStore) return;
     try {
       const entities: Record<string, unknown>[] = [];
@@ -1006,7 +899,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
       console.error('JSON export failed:', err);
       toast.error(`JSON export failed: ${err instanceof Error ? err.message : 'Unknown error'}`);
     }
-  }, [ifcDataStore, requireDesktopFeature]);
+  }, [ifcDataStore]);
 
   return (
     <div className="flex items-center gap-1 px-2 h-12 border-b bg-white dark:bg-black border-zinc-200 dark:border-zinc-800 relative z-50">
@@ -1034,25 +927,9 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
           <Button
             variant="ghost"
             size="icon-sm"
-            onClick={async (e) => {
+            onClick={(e) => {
               // Blur button to close tooltip before opening file dialog
               (e.currentTarget as HTMLButtonElement).blur();
-
-              void logToDesktopTerminal('info', '[MainToolbar] Open file button clicked');
-              const file = await openIfcFileDialog();
-              if (file) {
-                void logToDesktopTerminal('info', `[MainToolbar] Native dialog selected ${file.path}`);
-                recordRecentFiles([{
-                  name: file.name,
-                  size: file.size,
-                  path: file.path,
-                  modifiedMs: file.modifiedMs ?? null,
-                }]);
-                void loadFile(file);
-                return;
-              }
-
-              void logToDesktopTerminal('info', '[MainToolbar] Falling back to browser file input');
               fileInputRef.current?.click();
             }}
             disabled={loading}
@@ -1095,37 +972,23 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
           </Button>
         </DropdownMenuTrigger>
         <DropdownMenuContent>
-          {hasDesktopFeatureAccess(desktopEntitlement, 'exports') ? (
-            <ExportDialog
-              trigger={
-                <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
-                  <FileText className="h-4 w-4 mr-2" />
-                  Export IFC (with changes)
-                </DropdownMenuItem>
-              }
-            />
-          ) : (
-            <DropdownMenuItem onClick={() => promptDesktopUpgrade('Exports')}>
-              <FileText className="h-4 w-4 mr-2" />
-              Export IFC (with changes)
-            </DropdownMenuItem>
-          )}
+          <ExportDialog
+            trigger={
+              <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
+                <FileText className="h-4 w-4 mr-2" />
+                Export IFC (with changes)
+              </DropdownMenuItem>
+            }
+          />
           <DropdownMenuSeparator />
-          {hasDesktopFeatureAccess(desktopEntitlement, 'exports') ? (
-            <GLBExportDialog
-              trigger={
-                <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
-                  <Download className="h-4 w-4 mr-2" />
-                  Export GLB (3D Model)
-                </DropdownMenuItem>
-              }
-            />
-          ) : (
-            <DropdownMenuItem onClick={() => promptDesktopUpgrade('Exports')}>
-              <Download className="h-4 w-4 mr-2" />
-              Export GLB (3D Model)
-            </DropdownMenuItem>
-          )}
+          <GLBExportDialog
+            trigger={
+              <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
+                <Download className="h-4 w-4 mr-2" />
+                Export GLB (3D Model)
+              </DropdownMenuItem>
+            }
+          />
           <DropdownMenuSeparator />
           <DropdownMenuSub>
             <DropdownMenuSubTrigger disabled={!ifcDataStore}>
@@ -1197,9 +1060,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
       </DropdownMenu>
 
       {/* Export Changes Button - shows when there are pending mutations */}
-      {hasDesktopFeatureAccess(desktopEntitlement, 'exports') ? (
-        <ExportChangesButton />
-      ) : null}
+      <ExportChangesButton />
 
       {/* ── Panels ── */}
       <DropdownMenu>
@@ -1549,6 +1410,51 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
           model lacks is a no-op.
         */}
         <DropdownMenuContent align="start" className="w-[300px] p-1.5">
+          {/* Model / Types 3D view switch (#957 follow-up). A type carries a
+              RepresentationMap whose shape is drawn at its MappingOrigin; "Types"
+              shows that type library, "Model" shows the placed occurrences. The
+              two are mutually exclusive — toggling re-filters the cached mesh set
+              instantly (no reload). */}
+          <div className="px-1.5 pb-1 pt-0.5">
+            <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+              3D View
+            </span>
+          </div>
+          <div className="flex gap-1 px-1.5 pb-1.5" role="radiogroup" aria-label="3D view mode">
+            <button
+              type="button"
+              role="radio"
+              aria-checked={typeViewMode === 'model'}
+              onClick={() => setTypeViewMode('model')}
+              className={cn(
+                'flex flex-1 items-center justify-center gap-1.5 rounded-md border px-2 py-1.5 text-xs font-medium transition-colors',
+                typeViewMode === 'model'
+                  ? 'border-primary/40 bg-primary/10 text-foreground'
+                  : 'border-transparent text-muted-foreground hover:bg-muted/50',
+              )}
+            >
+              <Boxes className="h-3.5 w-3.5 shrink-0" />
+              Model
+            </button>
+            <button
+              type="button"
+              role="radio"
+              aria-checked={typeViewMode === 'types'}
+              onClick={() => setTypeViewMode('types')}
+              className={cn(
+                'flex flex-1 items-center justify-center gap-1.5 rounded-md border px-2 py-1.5 text-xs font-medium transition-colors',
+                typeViewMode === 'types'
+                  ? 'border-primary/40 bg-primary/10 text-foreground'
+                  : 'border-transparent text-muted-foreground hover:bg-muted/50',
+              )}
+            >
+              <Shapes className="h-3.5 w-3.5 shrink-0" />
+              Types
+            </button>
+          </div>
+
+          <DropdownMenuSeparator className="my-1" />
+
           <div className="flex items-center justify-between gap-2 px-1.5 pb-1 pt-0.5">
             <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
               Visibility
@@ -1638,7 +1544,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
         appears beside it (its amber tint signals a modal pose whose
         exit affordance must stay visible).
       */}
-      {cesiumAvailable && !desktopShell && (
+      {cesiumAvailable && (
         <>
           <Tooltip>
             <TooltipTrigger asChild>
@@ -1800,22 +1706,6 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
           the toolbar's meta cluster stays focused on shell chrome
           (Settings · Theme · Help). */}
       <div className="flex items-center gap-2 ml-2 pl-2 border-l border-zinc-200 dark:border-zinc-700/60">
-        {desktopShell ? (
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
-                size="icon"
-                className="rounded-full"
-                onClick={() => navigateToPath('/settings')}
-              >
-                <Settings className="!h-[20px] !w-[20px]" />
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent>Settings</TooltipContent>
-          </Tooltip>
-        ) : null}
-
         <Tooltip>
           <TooltipTrigger asChild>
             <div>

package/src/components/viewer/MobileToolbar.tsx

@@ -44,8 +44,6 @@ import { executeBasketIsolate } from '@/store/basket/basketCommands';
 import { useIfc } from '@/hooks/useIfc';
 import { cn } from '@/lib/utils';
 import { GLTFExporter } from '@ifc-lite/export';
-import { openIfcFileDialog } from '@/services/file-dialog';
-import { logToDesktopTerminal } from '@/services/desktop-logger';
 import { recordRecentFiles, cacheFileBlobs } from '@/lib/recent-files';
 import { toast } from '@/components/ui/toast';
 
@@ -181,13 +179,7 @@ export function MobileToolbar() {
         variant="ghost"
         size="icon-sm"
         className="h-9 w-9 flex-shrink-0"
-        onClick={async () => {
-          const file = await openIfcFileDialog();
-          if (file) {
-            recordRecentFiles([{ name: file.name, size: file.size, path: file.path, modifiedMs: file.modifiedMs ?? null }]);
-            void loadFile(file);
-            return;
-          }
+        onClick={() => {
           fileInputRef.current?.click();
         }}
         disabled={loading}