@agilant/toga-blox 1.0.215 → 1.0.216
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/TableCell/TableCell.d.ts +1 -1
- package/dist/components/TableCell/TableCell.js +2 -2
- package/dist/components/TableCell/types.d.ts +3 -1
- package/dist/components/TableRow/TableRow.d.ts +2 -1
- package/dist/components/TableRow/TableRow.js +2 -2
- package/dist/components/TableRow/TableRow.stories.js +2 -2
- package/dist/components/TableRow/TableRow.test.js +5 -5
- package/package.json +1 -1
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { TableCellProps } from "./types";
|
|
2
|
-
declare const TableCell: ({ cell, isLastCell, expanded, onToggle, maxCharacters, cellMaxWidthWhenExpanded, cellColor, additionalCellClassNames, toggleComponent: ToggleComponent, cellExpandable, linkTextClassNames, cellTextClassNames, onCellOverflow, }: TableCellProps) => import("react/jsx-runtime").JSX.Element;
|
|
2
|
+
declare const TableCell: ({ cell, isLastCell, expanded, onToggle, maxCharacters, cellMaxWidthWhenExpanded, cellColor, additionalCellClassNames, toggleComponent: ToggleComponent, cellExpandable, linkTextClassNames, cellTextClassNames, onCellOverflow, expandedCellActionButton, }: TableCellProps) => import("react/jsx-runtime").JSX.Element;
|
|
3
3
|
export default TableCell;
|
|
@@ -8,7 +8,7 @@ const DefaultCollapsedToggle = ({ onToggle, truncated, className = "", linkTextC
|
|
|
8
8
|
e.stopPropagation();
|
|
9
9
|
onToggle();
|
|
10
10
|
}, children: _jsxs("span", { children: [truncated, "\u2026", _jsx("span", { className: `hidden group-hover:inline text-purple-500 ml-1 underline ${linkTextClassNames}`, children: "Show more" })] }) }));
|
|
11
|
-
const TableCell = ({ cell, isLastCell, 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", cellTextClassNames = "", onCellOverflow = () => { }, }) => {
|
|
11
|
+
const TableCell = ({ cell, isLastCell, 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", cellTextClassNames = "", onCellOverflow = () => { }, expandedCellActionButton = (_jsx("span", { className: "text-blue-500", children: "Action button here" })), }) => {
|
|
12
12
|
const prev = useRef();
|
|
13
13
|
// --- truncation logic ---
|
|
14
14
|
const isString = typeof cell.value === "string";
|
|
@@ -40,7 +40,7 @@ const TableCell = ({ cell, isLastCell, expanded, onToggle, maxCharacters = DEFAU
|
|
|
40
40
|
}, [needsToggle, onCellOverflow]);
|
|
41
41
|
return (_jsx("td", { ...safeCellProps, className: isStickyColumn ? undefined : isLastCell ? "" : baseTd, children: _jsx("div", { className: wrapper, style: { maxWidth: `${cellMaxWidthWhenExpanded}ch` }, children: needsToggle ? (!expanded ? (_jsx(ToggleComponent, { expanded: expanded, onToggle: onToggle, truncated: truncated, fullText: fullText, className: additionalCellClassNames, linkTextClassNames: linkTextClassNames })) : (_jsxs("div", { className: "flex flex-col min-w-full", style: {
|
|
42
42
|
maxWidth: `${cellMaxWidthWhenExpanded}ch`,
|
|
43
|
-
}, children: [_jsx("span", { className: `text-left pr-5 ${cellTextClassNames}`, children: fullText }), _jsx("span", { onClick: (e) => {
|
|
43
|
+
}, children: [_jsx("span", { className: `text-left pr-5 ${cellTextClassNames}`, children: fullText }), _jsx("span", { children: expandedCellActionButton }), _jsx("span", { onClick: (e) => {
|
|
44
44
|
e.stopPropagation();
|
|
45
45
|
onToggle();
|
|
46
46
|
}, className: linkTextClassNames, children: "Show less" })] }))) : (cell.render("Cell")) }) }, cellKey));
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ComponentType, ReactNode } from "react";
|
|
1
2
|
export interface DataWithUUID {
|
|
2
3
|
uuid?: string;
|
|
3
4
|
}
|
|
@@ -31,9 +32,10 @@ export interface TableCellProps {
|
|
|
31
32
|
/** if true, will show “Show more / Show less” */
|
|
32
33
|
hasInfiniteScroll: boolean;
|
|
33
34
|
/** override the collapsed UI */
|
|
34
|
-
toggleComponent?:
|
|
35
|
+
toggleComponent?: ComponentType<ToggleProps>;
|
|
35
36
|
/** classes for both “more” & “less” links */
|
|
36
37
|
linkTextClassNames?: string;
|
|
37
38
|
cellTextClassNames: string;
|
|
38
39
|
onCellOverflow?: (isOverflowing: boolean) => void;
|
|
40
|
+
expandedCellActionButton?: ReactNode;
|
|
39
41
|
}
|
|
@@ -30,6 +30,7 @@ export interface TableRowProps<T extends DataWithUUID> extends HTMLAttributes<HT
|
|
|
30
30
|
additionalCellClassNames: string;
|
|
31
31
|
toggleComponent?: React.ComponentType<ToggleProps>;
|
|
32
32
|
onRowOverflow?: (rowUuid: string, hasOverflow: boolean) => void;
|
|
33
|
+
expandedCellActionButton: ReactNode;
|
|
33
34
|
}
|
|
34
|
-
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, cellTextClassNames, onRowOverflow, }: TableRowProps<T>) => import("react/jsx-runtime").JSX.Element;
|
|
35
|
+
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, cellTextClassNames, onRowOverflow, expandedCellActionButton, }: TableRowProps<T>) => import("react/jsx-runtime").JSX.Element;
|
|
35
36
|
export default TableRow;
|
|
@@ -3,7 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
3
3
|
import { Fragment, useState, useCallback, } from "react";
|
|
4
4
|
import { motion, AnimatePresence } from "framer-motion";
|
|
5
5
|
import TableCell from "../TableCell";
|
|
6
|
-
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 = "", cellTextClassNames = "", onRowOverflow = () => { }, }) => {
|
|
6
|
+
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 = "", cellTextClassNames = "", onRowOverflow = () => { }, expandedCellActionButton, }) => {
|
|
7
7
|
prepareRow(row);
|
|
8
8
|
const rowClasses = `border-primary${activeIndex === row.index ? ` activeRow ${activeRowColor}` : ""}`;
|
|
9
9
|
const [overflowMap, setOverflowMap] = useState({});
|
|
@@ -51,7 +51,7 @@ const TableRow = ({ row, prepareRow, activeIndex, activeRowColor = "bg-pink-100"
|
|
|
51
51
|
: {};
|
|
52
52
|
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) => {
|
|
53
53
|
const cellKey = `${rowUuid ?? "no-uuid"}-${cell.column.id}`;
|
|
54
|
-
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, cellTextClassNames: cellTextClassNames, onCellOverflow: (isOverflowing) => handleOverflow(cellKey, isOverflowing) }, cellKey));
|
|
54
|
+
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, cellTextClassNames: cellTextClassNames, onCellOverflow: (isOverflowing) => handleOverflow(cellKey, isOverflowing), expandedCellActionButton: expandedCellActionButton }, cellKey));
|
|
55
55
|
}) }, 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") }) })) }))] }));
|
|
56
56
|
};
|
|
57
57
|
export default TableRow;
|
|
@@ -102,7 +102,7 @@ const Template = (args) => {
|
|
|
102
102
|
// ── **new** single-row expansion state ──
|
|
103
103
|
const [expandedRowUuid, setExpandedRowUuid] = React.useState(null);
|
|
104
104
|
const onToggleRow = React.useCallback((uuid) => setExpandedRowUuid((prev) => (prev === uuid ? null : uuid)), []);
|
|
105
|
-
return (_jsxs(_Fragment, { children: [_jsxs("div", { style: { marginBottom: 12 }, children: ["\uD83D\uDEA8 Row overflow?", " ", _jsx("strong", { children: rowHasOverflow ? "YES" : "no" })] }), _jsx("table", { className: "min-w-[700px]", children: _jsx("tbody", { children: _jsx(TableRow, { additionalCellClassNames: "", cellColor: "", cellMaxWidthWhenExpanded: 0, row: undefined, prepareRow: function (row) {
|
|
105
|
+
return (_jsxs(_Fragment, { children: [_jsxs("div", { style: { marginBottom: 12 }, children: ["\uD83D\uDEA8 Row overflow?", " ", _jsx("strong", { children: rowHasOverflow ? "YES" : "no" })] }), _jsx("table", { className: "min-w-[700px]", children: _jsx("tbody", { children: _jsx(TableRow, { expandedCellActionButton: "", additionalCellClassNames: "", cellColor: "", cellMaxWidthWhenExpanded: 0, row: undefined, prepareRow: function (row) {
|
|
106
106
|
throw new Error("Function not implemented.");
|
|
107
107
|
}, ...args, expandedCells: expandedCells, toggleCell: toggleCell, hasInfiniteScroll: args.hasInfiniteScroll ?? true, onRowClick: args.onRowClick ?? (() => alert("from row")), expandedRowUuid: expandedRowUuid, onToggleRow: onToggleRow, maxCharacters: 30, onRowOverflow: (_uuid, anyOverflow) => {
|
|
108
108
|
console.log("onRowOverflow:", anyOverflow);
|
|
@@ -134,7 +134,7 @@ export const MultipleRows = () => {
|
|
|
134
134
|
const toggleCell = React.useCallback((key) => setExpandedCells((s) => ({ ...s, [key]: !s[key] })), []);
|
|
135
135
|
const [expandedRowUuid, setExpandedRowUuid] = React.useState(null);
|
|
136
136
|
const onToggleRow = React.useCallback((uuid) => setExpandedRowUuid((prev) => (prev === uuid ? null : uuid)), []);
|
|
137
|
-
return (_jsx("table", { className: "min-w-[700px]", children: _jsxs("tbody", { children: [_jsx(TableRow, { row: mockRow, prepareRow: prepareRow, hasInfiniteScroll: true, onRowClick: () => alert("from row"), hasDropDown: true, rowUuid: "1", expandedContent: sampleData.expandedContent, expandedCells: expandedCells, toggleCell: toggleCell, expandedRowUuid: expandedRowUuid, onToggleRow: onToggleRow, maxCharacters: 30, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", cellExpandable: true }), _jsx(TableRow, { row: mockRow2, prepareRow: prepareRow, hasInfiniteScroll: true, onRowClick: () => alert("from row"), hasDropDown: false, rowUuid: "2", expandedContent: sampleData.expandedContent, expandedCells: expandedCells, toggleCell: toggleCell, expandedRowUuid: expandedRowUuid, onToggleRow: onToggleRow, cellExpandable: true, maxCharacters: 30, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "" })] }) }));
|
|
137
|
+
return (_jsx("table", { className: "min-w-[700px]", children: _jsxs("tbody", { children: [_jsx(TableRow, { row: mockRow, prepareRow: prepareRow, hasInfiniteScroll: true, onRowClick: () => alert("from row"), hasDropDown: true, rowUuid: "1", expandedContent: sampleData.expandedContent, expandedCells: expandedCells, toggleCell: toggleCell, expandedRowUuid: expandedRowUuid, onToggleRow: onToggleRow, maxCharacters: 30, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", cellExpandable: true, expandedCellActionButton: "" }), _jsx(TableRow, { row: mockRow2, prepareRow: prepareRow, hasInfiniteScroll: true, onRowClick: () => alert("from row"), hasDropDown: false, rowUuid: "2", expandedContent: sampleData.expandedContent, expandedCells: expandedCells, toggleCell: toggleCell, expandedRowUuid: expandedRowUuid, onToggleRow: onToggleRow, cellExpandable: true, maxCharacters: 30, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", expandedCellActionButton: "" })] }) }));
|
|
138
138
|
};
|
|
139
139
|
export const WithCustomToggle = Template.bind({});
|
|
140
140
|
WithCustomToggle.args = {
|
|
@@ -25,7 +25,7 @@ describe("TableRow - Branch Coverage Tests", () => {
|
|
|
25
25
|
throw new Error("Function not implemented.");
|
|
26
26
|
}, expandedCells: undefined, toggleCell: function (key) {
|
|
27
27
|
throw new Error("Function not implemented.");
|
|
28
|
-
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "" }) }) }));
|
|
28
|
+
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", expandedCellActionButton: "" }) }) }));
|
|
29
29
|
expect(screen.getByTestId("table-row")).toHaveClass("activeRow");
|
|
30
30
|
});
|
|
31
31
|
it("covers isActive = false (row is NOT active)", () => {
|
|
@@ -33,14 +33,14 @@ describe("TableRow - Branch Coverage Tests", () => {
|
|
|
33
33
|
throw new Error("Function not implemented.");
|
|
34
34
|
}, expandedCells: undefined, toggleCell: function (key) {
|
|
35
35
|
throw new Error("Function not implemented.");
|
|
36
|
-
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "" }) }) }));
|
|
36
|
+
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", expandedCellActionButton: "" }) }) }));
|
|
37
37
|
expect(screen.getByTestId("table-row")).not.toHaveClass("activeRow");
|
|
38
38
|
});
|
|
39
39
|
it("covers onRowClick = defined + rowUuid = provided", () => {
|
|
40
40
|
const mockOnRowClick = vi.fn();
|
|
41
41
|
render(_jsx("table", { children: _jsx("tbody", { children: _jsx(TableRow, { row: baseMockRow, prepareRow: mockPrepareRow, onRowClick: mockOnRowClick, rowUuid: "some-uuid", hasInfiniteScroll: false, expandedCells: undefined, toggleCell: function (key) {
|
|
42
42
|
throw new Error("Function not implemented.");
|
|
43
|
-
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "" }) }) }));
|
|
43
|
+
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", expandedCellActionButton: "" }) }) }));
|
|
44
44
|
fireEvent.click(screen.getByTestId("table-row"));
|
|
45
45
|
expect(mockOnRowClick).toHaveBeenCalledWith(baseMockRow.index, // 0
|
|
46
46
|
"some-uuid", expect.anything() // Synthetic event
|
|
@@ -50,7 +50,7 @@ describe("TableRow - Branch Coverage Tests", () => {
|
|
|
50
50
|
const mockOnRowClick = vi.fn();
|
|
51
51
|
render(_jsx("table", { children: _jsx("tbody", { children: _jsx(TableRow, { row: baseMockRow, prepareRow: mockPrepareRow, onRowClick: mockOnRowClick, hasInfiniteScroll: false, expandedCells: undefined, toggleCell: function (key) {
|
|
52
52
|
throw new Error("Function not implemented.");
|
|
53
|
-
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "" }) }) }));
|
|
53
|
+
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", expandedCellActionButton: "" }) }) }));
|
|
54
54
|
fireEvent.click(screen.getByTestId("table-row"));
|
|
55
55
|
expect(mockOnRowClick).toHaveBeenCalledWith(baseMockRow.index, // 0
|
|
56
56
|
"", expect.anything());
|
|
@@ -60,7 +60,7 @@ describe("TableRow - Branch Coverage Tests", () => {
|
|
|
60
60
|
throw new Error("Function not implemented.");
|
|
61
61
|
}, expandedCells: undefined, toggleCell: function (key) {
|
|
62
62
|
throw new Error("Function not implemented.");
|
|
63
|
-
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "" }) }) }));
|
|
63
|
+
}, maxCharacters: 0, cellColor: "", cellMaxWidthWhenExpanded: 0, additionalCellClassNames: "", expandedCellActionButton: "" }) }) }));
|
|
64
64
|
// onRowClick not provided; just ensure no crash
|
|
65
65
|
fireEvent.click(screen.getByTestId("table-row"));
|
|
66
66
|
});
|