@open-mercato/ui 0.9.1-develop.7574.1.837288eec1 → 0.10.1-develop.7576.1.21d5b50435

package/dist/backend/DataTable.js

@@ -52,7 +52,7 @@ 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, InjectionPosition } from "@open-mercato/shared/modules/widgets/injection-position";
+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";
 import {
@@ -111,37 +111,6 @@ function withDataTableNamespaces(mappedRow, sourceItem) {
     ...namespaced
   };
 }
-function reconcileColumnOrder(prev, ids, placements = /* @__PURE__ */ new Map()) {
-  const allowed = new Set(ids);
-  const result = prev.filter((id) => allowed.has(id));
-  const known = new Set(result);
-  ids.forEach((id, index) => {
-    if (known.has(id)) return;
-    const placement = placements.get(id);
-    const anchorIndex = placement?.relativeTo ? result.indexOf(placement.relativeTo) : -1;
-    if (anchorIndex !== -1 && (placement?.position === InjectionPosition.Before || placement?.position === InjectionPosition.After)) {
-      result.splice(placement.position === InjectionPosition.Before ? anchorIndex : anchorIndex + 1, 0, id);
-      known.add(id);
-      return;
-    }
-    const hasKnownSuccessor = ids.slice(index + 1).some((candidate) => known.has(candidate));
-    if (!hasKnownSuccessor) {
-      result.push(id);
-    } else {
-      let insertAt = 0;
-      for (let cursor = index - 1; cursor >= 0; cursor -= 1) {
-        const predecessorIndex = result.indexOf(ids[cursor]);
-        if (predecessorIndex !== -1) {
-          insertAt = predecessorIndex + 1;
-          break;
-        }
-      }
-      result.splice(insertAt, 0, id);
-    }
-    known.add(id);
-  });
-  return result;
-}
 function resolveDataTableRowId(row, index) {
   if (row && typeof row === "object") {
     const candidate = row.id;
@@ -1322,18 +1291,23 @@ function DataTableImpl({
     [baseInjectionContext, hasInjectedBulkActions, rowSelection]
   );
   React.useEffect(() => {
-    const ids = table.getAllColumns().flatMap((column) => column.getLeafColumns()).map((column) => column.id);
+    const ids = table.getAllLeafColumns().map((column) => column.id);
     if (!ids.length) return;
-    const placements = new Map(
-      injectedColumnDefs.map(({ def, placement }) => [def.id ?? "", placement])
-    );
     setColumnOrder((prev) => {
       if (!prev.length) return ids;
-      const next = reconcileColumnOrder(prev, ids, placements);
-      const changed = next.length !== prev.length || next.some((id, index) => id !== prev[index]);
-      return changed ? next : prev;
+      const allowed = ids;
+      const filtered = prev.filter((id) => allowed.includes(id));
+      const seen = new Set(filtered);
+      for (const id of allowed) {
+        if (!seen.has(id)) {
+          filtered.push(id);
+          seen.add(id);
+        }
+      }
+      const changed = filtered.length !== prev.length || filtered.some((id, index) => id !== prev[index]);
+      return changed ? filtered : prev;
     });
-  }, [table, mergedColumns, injectedColumnDefs]);
+  }, [table, mergedColumns]);
   const visibilityDecidedColumnIds = React.useRef(
     new Set(Object.keys(mergedInitialSettings?.columnVisibility ?? {}))
   );