@open-mercato/ui 0.6.7 → 0.6.8-develop.6874.1.982d6097d8

package/dist/backend/DataTable.js

@@ -46,6 +46,7 @@ import { useT } from "@open-mercato/shared/lib/i18n/context";
 import { flash } from "./FlashMessages.js";
 import { useConfirmDialog } from "./confirm-dialog/index.js";
 import { ComponentReplacementHandles } from "@open-mercato/shared/modules/widgets/component-registry";
+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";
 import { getDefaultOperator, isAdvancedFilterState, flatToTree } from "@open-mercato/shared/lib/query/advanced-filter";
@@ -74,6 +75,7 @@ import {
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { createLogger } from "@open-mercato/shared/lib/logger";
+import { clearAllPerspectiveState, PERSPECTIVE_COOKIE_PREFIX, PERSPECTIVE_STORAGE_PREFIX } from "./perspectiveState.js";
 const logger = createLogger("ui").child({ component: "DataTable" });
 let refreshScheduled = false;
 function scheduleRouterRefresh(router) {
@@ -199,8 +201,6 @@ function resolveExportSections(config) {
   addSection("full", config.full, "Full data export");
   return sections;
 }
-const PERSPECTIVE_COOKIE_PREFIX = "om_table_perspective";
-const PERSPECTIVE_STORAGE_PREFIX = "om_table_perspective_snapshot";
 const COLUMN_MIN_WIDTH = 60;
 const COLUMN_MAX_WIDTH = 900;
 function formatDurationLabel(durationMs) {
@@ -932,7 +932,7 @@ function DataTable({
     if (injectionSpotId?.startsWith("data-table:")) return injectionSpotId.slice("data-table:".length);
     return null;
   }, [injectionSpotId, perspective?.tableId, extensionTableIdProp]);
-  const resolvedInjectionSpotId = injectionSpotId ?? (perspective?.tableId ? `data-table:${perspective.tableId}` : null) ?? (extensionTableIdProp ? `data-table:${extensionTableIdProp}` : null);
+  const resolvedInjectionSpotId = injectionSpotId ?? (perspective?.tableId ? dataTableExtensionSpotId(perspective.tableId) : null) ?? (extensionTableIdProp ? dataTableExtensionSpotId(extensionTableIdProp) : null);
   const resolvedReplacementHandle = replacementHandle ?? ComponentReplacementHandles.dataTable(extensionTableId ?? "unknown");
   const baseInjectionContext = React.useMemo(
     () => {
@@ -944,32 +944,32 @@ function DataTable({
     [injectionContext, perspective?.tableId, extensionTableId, title]
   );
   const headerInjectionSpotId = React.useMemo(
-    () => resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:header` : null,
+    () => resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, "header") : null,
     [resolvedInjectionSpotId]
   );
   const toolbarInjectionSpotId = React.useMemo(
-    () => resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:toolbar` : null,
+    () => resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, "toolbar") : null,
     [resolvedInjectionSpotId]
   );
   const searchTrailingInjectionSpotId = React.useMemo(
-    () => resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:search-trailing` : null,
+    () => resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, "search-trailing") : null,
     [resolvedInjectionSpotId]
   );
   const footerInjectionSpotId = React.useMemo(
-    () => resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:footer` : null,
+    () => resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, "footer") : null,
     [resolvedInjectionSpotId]
   );
   const { widgets: columnWidgets } = useInjectionDataWidgets(
-    extensionTableId ? `data-table:${extensionTableId}:columns` : "__disabled__:columns"
+    extensionTableId ? dataTableExtensionSpotId(extensionTableId, "columns") : "__disabled__:columns"
   );
   const { widgets: rowActionWidgets } = useInjectionDataWidgets(
-    extensionTableId ? `data-table:${extensionTableId}:row-actions` : "__disabled__:row-actions"
+    extensionTableId ? dataTableExtensionSpotId(extensionTableId, "row-actions") : "__disabled__:row-actions"
   );
   const { widgets: bulkActionWidgets } = useInjectionDataWidgets(
-    extensionTableId ? `data-table:${extensionTableId}:bulk-actions` : "__disabled__:bulk-actions"
+    extensionTableId ? dataTableExtensionSpotId(extensionTableId, "bulk-actions") : "__disabled__:bulk-actions"
   );
   const { widgets: filterWidgets } = useInjectionDataWidgets(
-    extensionTableId ? `data-table:${extensionTableId}:filters` : "__disabled__:filters"
+    extensionTableId ? dataTableExtensionSpotId(extensionTableId, "filters") : "__disabled__:filters"
   );
   const injectedColumnDefs = React.useMemo(() => {
     const entries = [];
@@ -1231,18 +1231,19 @@ function DataTable({
       return changed ? filtered : prev;
     });
   }, [table, mergedColumns]);
-  const initialVisibilityApplied = React.useRef(Boolean(mergedInitialSettings?.columnVisibility));
+  const visibilitySeededByStoredSettings = React.useRef(Boolean(mergedInitialSettings?.columnVisibility));
+  const autoHiddenColumnIds = React.useRef(/* @__PURE__ */ new Set());
   React.useEffect(() => {
-    if (initialVisibilityApplied.current) return;
+    if (visibilitySeededByStoredSettings.current) return;
     const hidden = {};
     table.getAllLeafColumns().forEach((column) => {
       const hiddenMeta = column.columnDef?.meta?.hidden;
-      if (hiddenMeta) hidden[column.id] = false;
+      if (!hiddenMeta || autoHiddenColumnIds.current.has(column.id)) return;
+      hidden[column.id] = false;
+      autoHiddenColumnIds.current.add(column.id);
     });
-    if (Object.keys(hidden).length) {
-      setColumnVisibility((prev) => ({ ...hidden, ...prev }));
-    }
-    initialVisibilityApplied.current = true;
+    if (!Object.keys(hidden).length) return;
+    setColumnVisibility((prev) => ({ ...hidden, ...prev }));
   }, [table, mergedColumns]);
   const getCurrentSettings = React.useCallback(() => {
     const visibility = {};
@@ -2555,6 +2556,7 @@ function DataTable({
 }
 export {
   DataTable,
+  clearAllPerspectiveState,
   readPerspectiveSnapshot,
   sanitizePerspectiveSettings,
   withDataTableNamespaces,