@open-mercato/ui 0.8.1-develop.7274.1.21a0083828 → 0.8.1-develop.7294.1.0ef99fc518

package/dist/backend/DataTable.js

@@ -867,10 +867,22 @@ function DataTable({
   const [perspectiveApiMissing, setPerspectiveApiMissing] = React.useState(false);
   const [viewBaseline, setViewBaselineState] = React.useState(() => mergedInitialSettings ?? {});
   const viewBaselineInitializedRef = React.useRef(Boolean(mergedInitialSettings));
+  const autoHiddenVisibilityRef = React.useRef({});
   const setViewBaseline = React.useCallback((settings) => {
     const initialized = viewBaselineInitializedRef.current;
     viewBaselineInitializedRef.current = true;
-    setViewBaselineState((previous) => initialized && diffPerspectiveSettings(previous, settings).length === 0 ? previous : settings);
+    const autoHidden = autoHiddenVisibilityRef.current;
+    const next = Object.keys(autoHidden).length ? { ...settings, columnVisibility: { ...settings.columnVisibility ?? {}, ...autoHidden } } : settings;
+    setViewBaselineState((previous) => initialized && diffPerspectiveSettings(previous, next).length === 0 ? previous : next);
+  }, []);
+  const foldAutoHiddenIntoBaseline = React.useCallback((entries) => {
+    autoHiddenVisibilityRef.current = { ...autoHiddenVisibilityRef.current, ...entries };
+    if (!viewBaselineInitializedRef.current) return;
+    setViewBaselineState((previous) => {
+      const current = previous.columnVisibility ?? {};
+      if (Object.keys(entries).every((key) => key in current)) return previous;
+      return { ...previous, columnVisibility: { ...entries, ...current } };
+    });
   }, []);
   const perspectiveFeatureQuery = useQuery({
     queryKey: ["feature-check", "perspectives"],
@@ -1290,26 +1302,30 @@ function DataTable({
       return changed ? filtered : prev;
     });
   }, [table, mergedColumns]);
-  const visibilitySeededByStoredSettings = React.useRef(Boolean(mergedInitialSettings?.columnVisibility));
-  const autoHiddenColumnIds = React.useRef(/* @__PURE__ */ new Set());
+  const visibilityDecidedColumnIds = React.useRef(
+    new Set(Object.keys(mergedInitialSettings?.columnVisibility ?? {}))
+  );
+  const [visibilityDefaultsPass, setVisibilityDefaultsPass] = React.useState(0);
   React.useEffect(() => {
-    if (visibilitySeededByStoredSettings.current) return;
     const hidden = {};
     table.getAllLeafColumns().forEach((column) => {
+      if (visibilityDecidedColumnIds.current.has(column.id)) return;
       const hiddenMeta = column.columnDef?.meta?.hidden;
-      if (!hiddenMeta || autoHiddenColumnIds.current.has(column.id)) return;
+      if (!hiddenMeta) return;
+      visibilityDecidedColumnIds.current.add(column.id);
       hidden[column.id] = false;
-      autoHiddenColumnIds.current.add(column.id);
     });
     if (!Object.keys(hidden).length) return;
     setColumnVisibility((prev) => ({ ...hidden, ...prev }));
-  }, [table, mergedColumns]);
+    foldAutoHiddenIntoBaseline(hidden);
+  }, [table, mergedColumns, visibilityDefaultsPass, foldAutoHiddenIntoBaseline]);
   const getCurrentSettings = React.useCallback(() => {
     const visibility = {};
     for (const [key, value] of Object.entries(columnVisibility)) {
-      if (typeof key === "string" && typeof value === "boolean") {
-        visibility[key] = value;
-      }
+      if (typeof value === "boolean") visibility[key] = value;
+    }
+    for (const column of table.getAllLeafColumns()) {
+      visibility[column.id] = column.getIsVisible();
     }
     let filtersPayload;
     if (advancedFilter) {
@@ -1331,9 +1347,10 @@ function DataTable({
       searchValue
     };
     return sanitizePerspectiveSettings(candidate) ?? {};
-  }, [columnOrder, columnVisibility, columnSizing, sorting, filterValues, searchValue, advancedFilter]);
+  }, [table, columnOrder, columnVisibility, columnSizing, sorting, filterValues, searchValue, advancedFilter]);
   const applyPerspectiveSettings = React.useCallback((settings, nextId, options) => {
     const normalized = sanitizePerspectiveSettings(settings) ?? {};
+    autoHiddenVisibilityRef.current = {};
     setViewBaseline(
       options?.preserveAdvancedFilter ? { ...normalized, filters: getCurrentSettings().filters } : normalized
     );
@@ -1343,6 +1360,8 @@ function DataTable({
       const ids = table.getAllLeafColumns().map((column) => column.id);
       if (ids.length) setColumnOrder(ids);
     }
+    visibilityDecidedColumnIds.current = new Set(Object.keys(normalized.columnVisibility ?? {}));
+    setVisibilityDefaultsPass((pass) => pass + 1);
     if (normalized.columnVisibility) setColumnVisibility(normalized.columnVisibility);
     else setColumnVisibility({});
     if (normalized.sorting) {