@open-mercato/ui 0.6.7-develop.6758.1.697eade236 → 0.6.7-develop.6766.1.40c9011995

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";
@@ -932,7 +933,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 +945,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 = [];