@toolbox-web/grid 1.19.3 → 1.21.0

package/lib/plugins/multi-sort/MultiSortPlugin.d.ts

@@ -93,6 +93,14 @@ export declare class MultiSortPlugin extends BaseGridPlugin<MultiSortConfig> {
      *  the edited row from jumping to a new sorted position mid-edit. Row data
      *  mutations are still visible because the array holds shared object refs. */
     private cachedSortResult;
+    /**
+     * Clear the core `_sortState` so that only this plugin's `processRows`
+     * sorting applies.  `ConfigManager.applyState()` always sets the core sort
+     * state when restoring from storage, even when a plugin handles sorting.
+     * Without this, the stale core state leaks into `collectState()` and
+     * `reapplyCoreSort()` after the plugin clears its own model.
+     */
+    private clearCoreSortState;
     /** @internal */
     detach(): void;
     /** @internal */

package/lib/plugins/multi-sort/MultiSortPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiSortPlugin.d.ts","sourceRoot":"","sources":["../../../../../../libs/grid/src/lib/plugins/multi-sort/MultiSortPlugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+EG;AACH,qBAAa,eAAgB,SAAQ,cAAc,CAAC,eAAe,CAAC;IAClE,gBAAgB;IAChB,QAAQ,CAAC,IAAI,eAAe;IAC5B,gBAAgB;IAChB,SAAkB,MAAM,SAAU;IAElC,gBAAgB;IAChB,cAAuB,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC,CAK/D;IAGD,OAAO,CAAC,SAAS,CAAmB;IACpC;;kFAE8E;IAC9E,OAAO,CAAC,gBAAgB,CAA0B;IAKlD,gBAAgB;IACP,MAAM,IAAI,IAAI;IAQvB,gBAAgB;IACP,WAAW,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,EAAE;IAyBzD,gBAAgB;IACP,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO;IAgBxD,gBAAgB;IACP,WAAW,IAAI,IAAI;IAoE5B;;;OAGG;IACH,YAAY,IAAI,SAAS,EAAE;IAI3B;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI;IAOtC;;OAEG;IACH,SAAS,IAAI,IAAI;IAOjB;;;;OAIG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI/C;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,SAAS;IAO3D;;;OAGG;IACM,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS;IAaxE;;;;OAIG;IACM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI;CA2BnE"}
+{"version":3,"file":"MultiSortPlugin.d.ts","sourceRoot":"","sources":["../../../../../../libs/grid/src/lib/plugins/multi-sort/MultiSortPlugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+EG;AACH,qBAAa,eAAgB,SAAQ,cAAc,CAAC,eAAe,CAAC;IAClE,gBAAgB;IAChB,QAAQ,CAAC,IAAI,eAAe;IAC5B,gBAAgB;IAChB,SAAkB,MAAM,SAAU;IAElC,gBAAgB;IAChB,cAAuB,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC,CAK/D;IAGD,OAAO,CAAC,SAAS,CAAmB;IACpC;;kFAE8E;IAC9E,OAAO,CAAC,gBAAgB,CAA0B;IAElD;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAQ1B,gBAAgB;IACP,MAAM,IAAI,IAAI;IAQvB,gBAAgB;IACP,WAAW,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,EAAE;IAyBzD,gBAAgB;IACP,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO;IAiBxD,gBAAgB;IACP,WAAW,IAAI,IAAI;IAoE5B;;;OAGG;IACH,YAAY,IAAI,SAAS,EAAE;IAI3B;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI;IAQtC;;OAEG;IACH,SAAS,IAAI,IAAI;IAQjB;;;;OAIG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI/C;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,SAAS;IAO3D;;;OAGG;IACM,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS;IAaxE;;;;OAIG;IACM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI;CA6BnE"}

package/lib/plugins/multi-sort/index.js

@@ -1,4 +1,4 @@
-const f = '<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>', S = {
+const f = '<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>', b = {
   expand: "▶",
   collapse: "▼",
   sortAsc: "▲",
@@ -301,7 +301,7 @@ class C {
    */
   get gridIcons() {
     const t = this.grid?.gridConfig?.icons ?? {};
-    return { ...S, ...t };
+    return { ...b, ...t };
   }
   // #region Animation Helpers
   /**
@@ -380,7 +380,7 @@ class C {
 function v(i, t, e) {
   return t.length ? [...i].sort((n, r) => {
     for (const s of t) {
-      const d = e.find((u) => u.field === s.field)?.sortComparator ?? x, g = n[s.field], c = r[s.field], o = d(g, c, n, r);
+      const d = e.find((u) => u.field === s.field)?.sortComparator ?? x, h = n[s.field], c = r[s.field], o = d(h, c, n, r);
       if (o !== 0)
         return s.direction === "asc" ? o : -o;
     }
@@ -398,7 +398,7 @@ function m(i, t) {
   const e = i.findIndex((n) => n.field === t);
   return e >= 0 ? e + 1 : void 0;
 }
-function p(i, t) {
+function S(i, t) {
   return i.find((e) => e.field === t)?.direction;
 }
 const w = '@layer tbw-plugins{.header-cell[data-sort=asc]:after{content:"↑";margin-left:var(--tbw-spacing-xs, .25em);opacity:.8}.header-cell[data-sort=desc]:after{content:"↓";margin-left:var(--tbw-spacing-xs, .25em);opacity:.8}.sort-indicator{margin-left:var(--tbw-spacing-xs, .25em);opacity:.8}.sort-index{font-size:var(--tbw-font-size-2xs, .7em);background:var(--tbw-multi-sort-badge-bg, var(--tbw-color-panel-bg));color:var(--tbw-multi-sort-badge-color, var(--tbw-color-fg));border-radius:50%;width:var(--tbw-multi-sort-badge-size, 1em);height:var(--tbw-multi-sort-badge-size, 1em);display:inline-flex;align-items:center;justify-content:center;margin-left:var(--tbw-spacing-xs, .125em);font-weight:600}}';
@@ -420,6 +420,17 @@ class y extends C {
    *  the edited row from jumping to a new sorted position mid-edit. Row data
    *  mutations are still visible because the array holds shared object refs. */
   cachedSortResult = null;
+  /**
+   * Clear the core `_sortState` so that only this plugin's `processRows`
+   * sorting applies.  `ConfigManager.applyState()` always sets the core sort
+   * state when restoring from storage, even when a plugin handles sorting.
+   * Without this, the stale core state leaks into `collectState()` and
+   * `reapplyCoreSort()` after the plugin clears its own model.
+   */
+  clearCoreSortState() {
+    const t = this.gridElement;
+    t && (t._sortState = null);
+  }
   // #endregion
   // #region Lifecycle
   /** @internal */
@@ -442,7 +453,7 @@ class y extends C {
   onHeaderClick(t) {
     if (!this.columns.find((s) => s.field === t.field)?.sortable) return !1;
     const n = t.originalEvent.shiftKey, r = this.config.maxSortColumns ?? 3;
-    return this.sortModel = M(this.sortModel, t.field, n, r), this.emit("sort-change", { sortModel: [...this.sortModel] }), this.requestRender(), this.grid?.requestStateChange?.(), !0;
+    return this.sortModel = M(this.sortModel, t.field, n, r), this.clearCoreSortState(), this.emit("sort-change", { sortModel: [...this.sortModel] }), this.requestRender(), this.grid?.requestStateChange?.(), !0;
   }
   /** @internal */
   afterRender() {
@@ -452,13 +463,13 @@ class y extends C {
     t.querySelectorAll(".header-row .cell[data-field]").forEach((r) => {
       const s = r.getAttribute("data-field");
       if (!s) return;
-      const a = m(this.sortModel, s), d = p(this.sortModel, s);
+      const a = m(this.sortModel, s), d = S(this.sortModel, s);
       if (r.querySelector(".sort-index")?.remove(), d) {
         r.querySelector('[part~="sort-indicator"], .sort-indicator')?.remove(), r.setAttribute("data-sort", d);
         const o = document.createElement("span");
         o.className = "sort-indicator", this.setIcon(o, this.resolveIcon(d === "asc" ? "sortAsc" : "sortDesc"));
-        const u = r.querySelector(".tbw-filter-btn"), b = r.querySelector(".resize-handle"), h = u ?? b;
-        if (h ? r.insertBefore(o, h) : r.appendChild(o), e && this.sortModel.length > 1 && a !== void 0) {
+        const u = r.querySelector(".tbw-filter-btn"), p = r.querySelector(".resize-handle"), g = u ?? p;
+        if (g ? r.insertBefore(o, g) : r.appendChild(o), e && this.sortModel.length > 1 && a !== void 0) {
           const l = document.createElement("span");
           l.className = "sort-index", l.textContent = String(a), o.nextSibling ? r.insertBefore(l, o.nextSibling) : r.appendChild(l);
         }
@@ -480,13 +491,13 @@ class y extends C {
    * @param model - New sort model to apply
    */
   setSortModel(t) {
-    this.sortModel = [...t], this.emit("sort-change", { sortModel: [...t] }), this.requestRender(), this.grid?.requestStateChange?.();
+    this.sortModel = [...t], this.clearCoreSortState(), this.emit("sort-change", { sortModel: [...t] }), this.requestRender(), this.grid?.requestStateChange?.();
   }
   /**
    * Clear all sorting.
    */
   clearSort() {
-    this.sortModel = [], this.emit("sort-change", { sortModel: [] }), this.requestRender(), this.grid?.requestStateChange?.();
+    this.sortModel = [], this.clearCoreSortState(), this.emit("sort-change", { sortModel: [] }), this.requestRender(), this.grid?.requestStateChange?.();
   }
   /**
    * Get the sort index (1-based) for a specific field.
@@ -502,7 +513,7 @@ class y extends C {
    * @returns Sort direction or undefined if not sorted
    */
   getSortDirection(t) {
-    return p(this.sortModel, t);
+    return S(this.sortModel, t);
   }
   // #endregion
   // #region Column State Hooks
@@ -533,7 +544,7 @@ class y extends C {
       field: t,
       direction: e.sort.direction
     };
-    n !== -1 ? this.sortModel[n] = r : this.sortModel.splice(e.sort.priority, 0, r);
+    n !== -1 ? this.sortModel[n] = r : this.sortModel.splice(e.sort.priority, 0, r), this.clearCoreSortState();
   }
   // #endregion
 }