@homebound/beam 2.377.2 → 2.378.0

package/dist/components/Table/utils/ColumnStorage.js

@@ -5,6 +5,9 @@ const mobx_1 = require("mobx");
 const utils_1 = require("./utils");
 /** Loads/saves the column state from sessionStorage. */
 class ColumnStorage {
+    states;
+    expandedIds;
+    visibleIds;
     constructor(states) {
         this.states = states;
     }
@@ -18,17 +21,15 @@ class ColumnStorage {
         // Unlike the others, where we only store the value on change, we immediately
         // store this value (but I'm not sure why...), hence using `autorun`.
         (0, mobx_1.autorun)(() => {
-            const columnIds = this.states.allVisibleColumns.map((cs) => cs.column.id);
+            const columnIds = this.states.allVisibleColumns("web").map((cs) => cs.column.id);
             sessionStorage.setItem(storageKey, JSON.stringify(columnIds));
         });
     }
     wasExpanded(id) {
-        var _a;
-        return (_a = this.expandedIds) === null || _a === void 0 ? void 0 : _a.includes(id);
+        return this.expandedIds?.includes(id);
     }
     wasVisible(id) {
-        var _a;
-        return (_a = this.visibleIds) === null || _a === void 0 ? void 0 : _a.includes(id);
+        return this.visibleIds?.includes(id);
     }
     done() {
         this.expandedIds = undefined;

package/dist/components/Table/utils/GridRowLookup.d.ts

@@ -31,3 +31,4 @@ export declare function getKinds<R extends Kinded>(columns: GridColumnWithId<R>[
 /** Optionally takes into consideration if a row is already in view before attempting to scroll to it. */
 export declare function shouldSkipScrollTo(index: number, virtuosoRangeRef: MutableRefObject<ListRange | null>): boolean;
 export {};
+//# sourceMappingURL=GridRowLookup.d.ts.map

package/dist/components/Table/utils/GridRowLookup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GridRowLookup.d.ts","sourceRoot":"","sources":["../../../../src/components/Table/utils/GridRowLookup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,0BAA4C;AAClE,OAAO,EAAE,gBAAgB,EAAE,wBAA0C;AACrE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,EAAyB,iBAAmC;AAEhH;;;;;GAKG;AACH,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,MAAM;IAC7C,yGAAyG;IACzG,MAAM,CACJ,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,EACnB,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,OAAO,GAClD,QAAQ,CAAC,CAAC,CAAC,GAAG;SACd,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;KAC5D,CAAC;IAEF,2EAA2E;IAC3E,WAAW,IAAI,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IAEzC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7C;AAED,UAAU,QAAQ,CAAC,CAAC,SAAS,MAAM;IACjC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;CAClC;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAC9C,GAAG,EAAE,gBAAgB,CAAC,CAAC,CAAC,EACxB,WAAW,EAAE,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,EACpD,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,GACnD,aAAa,CAAC,CAAC,CAAC,CA8ClB;AAED,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAI9E;AAED,yGAAyG;AACzG,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,WAUrG"}

package/dist/components/Table/utils/GridRowLookup.js

@@ -21,8 +21,6 @@ function createRowLookup(api, virtuosoRef, virtuosoRangeRef) {
             return api.tableState.visibleRows.map((rs) => rs.row);
         },
         lookup(row, additionalFilter = () => true) {
-            var _a, _b;
-            var _c;
             const rows = this.currentList().filter(additionalFilter);
             const columns = api.tableState.visibleColumns;
             // Ensure we have `result.kind = {}` for each kind
@@ -44,8 +42,8 @@ function createRowLookup(api, virtuosoRef, virtuosoRangeRef) {
                     }
                     else {
                         // next only writes first seen
-                        (_a = result[key]) !== null && _a !== void 0 ? _a : (result[key] = each);
-                        (_b = (_c = result[each.kind])[key]) !== null && _b !== void 0 ? _b : (_c[key] = each);
+                        result[key] ??= each;
+                        result[each.kind][key] ??= each;
                     }
                 }
             }

package/dist/components/Table/utils/RowState.d.ts

@@ -103,6 +103,7 @@ export declare class RowState<R extends Kinded> {
     private get visibleDirectlyMatchedChildren();
     /** The `visibleChildren`, but with the current sort config applied. */
     private get visibleSortedChildren();
+    private get hasSelectableChildren();
     /**
      * Returns whether this row should act like a parent.
      *
@@ -124,3 +125,4 @@ export declare class RowState<R extends Kinded> {
     private get hasDirectlyMatchedParent();
     private get isDirectlyMatched();
 }
+//# sourceMappingURL=RowState.d.ts.map

package/dist/components/Table/utils/RowState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RowState.d.ts","sourceRoot":"","sources":["../../../../src/components/Table/utils/RowState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,iBAAY;AAC7B,OAAO,EAAE,WAAW,EAAE,0BAA4C;AAClE,OAAO,EAAE,UAAU,EAAE,wBAA0C;AAC/D,OAAO,EAAE,SAAS,EAAE,oBAA6C;AACjE,OAAO,EAAE,aAAa,EAAE,qBAA8C;AAGtE,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,KAAK,IAAA,CAAE,iGAAiG;IACxG,KAAK,IAAA;CACN;AAED;;;;;GAKG;AACH,qBAAa,QAAQ,CAAC,CAAC,SAAS,MAAM;IAmClC,OAAO,CAAC,MAAM;IACP,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS;IAnCxC,wFAAwF;IACxF,OAAO,CAAC,IAAI,CAAkB;IAC9B,6EAA6E;IAC7E,OAAO,CAAC,KAAK,CAAU;IACvB,6FAA6F;IAC7F,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,CAAa;IAChD,0CAA0C;IAC1C,QAAQ,UAAS;IACjB,gCAAgC;IAChC,SAAS,UAAS;IAClB,mCAAmC;IACnC,aAAa,EAAE,WAAW,CAAoB;IAC9C;;;;;;;;;;;;;;;;;OAiBG;IACH,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAS;IACzC,OAAO,CAAC,wBAAwB,CAAS;gBAG/B,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EACrB,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,EACtC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;IA4BrB,qFAAqF;IACrF,IAAI,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAGxB;IAED,oFAAoF;IACpF,IAAI,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,EAM1B;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,OAAO,CAQvB;IAED;;;;;;;OAOG;IACH,IAAI,UAAU,IAAI,OAAO,CAIxB;IAED,4EAA4E;IAC5E,IAAI,aAAa,IAAI,aAAa,CAajC;IAED;;;;;OAKG;IACH,IAAI,sBAAsB,IAAI,aAAa,CAkB1C;IAED;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI;IAY/B,8EAA8E;IAC9E,WAAW,IAAI,IAAI;IAMnB,eAAe,IAAI,IAAI;IAIvB,uFAAuF;IACvF,IAAI,MAAM,IAAI,OAAO,CAWpB;IAED,IAAI,aAAa,IAAI,OAAO,CAI3B;IAED,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,KAAK,IAAI,MAAM,CAGlB;IAED,OAAO,KAAK,kBAAkB,GAE7B;IAED,kEAAkE;IAClE,IAAI,oBAAoB,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAOxC;IAED,OAAO,KAAK,eAAe,GAY1B;IAeD,OAAO,KAAK,8BAA8B,GAWzC;IAED,uEAAuE;IACvE,OAAO,KAAK,qBAAqB,GAOhC;IAED,OAAO,KAAK,qBAAqB,GAEhC;IAED;;;;;;;;;;OAUG;IACH,OAAO,KAAK,QAAQ,GAGnB;IAED,OAAO,KAAK,QAAQ,GAEnB;IAGD,IAAW,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAmB9B;IAED,IAAW,cAAc,IAAI,OAAO,CAEnC;IAED,uFAAuF;IACvF,OAAO,KAAK,0BAA0B,GAIrC;IAED,qFAAqF;IACrF,OAAO,KAAK,wBAAwB,GAEnC;IAED,OAAO,KAAK,iBAAiB,GAqB5B;CAMF"}

package/dist/components/Table/utils/RowState.js

@@ -16,41 +16,46 @@ var DraggedOver;
  * that uses parent/children easier to write, i.e. selected-ness and collapsed-ness.
  */
 class RowState {
+    states;
+    parent;
+    /** Our row, not actually observed, b/c each `createRows` calc creates unstable rows. */
+    _row;
+    /** Our data, only ref observed, so we don't crawl into GraphQL fragments. */
+    _data;
+    /** Our children row states, as of the latest `props.rows`, without any filtering applied. */
+    children = undefined;
+    /** Whether we are *directly* selected. */
+    selected = false;
+    /** Whether we are collapsed. */
+    collapsed = false;
+    /** Whether we are dragged over. */
+    isDraggedOver = DraggedOver.None;
+    /**
+     * Whether our `row` had been in `props.rows`, but then removed _while being
+     * selected_, i.e. potentially by server-side filters.
+     *
+     * We have had a large foot-gun where users "select a row", change the filters,
+     * the row disappears (filtered out), and the user clicks "Go!", but the table
+     * thinks their previously-selected row is gone (b/c it's not in view), and
+     * then the row is inappropriately deleted/unassociated/etc. (b/c in the user's
+     * head, it is "still selected").
+     *
+     * To avoid this, we by default keep selected rows, as "kept rows", to make
+     * extra sure the user wants them to go away.
+     *
+     * Soft-deleted rows are rows that were removed from `props.rows` (i.e. we
+     * suspect are just hidden by a changed server-side-filter), and hard-deleted
+     * rows are rows the page called `api.deleteRow` and confirmed it should be
+     * actively removed.
+     */
+    removed = false;
+    isCalculatingDirectMatch = false;
     constructor(states, parent, row) {
-        var _a;
         this.states = states;
         this.parent = parent;
-        /** Our children row states, as of the latest `props.rows`, without any filtering applied. */
-        this.children = undefined;
-        /** Whether we are *directly* selected. */
-        this.selected = false;
-        /** Whether we are collapsed. */
-        this.collapsed = false;
-        /** Whether we are dragged over. */
-        this.isDraggedOver = DraggedOver.None;
-        /**
-         * Whether our `row` had been in `props.rows`, but then removed _while being
-         * selected_, i.e. potentially by server-side filters.
-         *
-         * We have had a large foot-gun where users "select a row", change the filters,
-         * the row disappears (filtered out), and the user clicks "Go!", but the table
-         * thinks their previously-selected row is gone (b/c it's not in view), and
-         * then the row is inappropriately deleted/unassociated/etc. (b/c in the user's
-         * head, it is "still selected").
-         *
-         * To avoid this, we by default keep selected rows, as "kept rows", to make
-         * extra sure the user wants them to go away.
-         *
-         * Soft-deleted rows are rows that were removed from `props.rows` (i.e. we
-         * suspect are just hidden by a changed server-side-filter), and hard-deleted
-         * rows are rows the page called `api.deleteRow` and confirmed it should be
-         * actively removed.
-         */
-        this.removed = false;
-        this.isCalculatingDirectMatch = false;
         this.row = row;
         this.selected = !!row.initSelected;
-        this.collapsed = (_a = states.storage.wasCollapsed(row.id)) !== null && _a !== void 0 ? _a : !!row.initCollapsed;
+        this.collapsed = states.storage.wasCollapsed(row.id) ?? !!row.initCollapsed;
         (0, mobx_1.makeAutoObservable)(this, 
         // 'as any' because the fields are private so don't show up in the type
         {
@@ -62,9 +67,8 @@ class RowState {
         // we're initialized by GridTableApiImpl, before TableState.onRowSelect has a chance
         // to be set to GridTableProps.onRowSelect, so for now just always hook up this reaction.
         (0, mobx_1.reaction)(() => this.selectedState, (state) => {
-            var _a;
             const isSelected = state === "checked";
-            const tableFn = (_a = states.table.onRowSelect) === null || _a === void 0 ? void 0 : _a[this.row.kind];
+            const tableFn = states.table.onRowSelect?.[this.row.kind];
             tableFn && tableFn(this.row.data, isSelected, { row, api: states.table.api });
         });
     }
@@ -113,7 +117,8 @@ class RowState {
         // Parent `selectedState` is special b/c it does not directly depend on the parent's own selected-ness,
         // but instead depends on the current visible children. I.e. a parent might be "selected", but then the
         // client-side filter changes, a child reappears, and we need to transition to partial-ness.
-        if (this.isParent) {
+        // If there are no selectable children, we should return "checked" if the parent is selected.
+        if (this.isParent && this.hasSelectableChildren) {
             // Use visibleChildren b/c if filters are hiding some of our children, we still want to show fully selected
             const children = this.visibleChildren.filter((c) => c.row.selectable !== false);
             const allChecked = children.every((child) => child.selectedState === "checked");
@@ -129,7 +134,8 @@ class RowState {
      * wants to show partial-ness whenever any given child is selected.
      */
     get selectedStateForHeader() {
-        if (this.children) {
+        // If there are no selectable children, we should return "checked" if the parent is selected.
+        if (this.children && this.hasSelectableChildren) {
             const children = this.visibleChildren.filter((c) => c.row.selectable !== false || c.isParent);
             const allChecked = children.every((child) => child.selectedStateForHeader === "checked");
             const allUnchecked = children.every((child) => child.selectedStateForHeader === "unchecked");
@@ -218,15 +224,14 @@ class RowState {
         }
     }
     get visibleChildren() {
-        var _a, _b;
         // The keptGroup is special and its children are the dynamically kept rows
         if (this.row.kind === utils_1.KEPT_GROUP)
             return this.states.keptRows;
-        return ((_b = (_a = this.children) === null || _a === void 0 ? void 0 : _a.filter((rs) => 
+        return (this.children?.filter((rs) => 
         // Reserved rows are always visible, even though they're not considered matched.
         // ...except for the kept group: its `isMatched` will become true whenever it has
         // any kept row children, as they will cause its hasDirectlyMatchedChildren to be true.
-        (rs.isReservedKind && rs.row.kind !== utils_1.KEPT_GROUP) || rs.isMatched || rs.isPinned)) !== null && _b !== void 0 ? _b : []);
+        (rs.isReservedKind && rs.row.kind !== utils_1.KEPT_GROUP) || rs.isMatched || rs.isPinned) ?? []);
     }
     // This is a copy/paste of visibleChildren, but using isDirectlyMatched instead of isMatched
     // to avoid a cycle, i.e.:
@@ -242,13 +247,12 @@ class RowState {
     // We side-step this by assuming that the `GridRowApi.getVisibleChildren` can use the
     // slightly-less accurate "my children are visible if they're directly matched".
     get visibleDirectlyMatchedChildren() {
-        var _a, _b;
         if (this.row.kind === utils_1.KEPT_GROUP)
             return this.states.keptRows;
-        return ((_b = (_a = this.children) === null || _a === void 0 ? void 0 : _a.filter((rs) => (rs.isReservedKind && rs.row.kind !== utils_1.KEPT_GROUP) ||
+        return (this.children?.filter((rs) => (rs.isReservedKind && rs.row.kind !== utils_1.KEPT_GROUP) ||
             rs.isDirectlyMatched ||
             rs.hasDirectlyMatchedChildren ||
-            rs.isPinned)) !== null && _b !== void 0 ? _b : []);
+            rs.isPinned) ?? []);
     }
     /** The `visibleChildren`, but with the current sort config applied. */
     get visibleSortedChildren() {
@@ -260,6 +264,9 @@ class RowState {
             rows = [...rows].sort(sortFn);
         return rows;
     }
+    get hasSelectableChildren() {
+        return this.visibleChildren.some((c) => c.row.selectable !== false);
+    }
     /**
      * Returns whether this row should act like a parent.
      *
@@ -294,8 +301,7 @@ class RowState {
                 return !kind ? children : children.filter((r) => r.kind === kind);
             },
             getSelectedChildren(kind) {
-                var _a;
-                const children = ((_a = rs.children) !== null && _a !== void 0 ? _a : []).filter((cs) => cs.isSelected).map((cs) => cs.row);
+                const children = (rs.children ?? []).filter((cs) => cs.isSelected).map((cs) => cs.row);
                 return !kind ? children : children.filter((r) => r.kind === kind);
             },
         };

package/dist/components/Table/utils/RowStates.d.ts

@@ -38,3 +38,4 @@ export declare class RowStates<R extends Kinded> {
     private createKeptGroupRow;
     maybeSetRowDraggedOver(id: string, draggedOver: DraggedOver, requireSameParentRow?: GridDataRow<R> | undefined): void;
 }
+//# sourceMappingURL=RowStates.d.ts.map

package/dist/components/Table/utils/RowStates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RowStates.d.ts","sourceRoot":"","sources":["../../../../src/components/Table/utils/RowStates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,iBAAY;AAC7B,OAAO,EAAE,WAAW,EAAE,0BAA4C;AAClE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,mBAA4C;AAC5E,OAAO,EAAE,UAAU,EAAE,qBAA8C;AACnE,OAAO,EAAE,UAAU,EAAE,qBAA8C;AAGnE;;GAEG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM;IAErC,OAAO,CAAC,GAAG,CAA4C;IACvD,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9B,QAAQ,CAAC,OAAO,gBAAwB;IAGxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IAErC,OAAO,CAAC,YAAY,CAAc;IAClC,yGAAyG;IACzG,OAAO,CAAC,OAAO,CAAqB;gBAExB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAQhC,mDAAmD;IACnD,IAAI,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAE7B;IAED,oFAAoF;IACpF,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAM5B;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI;IAuDrC,sEAAsE;IACtE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE;IAQpB,4FAA4F;IAC5F,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IA0BjC,IAAI,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAM/B;IAED,0GAA0G;IAC1G,IAAI,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAE5B;IAED,IAAI,aAAa,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAEjC;IAED,OAAO,CAAC,eAAe;IAKvB,8GAA8G;IAC9G,OAAO,CAAC,kBAAkB;IAiB1B,sBAAsB,CACpB,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,WAAW,EACxB,oBAAoB,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,SAAqB,GAC3D,IAAI;CAwBR"}

package/dist/components/Table/utils/RowStates.js

@@ -9,12 +9,18 @@ const utils_1 = require("./utils");
  * Manages our tree of observable RowStates that manage each GridDataRow's behavior.
  */
 class RowStates {
+    // A flat map of all row id -> RowState
+    map = new mobx_1.ObservableMap();
+    table;
+    storage = new RowStorage_1.RowStorage(this);
+    // Pre-create the header to drive select-all/etc. behavior, even if the user
+    // doesn't pass an explicit `header` GridDataRow in `rows.props`
+    header;
+    // Pre-create our keptGroupRow for if/when we need it.
+    keptGroupRow;
+    /** The first level of rows, i.e. not the header (or kept group), but the totals + top-level children. */
+    topRows = [];
     constructor(table) {
-        // A flat map of all row id -> RowState
-        this.map = new mobx_1.ObservableMap();
-        this.storage = new RowStorage_1.RowStorage(this);
-        /** The first level of rows, i.e. not the header (or kept group), but the totals + top-level children. */
-        this.topRows = [];
         this.table = table;
         this.header = this.createHeaderRow();
         this.keptGroupRow = this.createKeptGroupRow(this.header);
@@ -45,7 +51,6 @@ class RowStates {
         // Keep track of existing rows, so we can mark any that are missing as removed
         const maybeKept = new Set(this.map.values());
         function addRowAndChildren(parent, row) {
-            var _a;
             // This should really be kind+id, but nearly all of our existing API uses just ids,
             // b/c we assume our ids are tagged/unique across parent/child kinds anyway. So go
             // ahead and enforce "row.id must be unique across kinds" b/c pragmatically that is
@@ -68,7 +73,7 @@ class RowStates {
                 state.removed = false;
                 maybeKept.delete(state);
             }
-            state.children = (_a = row.children) === null || _a === void 0 ? void 0 : _a.map((child) => addRowAndChildren(state, child));
+            state.children = row.children?.map((child) => addRowAndChildren(state, child));
             return state;
         }
         // Probe for the header row, so we can create it as a root RowState, even
@@ -166,18 +171,17 @@ class RowStates {
         return rs;
     }
     maybeSetRowDraggedOver(id, draggedOver, requireSameParentRow = undefined) {
-        var _a, _b, _c, _d, _e, _f;
         const rs = this.get(id);
         if (requireSameParentRow) {
             const requireParentRowState = this.get(requireSameParentRow.id);
-            if (((_b = (_a = requireParentRowState.parent) === null || _a === void 0 ? void 0 : _a.row) === null || _b === void 0 ? void 0 : _b.id) !== ((_d = (_c = rs.parent) === null || _c === void 0 ? void 0 : _c.row) === null || _d === void 0 ? void 0 : _d.id))
+            if (requireParentRowState.parent?.row?.id !== rs.parent?.row?.id)
                 return;
         }
         // if this is an expanded parent and draggedOver is Below then we want to set this on this rows bottom-most child
-        if (!rs.collapsed && rs.children && ((_e = rs.children) === null || _e === void 0 ? void 0 : _e.length) > 0 && draggedOver === RowState_1.DraggedOver.Below) {
+        if (!rs.collapsed && rs.children && rs.children?.length > 0 && draggedOver === RowState_1.DraggedOver.Below) {
             let rowState = rs;
             // recursively find the bottom-most child
-            while (rowState.children && ((_f = rowState.children) === null || _f === void 0 ? void 0 : _f.length) > 0) {
+            while (rowState.children && rowState.children?.length > 0) {
                 rowState = rowState.children[rowState.children.length - 1];
             }
             rowState.isDraggedOver = draggedOver;

package/dist/components/Table/utils/RowStorage.d.ts

@@ -26,3 +26,4 @@ export declare class RowStorage<R extends Kinded> {
      */
     wasCollapsed(id: string): boolean | undefined;
 }
+//# sourceMappingURL=RowStorage.d.ts.map

package/dist/components/Table/utils/RowStorage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RowStorage.d.ts","sourceRoot":"","sources":["../../../../src/components/Table/utils/RowStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,iBAAY;AAC7B,OAAO,EAAE,SAAS,EAAE,oBAA6C;AAGjE;;;;;;;;;;GAUG;AACH,qBAAa,UAAU,CAAC,CAAC,SAAS,MAAM;IAG1B,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,aAAa,CAAuB;gBAExB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAExC,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI;IAUnC,wHAAwH;IACxH,IAAI;IAIJ;;;;;OAKG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;CAG9C"}

package/dist/components/Table/utils/RowStorage.js

@@ -15,6 +15,8 @@ const utils_1 = require("./utils");
  * although we do reactive to collapsedRows changing to persist the new state.
  */
 class RowStorage {
+    states;
+    historicalIds;
     constructor(states) {
         this.states = states;
     }
@@ -35,8 +37,7 @@ class RowStorage {
      * past the first real-data load, and thus should prefer new incoming rows' `initCollapsed` flag.
      */
     wasCollapsed(id) {
-        var _a;
-        return (_a = this.historicalIds) === null || _a === void 0 ? void 0 : _a.includes(id);
+        return this.historicalIds?.includes(id);
     }
 }
 exports.RowStorage = RowStorage;

package/dist/components/Table/utils/TableState.d.ts

@@ -56,6 +56,8 @@ export declare class TableState<R extends Kinded> {
     get visibleRows(): RowState<R>[];
     /** Returns visible columns, i.e. those that are visible + any expanded children. */
     get visibleColumns(): GridColumnWithId<R>[];
+    /** Returns visible columns, i.e. those that are visible + any expanded children. */
+    get visibleCsvColumns(): GridColumnWithId<R>[];
     /** Implements GridTableApi.visibleColumnIds. */
     get visibleColumnIds(): string[];
     setVisibleColumns(ids: string[]): void;
@@ -97,3 +99,4 @@ export type SortState = {
 };
 export type SortOn = "client" | "server" | undefined;
 export {};
+//# sourceMappingURL=TableState.d.ts.map

package/dist/components/Table/utils/TableState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TableState.d.ts","sourceRoot":"","sources":["../../../../src/components/Table/utils/TableState.ts"],"names":[],"mappings":"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"}

package/dist/components/Table/utils/TableState.js

@@ -27,28 +27,36 @@ const utils_1 = require("./utils");
  * changes.
  */
 class TableState {
+    persistCollapse;
+    // The current list of rows, basically a useRef.current. Only shallow reactive.
+    rows = [];
+    // The current list of columns, basically a useRef.current. Only ref reactive.
+    columns = [];
+    api;
+    rowStates = new RowStates_1.RowStates(this);
+    columnStates = new ColumnStates_1.ColumnStates();
+    // Keeps track of the 'active' row, formatted `${row.kind}_${row.id}`
+    activeRowId = undefined;
+    // Keeps track of the 'active' cell, formatted `${row.kind}_${row.id}_${column.name}`
+    activeCellId = undefined;
+    /** Stores the current client-side type-ahead search/filter. */
+    search = [];
+    /** Stores whether CSVs should have some prefix rows. */
+    csvPrefixRows = undefined;
+    // Tracks the current `sortConfig`
+    sortConfig;
+    // Tracks the active sort column(s), so GridTable or SortHeaders can reactively
+    // re-render (for GridTable, only if client-side sorting)
+    sort = {};
+    // Keep track of the `initialSortState` so we can (1) revert back to it, and (2) properly derive next sort state
+    initialSortState;
+    // The server-side `onSort` callback, if any.
+    onSort;
+    onRowSelect = undefined;
     /**
      * Creates the `RowState` for a given `GridTable`.
      */
     constructor(api) {
-        // The current list of rows, basically a useRef.current. Only shallow reactive.
-        this.rows = [];
-        // The current list of columns, basically a useRef.current. Only ref reactive.
-        this.columns = [];
-        this.rowStates = new RowStates_1.RowStates(this);
-        this.columnStates = new ColumnStates_1.ColumnStates();
-        // Keeps track of the 'active' row, formatted `${row.kind}_${row.id}`
-        this.activeRowId = undefined;
-        // Keeps track of the 'active' cell, formatted `${row.kind}_${row.id}_${column.name}`
-        this.activeCellId = undefined;
-        /** Stores the current client-side type-ahead search/filter. */
-        this.search = [];
-        /** Stores whether CSVs should have some prefix rows. */
-        this.csvPrefixRows = undefined;
-        // Tracks the active sort column(s), so GridTable or SortHeaders can reactively
-        // re-render (for GridTable, only if client-side sorting)
-        this.sort = {};
-        this.onRowSelect = undefined;
         this.api = api;
         // Make ourselves an observable so that mobx will do caching of .collapseIds so
         // that it'll be a stable identity for GridTable to useMemo against.
@@ -71,16 +79,15 @@ class TableState {
         this.columnStates.loadExpanded(persistCollapse);
     }
     initSortState(sortConfig, columns) {
-        var _a, _b;
         if (this.sortConfig) {
             return;
         }
         this.sortConfig = sortConfig;
-        if ((sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.on) === "client") {
+        if (sortConfig?.on === "client") {
             const { initial, primary } = sortConfig;
-            const primaryKey = primary === null || primary === void 0 ? void 0 : primary[0];
+            const primaryKey = primary?.[0];
             const persistentSortData = primaryKey
-                ? { persistent: { columnId: primaryKey, direction: (_a = primary === null || primary === void 0 ? void 0 : primary[1]) !== null && _a !== void 0 ? _a : utils_1.ASC } }
+                ? { persistent: { columnId: primaryKey, direction: primary?.[1] ?? utils_1.ASC } }
                 : {};
             if (initial === undefined && "initial" in sortConfig) {
                 // if explicitly set to `undefined`, then do not sort
@@ -91,30 +98,29 @@ class TableState {
             }
             else {
                 // If no explicit sortState, assume 1st column ascending
-                const firstSortableColumn = (_b = columns.find((c) => c.clientSideSort !== false)) === null || _b === void 0 ? void 0 : _b.id;
+                const firstSortableColumn = columns.find((c) => c.clientSideSort !== false)?.id;
                 this.initialSortState = firstSortableColumn
                     ? { current: { columnId: firstSortableColumn, direction: utils_1.ASC }, ...persistentSortData }
                     : undefined;
             }
         }
         else {
-            this.initialSortState = (sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.value)
-                ? { current: { columnId: sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.value[0], direction: sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.value[1] } }
+            this.initialSortState = sortConfig?.value
+                ? { current: { columnId: sortConfig?.value[0], direction: sortConfig?.value[1] } }
                 : undefined;
         }
         // Only change `this.sort` if `initialSortState` is defined.
         if (this.initialSortState) {
             this.sort = this.initialSortState;
         }
-        this.onSort = (sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.on) === "server" ? sortConfig.onSort : undefined;
+        this.onSort = sortConfig?.on === "server" ? sortConfig.onSort : undefined;
     }
     setSortKey(clickedColumnId) {
-        var _a;
         if (this.sortConfig) {
             const newState = deriveSortState(this.sort, clickedColumnId, this.initialSortState);
-            this.sort = newState !== null && newState !== void 0 ? newState : {};
+            this.sort = newState ?? {};
             if (this.onSort) {
-                const { columnId, direction } = (_a = newState === null || newState === void 0 ? void 0 : newState.current) !== null && _a !== void 0 ? _a : {};
+                const { columnId, direction } = newState?.current ?? {};
                 this.onSort(columnId, direction);
             }
         }
@@ -125,7 +131,7 @@ class TableState {
     /** Returns a client-side sort function, if applicable. */
     get sortFn() {
         const { sortState, sortConfig, visibleColumns } = this;
-        if (!sortState || (sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.on) !== "client")
+        if (!sortState || sortConfig?.on !== "client")
             return undefined;
         // sortRows.ts wants to sort based on the GridDataRow, so make a small `rowStateFn` adapter
         const dataRowFn = (0, components_1.sortFn)(visibleColumns, sortState, !!sortConfig.caseSensitive);
@@ -154,7 +160,11 @@ class TableState {
     }
     /** Returns visible columns, i.e. those that are visible + any expanded children. */
     get visibleColumns() {
-        return this.columnStates.allVisibleColumns.map((cs) => cs.column);
+        return this.columnStates.allVisibleColumns("web").map((cs) => cs.column);
+    }
+    /** Returns visible columns, i.e. those that are visible + any expanded children. */
+    get visibleCsvColumns() {
+        return this.columnStates.allVisibleColumns("csv").map((cs) => cs.column);
     }
     /** Implements GridTableApi.visibleColumnIds. */
     get visibleColumnIds() {
@@ -173,9 +183,8 @@ class TableState {
         this.columnStates.get(columnId).toggleExpanded();
     }
     numberOfExpandedChildren(columnId) {
-        var _a, _b;
         // Should this be only _visible_ children?
-        return (_b = (_a = this.columnStates.get(columnId).children) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+        return this.columnStates.get(columnId).children?.length ?? 0;
     }
     loadExpandedColumns(columnId) {
         return this.columnStates.get(columnId).doExpand();
@@ -231,7 +240,6 @@ exports.TableStateContext = react_1.default.createContext({
 });
 // Exported for testing purposes
 function deriveSortState(currentSortState, clickedKey, initialSortState) {
-    var _a;
     // If the current sort state is not defined then sort ASC on the clicked key.
     if (!currentSortState.current) {
         return { ...initialSortState, current: { columnId: clickedKey, direction: utils_1.ASC } };
@@ -243,7 +251,7 @@ function deriveSortState(currentSortState, clickedKey, initialSortState) {
     }
     // If there is an `initialSortState` and we're clicking on that same key, then flip the sort.
     // Handles cases where the initial sort is DESC so that we can allow for DESC to ASC sorting.
-    if (initialSortState && ((_a = initialSortState.current) === null || _a === void 0 ? void 0 : _a.columnId) === clickedKey) {
+    if (initialSortState && initialSortState.current?.columnId === clickedKey) {
         return {
             ...initialSortState,
             current: { columnId: clickedKey, direction: currentDirection === utils_1.ASC ? utils_1.DESC : utils_1.ASC },

package/dist/components/Table/utils/columns.d.ts

@@ -33,3 +33,4 @@ export declare function calcColumnSizes<R extends Kinded>(columns: GridColumnWit
 export declare function assignDefaultColumnIds<T extends Kinded>(columns: GridColumn<T>[]): GridColumnWithId<T>[];
 export declare const generateColumnId: (columnIndex: number) => string;
 export declare function dragHandleColumn<T extends Kinded>(columnDef?: Partial<GridColumn<T>>): GridColumn<T>;
+//# sourceMappingURL=columns.d.ts.map

package/dist/components/Table/utils/columns.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"columns.d.ts","sourceRoot":"","sources":["../../../../src/components/Table/utils/columns.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,EAAyB,iBAAmC;AAKzG,qEAAqE;AACrE,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAEhF;AAED,qEAAqE;AACrE,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAEpF;AAED;6GAC6G;AAC7G,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAEvF;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAEtF;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAsBhG;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAqBlG;AAOD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAC9C,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,eAAe,EAAE,MAAM,YAAI,EAC3B,iBAAiB,EAAE,MAAM,EAAE,GAC1B,MAAM,EAAE,CA0FV;AAED,oCAAoC;AACpC,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAsBxG;AAED,eAAO,MAAM,gBAAgB,gBAAiB,MAAM,WAAgC,CAAC;AAErF,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAyCpG"}

package/dist/components/Table/utils/columns.js

@@ -52,7 +52,6 @@ function selectColumn(columnDef) {
         w: "40px",
         wrapAction: false,
         isAction: true,
-        expandColumns: undefined,
         // Select Column should not display the select toggle for `expandableHeader` or `totals` row kinds
         expandableHeader: utils_1.emptyCell,
         totals: utils_1.emptyCell,
@@ -83,7 +82,6 @@ function collapseColumn(columnDef) {
         w: "38px",
         wrapAction: false,
         isAction: true,
-        expandColumns: undefined,
         // Collapse Column should not display the collapse toggle for `expandableHeader` or `totals` row kinds
         expandableHeader: utils_1.emptyCell,
         totals: utils_1.emptyCell,
@@ -195,27 +193,23 @@ function calcColumnSizes(columns, tableWidth, tableMinWidthPx = 0, expandedColum
 /** Assign column ids if missing. */
 function assignDefaultColumnIds(columns) {
     return columns.map((c, idx) => {
-        var _a;
         const { expandColumns } = c;
         // If `expandColumns` is a function, we don't instrument it atm.
         const expandColumnsWithId = (0, utils_2.isFunction)(expandColumns)
             ? expandColumns
-            : expandColumns === null || expandColumns === void 0 ? void 0 : expandColumns.map((ec, ecIdx) => {
-                var _a;
-                return ({
-                    ...ec,
-                    id: (_a = ec.id) !== null && _a !== void 0 ? _a : `${(0, exports.generateColumnId)(idx)}_${ecIdx}`,
-                    // Defining this as undefined to make TS happy for now.
-                    // If we do not explicitly set to `undefined`, TS thinks `expandColumns` could still be of type GridColumn<T> (not WithId).
-                    // We only support a single level of expanding columns, so this is safe to do.
-                    expandColumns: undefined,
-                });
-            });
+            : expandColumns?.map((ec, ecIdx) => ({
+                ...ec,
+                id: ec.id ?? `${(0, exports.generateColumnId)(idx)}_${ecIdx}`,
+                // Defining this as undefined to make TS happy for now.
+                // If we do not explicitly set to `undefined`, TS thinks `expandColumns` could still be of type GridColumn<T> (not WithId).
+                // We only support a single level of expanding columns, so this is safe to do.
+                expandColumns: undefined,
+            }));
         // We use `Object.assign` instead of spreading the `c` property to maintain
         // the proxy objects if the user used selectColumn/collapseColumn, which have
         // method-missing hooks that render empty cells for any non-header rows.
         return Object.assign(c, {
-            id: (_a = c.id) !== null && _a !== void 0 ? _a : (0, exports.generateColumnId)(idx),
+            id: c.id ?? (0, exports.generateColumnId)(idx),
             expandColumns: expandColumnsWithId,
         });
     });
@@ -231,7 +225,6 @@ function dragHandleColumn(columnDef) {
         w: "40px",
         wrapAction: false,
         isAction: true,
-        expandColumns: undefined,
         expandableHeader: utils_1.emptyCell,
         totals: utils_1.emptyCell,
         // Use any of the user's per-row kind methods if they have them.
@@ -246,8 +239,8 @@ function dragHandleColumn(columnDef) {
                 content: row.draggable ? ((0, jsx_runtime_1.jsx)("div", { draggable: row.draggable, onDragStart: (evt) => {
                         // show the whole row being dragged when dragging with the handle
                         ref.current && evt.dataTransfer.setDragImage(ref.current, 0, 0);
-                        return onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(row, evt);
-                    }, onDragEnd: (evt) => onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd(row, evt), onDrop: (evt) => onDrop === null || onDrop === void 0 ? void 0 : onDrop(row, evt), onDragEnter: (evt) => onDragEnter === null || onDragEnter === void 0 ? void 0 : onDragEnter(row, evt), onDragOver: (evt) => onDragOver === null || onDragOver === void 0 ? void 0 : onDragOver(row, evt), css: Css_1.Css.ma.cursorPointer.$, children: (0, jsx_runtime_1.jsx)(src_1.Icon, { icon: "drag" }) })) : undefined,
+                        return onDragStart?.(row, evt);
+                    }, onDragEnd: (evt) => onDragEnd?.(row, evt), onDrop: (evt) => onDrop?.(row, evt), onDragEnter: (evt) => onDragEnter?.(row, evt), onDragOver: (evt) => onDragOver?.(row, evt), css: Css_1.Css.ma.cursorPointer.$, children: (0, jsx_runtime_1.jsx)(src_1.Icon, { icon: "drag" }) })) : undefined,
             };
         };
     });

package/dist/components/Table/utils/simpleHelpers.d.ts

@@ -28,3 +28,4 @@ export declare const simpleExpandableHeader: {
 export declare function simpleDataRows<R extends SimpleHeaderAndData<D>, D>(data?: Array<D & {
     id: string;
 }> | undefined): GridDataRow<R>[];
+//# sourceMappingURL=simpleHelpers.d.ts.map

package/dist/components/Table/utils/simpleHelpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simpleHelpers.d.ts","sourceRoot":"","sources":["../../../../src/components/Table/utils/simpleHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,0BAA4C;AAElE;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAC7B;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAIlB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,uCAAuC;AACvC,eAAO,MAAM,YAAY;;;;CAA6D,CAAC;AACvF,eAAO,MAAM,sBAAsB;;;;CAAiF,CAAC;AAErH,uDAAuD;AACvD,wBAAgB,cAAc,CAAC,CAAC,SAAS,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,EAChE,IAAI,GAAE,KAAK,CAAC,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,SAAc,GAC/C,WAAW,CAAC,CAAC,CAAC,EAAE,CAGlB"}