@homebound/beam 2.115.0 → 2.117.0

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

@@ -188,8 +188,10 @@ export declare type GridTableApi<R extends Kinded> = {
     scrollToIndex: (index: number) => void;
     /** Returns the ids of currently-selected rows. */
     getSelectedRowIds(): string[];
+    getSelectedRowIds<K extends R["kind"]>(kind: K): string[];
     /** Returns the currently-selected rows. */
     getSelectedRows(): GridDataRow<R>[];
+    getSelectedRows<K extends R["kind"]>(kind: K): GridDataRow<DiscriminateUnion<R, "kind", K>>[];
     /** Sets the internal state of 'activeRowId' */
     setActiveRowId: (id: string | undefined) => void;
 };
@@ -259,6 +261,8 @@ export declare type GridColumn<R extends Kinded, S = {}> = {
     serverSideSortKey?: S;
     /** Allows the column to stay in place when the user scrolls horizontally */
     sticky?: "left" | "right";
+    /** Prevent column from supporting RowStyle.onClick/rowLink in order to avoid nested interactivity. Defaults to true */
+    wrapAction?: false;
 };
 export declare const nonKindGridColumnKeys: string[];
 /** Allows rendering a specific cell. */

package/dist/components/Table/GridTable.js

@@ -95,12 +95,20 @@ function GridTable(props) {
     const tableRef = (0, react_1.useRef)(null);
     const api = (0, react_1.useRef)({
         scrollToIndex: (index) => virtuosoRef.current && virtuosoRef.current.scrollToIndex(index),
-        getSelectedRowIds: () => rowState.selectedIds,
-        getSelectedRows() {
+        getSelectedRowIds(kind) {
+            if (kind === undefined) {
+                return rowState.selectedIds;
+            }
+            else {
+                return this.getSelectedRows(kind).map((row) => row.id);
+            }
+        },
+        // The any is not great, but getting the overload to handle the optional kind is annoying
+        getSelectedRows(kind) {
             const ids = rowState.selectedIds;
             const selected = [];
             (0, visitor_1.visit)(rows, (row) => {
-                if (ids.includes(row.id)) {
+                if (ids.includes(row.id) && (!kind || row.kind === kind)) {
                     selected.push(row);
                 }
             });
@@ -113,7 +121,7 @@ function GridTable(props) {
     }
     (0, react_1.useEffect)(() => {
         rowState.activeRowId = activeRowId;
-    }, [activeRowId]);
+    }, [rowState, activeRowId]);
     // We track render count at the table level, which seems odd (we should be able to track this
     // internally within each GridRow using a useRef), but we have suspicions that react-virtuoso
     // (or us) is resetting component state more than necessary, so we track render counts from
@@ -209,6 +217,7 @@ function GridTable(props) {
         observeRows,
         columnSizes,
         collapsedIds,
+        getCount,
     ]);
     let tooManyClientSideRows = false;
     if (filterMaxRows && filteredRows.length > filterMaxRows) {
@@ -487,6 +496,7 @@ function GridRow(props) {
     let currentColspan = 1;
     const rowNode = ((0, jsx_runtime_1.jsx)(Row, Object.assign({ css: rowCss }, others, { "data-gridrow": true }, getCount(row.id), { children: columns.map((column, columnIndex) => {
             var _a, _b, _c, _d, _e;
+            const { wrapAction = true } = column;
             if (column.mw) {
                 // Validate the column's minWidth definition if set.
                 if (!column.mw.endsWith("px") && !column.mw.endsWith("%")) {
@@ -569,11 +579,11 @@ function GridRow(props) {
                 },
                 ...(column.mw ? Css_1.Css.mw(column.mw).$ : {}),
             };
-            const renderFn = (rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.renderCell) || (rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.rowLink)
+            const renderFn = ((rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.renderCell) || (rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.rowLink)) && wrapAction
                 ? rowLinkRenderFn(as)
                 : isHeader
                     ? headerRenderFn(columns, column, sortState, setSortKey, as)
-                    : (rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.onClick)
+                    : (rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.onClick) && wrapAction
                         ? rowClickRenderFn(as, api)
                         : defaultRenderFn(as);
             return renderFn(columnIndex, cellCss, content, row, rowStyle);

package/dist/components/Table/columns.js

@@ -41,6 +41,7 @@ function selectColumn(columnDef) {
         align: "center",
         // Defining `w: 48px` to accommodate for the `16px` wide checkbox and `16px` of padding on either side.
         w: "48px",
+        wrapAction: false,
         // Use any of the user's per-row kind methods if they have them.
         ...columnDef,
     };
@@ -63,6 +64,7 @@ function collapseColumn(columnDef) {
         align: "center",
         // Defining `w: 38px` based on the designs
         w: "38px",
+        wrapAction: false,
         ...columnDef,
     };
     return (0, index_1.newMethodMissingProxy)(base, (key) => {

package/dist/components/Table/styles.js

@@ -13,7 +13,7 @@ exports.defaultStyle = {
     indentOneCss: Css_1.Css.pl4.$,
     indentTwoCss: Css_1.Css.pl7.$,
     headerCellCss: Css_1.Css.nowrap.py1.bgGray100.aife.$,
-    firstRowMessageCss: Css_1.Css.tc.p3.$,
+    firstRowMessageCss: Css_1.Css.tc.py3.$,
 };
 /** Tightens up the padding of rows, great for rows that have form elements in them. */
 exports.condensedStyle = {
@@ -21,6 +21,7 @@ exports.condensedStyle = {
     headerCellCss: Css_1.Css.bgGray100.tinyEm.$,
     cellCss: Css_1.Css.aic.sm.py1.px2.$,
     rootCss: Css_1.Css.dg.gray700.xs.$,
+    firstRowMessageCss: Css_1.Css.tc.py2.$,
 };
 /** Renders each row as a card. */
 exports.cardStyle = {
@@ -44,6 +45,7 @@ exports.beamFixedStyle = {
     cellCss: Css_1.Css.gray900.xs.bgWhite.aic.nowrap.pxPx(12).hPx(36).boxShadow(`inset 0 -1px 0 ${Css_1.Palette.Gray100}`).$,
     emptyCell: "-",
     presentationSettings: { borderless: true, typeScale: "xs", wrap: false },
+    firstRowMessageCss: Css_1.Css.tc.py3.$,
     // Included as a hacky "treat indent as deprecated for this table" hint to GridTable
     levels: {},
 };

package/package.json

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