twico-ui 1.31.0 → 1.32.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -8212,7 +8212,6 @@ function classifyDiff(from = [], to = [], columns = [], rowKey, opts = {}) {
8212
8212
  return { rows, counts };
8213
8213
  }
8214
8214
  var DT_FILTER_PANEL_W = 620;
8215
- var DT_FILTER_LOGIC_W = 68;
8216
8215
  var DT_CSS = `
8217
8216
  .twc-dt { display: flex; flex-direction: column; font-family: var(--font-sans); color: var(--color-text);
8218
8217
  border: var(--border-thin) solid var(--color-border); border-radius: var(--radius-lg);
@@ -8454,7 +8453,13 @@ var DT_CSS = `
8454
8453
  /* #244: batch editor = pick columns (searchable), then set a value for each. */
8455
8454
  .twc-dt__be-add { padding: 6px 6px 8px; border-bottom: var(--border-thin) solid var(--color-divider); }
8456
8455
  .twc-dt__be-row { display: flex; align-items: center; gap: 8px; padding: 5px 6px; }
8457
- .twc-dt__be-name { width: 108px; flex: none; font-size: var(--text-sm); color: var(--color-text); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
8456
+ /* #341: cap width at min(260, row \u2212 160px) so the value control keeps ~120px (+ gaps + remove) and never
8457
+ collapses \u2014 panel-width-aware in pure CSS, so it also grows if the (resizable) panel is widened. */
8458
+ .twc-dt__be-name { position: relative; flex: none; width: clamp(88px, var(--twc-dt-be-name-usr, 108px), min(260px, 100% - 160px)); font-size: var(--text-sm); color: var(--color-text); }
8459
+ /* #341: ellipsis lives on the inner text span so the outer field can host the (edge-overhanging) resize handle without clipping it. */
8460
+ .twc-dt__be-name-txt { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
8461
+ /* #341: reveal the batch-name resize handle (reused .twc-dt__f-rz) on row hover, like the filter fields. */
8462
+ .twc-dt__be-row:hover .twc-dt__f-rz { opacity: 1; }
8458
8463
  .twc-dt__be-ctl { flex: 1; min-width: 0; }
8459
8464
  .twc-dt__be-x { flex: none; display: inline-grid; place-items: center; width: 24px; height: 24px; padding: 0; border: none;
8460
8465
  background: transparent; color: var(--color-text-subtle); cursor: pointer; border-radius: var(--radius-sm);
@@ -8519,6 +8524,19 @@ var DT_CSS = `
8519
8524
  clipping to one line. height stays a per-row minimum, so single-line cells are unchanged. */
8520
8525
  .twc-dt__td[data-wrap="true"] { white-space: normal; overflow: hidden; text-overflow: clip;
8521
8526
  word-break: break-word; overflow-wrap: anywhere; vertical-align: top; padding-block: 10px; line-height: 1.45; }
8527
+ /* #338: "combined" column cell \u2014 one column showing several source columns' values. */
8528
+ .twc-dt__combine--stack { display: flex; flex-direction: column; gap: 1px; }
8529
+ .twc-dt__combine-sep { color: var(--color-text-subtle); padding-inline: 3px; }
8530
+ .twc-dt__combine-label { color: var(--color-text-muted); font-weight: var(--font-medium); }
8531
+ /* #339: the runtime combine-columns editor panel. */
8532
+ .twc-dt__combine-hint { padding: 2px 12px 8px; font-size: var(--text-xs); color: var(--color-text-muted); }
8533
+ .twc-dt__combine-opts { padding: 8px 12px; border-top: var(--border-thin) solid var(--color-divider); display: flex; flex-direction: column; gap: 8px; }
8534
+ .twc-dt__combine-opt { display: flex; align-items: center; justify-content: space-between; gap: 10px; font-size: var(--text-sm); color: var(--color-text); }
8535
+ .twc-dt__combine-foot { display: flex; align-items: center; justify-content: space-between; gap: 8px; padding: 8px 12px; border-top: var(--border-thin) solid var(--color-divider); }
8536
+ .twc-dt__combine-apply { border: none; background: var(--color-primary); color: var(--color-primary-fg); font-family: inherit; font-size: var(--text-sm); font-weight: var(--font-semibold); padding: 6px 14px; border-radius: var(--radius-md); cursor: pointer; }
8537
+ .twc-dt__combine-apply:hover { opacity: 0.9; }
8538
+ .twc-dt__combine-apply:focus-visible { outline: none; box-shadow: var(--ring); }
8539
+ .twc-dt__col-combined { color: var(--color-text-subtle); font-size: var(--text-xs); font-style: italic; }
8522
8540
  .twc-dt__td[data-num="true"] { text-align: end; font-variant-numeric: tabular-nums; }
8523
8541
  /* Auto row-number gutter (rowNumbers) \u2014 a sticky-left ordinal column. */
8524
8542
  .twc-dt__rownum { text-align: end; font-variant-numeric: tabular-nums; color: var(--color-text-subtle);
@@ -8637,8 +8655,11 @@ th.twc-dt__rownum .twc-dt__th-inner { padding-inline: 8px; gap: 2px; justify-con
8637
8655
  .twc-dt__link:hover { background: var(--color-primary-subtle); }
8638
8656
  /* #330: MUI DataGrid-style per-row And/Or connector. Row 1 shows a static "Where"; the first connector
8639
8657
  row (row 2) hosts an editable And/Or Select bound to the single filterLogic; rows 3+ echo it as static
8640
- text. Fixed-width leading cell so the Column/Operator/Value cells stay aligned across rows. */
8641
- .twc-dt__f-logic { position: relative; flex: none; width: 68px; }
8658
+ text. Leading cell aligns the Column/Operator/Value cells across rows. It is a first-class resizable
8659
+ filter field like col/op: auto-fit to its content (-fit, from the #289 measurer) with a user drag tier
8660
+ (-usr) winning in the clamp cascade, so it no longer truncates and the width can be adjusted manually. */
8661
+ .twc-dt__f-logic { position: relative; flex: none; min-width: 84px;
8662
+ width: clamp(84px, var(--twc-dt-flogic-usr, var(--twc-dt-flogic-fit, 84px)), var(--twc-dt-flogic-cap, 180px)); }
8642
8663
  .twc-dt__f-where { display: inline-flex; align-items: center; height: 38px; padding-inline: 6px; color: var(--color-text-muted); font-size: var(--text-sm); font-weight: var(--font-medium); }
8643
8664
 
8644
8665
  /* Filter panel \u2014 user-resizable (#292): panel size + per-field widths resolve through a two-tier CSS var
@@ -8850,6 +8871,34 @@ function mergeColOrder(saved, propFields) {
8850
8871
  return result;
8851
8872
  }
8852
8873
  var getColVal = (col, row) => col && col.valueGetter ? col.valueGetter(row) : row == null ? void 0 : row[col && col.field];
8874
+ function combineCfg(combine) {
8875
+ if (!combine) return null;
8876
+ const cfg = Array.isArray(combine) ? { fields: combine } : combine;
8877
+ const fields = Array.isArray(cfg.fields) ? cfg.fields.filter((f) => f != null) : [];
8878
+ if (!fields.length) return null;
8879
+ return { fields, separator: cfg.separator != null ? cfg.separator : " \xB7 ", labels: !!cfg.labels, layout: cfg.layout === "stack" ? "stack" : "inline" };
8880
+ }
8881
+ var combineSrcCols = (cfg, byField) => cfg.fields.map((f) => byField && byField[f] || { field: f, headerName: String(f) });
8882
+ var combineValueGetter = (srcCols, cfg) => (row) => srcCols.map((sc) => {
8883
+ const v = getColVal(sc, row);
8884
+ const s = v == null ? "" : String(v);
8885
+ return cfg.labels && s ? `${sc.headerName ?? sc.field}: ${s}` : s;
8886
+ }).filter(Boolean).join(cfg.separator);
8887
+ function renderCombined(srcCols, row, cfg) {
8888
+ const nodes = [];
8889
+ let count = 0;
8890
+ srcCols.forEach((sc, idx) => {
8891
+ const v = getColVal(sc, row);
8892
+ if (v == null || v === "") return;
8893
+ const disp = sc.valueFormatter ? sc.valueFormatter(v, row) : v;
8894
+ const label = cfg.labels ? React51__namespace.default.createElement("span", { className: "twc-dt__combine-label" }, (sc.headerName ?? sc.field) + ": ") : null;
8895
+ if (count > 0 && cfg.layout !== "stack") nodes.push(React51__namespace.default.createElement("span", { key: "sep" + idx, className: "twc-dt__combine-sep", "aria-hidden": "true" }, cfg.separator));
8896
+ nodes.push(React51__namespace.default.createElement("span", { key: idx, className: "twc-dt__combine-item" }, label, disp));
8897
+ count++;
8898
+ });
8899
+ if (!nodes.length) return "";
8900
+ return React51__namespace.default.createElement("span", { className: cfg.layout === "stack" ? "twc-dt__combine twc-dt__combine--stack" : "twc-dt__combine" }, nodes);
8901
+ }
8853
8902
  var diffValueNode = (col, v, row) => col.renderCell ? col.renderCell(v, row) : col.valueFormatter ? col.valueFormatter(v, row) : v == null ? "" : v;
8854
8903
  function renderDiffCell(col, val, row) {
8855
8904
  const meta = row && row.__diffMeta;
@@ -9230,6 +9279,7 @@ function Datatable({
9230
9279
  aggregationValues = null,
9231
9280
  disableColumnReorder = false,
9232
9281
  disableColumnResize = false,
9282
+ columnCombining = false,
9233
9283
  emptyMessage,
9234
9284
  renderEmpty,
9235
9285
  editMode = false,
@@ -9296,9 +9346,19 @@ function Datatable({
9296
9346
  if (diffData && onClassifiedRef.current) onClassifiedRef.current(diffData.counts);
9297
9347
  }, [diffData]);
9298
9348
  const diffRowKeyFn = React51__namespace.default.useCallback((r2) => r2.__diffKey, []);
9349
+ const [userCombine, setUserCombine] = React51__namespace.default.useState({});
9299
9350
  const columns = React51__namespace.default.useMemo(
9300
- () => isDiff ? [DIFF_OP_COLUMN, ...columnsProp.map((c) => ({ ...c, renderCell: (val, row) => renderDiffCell(c, val, row) }))] : columnsProp,
9301
- [isDiff, columnsProp]
9351
+ () => {
9352
+ if (!isDiff) return columnsProp;
9353
+ const byField = {};
9354
+ for (const c of columnsProp) if (c && c.field != null) byField[c.field] = c;
9355
+ return [DIFF_OP_COLUMN, ...columnsProp.map((c) => {
9356
+ const cfg = combineCfg(userCombine[c.field] || c.combine);
9357
+ const base = cfg && !c.valueGetter ? { ...c, valueGetter: combineValueGetter(combineSrcCols(cfg, byField), cfg) } : c;
9358
+ return { ...base, renderCell: (val, row) => renderDiffCell(base, val, row) };
9359
+ })];
9360
+ },
9361
+ [isDiff, columnsProp, userCombine]
9302
9362
  );
9303
9363
  const rows = React51__namespace.default.useMemo(
9304
9364
  () => isDiff ? diffData.rows.filter((r2) => !diffOnly || r2.op !== "unchanged").map((r2) => ({ ...r2.to || r2.from, __diffop: r2.op, __diffMeta: r2, __diffKey: r2.key })) : rowsProp,
@@ -9338,8 +9398,26 @@ function Datatable({
9338
9398
  getActions: () => []
9339
9399
  });
9340
9400
  }
9401
+ const byField = {};
9402
+ for (const c of out) if (c.field != null) byField[c.field] = c;
9403
+ for (let i = 0; i < out.length; i++) {
9404
+ const c = out[i];
9405
+ const cfg = combineCfg(userCombine[c.field] || c.combine);
9406
+ if (!cfg) continue;
9407
+ const srcCols = combineSrcCols(cfg, byField);
9408
+ out[i] = {
9409
+ ...c,
9410
+ editable: false,
9411
+ // the combined value is synthetic — inline editing would write to a phantom field
9412
+ valueGetter: c.valueGetter || combineValueGetter(srcCols, cfg),
9413
+ // Consumer renderCell wins. If they overrode only valueGetter, fall back to the DEFAULT cell render
9414
+ // (renderCell: undefined) so the cell shows THEIR value — keeping display in sync with what
9415
+ // sort/filter/search/export use — rather than the auto source-join. Otherwise render the combined cell.
9416
+ renderCell: c.renderCell || (c.valueGetter ? void 0 : ((value, row) => renderCombined(srcCols, row, cfg)))
9417
+ };
9418
+ }
9341
9419
  return out;
9342
- }, [columns, rowPinning]);
9420
+ }, [columns, rowPinning, userCombine]);
9343
9421
  const _autoKey = React51__namespace.default.useRef();
9344
9422
  if (!_autoKey.current) _autoKey.current = { map: /* @__PURE__ */ new WeakMap(), n: 0 };
9345
9423
  const keyOf = rowKey || ((r2, i) => {
@@ -9373,6 +9451,42 @@ function Datatable({
9373
9451
  n.has(field) ? n.delete(field) : n.add(field);
9374
9452
  return n;
9375
9453
  });
9454
+ const openCombineEditor = (field) => {
9455
+ const existing = userCombine[field];
9456
+ setCombineTarget(field);
9457
+ setCombineDraft({
9458
+ selected: existing ? existing.fields.filter((f) => f !== field) : [],
9459
+ layout: existing && existing.layout === "stack" ? "stack" : "inline",
9460
+ labels: !!(existing && existing.labels)
9461
+ });
9462
+ };
9463
+ const closeCombineEditor = () => {
9464
+ setPanel(null);
9465
+ closePanel();
9466
+ setCombineTarget(null);
9467
+ setCombineDraft(null);
9468
+ restoreTriggerFocus();
9469
+ };
9470
+ const applyCombine = () => {
9471
+ if (!combineTarget || !combineDraft) return;
9472
+ const field = combineTarget;
9473
+ const sources = combineDraft.selected.filter((f) => f !== field);
9474
+ setUserCombine((m) => {
9475
+ const next = { ...m };
9476
+ if (sources.length) next[field] = { fields: [field, ...sources], layout: combineDraft.layout === "stack" ? "stack" : "inline", separator: " \xB7 ", labels: !!combineDraft.labels };
9477
+ else delete next[field];
9478
+ return next;
9479
+ });
9480
+ closeCombineEditor();
9481
+ };
9482
+ const uncombine = (field) => {
9483
+ setUserCombine((m) => {
9484
+ const next = { ...m };
9485
+ delete next[field];
9486
+ return next;
9487
+ });
9488
+ closeCombineEditor();
9489
+ };
9376
9490
  const [pins, setPins] = React51__namespace.default.useState(() => {
9377
9491
  const left = [], right = [];
9378
9492
  columns.forEach((c) => {
@@ -9434,6 +9548,7 @@ function Datatable({
9434
9548
  const rowFocusRef = React51__namespace.default.useRef(null);
9435
9549
  const [fWidths, setFWidths] = React51__namespace.default.useState({});
9436
9550
  const [fPanelSize, setFPanelSize] = React51__namespace.default.useState(null);
9551
+ const [batchNameW, setBatchNameW] = React51__namespace.default.useState(null);
9437
9552
  const [popSizes, setPopSizes] = React51__namespace.default.useState({});
9438
9553
  const serializeState = () => ({
9439
9554
  filters: filters.map(({ id, ...f }) => f),
@@ -9452,9 +9567,13 @@ function Datatable({
9452
9567
  density,
9453
9568
  // #292: additive, optional — user-resized filter panel + field widths (panel-global, not per column).
9454
9569
  filterPanelSize: fPanelSize || void 0,
9455
- filterFieldWidths: fWidths.col != null || fWidths.op != null || fWidths.val != null ? fWidths : void 0,
9570
+ filterFieldWidths: fWidths.col != null || fWidths.op != null || fWidths.val != null || fWidths.logic != null ? fWidths : void 0,
9456
9571
  // #304: additive, optional — user-resized sizes of the other toolbar popovers, keyed by popover id.
9457
- popoverSizes: Object.keys(popSizes).length ? popSizes : void 0
9572
+ popoverSizes: Object.keys(popSizes).length ? popSizes : void 0,
9573
+ // #339: additive, optional — runtime user-defined combined columns, keyed by target field.
9574
+ columnCombine: Object.keys(userCombine).length ? userCombine : void 0,
9575
+ // #341: additive, optional — user-resized batch-editor column-name field width (px).
9576
+ batchNameWidth: batchNameW != null ? batchNameW : void 0
9458
9577
  });
9459
9578
  const applyState = (s) => {
9460
9579
  if (!s || typeof s !== "object") return;
@@ -9482,7 +9601,7 @@ function Datatable({
9482
9601
  if (s.density === "compact" || s.density === "standard" || s.density === "comfortable") setDensity(s.density);
9483
9602
  if (s.filterFieldWidths && typeof s.filterFieldWidths === "object") {
9484
9603
  const fw = {};
9485
- for (const k of ["col", "op", "val"]) if (typeof s.filterFieldWidths[k] === "number") fw[k] = s.filterFieldWidths[k];
9604
+ for (const k of ["col", "op", "val", "logic"]) if (typeof s.filterFieldWidths[k] === "number") fw[k] = s.filterFieldWidths[k];
9486
9605
  if (Object.keys(fw).length) setFWidths(fw);
9487
9606
  }
9488
9607
  if (s.filterPanelSize && typeof s.filterPanelSize === "object") {
@@ -9499,6 +9618,16 @@ function Datatable({
9499
9618
  }
9500
9619
  if (Object.keys(next).length) setPopSizes(next);
9501
9620
  }
9621
+ if (s.columnCombine && typeof s.columnCombine === "object") {
9622
+ const uc = {};
9623
+ for (const [f, cfg] of Object.entries(s.columnCombine)) {
9624
+ if (!known.has(f) || !cfg || !Array.isArray(cfg.fields)) continue;
9625
+ const rest2 = cfg.fields.filter((x) => known.has(x) && x !== f);
9626
+ if (rest2.length) uc[f] = { fields: [f, ...rest2], layout: cfg.layout === "stack" ? "stack" : "inline", separator: typeof cfg.separator === "string" ? cfg.separator : " \xB7 ", labels: !!cfg.labels };
9627
+ }
9628
+ if (Object.keys(uc).length) setUserCombine(uc);
9629
+ }
9630
+ if (typeof s.batchNameWidth === "number") setBatchNameW(clampNum(s.batchNameWidth, 88, 260));
9502
9631
  };
9503
9632
  const stateReadyRef = React51__namespace.default.useRef(false);
9504
9633
  const stateRestoredRef = React51__namespace.default.useRef(false);
@@ -9516,7 +9645,7 @@ function Datatable({
9516
9645
  }
9517
9646
  }
9518
9647
  return void 0;
9519
- }, [filters, filterLogic, sort, quick, pageVal, sizeVal, order, widths, hidden, pins, density, fWidths, fPanelSize, popSizes, stateKey]);
9648
+ }, [filters, filterLogic, sort, quick, pageVal, sizeVal, order, widths, hidden, pins, density, fWidths, fPanelSize, popSizes, userCombine, batchNameW, stateKey]);
9520
9649
  const restoreState = () => {
9521
9650
  let saved = null;
9522
9651
  if (stateKey) {
@@ -9657,6 +9786,15 @@ function Datatable({
9657
9786
  const [menuPos, openMenu, closeMenu] = useFloating();
9658
9787
  const [panel, setPanel] = React51__namespace.default.useState(null);
9659
9788
  const [panelPos, openPanel, closePanel] = useFloating();
9789
+ const [combineTarget, setCombineTarget] = React51__namespace.default.useState(null);
9790
+ const [combineDraft, setCombineDraft] = React51__namespace.default.useState(null);
9791
+ const combinePanelRef = React51__namespace.default.useRef(null);
9792
+ React51__namespace.default.useEffect(() => {
9793
+ if (panel === "combine" && combinePanelRef.current) {
9794
+ const el = combinePanelRef.current.querySelector('[role="switch"], button, [tabindex]');
9795
+ (el || combinePanelRef.current).focus?.();
9796
+ }
9797
+ }, [panel]);
9660
9798
  const [rowMenu, setRowMenu] = React51__namespace.default.useState(null);
9661
9799
  const [rowMenuPos, openRowMenu, closeRowMenu] = useFloating();
9662
9800
  const [exportOpen, setExportOpen] = React51__namespace.default.useState(false);
@@ -9757,7 +9895,21 @@ function Datatable({
9757
9895
  };
9758
9896
  }, [exportOpen]);
9759
9897
  const colByField = React51__namespace.default.useMemo(() => Object.fromEntries(cols.map((c) => [c.field, c])), [cols]);
9760
- const visibleCols = cols.filter((c) => !hidden.has(c.field));
9898
+ const combineSources = React51__namespace.default.useMemo(() => {
9899
+ const s = /* @__PURE__ */ new Set();
9900
+ for (const cfg of Object.values(userCombine)) (cfg && cfg.fields ? cfg.fields : []).slice(1).forEach((f) => s.add(f));
9901
+ return s;
9902
+ }, [userCombine]);
9903
+ const stackCombineTargets = React51__namespace.default.useMemo(
9904
+ () => new Set(cols.filter((c) => {
9905
+ const cfg = combineCfg(userCombine[c.field] || c.combine);
9906
+ return cfg && cfg.layout === "stack";
9907
+ }).map((c) => c.field)),
9908
+ [cols, userCombine]
9909
+ );
9910
+ const effectiveHidden = React51__namespace.default.useMemo(() => combineSources.size ? /* @__PURE__ */ new Set([...hidden, ...combineSources]) : hidden, [hidden, combineSources]);
9911
+ const effectiveWrapped = React51__namespace.default.useMemo(() => stackCombineTargets.size ? /* @__PURE__ */ new Set([...wrapped, ...stackCombineTargets]) : wrapped, [wrapped, stackCombineTargets]);
9912
+ const visibleCols = cols.filter((c) => !effectiveHidden.has(c.field));
9761
9913
  const colFieldsKey = JSON.stringify(
9762
9914
  cols.filter((c) => typeof c.field === "string" && c.type !== "actions").map((c) => c.field)
9763
9915
  );
@@ -9776,17 +9928,17 @@ function Datatable({
9776
9928
  const i = order.indexOf(f);
9777
9929
  return i === -1 ? 9999 : i;
9778
9930
  };
9779
- const L = pins.left.map((f) => colByField[f]).filter((c) => c && !hidden.has(c.field));
9780
- const R = pins.right.map((f) => colByField[f]).filter((c) => c && !hidden.has(c.field));
9931
+ const L = pins.left.map((f) => colByField[f]).filter((c) => c && !effectiveHidden.has(c.field));
9932
+ const R = pins.right.map((f) => colByField[f]).filter((c) => c && !effectiveHidden.has(c.field));
9781
9933
  const mid = visibleCols.filter((c) => !pins.left.includes(c.field) && !pins.right.includes(c.field)).sort((a, b) => orderIdx(a.field) - orderIdx(b.field));
9782
9934
  return [...L, ...mid, ...R];
9783
- }, [pins, hidden, visibleCols, colByField, order]);
9935
+ }, [pins, effectiveHidden, visibleCols, colByField, order]);
9784
9936
  const NUM_W = 56;
9785
9937
  const CHK_W = checkboxSelection ? rowReorder ? 68 : 44 : 0;
9786
9938
  const numLeft = CHK_W;
9787
9939
  const leadW = numLeft + (showRowNum ? NUM_W : 0);
9788
- const visLeft = React51__namespace.default.useMemo(() => pins.left.filter((f) => colByField[f] && !hidden.has(f)), [pins.left, colByField, hidden]);
9789
- const visRight = React51__namespace.default.useMemo(() => pins.right.filter((f) => colByField[f] && !hidden.has(f)), [pins.right, colByField, hidden]);
9940
+ const visLeft = React51__namespace.default.useMemo(() => pins.left.filter((f) => colByField[f] && !effectiveHidden.has(f)), [pins.left, colByField, effectiveHidden]);
9941
+ const visRight = React51__namespace.default.useMemo(() => pins.right.filter((f) => colByField[f] && !effectiveHidden.has(f)), [pins.right, colByField, effectiveHidden]);
9790
9942
  const stickyOf = (field) => {
9791
9943
  if (visLeft.includes(field)) {
9792
9944
  let off = leadW;
@@ -10853,9 +11005,11 @@ function Datatable({
10853
11005
  const pad2 = trigger ? (parseFloat(cs.paddingLeft) || 0) + (parseFloat(cs.paddingRight) || 0) : 24;
10854
11006
  const chrome = pad2 + 8 + 16 + 4;
10855
11007
  const widest = (labels) => labels.reduce((m, l) => Math.max(m, ctx.measureText(String(l)).width), 0);
10856
- const colCap = Math.max(118, Math.min(210, el.clientWidth - DT_FILTER_LOGIC_W - 118 - 30 - 30 - 140 - 5 * 6 - 2 * 4));
11008
+ const logicW = Math.min(180, Math.max(84, Math.ceil(widest(["And", "Or"]) + chrome)));
11009
+ const colCap = Math.max(118, Math.min(210, el.clientWidth - logicW - 118 - 30 - 30 - 140 - 5 * 6 - 2 * 4));
10857
11010
  const colW = Math.min(colCap, Math.max(118, Math.ceil(widest(filterableCols.map((c) => c.headerName ?? c.field)) + chrome)));
10858
11011
  const opW = Math.min(170, Math.max(118, Math.ceil(widest(ALL_OP_LABELS) + chrome)));
11012
+ if (Number.isFinite(logicW)) el.style.setProperty("--twc-dt-flogic-fit", `${logicW}px`);
10859
11013
  if (Number.isFinite(colW)) el.style.setProperty("--twc-dt-fcol-fit", `${colW}px`);
10860
11014
  if (Number.isFinite(opW)) el.style.setProperty("--twc-dt-fop-fit", `${opW}px`);
10861
11015
  };
@@ -10869,10 +11023,10 @@ function Datatable({
10869
11023
  }
10870
11024
  return () => ro?.disconnect();
10871
11025
  }, [panel, filterableCols, filters.length]);
10872
- const F_MIN = { col: 118, op: 118, val: 140 };
10873
- const F_VAR = { col: "--twc-dt-fcol-usr", op: "--twc-dt-fop-usr", val: "--twc-dt-fval-usr" };
10874
- const F_SEL = { col: ".twc-dt__f-col", op: ".twc-dt__f-op", val: ".twc-dt__f-val" };
10875
- const F_LABEL = { col: "column", op: "operator", val: "value" };
11026
+ const F_MIN = { col: 118, op: 118, val: 140, logic: 84 };
11027
+ const F_VAR = { col: "--twc-dt-fcol-usr", op: "--twc-dt-fop-usr", val: "--twc-dt-fval-usr", logic: "--twc-dt-flogic-usr" };
11028
+ const F_SEL = { col: ".twc-dt__f-col", op: ".twc-dt__f-op", val: ".twc-dt__f-val", logic: ".twc-dt__f-logic" };
11029
+ const F_LABEL = { col: "column", op: "operator", val: "value", logic: "connector" };
10876
11030
  const fMaxW = () => typeof window === "undefined" ? 9999 : window.innerWidth - 32;
10877
11031
  const fMaxH = () => typeof window === "undefined" ? 9999 : window.innerHeight - 32;
10878
11032
  const clampNum = (v, lo, hi) => Math.max(lo, Math.min(hi, Math.round(v)));
@@ -10881,11 +11035,12 @@ function Datatable({
10881
11035
  return el ? el.getBoundingClientRect().width : F_MIN[field];
10882
11036
  };
10883
11037
  const fCap = (field) => {
11038
+ if (field === "logic") return 180;
10884
11039
  if (field === "col") return filterFieldMaxWidth || 360;
10885
11040
  if (field === "op") return filterFieldMaxWidth || 260;
10886
11041
  const p = filterPanelRef.current;
10887
11042
  if (!p) return 640;
10888
- return clampNum(p.clientWidth - DT_FILTER_LOGIC_W - fLiveW("col") - fLiveW("op") - 30 - 30 - 5 * 6 - 2 * 4, F_MIN.val, 640);
11043
+ return clampNum(p.clientWidth - fLiveW("logic") - fLiveW("col") - fLiveW("op") - 30 - 30 - 5 * 6 - 2 * 4, F_MIN.val, 640);
10889
11044
  };
10890
11045
  const isRtl = () => {
10891
11046
  const p = filterPanelRef.current;
@@ -10948,6 +11103,54 @@ function Datatable({
10948
11103
  if (field === "val") p.removeAttribute("data-val-fixed");
10949
11104
  }
10950
11105
  };
11106
+ const BE_NAME_MIN = 88, BE_NAME_MAX = 260;
11107
+ const startBeNameResize = (e) => {
11108
+ if (e.button != null && e.button !== 0) return;
11109
+ e.preventDefault();
11110
+ e.stopPropagation();
11111
+ const handle = e.currentTarget;
11112
+ const panel2 = handle.closest(".twc-dt__cfg"), nameEl = handle.closest(".twc-dt__be-name");
11113
+ if (!panel2 || !nameEl) return;
11114
+ const startX = e.clientX, startW = nameEl.getBoundingClientRect().width;
11115
+ const dir = getComputedStyle(panel2).direction === "rtl" ? -1 : 1;
11116
+ handle.setAttribute("data-active", "true");
11117
+ let last = startW;
11118
+ const onMove = (ev) => {
11119
+ last = clampNum(startW + (ev.clientX - startX) * dir, BE_NAME_MIN, BE_NAME_MAX);
11120
+ panel2.style.setProperty("--twc-dt-be-name-usr", `${last}px`);
11121
+ };
11122
+ const onUp = () => {
11123
+ setBatchNameW(last);
11124
+ handle.removeAttribute("data-active");
11125
+ window.removeEventListener("pointermove", onMove);
11126
+ window.removeEventListener("pointerup", onUp);
11127
+ };
11128
+ window.addEventListener("pointermove", onMove);
11129
+ window.addEventListener("pointerup", onUp);
11130
+ };
11131
+ const onBeNameResizeKey = (e) => {
11132
+ const panel2 = e.currentTarget.closest(".twc-dt__cfg");
11133
+ if (e.key === "Enter" || e.key === " " || e.key === "Backspace") {
11134
+ e.preventDefault();
11135
+ e.stopPropagation();
11136
+ setBatchNameW(null);
11137
+ if (panel2) panel2.style.removeProperty("--twc-dt-be-name-usr");
11138
+ return;
11139
+ }
11140
+ if (!["ArrowLeft", "ArrowRight", "Home", "End"].includes(e.key)) return;
11141
+ e.preventDefault();
11142
+ e.stopPropagation();
11143
+ const nameEl = e.currentTarget.closest(".twc-dt__be-name");
11144
+ const cur = nameEl ? nameEl.getBoundingClientRect().width : batchNameW ?? 108;
11145
+ const dir = panel2 && getComputedStyle(panel2).direction === "rtl" ? -1 : 1;
11146
+ const step = e.shiftKey ? 2 : 10;
11147
+ let next = cur;
11148
+ if (e.key === "ArrowRight") next = cur + step * dir;
11149
+ else if (e.key === "ArrowLeft") next = cur - step * dir;
11150
+ else if (e.key === "Home") next = BE_NAME_MIN;
11151
+ else if (e.key === "End") next = BE_NAME_MAX;
11152
+ setBatchNameW(clampNum(next, BE_NAME_MIN, BE_NAME_MAX));
11153
+ };
10951
11154
  const startPanelResize = (e) => {
10952
11155
  if (e.button != null && e.button !== 0) return;
10953
11156
  e.preventDefault();
@@ -11018,12 +11221,12 @@ function Datatable({
11018
11221
  setFPanelSize(null);
11019
11222
  const p = filterPanelRef.current;
11020
11223
  if (p) {
11021
- ["--twc-dt-fcol-usr", "--twc-dt-fop-usr", "--twc-dt-fval-usr", "--twc-dt-panel-w", "--twc-dt-panel-h"].forEach((v) => p.style.removeProperty(v));
11224
+ ["--twc-dt-fcol-usr", "--twc-dt-fop-usr", "--twc-dt-fval-usr", "--twc-dt-flogic-usr", "--twc-dt-panel-w", "--twc-dt-panel-h"].forEach((v) => p.style.removeProperty(v));
11022
11225
  p.removeAttribute("data-val-fixed");
11023
11226
  p.removeAttribute("data-panel-sized");
11024
11227
  }
11025
11228
  };
11026
- const hasFilterSizeOverride = fWidths.col != null || fWidths.op != null || fWidths.val != null || fPanelSize != null;
11229
+ const hasFilterSizeOverride = fWidths.col != null || fWidths.op != null || fWidths.val != null || fWidths.logic != null || fPanelSize != null;
11027
11230
  const POP_MIN_W = { columns: 240, agg: 240, pivot: 260, batchedit: 260 };
11028
11231
  const popMinW = (id) => POP_MIN_W[id] || 200;
11029
11232
  const clearPop = (id, node) => {
@@ -11170,7 +11373,7 @@ function Datatable({
11170
11373
  const shownColRows = cols.filter((c) => c.field !== "__pinactions__" && c.headerName.toLowerCase().includes(colQuery.trim().toLowerCase())).sort((a, b) => orderIdxOf(a.field) - orderIdxOf(b.field));
11171
11374
  const rowNumMatch = rowNumbers && "row number".includes(colQuery.trim().toLowerCase());
11172
11375
  const manageableCols = cols.filter((c) => c.field !== "__pinactions__");
11173
- const visibleColCount = manageableCols.filter((c) => !hidden.has(c.field)).length;
11376
+ const visibleColCount = manageableCols.filter((c) => !effectiveHidden.has(c.field)).length;
11174
11377
  const rppOptions = Array.from(new Set([...pageSizeOptions || [], pageSize].filter((n) => n > 0))).sort((a, b) => a - b).map((n) => ({ value: String(n), label: String(n) }));
11175
11378
  const totalCols = ordered.length + (checkboxSelection ? 1 : 0) + (showRowNum ? 1 : 0);
11176
11379
  function renderGroupRow(item) {
@@ -11328,7 +11531,7 @@ function Datatable({
11328
11531
  "data-cell-active": cellActive || void 0,
11329
11532
  "data-cell-selected": cellSelected || void 0,
11330
11533
  "data-copied": cellFlash || void 0,
11331
- "data-wrap": wrapped.has(c.field) || void 0,
11534
+ "data-wrap": effectiveWrapped.has(c.field) || void 0,
11332
11535
  "data-pin": st.pin,
11333
11536
  "data-pin-edge": st.edge,
11334
11537
  style: { width: widthOf(c), ...st.style },
@@ -12025,7 +12228,7 @@ function Datatable({
12025
12228
  delete values[f];
12026
12229
  return { ...b, fields, values };
12027
12230
  });
12028
- return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__pop twc-dt__cfg", style: { top: batchEditPos.top, left: batchEditPos.left, width: 320, ...popStyle("batchedit") }, "data-pop-sized": popSizes.batchedit ? "" : void 0, children: [
12231
+ return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__pop twc-dt__cfg", style: { top: batchEditPos.top, left: batchEditPos.left, width: 320, "--twc-dt-be-name-usr": batchNameW != null ? `${batchNameW}px` : void 0, ...popStyle("batchedit") }, "data-pop-sized": popSizes.batchedit ? "" : void 0, children: [
12029
12232
  /* @__PURE__ */ jsxRuntime.jsx(Caret, { pos: batchEditPos }),
12030
12233
  /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__cfg-head", children: [
12031
12234
  "Edit ",
@@ -12046,10 +12249,25 @@ function Datatable({
12046
12249
  onChange: addField
12047
12250
  }
12048
12251
  ) }) : null,
12049
- /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__cfg-list", children: pickedCols.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__be-empty", children: "Pick a column to set its value on all selected rows." }) : pickedCols.map((c) => {
12252
+ /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__cfg-list", children: pickedCols.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__be-empty", children: "Pick a column to set its value on all selected rows." }) : pickedCols.map((c, i) => {
12050
12253
  const opts = c.valueOptions ? c.valueOptions.map((o) => typeof o === "string" ? { value: o, label: o } : o) : null;
12051
12254
  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__be-row", children: [
12052
- /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__be-name", title: String(c.headerName ?? c.field), children: c.headerName }),
12255
+ /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "twc-dt__be-name", title: String(c.headerName ?? c.field), children: [
12256
+ /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__be-name-txt", children: c.headerName }),
12257
+ resizableFilters && i === 0 ? /* @__PURE__ */ jsxRuntime.jsx(
12258
+ "span",
12259
+ {
12260
+ className: "twc-dt__f-rz",
12261
+ role: "separator",
12262
+ "aria-orientation": "vertical",
12263
+ tabIndex: 0,
12264
+ "aria-label": "Resize column name field (Enter to reset)",
12265
+ onPointerDown: startBeNameResize,
12266
+ onClick: (e) => e.stopPropagation(),
12267
+ onKeyDown: onBeNameResizeKey
12268
+ }
12269
+ ) : null
12270
+ ] }),
12053
12271
  /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__be-ctl", children: c.renderBatchEditCell ? c.renderBatchEditCell({
12054
12272
  value: batchEdit.values[c.field],
12055
12273
  field: c.field,
@@ -12164,6 +12382,18 @@ function Datatable({
12164
12382
  " ",
12165
12383
  groupBy.includes(c.field) ? "Stop grouping" : "Group by this column"
12166
12384
  ] }) : null,
12385
+ columnCombining && c.type !== "actions" ? /* @__PURE__ */ jsxRuntime.jsxs("button", { type: "button", role: "menuitem", className: "twc-dt__mi", "data-active": !!userCombine[c.field] || void 0, onClick: () => {
12386
+ const anchor = menuTriggerRef.current;
12387
+ setColMenu(null);
12388
+ closeMenu();
12389
+ openCombineEditor(c.field);
12390
+ setPanel("combine");
12391
+ openPanel(anchor, "right", 300);
12392
+ }, children: [
12393
+ /* @__PURE__ */ jsxRuntime.jsx(Svg, { d: I.columns }),
12394
+ " ",
12395
+ userCombine[c.field] ? "Edit combined column\u2026" : "Combine columns\u2026"
12396
+ ] }) : null,
12167
12397
  !disableColumnReorder && c.reorderable !== false && c.type !== "actions" && !pins.left.includes(c.field) && !pins.right.includes(c.field) && movableMidFields.length > 1 ? (() => {
12168
12398
  const midIdx = movableMidFields.indexOf(c.field);
12169
12399
  const atFirst = midIdx === 0;
@@ -12331,10 +12561,13 @@ function Datatable({
12331
12561
  e.preventDefault();
12332
12562
  onColDrop(c.field);
12333
12563
  } : void 0,
12334
- onClick: () => c.hideable && toggleHiddenField(c.field),
12564
+ onClick: () => c.hideable && !combineSources.has(c.field) && toggleHiddenField(c.field),
12335
12565
  children: [
12336
12566
  canDrag ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__col-grip", "aria-hidden": "true", children: /* @__PURE__ */ jsxRuntime.jsx(Svg, { d: I.grip }) }) : null,
12337
- /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__col-name", children: c.headerName }),
12567
+ /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "twc-dt__col-name", children: [
12568
+ c.headerName,
12569
+ combineSources.has(c.field) ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__col-combined", children: " \xB7 combined" }) : null
12570
+ ] }),
12338
12571
  c.pinnable && c.type !== "actions" ? (
12339
12572
  // Pin from here too, so columns scrolled out of view (no reachable header ⋮) can still be pinned.
12340
12573
  /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "twc-dt__col-pins", draggable: false, onClick: (e) => e.stopPropagation(), children: [
@@ -12370,19 +12603,19 @@ function Datatable({
12370
12603
  "span",
12371
12604
  {
12372
12605
  className: "twc-dt__sw",
12373
- "data-on": !hidden.has(c.field) || void 0,
12606
+ "data-on": !effectiveHidden.has(c.field) || void 0,
12374
12607
  role: "switch",
12375
- "aria-checked": !hidden.has(c.field),
12608
+ "aria-checked": !effectiveHidden.has(c.field),
12376
12609
  "aria-label": c.headerName,
12377
- "aria-disabled": !c.hideable || void 0,
12378
- tabIndex: c.hideable ? 0 : -1,
12610
+ "aria-disabled": !c.hideable || combineSources.has(c.field) || void 0,
12611
+ tabIndex: c.hideable && !combineSources.has(c.field) ? 0 : -1,
12379
12612
  onKeyDown: (e) => {
12380
- if ((e.key === "Enter" || e.key === " ") && c.hideable) {
12613
+ if ((e.key === "Enter" || e.key === " ") && c.hideable && !combineSources.has(c.field)) {
12381
12614
  e.preventDefault();
12382
12615
  toggleHiddenField(c.field);
12383
12616
  }
12384
12617
  },
12385
- style: c.hideable ? void 0 : { opacity: 0.4 }
12618
+ style: c.hideable && !combineSources.has(c.field) ? void 0 : { opacity: 0.4 }
12386
12619
  }
12387
12620
  )
12388
12621
  ]
@@ -12393,6 +12626,82 @@ function Datatable({
12393
12626
  ] }),
12394
12627
  popGrip("columns")
12395
12628
  ] }) : null,
12629
+ panel === "combine" && panelPos && combineTarget && combineDraft ? (() => {
12630
+ const target = colByField[combineTarget];
12631
+ const candidates = cols.filter((c) => c.field !== combineTarget && c.type !== "actions" && c.field !== "__pinactions__" && c.hideable !== false && !userCombine[c.field]);
12632
+ const toggle = (f) => setCombineDraft((d) => ({ ...d, selected: d.selected.includes(f) ? d.selected.filter((x) => x !== f) : [...d.selected, f] }));
12633
+ return /* @__PURE__ */ jsxRuntime.jsxs("div", { ref: combinePanelRef, tabIndex: -1, className: "twc-dt__pop twc-dt__cols", style: { top: panelPos.top, left: panelPos.left, ...popStyle("combine") }, "data-pop-sized": popSizes.combine ? "" : void 0, role: "dialog", "aria-label": `Combine columns into ${target?.headerName || combineTarget}`, children: [
12634
+ /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__panel-head", children: /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "twc-dt__panel-title", children: [
12635
+ "Combine into \u201C",
12636
+ target?.headerName || combineTarget,
12637
+ "\u201D"
12638
+ ] }) }),
12639
+ /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__combine-hint", children: "Pick columns to merge into this one \u2014 their data shows in this cell and their own columns hide." }),
12640
+ /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__col-list", children: candidates.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__empty", style: { padding: "18px 12px" }, children: "No other columns" }) : candidates.map((c) => {
12641
+ const on = combineDraft.selected.includes(c.field);
12642
+ return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__col-row", onClick: () => toggle(c.field), children: [
12643
+ /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__col-name", children: c.headerName }),
12644
+ /* @__PURE__ */ jsxRuntime.jsx(
12645
+ "span",
12646
+ {
12647
+ className: "twc-dt__sw",
12648
+ "data-on": on || void 0,
12649
+ role: "switch",
12650
+ "aria-checked": on,
12651
+ "aria-label": c.headerName,
12652
+ tabIndex: 0,
12653
+ onKeyDown: (e) => {
12654
+ if (e.key === "Enter" || e.key === " ") {
12655
+ e.preventDefault();
12656
+ toggle(c.field);
12657
+ }
12658
+ }
12659
+ }
12660
+ )
12661
+ ] }, c.field);
12662
+ }) }),
12663
+ /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__combine-opts", children: [
12664
+ /* @__PURE__ */ jsxRuntime.jsxs("label", { className: "twc-dt__combine-opt", children: [
12665
+ /* @__PURE__ */ jsxRuntime.jsx("span", { children: "Layout" }),
12666
+ /* @__PURE__ */ jsxRuntime.jsx(
12667
+ Select,
12668
+ {
12669
+ size: "sm",
12670
+ portal: true,
12671
+ matchTriggerWidth: false,
12672
+ value: combineDraft.layout,
12673
+ options: [{ value: "inline", label: "Inline" }, { value: "stack", label: "Stacked" }],
12674
+ onChange: (v) => setCombineDraft((d) => ({ ...d, layout: v }))
12675
+ }
12676
+ )
12677
+ ] }),
12678
+ /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__combine-opt", onClick: () => setCombineDraft((d) => ({ ...d, labels: !d.labels })), style: { cursor: "pointer" }, children: [
12679
+ /* @__PURE__ */ jsxRuntime.jsx("span", { children: "Show labels" }),
12680
+ /* @__PURE__ */ jsxRuntime.jsx(
12681
+ "span",
12682
+ {
12683
+ className: "twc-dt__sw",
12684
+ "data-on": combineDraft.labels || void 0,
12685
+ role: "switch",
12686
+ "aria-checked": combineDraft.labels,
12687
+ "aria-label": "Show labels",
12688
+ tabIndex: 0,
12689
+ onKeyDown: (e) => {
12690
+ if (e.key === "Enter" || e.key === " ") {
12691
+ e.preventDefault();
12692
+ setCombineDraft((d) => ({ ...d, labels: !d.labels }));
12693
+ }
12694
+ }
12695
+ }
12696
+ )
12697
+ ] })
12698
+ ] }),
12699
+ /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__combine-foot", children: [
12700
+ userCombine[combineTarget] ? /* @__PURE__ */ jsxRuntime.jsx("button", { type: "button", className: "twc-dt__link", onClick: () => uncombine(combineTarget), children: "Uncombine" }) : /* @__PURE__ */ jsxRuntime.jsx("span", {}),
12701
+ /* @__PURE__ */ jsxRuntime.jsx("button", { type: "button", className: "twc-dt__combine-apply", onClick: applyCombine, children: "Apply" })
12702
+ ] })
12703
+ ] });
12704
+ })() : null,
12396
12705
  panel === "agg" && panelPos ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__pop twc-dt__cfg", style: { top: panelPos.top, left: panelPos.left, width: 300, ...popStyle("agg") }, "data-pop-sized": popSizes.agg ? "" : void 0, role: "dialog", "aria-label": "Aggregation settings", children: [
12397
12706
  /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__panel-head", children: [
12398
12707
  /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__panel-title", children: "Aggregation" }),
@@ -12573,6 +12882,7 @@ function Datatable({
12573
12882
  "--twc-dt-fcol-usr": fWidths.col != null ? `${fWidths.col}px` : void 0,
12574
12883
  "--twc-dt-fop-usr": fWidths.op != null ? `${fWidths.op}px` : void 0,
12575
12884
  "--twc-dt-fval-usr": fWidths.val != null ? `${fWidths.val}px` : void 0,
12885
+ "--twc-dt-flogic-usr": fWidths.logic != null ? `${fWidths.logic}px` : void 0,
12576
12886
  "--twc-dt-panel-w": fPanelSize?.w != null ? `${fPanelSize.w}px` : void 0,
12577
12887
  "--twc-dt-panel-h": fPanelSize?.h != null ? `${fPanelSize.h}px` : void 0,
12578
12888
  "--twc-dt-fcol-cap": filterFieldMaxWidth ? `${filterFieldMaxWidth}px` : void 0,
@@ -12593,17 +12903,20 @@ function Datatable({
12593
12903
  const ops = opsFor(filterTypeOf(col));
12594
12904
  const op = ops.find((o) => o.value === f.op) || ops[0];
12595
12905
  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__frow", children: [
12596
- /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-dt__f-logic", children: i === 0 ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__f-where", children: "Where" }) : i === 1 ? /* @__PURE__ */ jsxRuntime.jsx(
12597
- Select,
12598
- {
12599
- size: "sm",
12600
- portal: true,
12601
- "aria-label": "Combine with the other filters",
12602
- value: filterLogic,
12603
- options: [{ value: "and", label: "And" }, { value: "or", label: "Or" }],
12604
- onChange: (v) => setFilterLogic(v)
12605
- }
12606
- ) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__f-where", children: filterLogic === "or" ? "Or" : "And" }) }),
12906
+ /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__f-logic", children: [
12907
+ i === 0 ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__f-where", children: "Where" }) : i === 1 ? /* @__PURE__ */ jsxRuntime.jsx(
12908
+ Select,
12909
+ {
12910
+ size: "sm",
12911
+ portal: true,
12912
+ "aria-label": "Combine with the other filters",
12913
+ value: filterLogic,
12914
+ options: [{ value: "and", label: "And" }, { value: "or", label: "Or" }],
12915
+ onChange: (v) => setFilterLogic(v)
12916
+ }
12917
+ ) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-dt__f-where", children: filterLogic === "or" ? "Or" : "And" }),
12918
+ fieldHandle("logic", i)
12919
+ ] }),
12607
12920
  /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "twc-dt__f-col", children: [
12608
12921
  /* @__PURE__ */ jsxRuntime.jsx(
12609
12922
  Select,
@@ -15541,6 +15854,8 @@ var ICONBTN_CSS = `
15541
15854
  .twc-iconbtn:focus-visible { outline: none; box-shadow: var(--ring); }
15542
15855
  .twc-iconbtn:active:not(:disabled) { transform: scale(var(--press-scale)); }
15543
15856
  .twc-iconbtn:disabled { opacity: 0.5; cursor: not-allowed; }
15857
+ /* #342: disabled state for the anchor form (as="a") \u2014 :disabled doesn't apply to <a>. */
15858
+ .twc-iconbtn[aria-disabled="true"] { opacity: 0.5; cursor: not-allowed; pointer-events: none; }
15544
15859
  .twc-iconbtn svg { width: 1.25em; height: 1.25em; }
15545
15860
 
15546
15861
  /* tone supplies the accent set; variant decides how it's applied \u2014 mirrors Button. Default tone
@@ -15559,6 +15874,11 @@ var ICONBTN_CSS = `
15559
15874
  .twc-iconbtn[data-variant="outline"]:hover:not(:disabled) { border-color: var(--_accent); color: var(--_accent); background: var(--color-surface-sunken); }
15560
15875
  .twc-iconbtn[data-variant="ghost"]:hover:not(:disabled) { background: var(--color-surface-sunken); color: var(--_accent); }
15561
15876
  `;
15877
+ function safeHref6(url) {
15878
+ if (url == null) return void 0;
15879
+ const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
15880
+ return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
15881
+ }
15562
15882
  function IconButton({
15563
15883
  children,
15564
15884
  icon,
@@ -15567,21 +15887,28 @@ function IconButton({
15567
15887
  size = "md",
15568
15888
  round = false,
15569
15889
  disabled = false,
15890
+ as = "button",
15891
+ href,
15570
15892
  className = "",
15571
15893
  "aria-label": ariaLabel,
15572
15894
  ...rest
15573
15895
  }) {
15574
15896
  const __twcStyles = useScopedStyles("twc-iconbtn-styles", ICONBTN_CSS);
15897
+ const Tag2 = as;
15898
+ const inert = Tag2 === "a" && disabled;
15575
15899
  return /* @__PURE__ */ jsxRuntime.jsxs(
15576
- "button",
15900
+ Tag2,
15577
15901
  {
15578
15902
  className: `twc-iconbtn ${className}`,
15579
15903
  "data-variant": variant,
15580
15904
  "data-tone": tone,
15581
15905
  "data-size": size,
15582
15906
  "data-round": round || void 0,
15583
- disabled,
15584
- type: "button",
15907
+ disabled: Tag2 === "button" ? disabled : void 0,
15908
+ type: Tag2 === "button" ? "button" : void 0,
15909
+ href: Tag2 === "a" && !inert ? safeHref6(href) : void 0,
15910
+ "aria-disabled": inert || void 0,
15911
+ tabIndex: inert ? -1 : void 0,
15585
15912
  "aria-label": ariaLabel,
15586
15913
  ...rest,
15587
15914
  children: [
@@ -15783,7 +16110,7 @@ var LIST_CSS = `
15783
16110
  `;
15784
16111
  function List({ items, plain = false, emptyMessage, className = "", ...rest }) {
15785
16112
  const __twcStyles = useScopedStyles("twc-list-styles", LIST_CSS);
15786
- const safeHref13 = (url) => {
16113
+ const safeHref14 = (url) => {
15787
16114
  if (url == null) return void 0;
15788
16115
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
15789
16116
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -15795,7 +16122,7 @@ function List({ items, plain = false, emptyMessage, className = "", ...rest }) {
15795
16122
  /* @__PURE__ */ jsxRuntime.jsxs("ul", { className: `twc-list ${className}`, role: "list", "data-plain": plain || void 0, ...rest, children: [
15796
16123
  __twcStyles,
15797
16124
  items.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx("li", { role: "presentation", style: { display: "contents" }, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "twc-list__empty", children: emptyMessage ?? "Nothing here yet" }) }) : items.map((it, i) => {
15798
- const href = safeHref13(it.href);
16125
+ const href = safeHref14(it.href);
15799
16126
  const interactive = Boolean(it.onClick || href);
15800
16127
  const Tag2 = href ? "a" : interactive ? "button" : "div";
15801
16128
  const content = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -15851,7 +16178,7 @@ button.twc-navbar__brand, a.twc-navbar__brand { cursor: pointer; }
15851
16178
  .twc-navbar__menu-btn { display: inline-grid; }
15852
16179
  }
15853
16180
  `;
15854
- function safeHref6(url) {
16181
+ function safeHref7(url) {
15855
16182
  if (url == null) return void 0;
15856
16183
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
15857
16184
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -15874,9 +16201,9 @@ function Navbar({
15874
16201
  return /* @__PURE__ */ jsxRuntime.jsxs("header", { className: `twc-navbar ${className}`, "data-sticky": sticky || void 0, ...rest, children: [
15875
16202
  __twcStyles,
15876
16203
  onMenuClick ? /* @__PURE__ */ jsxRuntime.jsx("button", { type: "button", className: "twc-navbar__menu-btn", "aria-expanded": menuOpen, "aria-controls": menuControls, "aria-label": menuOpen ? "Close menu" : "Open menu", onClick: onMenuClick, children: /* @__PURE__ */ jsxRuntime.jsx("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.2", strokeLinecap: "round", strokeLinejoin: "round", children: /* @__PURE__ */ jsxRuntime.jsx("path", { d: "M4 6h16M4 12h16M4 18h16" }) }) }) : null,
15877
- brand ? brandHref ? /* @__PURE__ */ jsxRuntime.jsx("a", { className: "twc-navbar__brand", href: safeHref6(brandHref), children: brand }) : onBrandClick ? /* @__PURE__ */ jsxRuntime.jsx("button", { type: "button", className: "twc-navbar__brand", onClick: onBrandClick, children: brand }) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-navbar__brand", children: brand }) : null,
16204
+ brand ? brandHref ? /* @__PURE__ */ jsxRuntime.jsx("a", { className: "twc-navbar__brand", href: safeHref7(brandHref), children: brand }) : onBrandClick ? /* @__PURE__ */ jsxRuntime.jsx("button", { type: "button", className: "twc-navbar__brand", onClick: onBrandClick, children: brand }) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-navbar__brand", children: brand }) : null,
15878
16205
  /* @__PURE__ */ jsxRuntime.jsx("nav", { className: "twc-navbar__links", "aria-label": navLabel, children: links.map((l, i) => {
15879
- const href = safeHref6(l.href);
16206
+ const href = safeHref7(l.href);
15880
16207
  const inner = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
15881
16208
  l.icon,
15882
16209
  l.label
@@ -16663,13 +16990,13 @@ function Sidebar({
16663
16990
  document.addEventListener("keydown", onKey);
16664
16991
  return () => document.removeEventListener("keydown", onKey);
16665
16992
  }, [overlay, open, openProp, onOpenChange]);
16666
- const safeHref13 = (url) => {
16993
+ const safeHref14 = (url) => {
16667
16994
  if (url == null) return void 0;
16668
16995
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
16669
16996
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
16670
16997
  };
16671
16998
  const renderItem = (it, i) => {
16672
- const href = safeHref13(it.href);
16999
+ const href = safeHref14(it.href);
16673
17000
  const labelStr = typeof it.label === "string" ? it.label : void 0;
16674
17001
  const inner = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
16675
17002
  it.icon ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-sidebar__ic", "aria-hidden": "true", children: it.icon }) : labelStr != null ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "twc-sidebar__ic twc-sidebar__ic--initial", "aria-hidden": "true", children: labelStr.charAt(0) }) : null,
@@ -18383,7 +18710,7 @@ function bgValue(bg) {
18383
18710
  if (BG[bg]) return `var(${BG[bg]})`;
18384
18711
  return String(bg).startsWith("--") ? `var(${bg})` : bg;
18385
18712
  }
18386
- function safeHref7(url) {
18713
+ function safeHref8(url) {
18387
18714
  if (url == null) return void 0;
18388
18715
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
18389
18716
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -18431,7 +18758,7 @@ var Box = React51__namespace.default.forwardRef(function Box2({
18431
18758
  ...style,
18432
18759
  ...flatStyle
18433
18760
  };
18434
- if (Tag2 === "a" && rest.href != null) rest.href = safeHref7(rest.href);
18761
+ if (Tag2 === "a" && rest.href != null) rest.href = safeHref8(rest.href);
18435
18762
  return /* @__PURE__ */ jsxRuntime.jsxs(Tag2, { ref, className: `twc-box ${className}`.trim(), style: s, "data-twc-sx": sxAttr, ...rest, children: [
18436
18763
  styleNode,
18437
18764
  children
@@ -18439,7 +18766,7 @@ var Box = React51__namespace.default.forwardRef(function Box2({
18439
18766
  });
18440
18767
  Box.displayName = "Box";
18441
18768
  var SIZES = { sm: 640, md: 768, lg: 1024, xl: 1280, full: "100%" };
18442
- function safeHref8(url) {
18769
+ function safeHref9(url) {
18443
18770
  if (url == null) return void 0;
18444
18771
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
18445
18772
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -18456,7 +18783,7 @@ var Container = React51__namespace.default.forwardRef(function Container2({
18456
18783
  }, ref) {
18457
18784
  const { flatStyle, styleNode, sxAttr } = useSx(sx);
18458
18785
  const max = SIZES[size] ?? size;
18459
- if (Tag2 === "a" && rest.href != null) rest.href = safeHref8(rest.href);
18786
+ if (Tag2 === "a" && rest.href != null) rest.href = safeHref9(rest.href);
18460
18787
  return /* @__PURE__ */ jsxRuntime.jsxs(
18461
18788
  Tag2,
18462
18789
  {
@@ -18487,7 +18814,7 @@ function space2(v) {
18487
18814
  if (typeof v === "number") return `var(--space-${String(v).replace(".", "-")})`;
18488
18815
  return v;
18489
18816
  }
18490
- function safeHref9(url) {
18817
+ function safeHref10(url) {
18491
18818
  if (url == null) return void 0;
18492
18819
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
18493
18820
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -18515,7 +18842,7 @@ var Stack = React51__namespace.default.forwardRef(function Stack2({
18515
18842
  ...rest
18516
18843
  }, ref) {
18517
18844
  const { flatStyle, styleNode, sxAttr } = useSx(sx);
18518
- if (Tag2 === "a" && rest.href != null) rest.href = safeHref9(rest.href);
18845
+ if (Tag2 === "a" && rest.href != null) rest.href = safeHref10(rest.href);
18519
18846
  const kids = divider != null ? React51__namespace.default.Children.toArray(children).flatMap((child, i, arr) => i < arr.length - 1 ? [child, /* @__PURE__ */ jsxRuntime.jsx(React51__namespace.default.Fragment, { children: divider }, `twc-stack-div-${i}`)] : [child]) : children;
18520
18847
  return /* @__PURE__ */ jsxRuntime.jsxs(
18521
18848
  Tag2,
@@ -18570,7 +18897,7 @@ var CODE_CSS = `
18570
18897
  .twc-code__copy:focus-visible { outline: none; box-shadow: var(--ring); }
18571
18898
  .twc-code__copy svg { width: 15px; height: 15px; display: block; }
18572
18899
  `;
18573
- function safeHref10(url) {
18900
+ function safeHref11(url) {
18574
18901
  if (url == null) return void 0;
18575
18902
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
18576
18903
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -18587,7 +18914,7 @@ function Code({
18587
18914
  }) {
18588
18915
  const __twcStyles = useScopedStyles("twc-code-styles", CODE_CSS);
18589
18916
  const Tag2 = as ?? (block ? "pre" : "code");
18590
- if (Tag2 === "a" && rest.href != null) rest.href = safeHref10(rest.href);
18917
+ if (Tag2 === "a" && rest.href != null) rest.href = safeHref11(rest.href);
18591
18918
  const rootRef = React51__namespace.default.useRef(null);
18592
18919
  const [copied, setCopied] = React51__namespace.default.useState(false);
18593
18920
  const timerRef = React51__namespace.default.useRef(null);
@@ -18612,7 +18939,7 @@ function Code({
18612
18939
  ] });
18613
18940
  }
18614
18941
  var LEVEL_SIZE = { 1: "4xl", 2: "2xl", 3: "xl", 4: "lg", 5: "base", 6: "sm" };
18615
- function safeHref11(url) {
18942
+ function safeHref12(url) {
18616
18943
  if (url == null) return void 0;
18617
18944
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
18618
18945
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -18634,7 +18961,7 @@ var Heading = React51__namespace.default.forwardRef(function Heading2({
18634
18961
  const { flatStyle, styleNode, sxAttr } = useSx(sx);
18635
18962
  const Tag2 = as || `h${level}`;
18636
18963
  const sz = size || (display ? "display" : LEVEL_SIZE[level]) || "2xl";
18637
- if (Tag2 === "a" && rest.href != null) rest.href = safeHref11(rest.href);
18964
+ if (Tag2 === "a" && rest.href != null) rest.href = safeHref12(rest.href);
18638
18965
  return /* @__PURE__ */ jsxRuntime.jsxs(
18639
18966
  Tag2,
18640
18967
  {
@@ -18681,7 +19008,7 @@ var TONE = {
18681
19008
  // Adopt the surrounding color (e.g. inside a solid Button/Badge/Alert or a link).
18682
19009
  inherit: "inherit"
18683
19010
  };
18684
- function safeHref12(url) {
19011
+ function safeHref13(url) {
18685
19012
  if (url == null) return void 0;
18686
19013
  const s = String(url).replace(/[\x00-\x20]+/g, "").toLowerCase();
18687
19014
  return s.startsWith("javascript:") || s.startsWith("data:") || s.startsWith("vbscript:") ? void 0 : url;
@@ -18701,7 +19028,7 @@ var Text = React51__namespace.default.forwardRef(function Text2({
18701
19028
  ...rest
18702
19029
  }, ref) {
18703
19030
  const { flatStyle, styleNode, sxAttr } = useSx(sx);
18704
- if (Tag2 === "a" && rest.href != null) rest.href = safeHref12(rest.href);
19031
+ if (Tag2 === "a" && rest.href != null) rest.href = safeHref13(rest.href);
18705
19032
  const toneToken = TONE[tone] || TONE.default;
18706
19033
  return /* @__PURE__ */ jsxRuntime.jsxs(
18707
19034
  Tag2,