@agilant/toga-blox 1.0.200 → 1.0.201

package/dist/components/TableCell/TableCell.d.ts

@@ -1,17 +1,3 @@
-import { DataWithUUID } from "./types";
-export interface TableCellProps<T extends DataWithUUID> {
-    cell: any;
-    isLastCell: boolean;
-    hasInfiniteScroll: boolean;
-    rowUuid?: string;
-    expanded: boolean;
-    onToggle: () => void;
-    linkText?: string;
-    cellExpandable?: boolean;
-    maxCharacters?: number;
-    cellMaxWidthWhenExpanded?: number;
-    cellColor: string;
-    additionalCellClassNames: string;
-}
-declare const TableCell: <T extends DataWithUUID>({ cell, isLastCell, hasInfiniteScroll, expanded, onToggle, linkText, cellExpandable, maxCharacters, cellMaxWidthWhenExpanded, cellColor, additionalCellClassNames, }: TableCellProps<T>) => import("react/jsx-runtime").JSX.Element;
+import { TableCellProps } from "./types";
+declare const TableCell: ({ cell, isLastCell, hasInfiniteScroll, expanded, onToggle, maxCharacters, cellMaxWidthWhenExpanded, cellColor, additionalCellClassNames, toggleComponent: ToggleComponent, cellExpandable, linkTextClassNames, }: TableCellProps) => import("react/jsx-runtime").JSX.Element;
 export default TableCell;

package/dist/components/TableCell/TableCell.js

@@ -1,28 +1,26 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const MAX_CHARS = 30;
-const TableCell = ({ cell, isLastCell, hasInfiniteScroll, expanded, onToggle, linkText = "text-purple-500 ml-1 underline", cellExpandable = false, maxCharacters, cellMaxWidthWhenExpanded = 50, cellColor = "bg-blue-500", additionalCellClassNames = "", }) => {
-    /* decide if this cell even needs a toggle */
+const DEFAULT_MAX_CHARS = 30;
+// Default only implements the **collapsed** “Show more” UI.
+// We’ll never use its expanded branch, since expanded is handled below.
+const DefaultCollapsedToggle = ({ onToggle, truncated, className = "", linkTextClassNames = "text-purple-500 ml-1 underline", }) => (_jsx("div", { className: `flex items-center group ${className}`, onClick: (e) => {
+        e.stopPropagation();
+        onToggle();
+    }, children: _jsxs("span", { children: [truncated, "\u2026", _jsx("span", { className: "hidden group-hover:inline text-purple-500 ml-1 underline", children: "Show more" })] }) }));
+const TableCell = ({ cell, isLastCell, hasInfiniteScroll, expanded, onToggle, maxCharacters = DEFAULT_MAX_CHARS, cellMaxWidthWhenExpanded = 50, cellColor = "bg-blue-500", additionalCellClassNames = "", toggleComponent: ToggleComponent = DefaultCollapsedToggle, cellExpandable = false, linkTextClassNames = "text-purple-500 ml-1 underline", }) => {
+    // --- truncation logic ---
     const isString = typeof cell.value === "string";
     const fullText = isString ? cell.value : "";
     const isLong = isString && fullText.length > maxCharacters;
-    const hasToggle = cellExpandable && isLong;
     const truncated = fullText.slice(0, maxCharacters);
-    /* stop row click when toggling */
-    const handleToggle = (e) => {
-        e.stopPropagation(); // ← prevents bubbling to the <tr>
-        onToggle();
-    };
+    const needsToggle = cellExpandable && isLong;
+    // --- sticky support ---
     const isStickyColumn = cell?.column?.sticky === "left";
-    const stickyLeft = isStickyColumn && cell.column?.style
-        ? cell.column.style.left ?? 0
-        : 0;
-    const stickyClass = isStickyColumn ? cell.column?.className || "" : "";
-    const baseTd = `relative overflow-hidden font-light text-sm text-left px-5  ${cellColor}`;
-    const wrapper = ` min-h-[40px] flex select-none  ${cellColor}  ${hasToggle ? " cursor-pointer" : ""}`;
-    // FIX: extract key before spreading props into <td>
+    const baseTd = `relative overflow-hidden font-light text-sm text-left px-5 ${cellColor}`;
+    const wrapper = `min-h-[40px] flex select-none ${cellColor} ${needsToggle ? "cursor-pointer" : ""}`;
+    // extract key before spreading
     const rawCellProps = cell.getCellProps({
         className: isLastCell ? "" : baseTd,
-        style: cell.column?.sticky === "left"
+        style: isStickyColumn
             ? {
                 position: "sticky",
                 left: cell.column.style?.left || 0,
@@ -30,19 +28,18 @@ const TableCell = ({ cell, isLastCell, hasInfiniteScroll, expanded, onToggle, li
             }
             : {},
     });
-    const { key: cellKey, ...safeCellProps } = Object.assign({}, rawCellProps);
-    return (_jsx("td", { ...safeCellProps, className: isStickyColumn ? undefined : isLastCell ? "" : baseTd, children: _jsx("div", { className: wrapper, children: hasToggle ? (!expanded ? (
-            /* collapsed view */
-            _jsx("div", { className: `flex items-center group ${additionalCellClassNames}`, children: _jsxs("span", { children: [truncated, "\u2026", _jsx("span", { ...(hasToggle
-                                ? { onClick: handleToggle }
-                                : {}), className: `hidden group-hover:inline ${linkText}`, children: "Show more" })] }) })) : (
-            /* expanded view */
-            _jsxs("div", { className: `flex flex-col `, style: {
+    const { key: cellKey, ...safeCellProps } = rawCellProps;
+    return (_jsx("td", { ...safeCellProps, className: isStickyColumn ? undefined : isLastCell ? "" : baseTd, children: _jsx("div", { className: wrapper, style: { maxWidth: `${cellMaxWidthWhenExpanded}ch` }, children: needsToggle ? (!expanded ? (
+            // **collapsed**: use your ToggleComponent (portal-friendly)
+            _jsx(ToggleComponent, { expanded: expanded, onToggle: onToggle, truncated: truncated, fullText: fullText, className: additionalCellClassNames, linkTextClassNames: linkTextClassNames })) : (
+            // **expanded**: always use this constant layout
+            _jsxs("div", { className: "flex flex-col", style: {
                     maxWidth: `${cellMaxWidthWhenExpanded}ch`,
-                }, children: [_jsx("span", { className: "text-left pr-5", children: fullText }), _jsx("span", { ...(hasToggle
-                            ? { onClick: handleToggle }
-                            : {}), className: linkText, children: "Show less" })] }))) : (
-            /* no toggle required */
+                }, children: [_jsx("span", { className: "text-left pr-5", children: fullText }), _jsx("span", { onClick: (e) => {
+                            e.stopPropagation();
+                            onToggle();
+                        }, className: linkTextClassNames, children: "Show less" })] }))) : (
+            // no truncation needed
             cell.render("Cell")) }) }, cellKey));
 };
 export default TableCell;

package/dist/components/TableCell/TableCell.stories.d.ts

@@ -6,3 +6,4 @@ export declare const Default: any;
 export declare const CollapsedByDefault: any;
 export declare const NoExpand: any;
 export declare const LastCell: any;
+export declare const WithCustomToggle: any;

package/dist/components/TableCell/TableCell.stories.js

@@ -1,9 +1,13 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // src/components/TableCell/TableCell.stories.tsx
 import { useState } from "react";
 import TableCell from ".";
+// ----- Custom Toggle component -----
+const CustomToggle = ({ expanded, onToggle, truncated, fullText, className = "", linkTextClassNames = "text-purple-500 ml-1 underline", }) => (_jsx("button", { onClick: (e) => {
+        e.stopPropagation();
+        onToggle();
+    }, className: `px-2 py-1 border rounded ${className}`, children: expanded ? (_jsxs(_Fragment, { children: [fullText, " ", _jsx("span", { className: linkTextClassNames, children: "\u25B2 Less" })] })) : (_jsxs(_Fragment, { children: [truncated, "\u2026 ", _jsx("span", { className: linkTextClassNames, children: "\u25BC More" })] })) }));
 const sampleData = {
-    uuid: "12345",
     address: "123 Main St, Springfield, IL, 62701, United States of America — this is a very long address so we can show the expand behavior.",
 };
 /* ---------- story config ---------- */
@@ -62,3 +66,11 @@ LastCell.args = {
     isLastCell: true,
     cellExpandable: true,
 };
+export const WithCustomToggle = Template.bind({});
+WithCustomToggle.args = {
+    isLastCell: false,
+    cellExpandable: true,
+    maxCharacters: 20,
+    toggleComponent: CustomToggle,
+    hasInfiniteScroll: true,
+};

package/dist/components/TableCell/TableCell.test.js

@@ -9,6 +9,7 @@ const sampleData = {
     age: 30,
     address: "123 Main St, Springfield, IL, 62701, United States of America",
 };
+//FIXME: THIS SHOULD NOT BE ANY
 const defaultProps = {
     globalTrimActive: true,
     rowUuid: sampleData.uuid,

package/dist/components/TableCell/types.d.ts

@@ -1,14 +1,37 @@
-import { Cell } from "react-table";
 export interface DataWithUUID {
     uuid?: string;
 }
-export interface TableCellProps<T extends object> {
-    cell: Cell<T>;
+export interface ToggleProps {
+    expanded: boolean;
+    onToggle: () => void;
+    truncated: string;
+    fullText: string;
+    className?: string;
+    linkTextClassNames?: string;
+}
+export interface TableCellProps {
+    /** the react-table cell object */
+    cell: any;
+    /** is this the last column? */
     isLastCell: boolean;
+    /** do we want truncation/expand behavior? */
+    cellExpandable?: boolean;
+    /** current collapsed/expanded state */
+    expanded: boolean;
+    /** toggle callback */
+    onToggle: () => void;
+    /** text-slice length (default 30) */
+    maxCharacters?: number;
+    /** width in `ch` when expanded (default 50) */
+    cellMaxWidthWhenExpanded?: number;
+    /** background color utility (e.g. “bg-blue-50”) */
+    cellColor?: string;
+    /** extra wrapper classes */
+    additionalCellClassNames?: string;
+    /** if true, will show “Show more / Show less” */
     hasInfiniteScroll: boolean;
-    globalTrimActive?: boolean;
-    rowUuid?: string;
-    columnInputs?: string[];
-    rowHoverClasses?: string;
-    linkText?: string;
+    /** override the collapsed UI */
+    toggleComponent?: React.ComponentType<ToggleProps>;
+    /** classes for both “more” & “less” links */
+    linkTextClassNames?: string;
 }

package/dist/components/TableRow/TableRow.d.ts

@@ -1,6 +1,6 @@
 import React, { ReactNode } from "react";
 import { Row } from "react-table";
-import { DataWithUUID } from "../TableCell";
+import { DataWithUUID, ToggleProps } from "../TableCell";
 export interface TableRowProps<T extends DataWithUUID> {
     row: Row<T>;
     prepareRow: (row: Row<T>) => void;
@@ -13,12 +13,13 @@ export interface TableRowProps<T extends DataWithUUID> {
     cellExpandable?: boolean;
     expandedCells: Record<string, boolean>;
     toggleCell: (key: string) => void;
+    ToggleComponent?: React.ComponentType<ToggleProps>;
     hasDropDown?: boolean;
     onFetchRowData?: (uuid: string) => Promise<void> | void;
     loadingIndicator?: ReactNode;
     errorIndicator?: (error: Error) => ReactNode;
     expandedContent?: ReactNode;
-    linkText?: string;
+    linkTextClassNames?: string;
     rowClassNames?: string;
     maxCharacters: number;
     expandedRowUuid?: string | null;
@@ -26,6 +27,7 @@ export interface TableRowProps<T extends DataWithUUID> {
     cellColor: string;
     cellMaxWidthWhenExpanded: number;
     additionalCellClassNames: string;
+    toggleComponent?: React.ComponentType<ToggleProps>;
 }
-declare const TableRow: <T extends DataWithUUID>({ row, prepareRow, activeIndex, activeRowColor, rowHoverClasses, rowClassNames, hasInfiniteScroll, rowUuid, onRowClick, expandedCells, toggleCell, hasDropDown, onFetchRowData, loadingIndicator, errorIndicator, expandedContent, linkText, expandedRowUuid, cellExpandable, onToggleRow, maxCharacters, cellColor, cellMaxWidthWhenExpanded, additionalCellClassNames, }: TableRowProps<T>) => import("react/jsx-runtime").JSX.Element;
+declare const TableRow: <T extends DataWithUUID>({ row, prepareRow, activeIndex, activeRowColor, rowHoverClasses, rowClassNames, hasInfiniteScroll, rowUuid, onRowClick, expandedCells, toggleCell, hasDropDown, onFetchRowData, loadingIndicator, errorIndicator, expandedContent, expandedRowUuid, cellExpandable, onToggleRow, maxCharacters, cellColor, cellMaxWidthWhenExpanded, additionalCellClassNames, toggleComponent, linkTextClassNames, }: TableRowProps<T>) => import("react/jsx-runtime").JSX.Element;
 export default TableRow;

package/dist/components/TableRow/TableRow.js

@@ -3,7 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment, useState } from "react";
 import { motion, AnimatePresence } from "framer-motion";
 import TableCell from "../TableCell";
-const TableRow = ({ row, prepareRow, activeIndex, activeRowColor = "bg-pink-100", rowHoverClasses = "hover:bg-navy-100 hover:cursor-pointer", rowClassNames = "", hasInfiniteScroll, rowUuid, onRowClick, expandedCells, toggleCell, hasDropDown = false, onFetchRowData, loadingIndicator, errorIndicator, expandedContent, linkText = "text-blue-500", expandedRowUuid = null, cellExpandable = false, onToggleRow, maxCharacters = 30, cellColor = "bg-blue-50", cellMaxWidthWhenExpanded = 50, additionalCellClassNames = "", }) => {
+const TableRow = ({ row, prepareRow, activeIndex, activeRowColor = "bg-pink-100", rowHoverClasses = "hover:bg-navy-100 hover:cursor-pointer", rowClassNames = "", hasInfiniteScroll, rowUuid, onRowClick, expandedCells, toggleCell, hasDropDown = false, onFetchRowData, loadingIndicator, errorIndicator, expandedContent, expandedRowUuid = null, cellExpandable = false, onToggleRow, maxCharacters = 30, cellColor = "bg-blue-50", cellMaxWidthWhenExpanded = 50, additionalCellClassNames = "", toggleComponent = undefined, linkTextClassNames = "text-purple-500 ml-1 underline", }) => {
     prepareRow(row);
     const rowClasses = `border-primary${activeIndex === row.index ? ` activeRow ${activeRowColor}` : ""}`;
     /* keep fetch/loading local */
@@ -41,7 +41,7 @@ const TableRow = ({ row, prepareRow, activeIndex, activeRowColor = "bg-pink-100"
         : {};
     return (_jsxs(Fragment, { children: [_jsx("tr", { "data-testid": "table-row", className: `border-b border-b-navy-200 ${rowHoverClasses} ${rowClasses} ${rowClassNames}`, onClick: handleRowClick, ...safeRowProps, children: row.cells.map((cell, idx) => {
                     const cellKey = `${rowUuid ?? "no-uuid"}-${cell.column.id}`;
-                    return (_jsx(TableCell, { cell: cell, isLastCell: idx === row.cells.length - 1, hasInfiniteScroll: hasInfiniteScroll, cellExpandable: cellExpandable, rowUuid: rowUuid, expanded: expandedCells[cellKey] ?? false, onToggle: () => toggleCell(cellKey), linkText: linkText, maxCharacters: maxCharacters, cellColor: cellColor, cellMaxWidthWhenExpanded: cellMaxWidthWhenExpanded, additionalCellClassNames: additionalCellClassNames }, cellKey));
+                    return (_jsx(TableCell, { cell: cell, isLastCell: idx === row.cells.length - 1, hasInfiniteScroll: hasInfiniteScroll, cellExpandable: cellExpandable, expanded: expandedCells[cellKey] ?? false, onToggle: () => toggleCell(cellKey), linkTextClassNames: linkTextClassNames, maxCharacters: maxCharacters, cellColor: cellColor, cellMaxWidthWhenExpanded: cellMaxWidthWhenExpanded, additionalCellClassNames: additionalCellClassNames, toggleComponent: toggleComponent }, cellKey));
                 }) }, rowUuid), hasDropDown && (_jsx(AnimatePresence, { children: isExpanded && (_jsx("tr", { "data-testid": "expanded-row", children: _jsx("td", { colSpan: row.cells.length, className: "p-0", children: _jsx(motion.div, { initial: { height: 0, opacity: 0 }, animate: { height: "auto", opacity: 1 }, exit: { height: 0, opacity: 0 }, transition: { duration: 0.3 }, className: "overflow-hidden w-full", children: isLoading ? (loadingIndicator ?? (_jsx("span", { children: "Loading..." }))) : error ? (errorIndicator ? (errorIndicator(error)) : (_jsxs("span", { className: "text-red-700", children: ["Error: ", error.message] }))) : (expandedContent ?? (_jsxs("span", { children: ["drop down \u2013 ", rowUuid] }))) }, "expanded-dropdown-content") }) })) }))] }));
 };
 export default TableRow;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@agilant/toga-blox",
 	"private": false,
-	"version": "1.0.200",
+	"version": "1.0.201",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",