twico-ui 1.20.1 → 1.20.2

package/dist/index.mjs

@@ -8626,6 +8626,37 @@ var filterTypeOf = (col) => {
   if (ft === "number" || ft === "string") return ft;
   return col && col.type === "number" ? "number" : "string";
 };
+function mergeColOrder(saved, propFields) {
+  const known = new Set(propFields);
+  const result = saved.filter((f) => known.has(f));
+  const placed = new Set(result);
+  for (let i = 0; i < propFields.length; i++) {
+    const f = propFields[i];
+    if (!f || placed.has(f)) continue;
+    let at = 0;
+    for (let j = i - 1; j >= 0; j--) {
+      const idx = result.indexOf(propFields[j]);
+      if (idx !== -1) {
+        at = idx + 1;
+        break;
+      }
+    }
+    if (at === 0) {
+      let before = result.length;
+      for (let j = i + 1; j < propFields.length; j++) {
+        const idx = result.indexOf(propFields[j]);
+        if (idx !== -1) {
+          before = idx;
+          break;
+        }
+      }
+      at = before;
+    }
+    result.splice(at, 0, f);
+    placed.add(f);
+  }
+  return result;
+}
 var getColVal = (col, row) => col && col.valueGetter ? col.valueGetter(row) : row == null ? void 0 : row[col && col.field];
 var diffValueNode = (col, v, row) => col.renderCell ? col.renderCell(v, row) : col.valueFormatter ? col.valueFormatter(v, row) : v == null ? "" : v;
 function renderDiffCell(col, val, row) {
@@ -9201,9 +9232,7 @@ function Datatable({
     if (typeof s.page === "number" && !pageControlled) setInternalPage(Math.max(0, Math.floor(s.page)));
     if (typeof s.pageSize === "number" && !pageSizeControlled) setInternalRpp(s.pageSize > 0 ? s.pageSize : 10);
     if (Array.isArray(s.columnOrder)) {
-      const savedOrder = s.columnOrder.filter((f) => known.has(f));
-      const missing = cols.map((c) => c.field).filter((f) => f && !savedOrder.includes(f));
-      setOrder([...savedOrder, ...missing]);
+      setOrder(mergeColOrder(s.columnOrder, cols.map((c) => c.field).filter(Boolean)));
     }
     if (s.columnWidths && typeof s.columnWidths === "object") setWidths(Object.fromEntries(Object.entries(s.columnWidths).filter(([f, w]) => known.has(f) && typeof w === "number")));
     if (s.columnVisibility && typeof s.columnVisibility === "object") setHidden(new Set(Object.keys(s.columnVisibility).filter((f) => known.has(f) && s.columnVisibility[f] === false)));
@@ -9315,12 +9344,7 @@ function Datatable({
   }));
   const pivotActive = pivotOn && pivotConfig.rows.length > 0 && pivotConfig.values.length > 0;
   React51__default.useEffect(() => {
-    setOrder((prev) => {
-      const fields = columns.map((c) => c.field);
-      const kept = prev.filter((f) => fields.includes(f));
-      const added = fields.filter((f) => !kept.includes(f));
-      return [...kept, ...added];
-    });
+    setOrder((prev) => mergeColOrder(prev, columns.map((c) => c.field).filter(Boolean)));
   }, [columns]);
   const densitySyncedRef = React51__default.useRef(false);
   React51__default.useEffect(() => {