@homebound/beam 4.9.0 → 4.9.2

package/dist/index.js

@@ -6479,7 +6479,6 @@ import { makeAutoObservable as makeAutoObservable3, observableRef as observableR
 // src/components/Table/components/CompanionRow.tsx
 import { observer } from "mobx-react";
 import { isValidElement } from "react";
-import { trussProps as trussProps12, maybeCssVar as maybeCssVar12 } from "@homebound/truss/runtime";
 
 // src/layouts/DocumentScrollLayoutContext.tsx
 import { useResizeObserver } from "@react-aria/utils";
@@ -6665,6 +6664,7 @@ function headerContentPaddingX(compact = false) {
 }
 
 // src/components/Table/components/CompanionRow.tsx
+import { trussProps as trussProps12, maybeCssVar as maybeCssVar12 } from "@homebound/truss/runtime";
 import { jsx as jsx17 } from "react/jsx-runtime";
 var __maybeInc7 = (inc) => {
   return typeof inc === "string" ? inc : `calc(var(--t-spacing) * ${inc})`;
@@ -6680,7 +6680,9 @@ function CompanionRowImpl(props) {
     isLastBodyRow,
     companion,
     position = "trailing",
-    levelIndent
+    levelIndent,
+    rowCss,
+    cellCss
   } = props;
   const RowTag = as === "table" ? "tr" : "div";
   const CellTag = as === "table" ? "td" : "div";
@@ -6711,7 +6713,8 @@ function CompanionRowImpl(props) {
         "--marginLeft": `${levelIndent}px`
       }]
     },
-    ...isLastBodyRow && style.lastRowCss
+    ...isLastBodyRow && style.lastRowCss,
+    ...rowCss
   }), "data-gridrow": true, ...tid[rowId], children: /* @__PURE__ */ jsx17(CellTag, { ...trussProps12({
     ...style.cellCss,
     ...style.betweenRowsCss,
@@ -6722,6 +6725,7 @@ function CompanionRowImpl(props) {
     ...isLastBodyRow && style.lastRowCellCss,
     ...isLastBodyRow && style.lastRowFirstCellCss,
     ...isLastBodyRow && style.lastRowLastCellCss,
+    ...cellCss,
     // Companion content is arbitrary — allow wrapping and grow with content.
     ...{
       height: "h_auto",
@@ -9256,6 +9260,11 @@ function resolveStyles(style) {
   return style;
 }
 
+// src/components/Table/utils/maybeApplyFunction.ts
+function maybeApplyFunction(row, maybeFn) {
+  return typeof maybeFn === "function" ? maybeFn(row) : maybeFn;
+}
+
 // src/hooks/useRenderCount.ts
 import { useCallback as useCallback7, useRef as useRef10 } from "react";
 function useRenderCount() {
@@ -9642,7 +9651,7 @@ var __typography2 = {
     lineHeight: "lh_32px"
   }
 };
-function maybeApplyFunction(row, maybeFn) {
+function maybeApplyFunction2(row, maybeFn) {
   return typeof maybeFn === "function" ? maybeFn(row) : maybeFn;
 }
 function RowImpl(props) {
@@ -9698,7 +9707,7 @@ function RowImpl(props) {
   const RowTag = as === "table" ? "tr" : "div";
   const sortOn = tableState.sortConfig?.on;
   const showRowHoverColor = !reservedRowKinds.includes(row.kind) && !omitRowHover && style.rowHoverColor !== "none";
-  const rowStyleCellCss = maybeApplyFunction(row, rowStyle?.cellCss);
+  const rowStyleCellCss = maybeApplyFunction2(row, rowStyle?.cellCss);
   const levelStyle = style.levels && (typeof style.levels === "function" ? style.levels(level) : style.levels[level]);
   const levelIndent = levelStyle?.rowIndent;
   const containerCss = {
@@ -9735,7 +9744,7 @@ function RowImpl(props) {
     ...(rowStyle?.rowLink || rowStyle?.onClick) && {
       cursor: "h_cursorPointer"
     },
-    ...maybeApplyFunction(row, rowStyle?.rowCss),
+    ...maybeApplyFunction2(row, rowStyle?.rowCss),
     // Row hover paints cells via Row.css.ts (`.beam-row-hover:hover > *`); set the var via Css.style
     // (React CSSProperties rejects custom props without a cast).
     ...showRowHoverColor && {
@@ -13295,7 +13304,8 @@ function GridTable(props) {
     } }, rs.key);
     const makeCompanionRow = (rs, resolved, isFirstBodyRow, isLastBodyRow) => {
       const levelStyle = style.levels && (typeof style.levels === "function" ? style.levels(rs.level) : style.levels[rs.level]);
-      return /* @__PURE__ */ jsx51(CompanionRow, { as, style, columnSizes, rowId: rs.row.id, colSpan: columns.length, isFirstBodyRow, isLastBodyRow, position: resolved.position, companion: resolved.content, levelIndent: levelStyle?.rowIndent }, `${rs.key}-companion`);
+      const rowStyle = rowStyles?.[rs.row.kind];
+      return /* @__PURE__ */ jsx51(CompanionRow, { as, style, columnSizes, rowId: rs.row.id, colSpan: columns.length, isFirstBodyRow, isLastBodyRow, position: resolved.position, companion: resolved.content, levelIndent: levelStyle?.rowIndent, rowCss: maybeApplyFunction(rs.row, rowStyle?.rowCss), cellCss: maybeApplyFunction(rs.row, rowStyle?.cellCss) }, `${rs.key}-companion`);
     };
     const makeRowGroup = (rs, isFirstBodyRow, isLastBodyRow, inHead) => {
       const resolved = rs.companion;
@@ -28936,6 +28946,7 @@ function useUnsavedChangesGuard(options) {
   isDirtyRef.current = isDirty;
   const allowNavigationRef = useRef74(allowNavigation);
   allowNavigationRef.current = allowNavigation;
+  const allowCancelNavigationRef = useRef74(false);
   useEffect40(() => {
     const onBeforeUnload = (e) => {
       if (isDirtyRef.current?.()) {
@@ -28946,8 +28957,16 @@ function useUnsavedChangesGuard(options) {
     return () => window.removeEventListener("beforeunload", onBeforeUnload);
   }, []);
   const blocker = useBlocker((args) => {
+    if (allowCancelNavigationRef.current) {
+      return false;
+    }
     return !!isDirtyRef.current?.() && !allowNavigationRef.current?.(args);
   });
+  const confirmCancel = (e) => {
+    allowCancelNavigationRef.current = true;
+    onCancel(e);
+    allowCancelNavigationRef.current = false;
+  };
   const onCancelClick = (e) => {
     if (!isDirty?.()) {
       onCancel(e);
@@ -28955,7 +28974,7 @@ function useUnsavedChangesGuard(options) {
     }
     openModal({
       allowClosing: false,
-      content: /* @__PURE__ */ jsx237(ConfirmCloseModal, { onClose: () => onCancel(e) })
+      content: /* @__PURE__ */ jsx237(ConfirmCloseModal, { onClose: () => confirmCancel(e) })
     });
   };
   const navigationBlocker = blocker.state === "blocked" ? { proceed: () => blocker.proceed?.(), cancelNavigation: () => blocker.reset?.() } : void 0;