playbook_ui 13.18.0.pre.alpha.PBNTR191AdvancedTableFinalFixes2159 → 13.18.0.pre.alpha.PBNTR191AdvancedTableFinalFixes2173
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.
- checksums.yaml +4 -4
- data/app/pb_kits/playbook/pb_advanced_table/Components/CustomCell.tsx +4 -5
- data/app/pb_kits/playbook/pb_advanced_table/Components/SubRowHeaderRow.tsx +6 -2
- data/app/pb_kits/playbook/pb_advanced_table/SubKits/TableBody.tsx +2 -1
- data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.tsx +3 -0
- data/lib/playbook/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c50bdb2d776257482837525dcef9ac706994226966a7acc3041b81f5f9cf89e6
|
|
4
|
+
data.tar.gz: c467ed886607d31ee16abca2bdec30da5880ad8ff58798d74232f7852d6165db
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cd6efe9805a59dfd26fa143d566f107e6ab5f0435920a6ca5d7985aee7b2859b297734c319a13b1f76ba04732ca8292a24b40811b742bbd9703ae662f48217b4
|
|
7
|
+
data.tar.gz: c60068a9dcb1beebd857868a1fcbf795f9d59697ebce2de88da31fe9a7d50c7e22fd17563417676d0a806ab9e30417223095b9012a8d42e1a594673450e2c41f
|
|
@@ -22,15 +22,14 @@ export const CustomCell = ({
|
|
|
22
22
|
row,
|
|
23
23
|
value,
|
|
24
24
|
}: CustomCellProps & GlobalProps) => {
|
|
25
|
-
const { setExpanded, expanded } = useContext(AdvancedTableContext);
|
|
25
|
+
const { setExpanded, expanded, inlineRowLoading } = useContext(AdvancedTableContext);
|
|
26
26
|
|
|
27
27
|
const handleOnExpand = (row: Row<DataType>) => {
|
|
28
28
|
onRowToggleClick && onRowToggleClick(row);
|
|
29
29
|
setExpanded({ ...expanded, [row.id]: !row.getIsExpanded() });
|
|
30
30
|
};
|
|
31
|
-
|
|
32
31
|
const RowHasChildren = row.original.children ? true : false
|
|
33
|
-
|
|
32
|
+
const renderButton = inlineRowLoading ? RowHasChildren : row.getCanExpand()
|
|
34
33
|
|
|
35
34
|
return (
|
|
36
35
|
<div style={{ paddingLeft: `${row.depth * 1.25}em` }}>
|
|
@@ -38,7 +37,7 @@ export const CustomCell = ({
|
|
|
38
37
|
columnGap="xs"
|
|
39
38
|
orientation="row"
|
|
40
39
|
>
|
|
41
|
-
{
|
|
40
|
+
{renderButton ? (
|
|
42
41
|
<button
|
|
43
42
|
className="gray-icon expand-toggle-icon"
|
|
44
43
|
onClick={() => handleOnExpand(row)}
|
|
@@ -55,7 +54,7 @@ export const CustomCell = ({
|
|
|
55
54
|
)}
|
|
56
55
|
</button>
|
|
57
56
|
) : null}
|
|
58
|
-
<FlexItem paddingLeft={
|
|
57
|
+
<FlexItem paddingLeft={renderButton? "none" : "xs"}>
|
|
59
58
|
{row.depth === 0 ? getValue() : value}
|
|
60
59
|
</FlexItem>
|
|
61
60
|
</Flex>
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import React from "react"
|
|
1
|
+
import React, { useContext } from "react"
|
|
2
2
|
import Flex from "../../pb_flex/_flex"
|
|
3
3
|
import Caption from "../../pb_caption/_caption"
|
|
4
4
|
import { Row, Table } from "@tanstack/react-table"
|
|
5
5
|
|
|
6
|
+
import AdvancedTableContext from "../Context/AdvancedTableContext";
|
|
6
7
|
import { ToggleIconButton } from "./ToggleIconButton"
|
|
7
8
|
import { renderCollapsibleTrail } from "./CollapsibleTrail"
|
|
8
9
|
|
|
@@ -27,8 +28,11 @@ export const SubRowHeaderRow = ({
|
|
|
27
28
|
subRowHeaders,
|
|
28
29
|
table,
|
|
29
30
|
}: SubRowHeaderRowProps & GlobalProps) => {
|
|
31
|
+
const { inlineRowLoading } = useContext(AdvancedTableContext);
|
|
32
|
+
|
|
30
33
|
const numberOfColumns = table.getAllFlatColumns().length
|
|
31
|
-
const
|
|
34
|
+
const rowHasChildren = row.original.children ? true : false
|
|
35
|
+
const canExpand = inlineRowLoading ? rowHasChildren : row.getCanExpand()
|
|
32
36
|
|
|
33
37
|
return (
|
|
34
38
|
<tr className="custom-row bg-silver">
|
|
@@ -31,6 +31,7 @@ export const TableBody = ({
|
|
|
31
31
|
columnDefinitions,
|
|
32
32
|
enableToggleExpansion,
|
|
33
33
|
handleExpandOrCollapse,
|
|
34
|
+
inlineRowLoading,
|
|
34
35
|
loading,
|
|
35
36
|
table,
|
|
36
37
|
} = useContext(AdvancedTableContext)
|
|
@@ -51,7 +52,7 @@ export const TableBody = ({
|
|
|
51
52
|
const isFirstChildofSubrow = row.depth > 0 && row.index === 0
|
|
52
53
|
const rowHasNoChildren = row.original.children && !row.original.children.length ? true : false
|
|
53
54
|
const numberOfColumns = table.getAllFlatColumns().length
|
|
54
|
-
const isDataLoading = isExpandable && rowHasNoChildren && (row.depth < columnDefinitions[0].cellAccessors?.length)
|
|
55
|
+
const isDataLoading = isExpandable && (inlineRowLoading && rowHasNoChildren) && (row.depth < columnDefinitions[0].cellAccessors?.length)
|
|
55
56
|
|
|
56
57
|
return (
|
|
57
58
|
<React.Fragment key={`${row.index}-${row.id}-${row.depth}-row`}>
|
|
@@ -33,6 +33,7 @@ type AdvancedTableProps = {
|
|
|
33
33
|
htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
|
|
34
34
|
id?: string;
|
|
35
35
|
initialLoadingRowsCount?: number;
|
|
36
|
+
inlineRowLoading?: boolean;
|
|
36
37
|
loading?: boolean | string;
|
|
37
38
|
onRowToggleClick?: (arg: Row<DataType>) => void;
|
|
38
39
|
onToggleExpansionClick?: (arg: Row<DataType>) => void;
|
|
@@ -55,6 +56,7 @@ const AdvancedTable = (props: AdvancedTableProps) => {
|
|
|
55
56
|
htmlOptions = {},
|
|
56
57
|
id,
|
|
57
58
|
initialLoadingRowsCount = 10,
|
|
59
|
+
inlineRowLoading = false,
|
|
58
60
|
loading,
|
|
59
61
|
onRowToggleClick,
|
|
60
62
|
onToggleExpansionClick,
|
|
@@ -219,6 +221,7 @@ const AdvancedTable = (props: AdvancedTableProps) => {
|
|
|
219
221
|
enableToggleExpansion,
|
|
220
222
|
expanded,
|
|
221
223
|
handleExpandOrCollapse,
|
|
224
|
+
inlineRowLoading,
|
|
222
225
|
loading,
|
|
223
226
|
setExpanded,
|
|
224
227
|
sortControl,
|
data/lib/playbook/version.rb
CHANGED
metadata
CHANGED