@open-mercato/ui 0.8.1-develop.7296.1.2111d779db → 0.8.1-develop.7441.1.b42958b98c

package/dist/backend/DataTable.js

@@ -50,6 +50,7 @@ import { flash } from "./FlashMessages.js";
 import { useConfirmDialog } from "./confirm-dialog/index.js";
 import { surfaceRecordConflict } from "./conflicts/index.js";
 import { ComponentReplacementHandles } from "@open-mercato/shared/modules/widgets/component-registry";
+import { useRegisteredComponent } from "./injection/useRegisteredComponent.js";
 import { dataTableExtensionSpotId, extensionSpotChildId } from "@open-mercato/shared/modules/widgets/extension-points";
 import { insertByInjectionPlacement } from "@open-mercato/shared/modules/widgets/injection-position";
 import { useVirtualizer } from "@tanstack/react-virtual";
@@ -736,7 +737,7 @@ function ViewSwitcherDropdown({
     ] })
   ] });
 }
-function DataTable({
+function DataTableImpl({
   columns,
   data,
   toolbar,
@@ -846,6 +847,11 @@ function DataTable({
   const snapshotHydratedTableRef = React.useRef(null);
   const serverReconciledTableRef = React.useRef(null);
   const hydratedSnapshotRef = React.useRef(null);
+  const hydratedAdvancedFilterRestoredRef = React.useRef(false);
+  const pendingPerspectiveFiltersRef = React.useRef(null);
+  React.useLayoutEffect(() => {
+    pendingPerspectiveFiltersRef.current = null;
+  }, [advancedFilter?.value, perspectiveTableId]);
   const initialSettingsSource = perspectiveConfig?.initialState?.initialSettings ?? null;
   const mergedInitialSettings = React.useMemo(
     () => sanitizePerspectiveSettings(initialSettingsSource),
@@ -1350,9 +1356,18 @@ function DataTable({
   }, [table, columnOrder, columnVisibility, columnSizing, sorting, filterValues, searchValue, advancedFilter]);
   const applyPerspectiveSettings = React.useCallback((settings, nextId, options) => {
     const normalized = sanitizePerspectiveSettings(settings) ?? {};
+    if (!options?.preserveAdvancedFilter && advancedFilter?.onApplyTree) {
+      hydratedAdvancedFilterRestoredRef.current = false;
+      pendingPerspectiveFiltersRef.current = {
+        filters: isPersistedFilterTree(normalized.filters) ? normalized.filters : void 0
+      };
+    }
     autoHiddenVisibilityRef.current = {};
     setViewBaseline(
-      options?.preserveAdvancedFilter ? { ...normalized, filters: getCurrentSettings().filters } : normalized
+      options?.preserveAdvancedFilter ? {
+        ...normalized,
+        filters: pendingPerspectiveFiltersRef.current ? pendingPerspectiveFiltersRef.current.filters : getCurrentSettings().filters
+      } : normalized
     );
     if (normalized.columnOrder && normalized.columnOrder.length) {
       setColumnOrder(normalized.columnOrder);
@@ -1399,7 +1414,10 @@ function DataTable({
     if (perspectiveTableId) {
       writePerspectiveCookie(perspectiveTableId, nextId);
       if (nextId) {
-        const snapshot = { perspectiveId: nextId, settings: normalized, updatedAt: Date.now() };
+        const previousSnapshot = readPerspectiveSnapshot(perspectiveTableId) ?? initialSnapshotRef.current;
+        const preserveClearedFilter = options?.preserveAdvancedFilter && !getCurrentSettings().filters && !previousSnapshot?.settings.filters;
+        const snapshotSettings = preserveClearedFilter ? { ...normalized, filters: void 0 } : normalized;
+        const snapshot = { perspectiveId: nextId, settings: snapshotSettings, updatedAt: Date.now() };
         writePerspectiveSnapshot(perspectiveTableId, snapshot);
         initialSnapshotRef.current = snapshot;
       } else if (normalized.columnSizing && Object.keys(normalized.columnSizing).length) {
@@ -1450,18 +1468,36 @@ function DataTable({
     if (!perspectiveTableId) return;
     if (snapshotHydratedTableRef.current === perspectiveTableId) return;
     snapshotHydratedTableRef.current = perspectiveTableId;
+    hydratedAdvancedFilterRestoredRef.current = false;
     const snapshot = readPerspectiveSnapshot(perspectiveTableId);
     if (!snapshot) return;
     initialSnapshotRef.current = snapshot;
     hydratedSnapshotRef.current = snapshot;
-    const preserveAdvancedFilter = !!advancedFilter?.onApplyTree;
+    const restoredTree = isPersistedFilterTree(snapshot.settings.filters) ? deserializeTreeFromPersist(snapshot.settings.filters) : null;
+    const preserveAdvancedFilter = !!advancedFilter?.onApplyTree && (advancedFilter.value.root.children.length > 0 || !restoredTree?.root.children.length);
     applyPerspectiveSettings(
       snapshot.settings,
       snapshot.perspectiveId ?? null,
       { preserveAdvancedFilter }
     );
+    hydratedAdvancedFilterRestoredRef.current = !!advancedFilter?.onApplyTree && !preserveAdvancedFilter;
     initialPerspectiveAppliedRef.current = true;
   }, [perspectiveTableId, applyPerspectiveSettings, advancedFilter]);
+  const previousAdvancedFilterRef = React.useRef(null);
+  const advancedFilterHasRules = !!advancedFilter?.value.root.children.length;
+  React.useEffect(() => {
+    const previous = previousAdvancedFilterRef.current;
+    previousAdvancedFilterRef.current = { tableId: perspectiveTableId, hasRules: advancedFilterHasRules };
+    if (!perspectiveTableId || !advancedFilter?.onApplyTree) return;
+    if (previous?.tableId !== perspectiveTableId || !previous.hasRules || advancedFilterHasRules) return;
+    const snapshot = readPerspectiveSnapshot(perspectiveTableId) ?? initialSnapshotRef.current;
+    if (!snapshot) return;
+    const settings = { ...snapshot.settings };
+    delete settings.filters;
+    const clearedSnapshot = { ...snapshot, settings, updatedAt: Date.now() };
+    writePerspectiveSnapshot(perspectiveTableId, clearedSnapshot);
+    initialSnapshotRef.current = clearedSnapshot;
+  }, [perspectiveTableId, advancedFilterHasRules, advancedFilter?.onApplyTree]);
   const perspectiveQueryKey = ["table-perspectives", perspectiveTableId];
   const rolePerspectivesForLocking = React.useMemo(
     () => perspectiveData?.manageableRolePerspectives ?? perspectiveData?.rolePerspectives ?? [],
@@ -1873,15 +1909,21 @@ function DataTable({
   React.useLayoutEffect(() => {
     if (!canUsePerspectives) return;
     if (!perspectiveTableId) return;
+    if ((initialSnapshotRef.current || initialPerspectiveAppliedRef.current) && serverReconciledTableRef.current === perspectiveTableId) return;
     const source = perspectiveData ?? perspectiveConfig?.initialState?.response;
     if (!source) return;
     let orphanedSnapshotDropped = false;
+    const currentFilters = pendingPerspectiveFiltersRef.current ? pendingPerspectiveFiltersRef.current.filters : getCurrentSettings().filters;
+    const restoredFilterStillActive = hydratedAdvancedFilterRestoredRef.current && diffPerspectiveSettings(
+      { filters: currentFilters },
+      { filters: hydratedSnapshotRef.current?.settings.filters }
+    ).length === 0;
+    const preserveAdvancedFilter = !!advancedFilter?.onApplyTree && !restoredFilterStillActive;
     const tryResolve = (id) => {
       if (!id) return void 0;
       return source.perspectives.find((p) => p.id === id) ?? source.rolePerspectives.find((p) => p.id === id);
     };
     if (initialSnapshotRef.current || initialPerspectiveAppliedRef.current) {
-      if (serverReconciledTableRef.current === perspectiveTableId) return;
       serverReconciledTableRef.current = perspectiveTableId;
       const hydrated = hydratedSnapshotRef.current;
       const snapshot = hydrated && (!activePerspectiveId || activePerspectiveId === hydrated.perspectiveId) ? hydrated : null;
@@ -1897,7 +1939,7 @@ function DataTable({
         ).length > 0;
         if (serverIsNewer && settingsDiffer) {
           applyPerspectiveSettings(local.settings, local.id, {
-            preserveAdvancedFilter: !!advancedFilter?.onApplyTree
+            preserveAdvancedFilter
           });
           initialPerspectiveAppliedRef.current = true;
         }
@@ -1928,15 +1970,15 @@ function DataTable({
       applyPerspectiveSettings(
         target.settings,
         target.id,
-        orphanedSnapshotDropped ? { preserveAdvancedFilter: !!advancedFilter?.onApplyTree } : void 0
+        orphanedSnapshotDropped ? { preserveAdvancedFilter } : void 0
       );
     } else if (orphanedSnapshotDropped) {
       applyPerspectiveSettings({}, null, {
-        preserveAdvancedFilter: !!advancedFilter?.onApplyTree
+        preserveAdvancedFilter
       });
     }
     initialPerspectiveAppliedRef.current = true;
-  }, [canUsePerspectives, perspectiveData, perspectiveTableId, perspectiveConfig, applyPerspectiveSettings, activePerspectiveId, advancedFilter?.onApplyTree]);
+  }, [canUsePerspectives, perspectiveData, perspectiveTableId, perspectiveConfig, applyPerspectiveSettings, activePerspectiveId, advancedFilter?.onApplyTree, getCurrentSettings]);
   const scrollTableIntoView = React.useCallback(() => {
     const rect = containerRef.current?.getBoundingClientRect();
     if (!rect || rect.top >= 0) return;
@@ -2893,6 +2935,16 @@ function DataTable({
     ) : null
   ] }) });
 }
+const DataTableFallback = DataTableImpl;
+function DataTable(props) {
+  const extensionTableId = props.perspective?.tableId ?? props.extensionTableId ?? (props.injectionSpotId?.startsWith("data-table:") ? props.injectionSpotId.slice("data-table:".length) : null);
+  const handle = props.replacementHandle ?? ComponentReplacementHandles.dataTable(extensionTableId ?? "unknown");
+  const Resolved = useRegisteredComponent(
+    handle,
+    DataTableFallback
+  );
+  return /* @__PURE__ */ jsx(Resolved, { ...props });
+}
 export {
   DataTable,
   clearAllPerspectiveState,