@homebound/beam 2.308.0 → 2.309.0

package/dist/components/Table/GridTable.d.ts

@@ -77,8 +77,6 @@ export interface GridTableProps<R extends Kinded, X> {
     filter?: string;
     /** Caps the client-side filter to a max number of rows. */
     filterMaxRows?: number;
-    /** Accepts the number of filtered rows (based on `filter`), for the caller to observe and display if they want. */
-    setRowCount?: (rowCount: number) => void;
     /** A combination of CSS settings to set the static look & feel (vs. rowStyles which is per-row styling). */
     style?: GridStyle | GridStyleDef;
     /**

package/dist/components/Table/GridTable.js

@@ -85,7 +85,7 @@ exports.setGridTableDefaults = setGridTableDefaults;
  */
 function GridTable(props) {
     var _a, _b, _c;
-    const { id = "gridTable", as = "div", columns: _columns, rows, style: maybeStyle = defaults.style, rowStyles, stickyHeader = defaults.stickyHeader, stickyOffset = 0, xss, filter, filterMaxRows, fallbackMessage = "No rows found.", infoMessage, setRowCount, persistCollapse, resizeTarget, activeRowId, activeCellId, visibleColumnsStorageKey, infiniteScroll, } = props;
+    const { id = "gridTable", as = "div", columns: _columns, rows, style: maybeStyle = defaults.style, rowStyles, stickyHeader = defaults.stickyHeader, stickyOffset = 0, xss, filter, filterMaxRows, fallbackMessage = "No rows found.", infoMessage, persistCollapse, resizeTarget, activeRowId, activeCellId, visibleColumnsStorageKey, infiniteScroll, } = props;
     const columnsWithIds = (0, react_1.useMemo)(() => (0, columns_1.assignDefaultColumnIds)(_columns), [_columns]);
     // We only use this in as=virtual mode, but keep this here for rowLookup to use
     const virtuosoRef = (0, react_1.useRef)(null);
@@ -195,10 +195,6 @@ function GridTable(props) {
         // Refs are cheap to assign to, so we don't bother doing this in a useEffect
         rowLookup.current = (0, GridRowLookup_1.createRowLookup)(columns, visibleDataRows, virtuosoRef);
     }
-    // TODO: Replace setRowCount with clients observing TableState via the API
-    (0, react_1.useEffect)(() => {
-        setRowCount && (visibleDataRows === null || visibleDataRows === void 0 ? void 0 : visibleDataRows.length) !== undefined && setRowCount(visibleDataRows.length);
-    }, [visibleDataRows === null || visibleDataRows === void 0 ? void 0 : visibleDataRows.length, setRowCount]);
     const noData = visibleDataRows.length === 0;
     const firstRowMessage = (noData && fallbackMessage) || (tooManyClientSideRows && "Hiding some rows, use filter...") || infoMessage;
     const borderless = (_a = style === null || style === void 0 ? void 0 : style.presentationSettings) === null || _a === void 0 ? void 0 : _a.borderless;

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

@@ -24,7 +24,7 @@ class ColumnState {
             this.expanded = true;
             this.doExpand();
         }
-        (0, mobx_1.makeAutoObservable)(this, { column: mobx_1.observable.ref });
+        (0, mobx_1.makeAutoObservable)(this, { column: mobx_1.observable.ref }, { name: `ColumnState@${column.id}` });
     }
     setVisible(visible) {
         const wasVisible = this.visible;

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

@@ -42,7 +42,7 @@ class RowState {
         this.row = row;
         this.selected = !!row.initSelected;
         this.collapsed = (_a = states.storage.wasCollapsed(row.id)) !== null && _a !== void 0 ? _a : !!row.initCollapsed;
-        (0, mobx_1.makeAutoObservable)(this, { row: mobx_1.observable.ref });
+        (0, mobx_1.makeAutoObservable)(this, { row: mobx_1.observable.ref }, { name: `RowState@${row.id}` });
     }
     /**
      * Whether we match a client-side filter; true if no filter is in place.
@@ -234,9 +234,9 @@ class RowState {
             .map((c) => (0, utils_1.applyRowFn)(c, this.row, api, 0, false))
             .some((maybeContent) => (0, utils_1.matchesFilter)(maybeContent, term)));
     }
-    /** Pretty toString. */
+    /** Used by node when doing `console.log(rs)`. */
     [Symbol.for("nodejs.util.inspect.custom")]() {
-        return `RowState ${this.row.kind}-${this.row.id}`;
+        return `RowState@${this.row.id}`;
     }
 }
 exports.RowState = RowState;

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

@@ -41,13 +41,25 @@ class RowStates {
      * Any missing rows are marked as `wasRemoved` so we can consider them "kept" if they're also selected.
      */
     setRows(rows) {
-        const existing = new Set(this.map.values());
         const states = this;
         const map = this.map;
+        // Keep track of ids as we add them, to detect duplicates
+        const seenIds = new Set();
+        // 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 a lot of our lookups just use id
+            // 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
+            // baked into the current API signatures.
             const key = row.id;
+            if (seenIds.has(key)) {
+                throw new Error(`Duplicate row id ${key}`);
+            }
+            else {
+                seenIds.add(key);
+            }
             let state = map.get(key);
             if (!state) {
                 state = new RowState_1.RowState(states, parent, row);
@@ -57,7 +69,7 @@ class RowStates {
                 state.parent = parent;
                 state.row = row;
                 state.removed = false;
-                existing.delete(state);
+                maybeKept.delete(state);
             }
             state.children = (_a = row.children) === null || _a === void 0 ? void 0 : _a.map((child) => addRowAndChildren(state, child));
             return state;
@@ -72,7 +84,7 @@ class RowStates {
         // from messing up "header is all selected" if its hidden/when there are no kept rows.
         this.header.children = [this.keptGroupRow, ...this.topRows];
         // Then mark any remaining as removed
-        for (const state of existing)
+        for (const state of maybeKept)
             state.markRemoved();
         // After the first load of real data, we detach collapse state, to respect
         // any incoming initCollapsed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebound/beam",
-  "version": "2.308.0",
+  "version": "2.309.0",
   "author": "Homebound",
   "license": "MIT",
   "main": "dist/index.js",