@ifc-lite/viewer 1.26.0 → 1.28.0

package/src/components/viewer/PropertiesPanel.tsx

@@ -36,7 +36,7 @@ import { getNativeEntityDetails } from '@/services/desktop-native-metadata';
 import { configureMutationView } from '@/utils/configureMutationView';
 import { IfcQuery } from '@ifc-lite/query';
 import { MutablePropertyView } from '@ifc-lite/mutations';
-import { extractClassificationsOnDemand, extractMaterialsOnDemand, extractTypePropertiesOnDemand, extractTypeEntityOwnProperties, extractDocumentsOnDemand, extractRelationshipsOnDemand, extractGeoreferencingOnDemand, extractLengthUnitScale, getAttributeNames, type IfcDataStore } from '@ifc-lite/parser';
+import { extractClassificationsOnDemand, extractMaterialsOnDemand, extractMaterialPropertiesOnDemand, extractTypePropertiesOnDemand, extractTypeEntityOwnProperties, extractDocumentsOnDemand, extractRelationshipsOnDemand, extractGeoreferencingOnDemand, extractLengthUnitScale, getAttributeNames, type IfcDataStore, type MaterialPsetGroup } from '@ifc-lite/parser';
 import type { NewEntity } from '@ifc-lite/mutations';
 import { EntityFlags, RelationshipType, isSpatialStructureTypeName, isStoreyLikeSpatialTypeName } from '@ifc-lite/data';
 import type { EntityRef, FederatedModel } from '@/store/types';
@@ -47,6 +47,7 @@ import { QuantitySetCard } from './properties/QuantitySetCard';
 import { ModelMetadataPanel } from './properties/ModelMetadataPanel';
 import { ClassificationCard } from './properties/ClassificationCard';
 import { MaterialCard } from './properties/MaterialCard';
+import { MaterialTotalsPanel } from './properties/MaterialTotalsPanel';
 import { ScheduleCard } from './properties/ScheduleCard';
 import { TaskEditCard } from './properties/TaskEditCard';
 import { DocumentCard } from './properties/DocumentCard';
@@ -56,6 +57,17 @@ import { BsddCard } from './properties/BsddCard';
 import { GeoreferencingPanel } from './properties/GeoreferencingPanel';
 import { RawStepCard } from './properties/RawStepCard';
 
+/** IFC material *definition* classes selectable from the Materials tab. */
+const MATERIAL_DEF_TYPES = new Set([
+  'IFCMATERIAL',
+  'IFCMATERIALLAYERSET',
+  'IFCMATERIALLAYERSETUSAGE',
+  'IFCMATERIALPROFILESET',
+  'IFCMATERIALPROFILESETUSAGE',
+  'IFCMATERIALCONSTITUENTSET',
+  'IFCMATERIALLIST',
+]);
+
 type DisplayProperty = { name: string; value: unknown; isMutated: boolean };
 type DisplayPropertySet = {
   name: string;
@@ -450,6 +462,16 @@ export function PropertiesPanel() {
     return typeName.endsWith('Type');
   }, [selectedEntity, model, ifcDataStore]);
 
+  // Detect a material definition selected from the "Materials" hierarchy tab.
+  // Materials aren't products, so the EntityTable's getTypeName doesn't cover
+  // them — read the raw class from the entity index instead.
+  const selectedMaterialId = useMemo(() => {
+    if (!selectedEntity) return null;
+    const dataStore = model?.ifcDataStore ?? ifcDataStore;
+    const rawType = (dataStore as IfcDataStore | null)?.entityIndex?.byId?.get(selectedEntity.expressId)?.type;
+    return rawType && MATERIAL_DEF_TYPES.has(rawType.toUpperCase()) ? selectedEntity.expressId : null;
+  }, [selectedEntity, model, ifcDataStore]);
+
   // Unified property/quantity access - EntityNode handles on-demand extraction automatically
   // These hooks must be called before any early return to maintain hook order
   // Use MutablePropertyView as primary source when available (it handles base + mutations)
@@ -512,7 +534,7 @@ export function PropertiesPanel() {
     if (!entityNode) return [];
 
     const rawProps = entityNode.properties();
-    let result = rawProps.map(pset => ({
+    let result: DisplayPropertySet[] = rawProps.map(pset => ({
       name: pset.name,
       properties: pset.properties.map(p => ({ name: p.name, value: p.value, isMutated: false })),
       isNewPset: false,
@@ -627,6 +649,17 @@ export function PropertiesPanel() {
     return extractMaterialsOnDemand(dataStore as IfcDataStore, lookupExpressId);
   }, [selectedEntity, lookupExpressId, model, ifcDataStore]);
 
+  // Property sets attached to the selected entity's material(s) via
+  // IfcMaterialProperties (e.g. Pset_MaterialConcrete). These live on the
+  // IfcMaterial — not on the object — so they never surface through the
+  // occurrence/type pset paths; resolve them through the material association.
+  const materialProperties: MaterialPsetGroup[] = useMemo(() => {
+    if (!selectedEntity || lookupExpressId === null) return [];
+    const dataStore = model?.ifcDataStore ?? ifcDataStore;
+    if (!dataStore) return [];
+    return extractMaterialPropertiesOnDemand(dataStore as IfcDataStore, lookupExpressId);
+  }, [selectedEntity, lookupExpressId, model, ifcDataStore]);
+
   // Extract documents for the selected entity from the IFC data store
   const documents = useMemo(() => {
     if (!selectedEntity || lookupExpressId === null) return [];
@@ -970,21 +1003,28 @@ export function PropertiesPanel() {
     }));
   }, [nativeDetails]);
 
+  // Overlay (authored) entities — split halves, duplicates, scripted
+  // adds — live only in the StoreEditor overlay, NOT the parsed store.
+  // `modelQuery.entity()` always returns a node, and its getters fall
+  // back to the 'Unknown'/'' sentinels for ids absent from the parsed
+  // table (entity-table.ts#getTypeName). Those non-null sentinels would
+  // shadow the overlay record in an `entityNode ?? overlay` chain, so
+  // when an overlay record exists it MUST take precedence.
   const renderedEntityType = isNativeLazySelection
     ? (nativeDetails?.summary.type ?? 'Loading...')
-    : (entityNode?.type ?? overlayEntity?.type ?? 'Unknown');
+    : (overlayEntity?.type ?? entityNode?.type ?? 'Unknown');
   const renderedEntityName = isNativeLazySelection
     ? (nativeDetails?.summary.name ?? `#${selectedEntity?.expressId ?? ''}`)
-    : (entityNode?.name ?? overlayAttr(2) ?? undefined);
+    : (overlayAttr(2) ?? entityNode?.name ?? undefined);
   const renderedEntityGlobalId = isNativeLazySelection
     ? (nativeDetails?.summary.globalId ?? null)
-    : (entityNode?.globalId ?? overlayAttr(0));
+    : (overlayAttr(0) ?? entityNode?.globalId);
   const renderedEntityDescription = isNativeLazySelection
     ? undefined
-    : (entityNode?.description ?? overlayAttr(3) ?? undefined);
+    : (overlayAttr(3) ?? entityNode?.description ?? undefined);
   const renderedEntityObjectType = isNativeLazySelection
     ? undefined
-    : (entityNode?.objectType ?? overlayAttr(4) ?? undefined);
+    : (overlayAttr(4) ?? entityNode?.objectType ?? undefined);
   const renderedSpatialInfo = isNativeLazySelection ? nativeSpatialInfo : spatialInfo;
   const renderedOccurrenceProperties = isNativeLazySelection ? nativeOccurrenceProperties : occurrenceProperties;
   const renderedInheritedTypeProperties = isNativeLazySelection ? [] : inheritedTypeProperties;
@@ -995,6 +1035,7 @@ export function PropertiesPanel() {
   const renderedAttributes = isNativeLazySelection ? [] : attributes;
   const renderedClassifications = isNativeLazySelection ? [] : classifications;
   const renderedMaterialInfo = isNativeLazySelection ? null : materialInfo;
+  const renderedMaterialProperties = isNativeLazySelection ? [] : materialProperties;
   const renderedDocuments = isNativeLazySelection ? [] : documents;
   const renderedEntityRelationships = isNativeLazySelection ? null : entityRelationships;
   const renderedGeoref = isNativeLazySelection ? null : georef;
@@ -1046,6 +1087,12 @@ export function PropertiesPanel() {
     }
   }
 
+  // Material selected from the "Materials" hierarchy tab — show the material's
+  // own property sets plus quantities aggregated across all using elements.
+  if (selectedMaterialId !== null && selectedEntity) {
+    return <MaterialTotalsPanel materialId={selectedMaterialId} modelId={selectedEntity.modelId} />;
+  }
+
   // Multi-entity selection (unified storeys) - render combined view
   if (selectedEntities.length > 1) {
     return (
@@ -1474,6 +1521,7 @@ export function PropertiesPanel() {
             {renderedMergedProperties.length === 0
               && renderedClassifications.length === 0
               && !renderedMaterialInfo
+              && renderedMaterialProperties.length === 0
               && renderedDocuments.length === 0
               && !renderedEntityRelationships
               && !hasScheduleForSelection ? (
@@ -1553,10 +1601,38 @@ export function PropertiesPanel() {
                   </>
                 )}
 
+                {/* Material Property Sets (Pset_Material* attached to the
+                    IfcMaterial via IfcMaterialProperties). Grouped per material,
+                    mirroring the Type Properties block. */}
+                {renderedMaterialProperties.length > 0 && (
+                  <>
+                    {(renderedMergedProperties.length > 0 || renderedClassifications.length > 0 || renderedMaterialInfo) && (
+                      <div className="border-t border-amber-200 dark:border-amber-800/50 pt-2 mt-2" />
+                    )}
+                    {renderedMaterialProperties.map((group) => (
+                      <div key={`matpset-${group.materialId}`} className="space-y-3">
+                        <div className="flex items-center gap-2 px-1 pb-0.5 text-[11px] text-amber-600/70 dark:text-amber-400/60 uppercase tracking-wider font-semibold">
+                          <Layers className="h-3 w-3 shrink-0" />
+                          <span className="truncate">Material Properties ({group.materialName})</span>
+                        </div>
+                        {group.psets.map((pset) => (
+                          <PropertySetCard
+                            key={`matpset-${group.materialId}-${pset.name}`}
+                            pset={{
+                              name: pset.name,
+                              properties: pset.properties.map((p) => ({ name: p.name, value: p.value, isMutated: false })),
+                            }}
+                          />
+                        ))}
+                      </div>
+                    ))}
+                  </>
+                )}
+
                 {/* Documents */}
                 {renderedDocuments.length > 0 && (
                   <>
-                    {(renderedMergedProperties.length > 0 || renderedClassifications.length > 0 || renderedMaterialInfo) && (
+                    {(renderedMergedProperties.length > 0 || renderedClassifications.length > 0 || renderedMaterialInfo || renderedMaterialProperties.length > 0) && (
                       <div className="border-t border-zinc-200 dark:border-zinc-800 pt-2 mt-2" />
                     )}
                     {renderedDocuments.map((doc, i) => (

package/src/components/viewer/SearchInline.tsx

@@ -25,7 +25,7 @@
  */
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Search, Clock, X } from 'lucide-react';
+import { Search, Clock, X, SlidersHorizontal } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 import { Input } from '@/components/ui/input';
 import { useViewerStore } from '@/store';
@@ -79,6 +79,9 @@ export function SearchInline() {
     exitVimCycle,
     stepVimCycle,
     setSearchModalOpen,
+    setSearchModalTab,
+    activeRuleCount,
+    clearFilterRules,
     models,
     setSelectedEntity,
     setSelectedEntityId,
@@ -99,6 +102,9 @@ export function SearchInline() {
       exitVimCycle: s.exitVimCycle,
       stepVimCycle: s.stepVimCycle,
       setSearchModalOpen: s.setSearchModalOpen,
+      setSearchModalTab: s.setSearchModalTab,
+      activeRuleCount: s.searchFilter.rules.length,
+      clearFilterRules: s.clearFilterRules,
       models: s.models,
       setSelectedEntity: s.setSelectedEntity,
       setSelectedEntityId: s.setSelectedEntityId,
@@ -395,8 +401,10 @@ export function SearchInline() {
         e.preventDefault();
         // ⌘↵ / Ctrl+↵ opens the advanced modal instead of committing — the
         // inline query is preserved so the modal opens already populated.
+        // Text-search entry point, so land on the Search tab.
         if (e.metaKey || e.ctrlKey) {
           setSearchOpen(false);
+          setSearchModalTab('search');
           setSearchModalOpen(true);
           return;
         }
@@ -416,9 +424,19 @@ export function SearchInline() {
         if (target) commitResult(target, idx, e.shiftKey, liveResults, live);
       }
     },
-    [commitResult, results, searchHighlightIndex, searchOpen, setSearchHighlightIndex, setSearchModalOpen, setSearchOpen],
+    [commitResult, results, searchHighlightIndex, searchOpen, setSearchHighlightIndex, setSearchModalOpen, setSearchModalTab, setSearchOpen],
   );
 
+  const hasFilters = activeRuleCount > 0;
+
+  /** Open the advanced modal straight to the Filter builder — the
+   *  always-visible entry point to structured filtering. */
+  const openAdvancedFilter = useCallback(() => {
+    setSearchOpen(false);
+    setSearchModalTab('filter');
+    setSearchModalOpen(true);
+  }, [setSearchOpen, setSearchModalTab, setSearchModalOpen]);
+
   const queryTrimmedLen = searchQuery.trim().length;
   const showPopover = searchOpen && (results.length > 0 || queryTrimmedLen > 0 || recents.length > 0);
   const showRecents = searchOpen && queryTrimmedLen === 0 && recents.length > 0;
@@ -437,11 +455,52 @@ export function SearchInline() {
         }}
         onFocus={() => setSearchOpen(true)}
         onKeyDown={handleInputKeyDown}
+        className={cn(hasFilters ? 'pr-[4.5rem]' : 'pr-9')}
         aria-label="Search entities"
         aria-autocomplete="list"
         aria-expanded={showPopover}
         aria-controls="search-inline-popover"
       />
+      {/* Advanced-filter affordance — always visible so structured
+          filtering is discoverable without the ⌘⇧F shortcut. Shows the
+          active rule count and a quick-clear when a filter is applied. */}
+      <div className="absolute right-1.5 top-1/2 -translate-y-1/2 flex items-center gap-0.5">
+        {hasFilters && (
+          <button
+            type="button"
+            aria-label="Clear filters"
+            title="Clear filters"
+            onMouseDown={(e) => {
+              e.preventDefault();
+              clearFilterRules();
+            }}
+            className="rounded p-1 text-muted-foreground transition-colors hover:bg-zinc-100 hover:text-foreground dark:hover:bg-zinc-800"
+          >
+            <X className="h-3.5 w-3.5" />
+          </button>
+        )}
+        <button
+          type="button"
+          aria-label={hasFilters ? `Advanced filter — ${activeRuleCount} active` : 'Advanced filter'}
+          aria-pressed={hasFilters}
+          title="Advanced filter (⌘⇧F)"
+          onMouseDown={(e) => {
+            e.preventDefault();
+            openAdvancedFilter();
+          }}
+          className={cn(
+            'flex items-center gap-1 rounded px-1.5 py-1 text-xs transition-colors',
+            hasFilters
+              ? 'bg-primary/10 text-primary hover:bg-primary/15'
+              : 'text-muted-foreground hover:bg-zinc-100 hover:text-foreground dark:hover:bg-zinc-800',
+          )}
+        >
+          <SlidersHorizontal className="h-3.5 w-3.5" />
+          {hasFilters && (
+            <span className="font-mono text-[10px] font-semibold leading-none">{activeRuleCount}</span>
+          )}
+        </button>
+      </div>
       {/* Vim cycle hint — shows below the input whenever a cycle is active
           and the popover is closed. Clicking it exits the cycle. */}
       {searchVimCycle && !showPopover && (
@@ -475,6 +534,7 @@ export function SearchInline() {
           onHover={(i) => setSearchHighlightIndex(i)}
           onOpenAdvanced={() => {
             setSearchOpen(false);
+            setSearchModalTab('search');
             setSearchModalOpen(true);
           }}
         />