@toolbox-web/grid 1.14.1 → 1.16.0

package/lib/plugins/grouping-columns/GroupingColumnsPlugin.d.ts

@@ -1,4 +1,4 @@
-import { AfterCellRenderContext, PluginManifest, BaseGridPlugin } from '../../core/plugin/base-plugin';
+import { AfterCellRenderContext, PluginManifest, PluginQuery, BaseGridPlugin } from '../../core/plugin/base-plugin';
 import { ColumnConfig } from '../../core/types';
 import { ColumnGroup, GroupingColumnsConfig } from './types';
 /**
@@ -96,7 +96,11 @@ export declare class GroupingColumnsPlugin extends BaseGridPlugin<GroupingColumn
     private groups;
     private isActive;
     /** @internal */
+    attach(grid: import('../../core/plugin/base-plugin').GridElement): void;
+    /** @internal */
     detach(): void;
+    /** @internal */
+    handleQuery(query: PluginQuery): unknown;
     /**
      * Auto-detect column groups from column configuration.
      * Detects both inline `column.group` properties and declarative `columnGroups` config.

package/lib/plugins/grouping-columns/GroupingColumnsPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupingColumnsPlugin.d.ts","sourceRoot":"","sources":["../../../../../../libs/grid/src/lib/plugins/grouping-columns/GroupingColumnsPlugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAQrD,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8EG;AACH,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,qBAAqB,CAAC;;IAC9E;;;OAGG;IACH,gBAAyB,QAAQ,EAAE,cAAc,CAc/C;IAEF,gBAAgB;IAChB,QAAQ,CAAC,IAAI,qBAAqB;IAClC,gBAAgB;IAChB,SAAkB,MAAM,SAAU;IAElC,gBAAgB;IAChB,cAAuB,aAAa,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAIrE;IAGD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAS;IAOzB,gBAAgB;IACP,MAAM,IAAI,IAAI;IASvB;;;OAGG;IACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO;IAczD,gBAAgB;IACP,cAAc,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY,EAAE;IAmDzE,gBAAgB;IACP,WAAW,IAAI,IAAI;IA6C5B;;;;;OAKG;IACM,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAQ/D;;;OAGG;IACH,gBAAgB,IAAI,OAAO;IAI3B;;;OAGG;IACH,SAAS,IAAI,WAAW,EAAE;IAI1B;;;;OAIG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,EAAE;IAKhD;;OAEG;IACH,OAAO,IAAI,IAAI;CAIhB"}
+{"version":3,"file":"GroupingColumnsPlugin.d.ts","sourceRoot":"","sources":["../../../../../../libs/grid/src/lib/plugins/grouping-columns/GroupingColumnsPlugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AASrD,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8EG;AACH,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,qBAAqB,CAAC;;IAC9E;;;OAGG;IACH,gBAAyB,QAAQ,EAAE,cAAc,CAe/C;IAEF,gBAAgB;IAChB,QAAQ,CAAC,IAAI,qBAAqB;IAClC,gBAAgB;IAChB,SAAkB,MAAM,SAAU;IAElC,gBAAgB;IAChB,cAAuB,aAAa,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAKrE;IAGD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAS;IAOzB,gBAAgB;IACP,MAAM,CAAC,IAAI,EAAE,OAAO,+BAA+B,EAAE,WAAW,GAAG,IAAI;IAShF,gBAAgB;IACP,MAAM,IAAI,IAAI;IAmHvB,gBAAgB;IACP,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO;IAmFjD;;;OAGG;IACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO;IAczD,gBAAgB;IACP,cAAc,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY,EAAE;IAmDzE,gBAAgB;IACP,WAAW,IAAI,IAAI;IAyD5B;;;;;OAKG;IACM,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAQ/D;;;OAGG;IACH,gBAAgB,IAAI,OAAO;IAI3B;;;OAGG;IACH,SAAS,IAAI,WAAW,EAAE;IAI1B;;;;OAIG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,EAAE;IAKhD;;OAEG;IACH,OAAO,IAAI,IAAI;CAIhB"}

package/lib/plugins/grouping-columns/index.js

@@ -1,4 +1,4 @@
-const c = '<svg viewBox="0 0 16 16" width="12" height="12"><path fill="currentColor" d="M6 10.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/></svg>', h = {
+const g = '<svg viewBox="0 0 16 16" width="12" height="12"><path fill="currentColor" d="M6 10.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/></svg>', p = {
   expand: "▶",
   collapse: "▼",
   sortAsc: "▲",
@@ -7,11 +7,11 @@ const c = '<svg viewBox="0 0 16 16" width="12" height="12"><path fill="currentCo
   submenuArrow: "▶",
   dragHandle: "⋮⋮",
   toolPanel: "☰",
-  filter: c,
-  filterActive: c,
+  filter: g,
+  filterActive: g,
   print: "🖨️"
 };
-class p {
+class f {
   /**
    * Plugin dependencies - declare other plugins this one requires.
    *
@@ -138,16 +138,16 @@ class p {
   /**
    * Emit a custom event from the grid.
    */
-  emit(e, r) {
-    this.grid?.dispatchEvent?.(new CustomEvent(e, { detail: r, bubbles: !0 }));
+  emit(e, t) {
+    this.grid?.dispatchEvent?.(new CustomEvent(e, { detail: t, bubbles: !0 }));
   }
   /**
    * Emit a cancelable custom event from the grid.
    * @returns `true` if the event was cancelled (preventDefault called), `false` otherwise
    */
-  emitCancelable(e, r) {
-    const t = new CustomEvent(e, { detail: r, bubbles: !0, cancelable: !0 });
-    return this.grid?.dispatchEvent?.(t), t.defaultPrevented;
+  emitCancelable(e, t) {
+    const s = new CustomEvent(e, { detail: t, bubbles: !0, cancelable: !0 });
+    return this.grid?.dispatchEvent?.(s), s.defaultPrevented;
   }
   // =========================================================================
   // Event Bus - Plugin-to-Plugin Communication
@@ -168,8 +168,8 @@ class p {
    * });
    * ```
    */
-  on(e, r) {
-    this.grid?._pluginManager?.subscribe(this, e, r);
+  on(e, t) {
+    this.grid?._pluginManager?.subscribe(this, e, t);
   }
   /**
    * Unsubscribe from a plugin event.
@@ -203,8 +203,8 @@ class p {
    * this.emit('filter-change', { field: 'name', value: 'Alice' });
    * ```
    */
-  emitPluginEvent(e, r) {
-    this.grid?._pluginManager?.emitPluginEvent(e, r);
+  emitPluginEvent(e, t) {
+    this.grid?._pluginManager?.emitPluginEvent(e, t);
   }
   /**
    * Request a re-render of the grid.
@@ -301,7 +301,7 @@ class p {
    */
   get gridIcons() {
     const e = this.grid?.gridConfig?.icons ?? {};
-    return { ...h, ...e };
+    return { ...p, ...e };
   }
   // #region Animation Helpers
   /**
@@ -324,8 +324,8 @@ class p {
     const e = this.grid?.effectiveConfig?.animation?.mode ?? "reduced-motion";
     if (e === !1 || e === "off") return !1;
     if (e === !0 || e === "on") return !0;
-    const r = this.gridElement;
-    return r ? getComputedStyle(r).getPropertyValue("--tbw-animation-enabled").trim() !== "0" : !0;
+    const t = this.gridElement;
+    return t ? getComputedStyle(t).getPropertyValue("--tbw-animation-enabled").trim() !== "0" : !0;
   }
   /**
    * Get the animation duration in milliseconds from CSS variable.
@@ -342,8 +342,8 @@ class p {
   get animationDuration() {
     const e = this.gridElement;
     if (e) {
-      const r = getComputedStyle(e).getPropertyValue("--tbw-animation-duration").trim(), t = parseInt(r, 10);
-      if (!isNaN(t)) return t;
+      const t = getComputedStyle(e).getPropertyValue("--tbw-animation-duration").trim(), s = parseInt(t, 10);
+      if (!isNaN(s)) return s;
     }
     return 200;
   }
@@ -356,8 +356,8 @@ class p {
    * @param pluginOverride - Optional plugin-level override
    * @returns The resolved icon value
    */
-  resolveIcon(e, r) {
-    return r !== void 0 ? r : this.gridIcons[e];
+  resolveIcon(e, t) {
+    return t !== void 0 ? t : this.gridIcons[e];
   }
   /**
    * Set an icon value on an element.
@@ -366,8 +366,8 @@ class p {
    * @param element - The element to set the icon on
    * @param icon - The icon value (string or HTMLElement)
    */
-  setIcon(e, r) {
-    typeof r == "string" ? e.innerHTML = r : r instanceof HTMLElement && (e.innerHTML = "", e.appendChild(r.cloneNode(!0)));
+  setIcon(e, t) {
+    typeof t == "string" ? e.innerHTML = t : t instanceof HTMLElement && (e.innerHTML = "", e.appendChild(t.cloneNode(!0)));
   }
   /**
    * Log a warning message.
@@ -377,74 +377,74 @@ class p {
   }
   // #endregion
 }
-function g(u) {
-  if (!u.length) return [];
-  const e = /* @__PURE__ */ new Map(), r = [], t = (o, s) => {
-    if (!s.length) return;
-    const i = r[r.length - 1];
-    if (i && i.implicit && i.firstIndex + i.columns.length === o) {
-      i.columns.push(...s);
+function c(d) {
+  if (!d.length) return [];
+  const e = /* @__PURE__ */ new Map(), t = [], s = (o, n) => {
+    if (!n.length) return;
+    const l = t[t.length - 1];
+    if (l && l.implicit && l.firstIndex + l.columns.length === o) {
+      l.columns.push(...n);
       return;
     }
-    r.push({
+    t.push({
       id: "__implicit__" + o,
       label: void 0,
-      columns: s,
+      columns: n,
       firstIndex: o,
       implicit: !0
     });
   };
-  let l = [], n = 0;
-  return u.forEach((o, s) => {
-    const i = o.group;
-    if (!i) {
-      l.length === 0 && (n = s), l.push(o);
+  let i = [], r = 0;
+  return d.forEach((o, n) => {
+    const l = o.group;
+    if (!l) {
+      i.length === 0 && (r = n), i.push(o);
       return;
     }
-    l.length && (t(n, l.slice()), l = []);
-    const d = typeof i == "string" ? i : i.id;
-    let a = e.get(d);
+    i.length && (s(r, i.slice()), i = []);
+    const u = typeof l == "string" ? l : l.id;
+    let a = e.get(u);
     a || (a = {
-      id: d,
-      label: typeof i == "string" ? void 0 : i.label,
+      id: u,
+      label: typeof l == "string" ? void 0 : l.label,
       columns: [],
-      firstIndex: s
-    }, e.set(d, a), r.push(a)), a.columns.push(o);
-  }), l.length && t(n, l), r.length === 1 && r[0].implicit && r[0].columns.length === u.length ? [] : r;
+      firstIndex: n
+    }, e.set(u, a), t.push(a)), a.columns.push(o);
+  }), i.length && s(r, i), t.length === 1 && t[0].implicit && t[0].columns.length === d.length ? [] : t;
 }
-function f(u, e, r) {
-  if (!e.length || !u) return;
-  const t = /* @__PURE__ */ new Map();
-  for (const n of e)
-    for (const o of n.columns)
-      o.field && t.set(o.field, n.id);
-  const l = Array.from(u.querySelectorAll(".cell[data-field]"));
-  l.forEach((n) => {
-    const o = n.getAttribute("data-field") || "", s = t.get(o);
-    s && (n.classList.add("grouped"), n.getAttribute("data-group") || n.setAttribute("data-group", s));
+function h(d, e, t) {
+  if (!e.length || !d) return;
+  const s = /* @__PURE__ */ new Map();
+  for (const r of e)
+    for (const o of r.columns)
+      o.field && s.set(o.field, r.id);
+  const i = Array.from(d.querySelectorAll(".cell[data-field]"));
+  i.forEach((r) => {
+    const o = r.getAttribute("data-field") || "", n = s.get(o);
+    n && (r.classList.add("grouped"), r.getAttribute("data-group") || r.setAttribute("data-group", n));
   });
-  for (const n of e) {
-    const o = n.columns[n.columns.length - 1], s = l.find((i) => i.getAttribute("data-field") === o.field);
-    s && s.classList.add("group-end");
+  for (const r of e) {
+    const o = r.columns[r.columns.length - 1], n = i.find((l) => l.getAttribute("data-field") === o.field);
+    n && n.classList.add("group-end");
   }
 }
-function m(u, e) {
-  if (u.length === 0) return null;
-  const r = document.createElement("div");
-  r.className = "header-group-row", r.setAttribute("role", "row");
-  for (const t of u) {
-    const l = t.columns[0], n = l ? e.findIndex((d) => d.field === l.field) : -1;
-    if (n === -1) continue;
-    const o = String(t.id).startsWith("__implicit__"), s = o ? "" : t.label || t.id, i = document.createElement("div");
-    i.className = "cell header-group-cell", o && i.classList.add("implicit-group"), i.setAttribute("data-group", String(t.id)), i.style.gridColumn = `${n + 1} / span ${t.columns.length}`, i.textContent = s, r.appendChild(i);
-  }
-  return r;
+function m(d, e) {
+  if (d.length === 0) return null;
+  const t = document.createElement("div");
+  t.className = "header-group-row", t.setAttribute("role", "row");
+  for (const s of d) {
+    const i = s.columns[0], r = i ? e.findIndex((u) => u.field === i.field) : -1;
+    if (r === -1) continue;
+    const o = String(s.id).startsWith("__implicit__"), n = o ? "" : s.label || s.id, l = document.createElement("div");
+    l.className = "cell header-group-cell", o && l.classList.add("implicit-group"), l.setAttribute("data-group", String(s.id)), l.style.gridColumn = `${r + 1} / span ${s.columns.length}`, l.textContent = n, t.appendChild(l);
+  }
+  return t;
 }
-function b(u) {
-  return u.some((e) => e.group != null);
+function b(d) {
+  return d.some((e) => e.group != null);
 }
 const w = "@layer tbw-plugins{.header-group-row{display:grid;grid-auto-flow:column;background:var(--tbw-grouping-columns-header-bg, var(--tbw-color-header-bg));border-bottom:1px solid var(--tbw-grouping-columns-border, var(--tbw-color-border))}.header-group-cell{display:flex;align-items:center;justify-content:center;padding:var(--tbw-button-padding-sm, .25rem .5rem);font-weight:600;font-size:var(--tbw-font-size-sm, .9em);text-transform:uppercase;letter-spacing:.5px;border-right:2px solid var(--tbw-grouping-columns-separator, var(--tbw-color-border-strong, var(--tbw-color-border)))}.header-group-cell:last-child{border-right:none}.header-row .cell.grouped{border-top:none}.header-row .cell.group-end{border-right:2px solid var(--tbw-grouping-columns-separator, var(--tbw-color-border-strong, var(--tbw-color-border)))}.header-row .cell.group-end:last-child{border-right:none}.rows .cell.group-end{border-right:2px solid var(--tbw-grouping-columns-separator, var(--tbw-color-border-strong, var(--tbw-color-border)))}.rows .cell.group-end:last-child{border-right:none}.header-group-row.no-borders{border-bottom:none}.header-group-row.no-borders .header-group-cell{border-right:none}.header-row.no-group-borders .cell.group-end{border-right:1px solid var(--tbw-color-border)}}";
-class v extends p {
+class v extends f {
   /**
    * Plugin manifest - declares owned properties for configuration validation.
    * @internal
@@ -462,7 +462,8 @@ class v extends p {
         description: 'the "columnGroups" config property',
         isUsed: (e) => Array.isArray(e) && e.length > 0
       }
-    ]
+    ],
+    queries: [{ type: "getColumnGrouping", description: "Returns column group metadata for the visibility panel" }]
   };
   /** @internal */
   name = "groupingColumns";
@@ -471,7 +472,8 @@ class v extends p {
   /** @internal */
   get defaultConfig() {
     return {
-      showGroupBorders: !0
+      showGroupBorders: !0,
+      lockGroupOrder: !1
     };
   }
   // #region Internal State
@@ -482,69 +484,200 @@ class v extends p {
   // #endregion
   // #region Lifecycle
   /** @internal */
+  attach(e) {
+    super.attach(e), e.addEventListener("column-move", this.#r, {
+      signal: this.disconnectSignal
+    });
+  }
+  /** @internal */
   detach() {
     this.groups = [], this.isActive = !1, this.#e.clear();
   }
+  // #region Column Move Guard
+  /**
+   * Handle the cancelable column-move event.
+   * - When lockGroupOrder is enabled, prevents moves that would break group contiguity.
+   * - Always refreshes #groupEndFields after a successful move so that afterCellRender
+   *   applies group-end borders to the correct (reordered) last column.
+   */
+  #r = (e) => {
+    if (!this.isActive) return;
+    const t = e, { field: s, columnOrder: i } = t.detail;
+    if (this.config.lockGroupOrder) {
+      for (const r of this.groups)
+        if (!r.id.startsWith("__implicit__") && !this.#i(r, i)) {
+          t.preventDefault(), this.#s(s);
+          return;
+        }
+    }
+    this.#t(i);
+  };
+  /**
+   * Recompute which fields are group-end based on a column order.
+   * The last field of each explicit group in the order gets the group-end class.
+   */
+  #t(e) {
+    this.#e.clear();
+    const t = this.#o(e);
+    for (const s of this.groups) {
+      const i = new Set(s.columns.map((r) => r.field));
+      for (let r = e.length - 1; r >= 0; r--)
+        if (i.has(e[r])) {
+          const o = e[r];
+          o !== t && this.#e.add(o);
+          break;
+        }
+    }
+  }
+  /**
+   * Find the trailing field of the last group in column order (to exclude from group-end marking).
+   */
+  #o(e) {
+    if (this.groups.length === 0) return null;
+    for (let t = e.length - 1; t >= 0; t--) {
+      const s = e[t];
+      for (const i of this.groups)
+        if (i.columns.some((r) => r.field === s)) {
+          const r = new Set(i.columns.map((o) => o.field));
+          for (let o = e.length - 1; o >= 0; o--)
+            if (r.has(e[o])) return e[o];
+        }
+    }
+    return null;
+  }
+  /**
+   * Check if all columns in a group are contiguous in the proposed column order.
+   */
+  #i(e, t) {
+    const s = e.columns.map((i) => t.indexOf(i.field)).filter((i) => i !== -1).sort((i, r) => i - r);
+    return s.length <= 1 ? !0 : s.length === s[s.length - 1] - s[0] + 1;
+  }
+  /**
+   * Flash the header cell with an error color to indicate a blocked move.
+   */
+  #s(e) {
+    const t = this.gridElement?.querySelector(
+      `.header-row [part~="header-cell"][data-field="${e}"]`
+    );
+    t && (t.style.setProperty("--_flash-color", "var(--tbw-color-error)"), t.animate(
+      [{ backgroundColor: "rgba(from var(--_flash-color) r g b / 30%)" }, { backgroundColor: "transparent" }],
+      { duration: 400, easing: "ease-out" }
+    ));
+  }
+  // #endregion
+  /** @internal */
+  handleQuery(e) {
+    if (e.type === "getColumnGrouping")
+      return this.#n();
+  }
+  /**
+   * Get stable column grouping info that includes ALL columns (visible and hidden).
+   * Used by the visibility panel to maintain group structure regardless of visibility state.
+   * Fields within each group are sorted by current display order.
+   */
+  #n() {
+    let e;
+    const t = this.grid?.gridConfig?.columnGroups;
+    if (t && Array.isArray(t) && t.length > 0)
+      e = t.filter((i) => i.children.length > 0).map((i) => ({
+        id: i.id,
+        label: i.header,
+        fields: [...i.children]
+      }));
+    else if (this.isActive && this.groups.length > 0) {
+      e = this.groups.filter((r) => !r.id.startsWith("__implicit__")).map((r) => ({
+        id: r.id,
+        label: r.label ?? r.id,
+        fields: r.columns.map((o) => o.field)
+      }));
+      const i = this.columns;
+      for (const r of i)
+        if (r.hidden && r.group) {
+          const o = typeof r.group == "string" ? r.group : r.group.id, n = typeof r.group == "string" ? r.group : r.group.label ?? r.group.id, l = e.find((u) => u.id === o);
+          l ? l.fields.includes(r.field) || l.fields.push(r.field) : e.push({ id: o, label: n, fields: [r.field] });
+        }
+    } else {
+      const i = this.columns, r = /* @__PURE__ */ new Map();
+      for (const o of i) {
+        if (!o.group) continue;
+        const n = typeof o.group == "string" ? o.group : o.group.id, l = typeof o.group == "string" ? o.group : o.group.label ?? o.group.id, u = r.get(n);
+        u ? u.fields.includes(o.field) || u.fields.push(o.field) : r.set(n, { id: n, label: l, fields: [o.field] });
+      }
+      e = Array.from(r.values());
+    }
+    const s = this.grid?.getColumnOrder();
+    if (s && s.length > 0) {
+      const i = new Map(s.map((r, o) => [r, o]));
+      for (const r of e)
+        r.fields.sort((o, n) => (i.get(o) ?? 1 / 0) - (i.get(n) ?? 1 / 0));
+    }
+    return e;
+  }
   // #endregion
   // #region Static Detection
   /**
    * Auto-detect column groups from column configuration.
    * Detects both inline `column.group` properties and declarative `columnGroups` config.
    */
-  static detect(e, r) {
-    if (r?.columnGroups && Array.isArray(r.columnGroups) && r.columnGroups.length > 0)
+  static detect(e, t) {
+    if (t?.columnGroups && Array.isArray(t.columnGroups) && t.columnGroups.length > 0)
       return !0;
-    const t = r?.columns;
-    return Array.isArray(t) ? b(t) : !1;
+    const s = t?.columns;
+    return Array.isArray(s) ? b(s) : !1;
   }
   // #endregion
   // #region Hooks
   /** @internal */
   processColumns(e) {
-    const r = this.grid?.gridConfig?.columnGroups;
-    let t;
-    if (r && Array.isArray(r) && r.length > 0) {
-      const n = /* @__PURE__ */ new Map();
-      for (const o of r)
-        for (const s of o.children)
-          n.set(s, { id: o.id, label: o.header });
-      t = e.map((o) => {
-        const s = n.get(o.field);
-        return s && !o.group ? { ...o, group: s } : o;
+    const t = this.grid?.gridConfig?.columnGroups;
+    let s;
+    if (t && Array.isArray(t) && t.length > 0) {
+      const r = /* @__PURE__ */ new Map();
+      for (const o of t)
+        for (const n of o.children)
+          r.set(n, { id: o.id, label: o.header });
+      s = e.map((o) => {
+        const n = r.get(o.field);
+        return n && !o.group ? { ...o, group: n } : o;
       });
     } else
-      t = [...e];
-    const l = g(t);
-    if (l.length === 0)
-      return this.isActive = !1, this.groups = [], t;
-    this.isActive = !0, this.groups = l, this.#e.clear();
-    for (const n of l) {
-      const o = n.columns[n.columns.length - 1];
+      s = [...e];
+    const i = c(s);
+    if (i.length === 0)
+      return this.isActive = !1, this.groups = [], s;
+    this.isActive = !0, this.groups = i, this.#e.clear();
+    for (const r of i) {
+      const o = r.columns[r.columns.length - 1];
       o?.field && this.#e.add(o.field);
     }
-    return t;
+    return s;
   }
   /** @internal */
   afterRender() {
     if (!this.isActive) {
-      const i = this.gridElement?.querySelector(".header")?.querySelector(".header-group-row");
-      i && i.remove();
+      const l = this.gridElement?.querySelector(".header")?.querySelector(".header-group-row");
+      l && l.remove();
       return;
     }
     const e = this.gridElement?.querySelector(".header");
     if (!e) return;
-    const r = e.querySelector(".header-group-row");
-    r && r.remove();
-    const t = this.columns, l = g(t);
-    if (l.length === 0) return;
-    const n = m(l, t);
-    if (n) {
-      n.classList.toggle("no-borders", !this.config.showGroupBorders);
-      const s = e.querySelector(".header-row");
-      s ? e.insertBefore(n, s) : e.appendChild(n);
+    const t = e.querySelector(".header-group-row");
+    t && t.remove();
+    const s = this.visibleColumns, i = c(s);
+    if (i.length === 0) return;
+    this.#e.clear();
+    for (let n = 0; n < i.length; n++) {
+      const l = i[n], u = l.columns[l.columns.length - 1];
+      u?.field && n < i.length - 1 && this.#e.add(u.field);
+    }
+    const r = m(i, s);
+    if (r) {
+      r.classList.toggle("no-borders", !this.config.showGroupBorders);
+      const n = e.querySelector(".header-row");
+      n ? e.insertBefore(r, n) : e.appendChild(r);
     }
     const o = e.querySelector(".header-row");
-    o && (o.classList.toggle("no-group-borders", !this.config.showGroupBorders), f(o, l));
+    o && (o.classList.toggle("no-group-borders", !this.config.showGroupBorders), h(o, i));
   }
   /**
    * Apply group-end class to individual cells during render and scroll.
@@ -577,8 +710,8 @@ class v extends p {
    * @returns Array of columns in the group
    */
   getGroupColumns(e) {
-    const r = this.groups.find((t) => t.id === e);
-    return r ? r.columns : [];
+    const t = this.groups.find((s) => s.id === e);
+    return t ? t.columns : [];
   }
   /**
    * Refresh column groups (recompute from current columns).