@freegridjs/core 1.10.0 → 1.11.0

package/dist/index.js

@@ -654,6 +654,39 @@ var ColumnModel = class {
   }
 };
 
+// src/keyboard.ts
+var imeKey = (e) => e.isComposing || e.keyCode === 229;
+var NAV_KEYS = /* @__PURE__ */ new Set(["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Tab", "Home", "End", "PageUp", "PageDown"]);
+function nextFocus(key, mods, p, s) {
+  const r = (i) => Math.max(0, Math.min(s.rows - 1, i));
+  const c = (i) => Math.max(0, Math.min(s.cols - 1, i));
+  switch (key) {
+    case "ArrowUp":
+      return { rowIndex: r(p.rowIndex - 1), colIndex: p.colIndex };
+    case "ArrowDown":
+      return { rowIndex: r(p.rowIndex + 1), colIndex: p.colIndex };
+    case "ArrowLeft":
+      return { rowIndex: p.rowIndex, colIndex: c(p.colIndex - 1) };
+    case "ArrowRight":
+      return { rowIndex: p.rowIndex, colIndex: c(p.colIndex + 1) };
+    case "PageUp":
+      return { rowIndex: r(p.rowIndex - s.pageRows), colIndex: p.colIndex };
+    case "PageDown":
+      return { rowIndex: r(p.rowIndex + s.pageRows), colIndex: p.colIndex };
+    case "Home":
+      return { rowIndex: mods.ctrl ? 0 : p.rowIndex, colIndex: 0 };
+    case "End":
+      return { rowIndex: mods.ctrl ? s.rows - 1 : p.rowIndex, colIndex: s.cols - 1 };
+    case "Tab": {
+      const flat2 = p.rowIndex * s.cols + p.colIndex + (mods.shift ? -1 : 1);
+      if (flat2 < 0 || flat2 >= s.rows * s.cols) return null;
+      return { rowIndex: Math.floor(flat2 / s.cols), colIndex: flat2 % s.cols };
+    }
+    default:
+      return null;
+  }
+}
+
 // src/formula.ts
 var FormulaError = class extends Error {
   constructor(code) {
@@ -1336,25 +1369,6 @@ function columnFormulaValue(def, row) {
 }
 var formulasOff = (def) => !!scopes.get(def)?.off?.();
 var isFormula = (v) => typeof v === "string" && v.length > 1 && v.startsWith("=");
-function formulaRefs(formula) {
-  let n;
-  try {
-    n = compile(formula);
-  } catch {
-    return null;
-  }
-  const out = /* @__PURE__ */ new Set();
-  const walk = (x) => {
-    if (x.k === "ref") out.add(x.name);
-    else if (x.k === "un") walk(x.a);
-    else if (x.k === "bin") {
-      walk(x.a);
-      walk(x.b);
-    } else if (x.k === "call") x.args.forEach(walk);
-  };
-  walk(n);
-  return [...out];
-}
 
 // src/rows/values.ts
 function getCellValue(def, row) {
@@ -1563,6 +1577,7 @@ var FilterRow = class {
     });
     input.addEventListener("keydown", (e) => {
       e.stopPropagation();
+      if (imeKey(e)) return;
       if (e.key === "Enter") {
         clearTimeout(this.timers.get(c.id));
         apply();
@@ -1852,8 +1867,10 @@ function extreme(values, pickMax) {
 function aggregate(agg, values, rows) {
   if (typeof agg === "function") return agg(values, rows);
   switch (agg) {
-    case "sum":
-      return numbers(values).reduce((s, n) => s + n, 0);
+    case "sum": {
+      const nums = numbers(values);
+      return nums.length || !values.length ? nums.reduce((s, n) => s + n, 0) : null;
+    }
     case "avg": {
       const nums = numbers(values);
       return nums.length ? nums.reduce((s, n) => s + n, 0) / nums.length : null;
@@ -2238,7 +2255,8 @@ var Renderer = class {
     }
     if (options.autoHeight && !this.useCards()) {
       this.root.classList.add("fg-auto-height");
-      this.bodyEl.style.height = `${this.rowsHeight(count) + this.topOffset + bottomExtra + Math.max(0, this.scroller.offsetHeight - this.scroller.clientHeight)}px`;
+      const rowsH = count > 0 ? this.rowsHeight(count) : Math.max(this.rowsHeight(count), 3 * rh);
+      this.bodyEl.style.height = `${rowsH + this.topOffset + bottomExtra + Math.max(0, this.scroller.offsetHeight - this.scroller.clientHeight)}px`;
     }
     const sig = `${headerHeight}|${REGIONS3.map((r) => columns.regionWidth(r)).join(",")}|${this.rowsHeight(count) + this.topOffset + bottomExtra}|${summary && sumPinned ? sumPos : ""}|${sumRows}|${options.autoHeight ? 1 : 0}`;
     if (sig !== this.layoutSig) {
@@ -3682,7 +3700,6 @@ var en = {
   freeBadge: "Free version",
   exportPdf: "Export PDF",
   exportJson: "Export JSON",
-  ai: { title: "AI assistant", placeholder: "Ask about the data or tell the grid what to do", send: "Send", thinking: "Working\u2026", undo: "Undo", undone: "Undone", failed: "The assistant did not answer", skipped: "Skipped", done: "Done" },
   cf: {
     title: "Conditional formatting",
     add: "Add rule",
@@ -3779,38 +3796,6 @@ function eventInside(e, ...els) {
   return els.some((el2) => !!el2 && el2.contains(e.target));
 }
 
-// src/keyboard.ts
-var NAV_KEYS = /* @__PURE__ */ new Set(["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Tab", "Home", "End", "PageUp", "PageDown"]);
-function nextFocus(key, mods, p, s) {
-  const r = (i) => Math.max(0, Math.min(s.rows - 1, i));
-  const c = (i) => Math.max(0, Math.min(s.cols - 1, i));
-  switch (key) {
-    case "ArrowUp":
-      return { rowIndex: r(p.rowIndex - 1), colIndex: p.colIndex };
-    case "ArrowDown":
-      return { rowIndex: r(p.rowIndex + 1), colIndex: p.colIndex };
-    case "ArrowLeft":
-      return { rowIndex: p.rowIndex, colIndex: c(p.colIndex - 1) };
-    case "ArrowRight":
-      return { rowIndex: p.rowIndex, colIndex: c(p.colIndex + 1) };
-    case "PageUp":
-      return { rowIndex: r(p.rowIndex - s.pageRows), colIndex: p.colIndex };
-    case "PageDown":
-      return { rowIndex: r(p.rowIndex + s.pageRows), colIndex: p.colIndex };
-    case "Home":
-      return { rowIndex: mods.ctrl ? 0 : p.rowIndex, colIndex: 0 };
-    case "End":
-      return { rowIndex: mods.ctrl ? s.rows - 1 : p.rowIndex, colIndex: s.cols - 1 };
-    case "Tab": {
-      const flat2 = p.rowIndex * s.cols + p.colIndex + (mods.shift ? -1 : 1);
-      if (flat2 < 0 || flat2 >= s.rows * s.cols) return null;
-      return { rowIndex: Math.floor(flat2 / s.cols), colIndex: flat2 % s.cols };
-    }
-    default:
-      return null;
-  }
-}
-
 // src/registry.ts
 var liveGrids = /* @__PURE__ */ new Map();
 var apiGrids = /* @__PURE__ */ new WeakMap();
@@ -3993,6 +3978,13 @@ function attachBody(grid) {
     }
     return false;
   };
+  const onImeKey = (e) => {
+    const f = grid.store.state.focus;
+    if (e.isComposing || e.key !== "Process" || e.ctrlKey || e.metaKey || e.altKey) return;
+    if (!f || !grid.editor.canEdit(f.rowIndex, f.colId)) return;
+    if (grid.columns.getColumn(f.colId).def.type === "boolean") return;
+    grid.editor.start(f.rowIndex, f.colId, "");
+  };
   const onExpandKey = (e) => {
     const f = grid.store.state.focus;
     if (!f || e.ctrlKey || e.metaKey || e.altKey || e.shiftKey) return false;
@@ -4142,6 +4134,10 @@ function attachBody(grid) {
     const cols = grid.columns.displayed();
     const count = grid.rowModel.getRowCount();
     if (!cols.length || !count) return;
+    if (imeKey(e)) {
+      onImeKey(e);
+      return;
+    }
     if (onExpandKey(e)) {
       e.preventDefault();
       return;
@@ -4766,7 +4762,6 @@ var ContextMenu = class {
       { label: loc.exportCsv, action: () => grid.api.exportCsv() },
       ...grid.paid ? [{ label: loc.exportExcel, action: () => grid.api.exportXlsx() }] : [],
       { label: loc.exportJson, action: () => grid.api.exportJson() },
-      ...grid.options.assistant?.url && grid.paid ? [{ label: `${loc.ai.title}\u2026`, action: () => grid.api.openAssistant() }] : [],
       ...grid.paid ? [{ label: loc.exportPdf, action: () => grid.api.exportPdf() }] : []
     );
     if (grid.options.advancedFilter !== false && !grid.options.pivot && grid.paid) items.push("separator", { label: `${loc.advancedFilter}\u2026`, action: () => grid.filterBuilder.open() });
@@ -5116,6 +5111,7 @@ var Finder = class {
     input.addEventListener("input", () => this.find(input.value));
     bar.addEventListener("keydown", (e) => {
       e.stopPropagation();
+      if (imeKey(e)) return;
       if (e.key === "Escape") {
         e.preventDefault();
         this.closeBar();
@@ -5472,6 +5468,7 @@ var CellEditor = class {
     wrap2.append(msg);
     const onKey = (e) => {
       e.stopPropagation();
+      if (imeKey(e)) return;
       if (e.key === "Escape") {
         e.preventDefault();
         this.cancel();
@@ -7192,8 +7189,10 @@ function buildXlsxSheet(grid, opts = {}) {
         return d ? { v: d, fmt } : String(v);
       }
       case "boolean":
+        if (typeof v === "number" && Number.isFinite(v)) return v;
         return typeof v === "boolean" ? v : String(v);
       default:
+        if (typeof v === "number" && Number.isFinite(v)) return v;
         return formatters[i](v);
     }
   };
@@ -7832,9 +7831,12 @@ var ROLLUP = /* @__PURE__ */ new WeakMap();
 function rollupSource(row) {
   return ROLLUP.get(row);
 }
-function buildRollup(source, defs) {
-  const keys = defs.filter((d) => !d.aggFunc);
-  const values = defs.filter((d) => d.aggFunc && d.field && !d.valueGetter);
+function buildRollup(source, cols, by) {
+  const isKey = (c) => by ? by.includes(c.id) : !c.def.aggFunc;
+  const keys = cols.filter(isKey).map((c) => c.def);
+  const rest = cols.filter((c) => !isKey(c) && c.def.field && !c.def.valueGetter).map((c) => c.def);
+  const values = rest.filter((d) => d.aggFunc);
+  const others = rest.filter((d) => !d.aggFunc);
   const buckets = /* @__PURE__ */ new Map();
   for (const r of source) {
     const k = keys.map((d) => setKey(getCellValue(d, r))).join("
");
@@ -7852,6 +7854,12 @@ function buildRollup(source, defs) {
         row[d.field] = null;
       }
     }
+    if (src.length > 1) {
+      for (const d of others) {
+        const first = setKey(getCellValue(d, src[0]));
+        if (src.some((r) => setKey(getCellValue(d, r)) !== first)) row[d.field] = null;
+      }
+    }
     ROLLUP.set(row, src);
     rows.push(row);
   }
@@ -7876,13 +7884,12 @@ var PAID_FEATURES = {
   formulas: { en: "Formulas", ko: "\uC218\uC2DD" },
   find: { en: "Find", ko: "\uCC3E\uAE30" },
   conditional: { en: "Conditional formatting", ko: "\uC870\uAC74\uBD80 \uC11C\uC2DD" },
-  assistant: { en: "AI assistant", ko: "AI \uC5B4\uC2DC\uC2A4\uD134\uD2B8" },
   merge: { en: "Merged cells", ko: "\uC140 \uBCD1\uD569" },
   workbook: { en: "Workbook", ko: "\uC6CC\uD06C\uBD81" }
 };
 
 // src/version.ts
-var version = "1.10.0";
+var version = "1.11.0";
 
 // src/license.ts
 var PUBLIC_KEY = { kty: "EC", crv: "P-256", x: "sUTKkglZmk-HMKPNub8p7AeLBKesHCU8irIkw9rJlbE", y: "j0U_aKRDR7iApY9UpaD3hUemhBLZJwDv9-QiT_hUyw8" };
@@ -8181,7 +8188,7 @@ var ColumnMenu = class {
       if (grouped.length) g.push([loc.expandAll, () => this.grid.expandAll(true)], [loc.collapseAll, () => this.grid.expandAll(false)]);
       popup.append(this.section(g));
     }
-    if (this.grid.getRollup()) {
+    if (this.grid.getRollup() && !this.grid.isRollupKey(colId)) {
       const cur = def.aggFunc ?? null;
       const mark = (on, label) => `${on ? "\u2713 " : ""}${label}`;
       const aggs = ["sum", "avg", "min", "max", "count"].map((a) => [mark(cur === a, loc[a]), () => this.grid.setColumnAggFunc(colId, a)]);
@@ -8318,7 +8325,7 @@ var ColumnMenu = class {
     };
     select.addEventListener("change", sync);
     sync();
-    for (const input of [v1, v2]) input.addEventListener("keydown", (e) => e.key === "Enter" && apply());
+    for (const input of [v1, v2]) input.addEventListener("keydown", (e) => e.key === "Enter" && !imeKey(e) && apply());
     row.append(select, v1, v2);
     const read = () => {
       const op = select.value;
@@ -8430,7 +8437,7 @@ var ColumnMenu = class {
       grid.setFilter(colId, checked.size === distinct.size ? null : { type: "set", values: entries.filter(([k]) => checked.has(k)).map(([, v]) => v) });
       done();
     };
-    search.addEventListener("keydown", (e) => e.key === "Enter" && apply());
+    search.addEventListener("keydown", (e) => e.key === "Enter" && !imeKey(e) && apply());
     draw();
     box.append(this.title(loc), search, allLabel, list, this.actions(colId, loc, apply, done));
     return box;
@@ -9767,394 +9774,6 @@ var FormatDialog = class {
   }
 };
 
-// src/assistant.ts
-var FILTER_TYPES = ["text", "number", "date", "set", "combined"];
-var CHART_TYPES = ["bar", "stackedBar", "line", "area", "pie", "donut", "combo", "scatter"];
-var MAX_ACTIONS = 30;
-function describeColumn(grid, id, def, rows) {
-  const col = { id, header: def.header ?? def.field ?? id };
-  if (def.type) col.type = def.type;
-  if (def.formula) col.formula = def.formula;
-  if (def.aggFunc && typeof def.aggFunc === "string") col.aggFunc = def.aggFunc;
-  let blanks = 0;
-  const counts = /* @__PURE__ */ new Map();
-  let min = Infinity, max = -Infinity, sum = 0, nums = 0;
-  let minText = "", maxText = "";
-  for (const r of rows) {
-    const v = getCellValue(def, r);
-    if (isBlank(v)) {
-      blanks++;
-      continue;
-    }
-    if (typeof v === "number" && Number.isFinite(v)) {
-      nums++;
-      sum += v;
-      if (v < min) min = v;
-      if (v > max) max = v;
-    } else if (def.type === "date") {
-      const t = v instanceof Date ? v.toISOString().slice(0, 10) : String(v);
-      if (!minText || t < minText) minText = t;
-      if (!maxText || t > maxText) maxText = t;
-    }
-    if (counts.size < 5e3) {
-      const k = setKey(v);
-      const c = counts.get(k);
-      if (c) c.n++;
-      else counts.set(k, { value: v, n: 1 });
-    }
-  }
-  col.blanks = blanks;
-  col.distinct = counts.size;
-  if (nums) Object.assign(col, { min, max, avg: Math.round(sum / nums * 1e3) / 1e3 });
-  if (minText) Object.assign(col, { min: minText, max: maxText });
-  if (!nums && counts.size) {
-    col.top = [...counts.values()].sort((a, b) => b.n - a.n).slice(0, 12).map((c) => ({ value: String(c.value).slice(0, 80), count: c.n }));
-  }
-  return col;
-}
-function assistantRequest(grid, prompt, options) {
-  const rows = grid.rowModel.dataRows().map((n) => n.data);
-  const all2 = grid.columns.getState().map((s2) => grid.columns.getNode(s2.colId)).filter((n) => n && !n.children && !isSystemCol(n.id));
-  const columns = all2.map((n) => ({ ...describeColumn(grid, n.id, n.def, rows), hidden: grid.columns.getState().find((s2) => s2.colId === n.id)?.hide || void 0 }));
-  const sampleN = typeof options.sampleRows === "number" && options.sampleRows >= 0 ? Math.min(50, options.sampleRows) : 5;
-  const sample = rows.slice(0, sampleN).map((r) => Object.fromEntries(all2.map((n) => [n.id, getCellValue(n.def, r)])));
-  const s = grid.store.state;
-  return {
-    prompt: String(prompt).slice(0, 2e3),
-    locale: s.locale.code,
-    rowCount: rows.length,
-    totalRows: grid.rowModel.server ? rows.length : grid.store.state.data.length,
-    columns,
-    sample,
-    state: {
-      sort: s.sort,
-      filters: s.filters,
-      quickFilter: s.quickFilter,
-      advancedFilter: s.advancedFilter,
-      groupBy: grid.getGroupBy(),
-      pivot: grid.getPivot(),
-      conditionalFormats: grid.getConditionalFormats()
-    },
-    ...options.context ? { context: options.context() } : {}
-  };
-}
-function applyAssistantActions(grid, actions) {
-  const before = { state: grid.api.getState(), defs: grid.columnDefs(), summary: grid.summaryOptions() };
-  const applied = [];
-  const skipped = [];
-  const charts = [];
-  const list = Array.isArray(actions) ? actions.slice(0, MAX_ACTIONS) : [];
-  const known = (id) => typeof id === "string" && !!grid.columns.getNode(id) && !grid.columns.getNode(id).children && !isSystemCol(id);
-  const ok = (a) => applied.push(a);
-  const skip = (a, reason) => skipped.push({ action: a, reason });
-  for (const raw of list) {
-    const a = raw;
-    if (!a || typeof a !== "object" || typeof a.type !== "string") {
-      skip(raw, "not an action");
-      continue;
-    }
-    try {
-      switch (a.type) {
-        case "sort": {
-          const sort = (Array.isArray(a.sort) ? a.sort : []).filter((x) => !!x && known(x.colId) && (x.dir === "asc" || x.dir === "desc"));
-          if (Array.isArray(a.sort) && sort.length !== a.sort.length) skip(a, "unknown column in sort");
-          grid.setSort(sort.map((x) => ({ colId: x.colId, dir: x.dir })));
-          ok(a);
-          break;
-        }
-        case "filter": {
-          if (!known(a.colId)) {
-            skip(a, "unknown column");
-            break;
-          }
-          const m = a.model;
-          if (m !== null && (!m || typeof m !== "object" || !FILTER_TYPES.includes(m.type))) {
-            skip(a, "bad filter model");
-            break;
-          }
-          grid.setFilter(a.colId, m);
-          ok(a);
-          break;
-        }
-        case "clearFilters":
-          for (const id of Object.keys(grid.store.state.filters)) grid.setFilter(id, null);
-          grid.setAdvancedFilter(null);
-          grid.api.setQuickFilter("");
-          ok(a);
-          break;
-        case "quickFilter":
-          grid.api.setQuickFilter(typeof a.text === "string" ? a.text.slice(0, 200) : "");
-          ok(a);
-          break;
-        case "advancedFilter": {
-          const f = a.filter;
-          const ids = [];
-          const walk = (x) => {
-            const o = x;
-            if (Array.isArray(o?.conditions)) o.conditions.forEach(walk);
-            else ids.push(o?.colId);
-          };
-          if (f) walk(f);
-          if (f && (!Array.isArray(f.conditions) || !ids.every(known))) {
-            skip(a, "unknown column in advanced filter");
-            break;
-          }
-          grid.setAdvancedFilter(f ?? null);
-          ok(a);
-          break;
-        }
-        case "groupBy": {
-          const ids = Array.isArray(a.colIds) ? a.colIds.filter(known) : [];
-          grid.setGroupBy(ids);
-          if (a.expand) grid.expandAll(true);
-          ok(a);
-          break;
-        }
-        case "pivot": {
-          const p = a.pivot;
-          if (p && (!Array.isArray(p.rows) || !Array.isArray(p.values) || !p.rows.every(known) || !(p.columns ?? []).every(known) || !p.values.every((v) => v && known(v.colId)))) {
-            skip(a, "unknown column in pivot");
-            break;
-          }
-          grid.setPivot(p ?? null);
-          ok(a);
-          break;
-        }
-        case "showColumns":
-        case "hideColumns": {
-          const ids = Array.isArray(a.colIds) ? a.colIds.filter(known) : [];
-          if (ids.length) grid.setColumnsVisible(ids, a.type === "showColumns");
-          ok(a);
-          break;
-        }
-        case "conditionalFormat": {
-          const f = a.format;
-          if (!f || !Array.isArray(f.columns) || !f.columns.length || !f.columns.every(known)) {
-            skip(a, "unknown column in format");
-            break;
-          }
-          grid.setConditionalFormats([...grid.getConditionalFormats(), f]);
-          ok(a);
-          break;
-        }
-        case "clearConditionalFormats":
-          grid.setConditionalFormats([]);
-          ok(a);
-          break;
-        case "addColumn": {
-          const c = a.column;
-          if (!c || typeof c.id !== "string" || !/^[\w.-]{1,40}$/.test(c.id) || grid.columns.getNode(c.id)) {
-            skip(a, "bad or taken column id");
-            break;
-          }
-          const f = typeof c.formula === "string" ? c.formula.startsWith("=") ? c.formula : `=${c.formula}` : "";
-          const refs = f ? formulaRefs(f) : null;
-          if (!refs) {
-            skip(a, "formula does not parse");
-            break;
-          }
-          const def = { id: c.id, header: typeof c.header === "string" ? c.header.slice(0, 80) : c.id, formula: f };
-          if (c.type === "number" || c.type === "date" || c.type === "text") def.type = c.type;
-          grid.api.setColumns([...grid.columnDefs(), def]);
-          ok(a);
-          break;
-        }
-        case "summary": {
-          const s = a.summary;
-          if (s && (!Array.isArray(s.rows) || !s.rows.every((r) => r && Object.keys(r.columns ?? {}).every(known)))) {
-            skip(a, "unknown column in summary");
-            break;
-          }
-          grid.setSummary(s ?? null);
-          ok(a);
-          break;
-        }
-        case "chart": {
-          const ids = Array.isArray(a.colIds) ? a.colIds.filter(known) : [];
-          const displayed = grid.columns.displayed().map((c) => c.id);
-          const idx = ids.map((id) => displayed.indexOf(id)).filter((i) => i >= 0);
-          const count = grid.rowModel.getRowCount();
-          if (!idx.length || !count) {
-            skip(a, "nothing to chart");
-            break;
-          }
-          const range = { start: { rowIndex: 0, colId: displayed[Math.min(...idx)] }, end: { rowIndex: Math.min(count, 200) - 1, colId: displayed[Math.max(...idx)] } };
-          charts.push(grid.api.createChart({ type: CHART_TYPES.includes(a.chartType) ? a.chartType : "bar", range, title: typeof a.title === "string" ? a.title.slice(0, 80) : void 0 }));
-          ok(a);
-          break;
-        }
-        case "message":
-          ok(a);
-          break;
-        default:
-          skip(a, "unknown action");
-      }
-    } catch {
-      skip(a, "failed");
-    }
-  }
-  const undo = () => {
-    for (const c of charts) c.destroy();
-    if (grid.columnDefs().length !== before.defs.length || grid.columnDefs().some((d, i) => d !== before.defs[i])) grid.api.setColumns(before.defs);
-    grid.setSummary(before.summary);
-    grid.api.setState(before.state);
-    if (!before.state.conditionalFormats) grid.setConditionalFormats([]);
-  };
-  return { applied, skipped, undo };
-}
-async function askAssistant(grid, prompt, options, signal) {
-  if (!options?.url) throw new Error("assistant.url is not set");
-  const headers = typeof options.headers === "function" ? options.headers() : options.headers ?? {};
-  const res = await fetch(options.url, {
-    method: "POST",
-    credentials: options.credentials ?? "same-origin",
-    headers: { "Content-Type": "application/json", Accept: "application/json", ...headers },
-    body: JSON.stringify(assistantRequest(grid, prompt, options)),
-    signal
-  });
-  if (!res.ok) throw new Error(`HTTP ${res.status} from the assistant`);
-  const json = await res.json();
-  const result = applyAssistantActions(grid, Array.isArray(json?.actions) ? json.actions : []);
-  const say = typeof json?.message === "string" ? json.message : result.applied.filter((a) => a.type === "message").map((a) => a.text ?? "").join("\n");
-  return { ...result, message: say.slice(0, 4e3) };
-}
-
-// src/interactions/assistantPanel.ts
-var AssistantPanel = class {
-  constructor(grid) {
-    this.grid = grid;
-    this.popup = null;
-    this.log = null;
-    this.off = [];
-    this.busy = null;
-  }
-  get isOpen() {
-    return !!this.popup;
-  }
-  open() {
-    if (this.popup) {
-      this.popup.querySelector(".fg-ai-input")?.focus();
-      return;
-    }
-    const { grid } = this;
-    const loc = grid.store.state.locale;
-    const opts = grid.options.assistant;
-    const popup = el("div", `fg-menu fg-ai-panel fg-theme-${grid.store.state.theme}`, { role: "dialog", "aria-label": loc.ai.title });
-    grid.applyFontTo(popup);
-    const head = el("div", "fg-chooser-head");
-    const title = el("span", "fg-menu-title");
-    title.textContent = loc.ai.title;
-    const x = el("button", "fg-chooser-close", { type: "button", "aria-label": loc.close });
-    x.textContent = "\xD7";
-    x.addEventListener("click", () => this.close());
-    head.append(title, x);
-    const log = el("div", "fg-ai-log", { role: "log", "aria-live": "polite" });
-    this.log = log;
-    const form = el("form", "fg-ai-form");
-    const input = el("textarea", "fg-input fg-ai-input", { rows: "2", placeholder: loc.ai.placeholder, "aria-label": loc.ai.placeholder, maxlength: "2000" });
-    const send2 = el("button", "fg-btn fg-btn-primary fg-ai-send", { type: "submit" });
-    send2.textContent = loc.ai.send;
-    form.append(input, send2);
-    const tips = el("div", "fg-ai-tips");
-    for (const s of (opts?.suggestions ?? []).slice(0, 6)) {
-      const b = el("button", "fg-ai-tip", { type: "button" });
-      b.textContent = s;
-      b.addEventListener("click", () => {
-        input.value = s;
-        input.focus();
-      });
-      tips.append(b);
-    }
-    input.addEventListener("keydown", (e) => {
-      if (e.key === "Enter" && !e.shiftKey && !e.isComposing) {
-        e.preventDefault();
-        form.requestSubmit?.() ?? form.dispatchEvent(new Event("submit", { cancelable: true }));
-      }
-    });
-    form.addEventListener("submit", (e) => {
-      e.preventDefault();
-      const prompt = input.value.trim();
-      if (!prompt || this.busy) return;
-      input.value = "";
-      void this.ask(prompt, send2);
-    });
-    popup.append(head, log, form);
-    if (tips.childElementCount) popup.append(tips);
-    popupParent(grid.renderer.root).append(popup);
-    const r = grid.renderer.root.getBoundingClientRect();
-    const w = popup.offsetWidth || 360;
-    popup.style.left = `${Math.max(4, Math.min(r.right - w - 16, (window.innerWidth || 1024) - w - 4))}px`;
-    popup.style.top = `${Math.max(4, r.top + 16)}px`;
-    this.popup = popup;
-    input.focus();
-    const onDown = (e) => {
-      if (!eventInside(e, popup) && !this.busy) this.close();
-    };
-    const onKey = (e) => {
-      if (e.key === "Escape") this.close();
-    };
-    document.addEventListener("pointerdown", onDown, true);
-    document.addEventListener("keydown", onKey, true);
-    this.off.push(
-      () => document.removeEventListener("pointerdown", onDown, true),
-      () => document.removeEventListener("keydown", onKey, true)
-    );
-  }
-  say(who, text2) {
-    const msg = el("div", `fg-ai-msg fg-ai-${who}`);
-    msg.textContent = text2;
-    this.log?.append(msg);
-    if (this.log) this.log.scrollTop = this.log.scrollHeight;
-    return msg;
-  }
-  async ask(prompt, send2) {
-    const loc = this.grid.store.state.locale;
-    this.say("user", prompt);
-    const wait = this.say("ai", loc.ai.thinking);
-    wait.classList.add("fg-ai-wait");
-    this.busy = new AbortController();
-    send2.disabled = true;
-    try {
-      const res = await askAssistant(this.grid, prompt, this.grid.options.assistant, this.busy.signal);
-      wait.classList.remove("fg-ai-wait");
-      const changed = res.applied.filter((a) => a.type !== "message").length;
-      wait.textContent = res.message || (changed ? loc.ai.done : "");
-      if (res.skipped.length) {
-        const note = el("div", "fg-ai-note");
-        note.textContent = `${loc.ai.skipped}: ${res.skipped.map((s) => s.reason).join(", ")}`;
-        wait.append(note);
-      }
-      if (changed) {
-        const undo = el("button", "fg-btn fg-ai-undo", { type: "button" });
-        undo.textContent = loc.ai.undo;
-        undo.addEventListener("click", () => {
-          res.undo();
-          undo.disabled = true;
-          undo.textContent = loc.ai.undone;
-        });
-        wait.append(undo);
-      }
-      this.grid.events.emit("assistantAnswer", { prompt, message: res.message, applied: res.applied, skipped: res.skipped });
-    } catch (e) {
-      if (e?.name === "AbortError") return;
-      wait.remove();
-      this.say("error", loc.ai.failed);
-    } finally {
-      this.busy = null;
-      send2.disabled = false;
-    }
-  }
-  close() {
-    this.busy?.abort();
-    this.busy = null;
-    for (const f of this.off) f();
-    this.off = [];
-    this.popup?.remove();
-    this.popup = null;
-    this.log = null;
-  }
-};
-
 // src/grid.ts
 var autoRowHeight = (size) => Math.round(size * 2.75);
 var autoHeaderHeight = (size) => Math.round(size * 3.1);
@@ -10196,6 +9815,8 @@ var Grid = class {
     this.pivotData = null;
     /** rollup option / setRollup: rows merged by the shown columns without an aggFunc. */
     this.rollupOn = false;
+    /** rollup { by }: the columns the rows merge by (only the shown ones count); null: every shown column without an aggFunc. */
+    this.rollupBy = null;
     /** The merged rows while rollup applies (not while pivoting), else null. */
     this.rollupData = null;
     /** Grouping state from before pivot mode, restored when it ends. */
@@ -10238,7 +9859,8 @@ var Grid = class {
       formula: (f, row) => evaluateFormula(f, row, /* @__PURE__ */ new Set(), 0, /* @__PURE__ */ new Map(), this.formulaScope)
     });
     this.formatDialog = new FormatDialog(this);
-    this.assistantPanel = new AssistantPanel(this);
+    /** Selection waiting for the row model to hold the newly merged rows (set by updateRows). */
+    this.rollupSelection = null;
     // ── pagination and server rows ──────────────────────────────
     /** Cells flashing after a transaction: `${rowId}\u0000${colId}` → time the flash ends. */
     /** showOverlay: an overlay the app asked for, shown whatever the row count. */
@@ -10373,7 +9995,6 @@ var Grid = class {
       () => this.charts.destroy(),
       () => this.filterBuilder.close(),
       () => this.formatDialog.close(),
-      () => this.assistantPanel.close(),
       attachTooltips(this)
     );
     if (typeof ResizeObserver !== "undefined") {
@@ -10382,7 +10003,7 @@ var Grid = class {
       this.disposers.push(() => ro.disconnect());
     }
     if (options.pivot) this.setPivot(options.pivot);
-    if (options.rollup) this.setRollup(true);
+    if (options.rollup) this.setRollup(options.rollup);
     void needsFreeBadge(options.licenseKey).then((show) => {
       if (show && !this.destroyed) this.renderer.showFreeBadge();
     });
@@ -10486,6 +10107,11 @@ var Grid = class {
     const paged = !!this.options.pagination;
     const data = this.viewRows();
     this.rowModel.update({ ...this.store.state, data, display: this.display(), page: paged ? { index: this.page, size: this.pageSize } : null });
+    const remapped = this.rollupSelection;
+    if (remapped) {
+      this.rollupSelection = null;
+      this.setSelected(remapped);
+    }
     if (paged && this.page >= this.getPageCount()) {
       this.page = this.getPageCount() - 1;
       this.rowModel.update({ ...this.store.state, data, display: this.display(), page: { index: this.page, size: this.pageSize } });
@@ -10498,25 +10124,51 @@ var Grid = class {
   }
   // ── rollup ──────────────────────────────────────────────────
   getRollup() {
-    return this.rollupOn;
+    return this.rollupBy ? { by: [...this.rollupBy] } : this.rollupOn;
   }
-  setRollup(on) {
-    on = !!on;
+  /** true: merge by every shown column without an aggFunc; { by }: merge by the shown `by` columns; false: off. */
+  setRollup(cfg) {
+    const by = cfg && typeof cfg === "object" ? Array.isArray(cfg.by) ? cfg.by.filter((id) => typeof id === "string") : null : null;
+    if (cfg && typeof cfg === "object" && !by) {
+      warn("setRollup: expected true, false or { by: string[] }");
+      return;
+    }
+    const on = !!cfg;
     if (on && !this.allow("pivot")) return;
     if (on && this.clientOnly("rollup")) return;
     if (on && this.options.treeData) {
       warn("rollup is not available with treeData");
       return;
     }
-    if (on === this.rollupOn) return;
+    if (on === this.rollupOn && (by ?? []).join("
") === (this.rollupBy ?? []).join("
") && !by === !this.rollupBy) return;
     this.editor.cancel();
     this.rollupOn = on;
+    this.rollupBy = on ? by : null;
     this.store.set({ range: null, focus: null });
     this.columnsChanged();
   }
   /** Merge the source rows again (rollup on, not pivoting); the view is updated by the caller. */
   rebuildRollup() {
-    this.rollupData = this.rollupOn && !this.pivotCfg ? buildRollup(this.store.state.data, this.dataColumns().map((c) => c.def)) : null;
+    const old = this.rollupData;
+    this.rollupData = this.rollupOn && !this.pivotCfg ? buildRollup(this.store.state.data, this.dataColumns().map((c) => ({ id: c.id, def: c.def })), this.rollupBy) : null;
+    if (old || this.rollupData) this.remapRollupSelection(old);
+  }
+  /**
+   * Keep the selection across a re-merge: a selected merged row stands for its source rows, and a newly merged
+   * row is selected when every one of its source rows was (so a delete never reaches a row nobody checked).
+   */
+  remapRollupSelection(old) {
+    const sel = this.store.state.selected;
+    if (!sel.size) return;
+    const idOf = (r) => this.rowModel.idOf(r);
+    const picked = old ? new Set(old.filter((r) => sel.has(idOf(r))).flatMap((r) => rollupSource(r) ?? [r]).map(idOf)) : sel;
+    const now = this.rollupData;
+    const next = now ? now.filter((r) => (rollupSource(r) ?? [r]).every((s) => picked.has(idOf(s)))).map(idOf) : this.store.state.data.map(idOf).filter((id) => picked.has(id));
+    if (next.length !== sel.size || next.some((id) => !sel.has(id))) this.rollupSelection = new Set(next);
+  }
+  /** With rollup { by }: whether the rows merge by this column (it is one of `by`). */
+  isRollupKey(colId) {
+    return !!this.rollupBy?.includes(colId);
   }
   /** The source rows behind `rows`: merged rollup rows stand for the rows they merge (for group and summary values). */
   sourceRowsOf(rows) {
@@ -12084,7 +11736,7 @@ var Grid = class {
   removeRows(target, record = true) {
     if (this.clientOnly("removeRows")) return [];
     const data = this.store.state.data;
-    const match = typeof target === "function" ? target : /* @__PURE__ */ ((set) => (r) => set.has(r))(new Set(target));
+    const match = typeof target === "function" ? target : /* @__PURE__ */ ((set) => (r) => set.has(r))(new Set(Array.isArray(target) ? target.flatMap((r) => rollupSource(r) ?? [r]) : []));
     const removed = [];
     data.forEach((row, index) => {
       let hit = false;
@@ -12208,10 +11860,12 @@ var Grid = class {
     const { first, last } = this.renderer.renderedRange();
     const code = this.store.state.locale.code;
     const pad4 = this.getCellPadding() * 2;
-    const HEADER_EXTRA = pad4 + 22 + 6 + 14;
+    const HEADER_EXTRA = pad4 + 6 + 14;
+    const FILTER_BTN = 6 + 22;
+    const filters = this.store.state.filters;
     const CELL_EXTRA = pad4;
     for (const col of cols) {
-      let w = this.renderer.measureText(col.def.header ?? col.def.field ?? "", true) + HEADER_EXTRA;
+      let w = this.renderer.measureText(col.def.header ?? col.def.field ?? "", true) + HEADER_EXTRA + (filters[col.id] ? FILTER_BTN : 0);
       const fmt = getFormatter(col.def, code);
       for (let i = first; i <= last; i++) {
         const node = this.rowModel.getRow(i);
@@ -12408,9 +12062,10 @@ var Grid = class {
     }
     this.setSelected(next);
   }
+  /** The checked rows' data; a merged rollup row stands for its source rows, so these are always rows of the data. */
   selectedRows() {
     const sel = this.store.state.selected;
-    return sel.size ? this.rowModel.allNodes().filter((n) => sel.has(n.id)).map((n) => n.data) : [];
+    return sel.size ? this.sourceRowsOf(this.rowModel.allNodes().filter((n) => sel.has(n.id)).map((n) => n.data)) : [];
   }
   /** Filtered data rows in display order (group buckets, parents before children), collapsed ones included. */
   orderedDataRows() {
@@ -12501,7 +12156,6 @@ var Grid = class {
     this.contextMenu.close();
     this.filterBuilder.close();
     this.formatDialog.close();
-    this.assistantPanel.close();
     if (inPopup) this.renderer.gridEl.focus({ preventScroll: true });
   }
   onChange(keys) {
@@ -12602,12 +12256,6 @@ var Grid = class {
         if (!this.allow("conditional")) return;
         this.formatDialog.open(colId);
       }),
-      // closed: as if `assistant` were not set
-      askAssistant: guard((prompt) => askAssistant(this, prompt, this.allow("assistant") ? this.options.assistant : void 0)),
-      openAssistant: guard(() => {
-        if (!this.allow("assistant")) return;
-        this.assistantPanel.open();
-      }),
       getState: guard(() => this.getState()),
       setState: guard((s, o) => this.setState(s, o)),
       getScrollPosition: guard(() => this.renderer.getScroll()),
@@ -12618,7 +12266,7 @@ var Grid = class {
       setFont: guard((f) => this.setFont(f)),
       setCellPadding: guard((px) => this.setCellPadding(px)),
       getCellPadding: guard(() => this.getCellPadding()),
-      setRollup: guard((on) => this.setRollup(on)),
+      setRollup: guard((cfg) => this.setRollup(cfg)),
       getRollup: guard(() => this.getRollup()),
       setColumnAggFunc: guard((id, agg) => this.setColumnAggFunc(id, agg)),
       setColumnVisible: guard((id, v) => this.setColumnsVisible([id], v)),