@ifc-lite/viewer 1.14.3 → 1.15.0

package/src/store/basketVisibleSet.ts

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import { IfcTypeEnum, type SpatialNode } from '@ifc-lite/data';
+import { IfcTypeEnum, type SpatialNode, type SpatialHierarchy } from '@ifc-lite/data';
 import type { IfcDataStore } from '@ifc-lite/parser';
 import type { EntityRef } from './types.js';
 import { entityRefToString, stringToEntityRef } from './types.js';
@@ -57,6 +57,7 @@ function visibilityFingerprint(state: ViewerStateSnapshot): string {
   return [
     digestNumberSet(state.hiddenEntities),
     state.isolatedEntities ? digestNumberSet(state.isolatedEntities) : 'none',
+    state.classFilter ? digestNumberSet(state.classFilter.ids) : 'none',
     digestNumberSet(state.lensHiddenIds),
     digestModelEntityMap(state.hiddenEntitiesByModel),
     digestModelEntityMap(state.isolatedEntitiesByModel),
@@ -273,6 +274,52 @@ function getExpandedSelectionRefs(state: ViewerStateSnapshot): EntityRef[] {
   return dedupeRefs(baseRefs.flatMap((ref) => expandRefToElements(state, ref)));
 }
 
+/**
+ * Collect all descendant IfcSpace expressIds from a spatial node.
+ */
+function collectDescendantSpaceIds(node: SpatialNode): number[] {
+  const spaceIds: number[] = [];
+  for (const child of node.children || []) {
+    if (child.type === IfcTypeEnum.IfcSpace) {
+      spaceIds.push(child.expressId);
+    }
+    // Recurse into all children (spaces can nest under other spatial nodes)
+    spaceIds.push(...collectDescendantSpaceIds(child));
+  }
+  return spaceIds;
+}
+
+/**
+ * Collect all element IDs for an IfcBuildingStorey, including elements
+ * contained in descendant IfcSpace nodes and the space geometry itself.
+ */
+export function collectIfcBuildingStoreyElementsWithIfcSpace(
+  hierarchy: SpatialHierarchy,
+  storeyId: number
+): number[] | null {
+  const storeyElements = hierarchy.byStorey.get(storeyId);
+  if (!storeyElements) return null;
+
+  const storeyNode = findSpatialNode(hierarchy.project, storeyId);
+  if (!storeyNode) return storeyElements;
+
+  const spaceIds = collectDescendantSpaceIds(storeyNode);
+  if (spaceIds.length === 0) return storeyElements;
+
+  // Combine storey elements + space expressIds + elements inside spaces
+  const combined = [...storeyElements];
+  for (const spaceId of spaceIds) {
+    combined.push(spaceId); // The space geometry itself
+    const spaceElements = hierarchy.bySpace.get(spaceId);
+    if (spaceElements) {
+      for (const elemId of spaceElements) {
+        combined.push(elemId);
+      }
+    }
+  }
+  return combined;
+}
+
 function computeStoreyIsolation(state: ViewerStateSnapshot): Set<number> | null {
   if (state.selectedStoreys.size === 0) return null;
 
@@ -284,7 +331,8 @@ function computeStoreyIsolation(state: ViewerStateSnapshot): Set<number> | null
       if (!hierarchy) continue;
       const offset = model.idOffset ?? 0;
       for (const storeyId of state.selectedStoreys) {
-        const storeyElementIds = hierarchy.byStorey.get(storeyId) || hierarchy.byStorey.get(storeyId - offset);
+        const localStoreyId = hierarchy.byStorey.has(storeyId) ? storeyId : storeyId - offset;
+        const storeyElementIds = collectIfcBuildingStoreyElementsWithIfcSpace(hierarchy, localStoreyId);
         if (!storeyElementIds) continue;
         for (const localId of storeyElementIds) {
           ids.add(localId + offset);
@@ -292,8 +340,9 @@ function computeStoreyIsolation(state: ViewerStateSnapshot): Set<number> | null
       }
     }
   } else if (state.ifcDataStore?.spatialHierarchy) {
+    const hierarchy = state.ifcDataStore.spatialHierarchy;
     for (const storeyId of state.selectedStoreys) {
-      const storeyElementIds = state.ifcDataStore.spatialHierarchy.byStorey.get(storeyId);
+      const storeyElementIds = collectIfcBuildingStoreyElementsWithIfcSpace(hierarchy, storeyId);
       if (!storeyElementIds) continue;
       for (const id of storeyElementIds) {
         ids.add(id);
@@ -345,7 +394,26 @@ function getVisibleGlobalIds(state: ViewerStateSnapshot): Set<number> {
     globalHidden.add(id);
   }
 
-  const globalIsolation = state.isolatedEntities ?? computeStoreyIsolation(state);
+  // Collect all active filter sets and intersect them
+  const filters: Set<number>[] = [];
+  const storeyIsolation = computeStoreyIsolation(state);
+  if (storeyIsolation !== null) filters.push(storeyIsolation);
+  if (state.classFilter !== null) filters.push(state.classFilter.ids);
+  if (state.isolatedEntities !== null) filters.push(state.isolatedEntities);
+
+  let globalIsolation: Set<number> | null = null;
+  if (filters.length === 1) {
+    globalIsolation = filters[0];
+  } else if (filters.length > 1) {
+    // Intersect all active filters — start from smallest for efficiency
+    const sorted = filters.sort((a, b) => a.size - b.size);
+    globalIsolation = new Set<number>();
+    for (const id of sorted[0]) {
+      if (sorted.every(s => s.has(id))) {
+        globalIsolation.add(id);
+      }
+    }
+  }
 
   const visible = new Set<number>();
   for (const candidate of candidates) {

package/src/store/index.ts

@@ -130,7 +130,7 @@ export const useViewerStore = create<ViewerState>()((...args) => ({
   // Note: Does NOT clear models - use clearAllModels() for that
   resetViewerState: () => {
     invalidateVisibleBasketCache();
-    const [set] = args;
+    const [set, get] = args;
     set({
       // Selection (legacy)
       selectedEntityId: null,
@@ -144,6 +144,7 @@ export const useViewerStore = create<ViewerState>()((...args) => ({
       // Visibility (legacy)
       hiddenEntities: new Set(),
       isolatedEntities: null,
+      classFilter: null,
       typeVisibility: {
         spaces: TYPE_VISIBILITY_DEFAULTS.SPACES,
         openings: TYPE_VISIBILITY_DEFAULTS.OPENINGS,
@@ -303,6 +304,15 @@ export const useViewerStore = create<ViewerState>()((...args) => ({
       chatStreamingContent: '',
       chatError: null,
       chatAbortController: null,
+
+      // Mutations - clear all mutation state so stale changes don't carry over
+      mutationViews: new Map(),
+      changeSets: new Map(),
+      activeChangeSetId: null,
+      undoStacks: new Map(),
+      redoStacks: new Map(),
+      dirtyModels: new Set(),
+      mutationVersion: get().mutationVersion + 1,
     });
   },
 }));

package/src/store/slices/visibilitySlice.ts

@@ -17,6 +17,8 @@ export interface VisibilitySlice {
   // State (legacy - single model)
   hiddenEntities: Set<number>;
   isolatedEntities: Set<number> | null;
+  /** Class-level filter (from Class tab type-group clicks) — independent of isolatedEntities */
+  classFilter: { ids: Set<number>; label: string } | null;
   typeVisibility: TypeVisibility;
 
   // State (multi-model)
@@ -34,6 +36,11 @@ export interface VisibilitySlice {
   isolateEntity: (id: number) => void;
   isolateEntities: (ids: number[]) => void;
   clearIsolation: () => void;
+  /** Set class-level filter (IFC class isolation from Class tab) */
+  setClassFilter: (ids: number[], label: string) => void;
+  clearClassFilter: () => void;
+  /** Clear all isolation and class filters */
+  clearAllFilters: () => void;
   showAll: () => void;
   isEntityVisible: (id: number) => boolean;
   toggleTypeVisibility: (type: 'spaces' | 'openings' | 'site') => void;
@@ -67,6 +74,7 @@ export const createVisibilitySlice: StateCreator<VisibilitySlice, [], [], Visibi
   // Initial state (legacy)
   hiddenEntities: new Set(),
   isolatedEntities: null,
+  classFilter: null,
   typeVisibility: {
     spaces: TYPE_VISIBILITY_DEFAULTS.SPACES,
     openings: TYPE_VISIBILITY_DEFAULTS.OPENINGS,
@@ -153,9 +161,25 @@ export const createVisibilitySlice: StateCreator<VisibilitySlice, [], [], Visibi
 
   clearIsolation: () => set({ isolatedEntities: null }),
 
-  showAll: () => set({ hiddenEntities: new Set(), isolatedEntities: null }),
+  setClassFilter: (ids, label) => set((state) => {
+    const idsSet = new Set(ids);
+    // Toggle: if same class already filtered, clear it
+    const isAlready = state.classFilter !== null &&
+      state.classFilter.ids.size === idsSet.size &&
+      ids.every(id => state.classFilter!.ids.has(id));
+    if (isAlready) {
+      return { classFilter: null };
+    }
+    return { classFilter: { ids: idsSet, label } };
+  }),
+
+  clearClassFilter: () => set({ classFilter: null }),
+
+  clearAllFilters: () => set({ isolatedEntities: null, classFilter: null }),
+
+  showAll: () => set({ hiddenEntities: new Set(), isolatedEntities: null, classFilter: null }),
 
-  setHiddenEntities: (ids) => set({ hiddenEntities: new Set(ids), isolatedEntities: null }),
+  setHiddenEntities: (ids) => set({ hiddenEntities: new Set(ids), isolatedEntities: null, classFilter: null }),
 
   setIsolatedEntities: (ids) => set({
     isolatedEntities: ids ? new Set(ids) : null,
@@ -166,6 +190,7 @@ export const createVisibilitySlice: StateCreator<VisibilitySlice, [], [], Visibi
     const state = get();
     if (state.hiddenEntities.has(id)) return false;
     if (state.isolatedEntities !== null && !state.isolatedEntities.has(id)) return false;
+    if (state.classFilter !== null && !state.classFilter.ids.has(id)) return false;
     return true;
   },
 
@@ -271,6 +296,7 @@ export const createVisibilitySlice: StateCreator<VisibilitySlice, [], [], Visibi
   showAllInAllModels: () => set({
     hiddenEntities: new Set(),
     isolatedEntities: null,
+    classFilter: null,
     hiddenEntitiesByModel: new Map(),
     isolatedEntitiesByModel: new Map(),
   }),