playbook_ui 14.21.2.pre.alpha.PLAY2046advancedtableinfinitescroll8311 → 14.21.2.pre.alpha.PLAY21318324

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.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/app/pb_kits/playbook/pb_advanced_table/Components/CustomCell.tsx +4 -1
  3. data/app/pb_kits/playbook/pb_advanced_table/Components/RegularTableView.tsx +8 -0
  4. data/app/pb_kits/playbook/pb_advanced_table/Components/VirtualizedTableView.tsx +16 -36
  5. data/app/pb_kits/playbook/pb_advanced_table/Context/AdvancedTableContext.tsx +5 -18
  6. data/app/pb_kits/playbook/pb_advanced_table/Hooks/useTableActions.ts +17 -37
  7. data/app/pb_kits/playbook/pb_advanced_table/Hooks/useTableState.ts +5 -2
  8. data/app/pb_kits/playbook/pb_advanced_table/SubKits/TableBody.tsx +0 -3
  9. data/app/pb_kits/playbook/pb_advanced_table/SubKits/TableHeader.tsx +40 -91
  10. data/app/pb_kits/playbook/pb_advanced_table/Utilities/CellRendererUtils.tsx +4 -1
  11. data/app/pb_kits/playbook/pb_advanced_table/Utilities/TableContainerStyles.ts +2 -3
  12. data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.scss +4 -32
  13. data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.tsx +22 -32
  14. data/app/pb_kits/playbook/pb_advanced_table/advanced_table.test.jsx +15 -10
  15. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_row_styling.jsx +64 -0
  16. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_row_styling.md +7 -0
  17. data/app/pb_kits/playbook/pb_advanced_table/docs/example.yml +1 -1
  18. data/app/pb_kits/playbook/pb_advanced_table/docs/index.js +1 -1
  19. data/dist/chunks/{_typeahead-CVIBi3oA.js → _typeahead-CoOpeYom.js} +2 -2
  20. data/dist/chunks/_weekday_stacked-BPs62iuT.js +45 -0
  21. data/dist/chunks/vendor.js +1 -1
  22. data/dist/playbook-doc.js +1 -1
  23. data/dist/playbook-rails-react-bindings.js +1 -1
  24. data/dist/playbook-rails.js +1 -1
  25. data/dist/playbook.css +1 -1
  26. data/lib/playbook/version.rb +1 -1
  27. metadata +5 -4
  28. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_infinite_scroll.md +0 -3
  29. data/dist/chunks/_weekday_stacked-BQMmOtHu.js +0 -45
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ff6f2ffd365bc785eabd3d26506006d648d5353d29703d1438ec13934616b6da
4
- data.tar.gz: c79e396049a40aaa0870f9dc63b13ba23114b5bca74ebdff62a50b39f2d0b38d
3
+ metadata.gz: c17abab576d5fd7c20055de8ccd116937d25c593db8bd741469855415781fe06
4
+ data.tar.gz: e8150dced7379d9fd97511d3bcbd847b12af8efde286c5810cbfb7a9e656428f
5
5
  SHA512:
6
- metadata.gz: ae4f14ebac10eb7eb532eff6fb6e0a23ce8cac504dd8b453f7cd1b2ea4c9e84dcf33e71b3db450066462572ec04d267b14634ccab4d5fba49c69562282e6749f
7
- data.tar.gz: ac1549a024fafdde85b0ee20ce253f7ea605b480213b540787e81d45fefb5c0b97e1a92caca434cad64fcf262c4426a03f00baba1ea46b0299c67133bde3d934
6
+ metadata.gz: fec56b58208ddb3cc23e1c614ce43c8ab9bb05e47ed8f2c7a28e4aa851d2e5a1155177229fddca90ecad1950e34729f1b76a9fcae01f407e88841b54d6b47180
7
+ data.tar.gz: ec52041b049419fd5027839e93e67beb4f006fdfb7dfef230fa9f7d9c6a94f8d6251d4dec33b91afa21aeab56295284229d0bcc55be40c828498f7a845823981
@@ -19,6 +19,7 @@ interface CustomCellProps {
19
19
  value?: string
20
20
  customRenderer?: (row: Row<GenericObject>, value: string | undefined) => React.ReactNode
21
21
  selectableRows?: boolean
22
+ customStyle?: GenericObject
22
23
  }
23
24
 
24
25
  export const CustomCell = ({
@@ -28,6 +29,7 @@ export const CustomCell = ({
28
29
  value,
29
30
  customRenderer,
30
31
  selectableRows,
32
+ customStyle = {},
31
33
  }: CustomCellProps & GlobalProps) => {
32
34
  const { setExpanded, expanded, expandedControl, inlineRowLoading, hasAnySubRows } = useContext(AdvancedTableContext);
33
35
 
@@ -43,7 +45,7 @@ export const CustomCell = ({
43
45
  const renderButton = inlineRowLoading ? RowHasChildren : row.getCanExpand()
44
46
 
45
47
  return (
46
- <div style={{ paddingLeft: `${row.depth * 1.25}em` }}>
48
+ <div style={{ paddingLeft: `${row.depth * 1.25}em`}}>
47
49
  <Flex
48
50
  alignItems="center"
49
51
  columnGap="xs"
@@ -65,6 +67,7 @@ export const CustomCell = ({
65
67
  <button
66
68
  className="gray-icon expand-toggle-icon"
67
69
  onClick={() => handleOnExpand(row)}
70
+ style={{ color: customStyle?.expandButtonColor }}
68
71
  >
69
72
  {row.getIsExpanded() ? (
70
73
  <Icon cursor="pointer"
@@ -27,6 +27,7 @@ const TableCellRenderer = ({
27
27
  loading = false,
28
28
  stickyLeftColumn,
29
29
  columnPinning,
30
+ customRowStyle,
30
31
  columnDefinitions,
31
32
  }: {
32
33
  row: Row<GenericObject>
@@ -34,6 +35,7 @@ const TableCellRenderer = ({
34
35
  loading?: boolean | string
35
36
  stickyLeftColumn?: string[]
36
37
  columnPinning: { left: string[] }
38
+ customRowStyle?: GenericObject
37
39
  columnDefinitions?: {[key:string]:any}[]
38
40
  }) => {
39
41
  return (
@@ -74,6 +76,8 @@ const TableCellRenderer = ({
74
76
  ? '180px'
75
77
  : `${column.getStart("left")}px`
76
78
  : undefined,
79
+ backgroundColor: i === 0 && customRowStyle?.backgroundColor,
80
+ color: customRowStyle?.fontColor,
77
81
  }}
78
82
  >
79
83
  {collapsibleTrail && i === 0 && row.depth > 0 && renderCollapsibleTrail(row.depth)}
@@ -107,6 +111,7 @@ export const RegularTableView = ({
107
111
  pinnedRows,
108
112
  headerHeight,
109
113
  rowHeight,
114
+ rowStyling = [],
110
115
  sampleRowRef,
111
116
  } = useContext(AdvancedTableContext)
112
117
 
@@ -171,6 +176,7 @@ export const RegularTableView = ({
171
176
  const rowBackground = isExpandable && ((!inlineRowLoading && row.getCanExpand()) || (inlineRowLoading && rowHasNoChildren));
172
177
  const rowColor = row.getIsSelected() ? "bg-row-selection" : rowBackground ? "bg-silver" : "bg-white";
173
178
  const isFirstRegularRow = rowIndex === 0 && !row.getIsPinned();
179
+ const customRowStyle = rowStyling?.length > 0 && rowStyling?.find((s: GenericObject) => s?.rowId === row.id);
174
180
 
175
181
  return (
176
182
  <React.Fragment key={`${row.index}-${row.id}-${row.depth}-row`}>
@@ -189,6 +195,7 @@ export const RegularTableView = ({
189
195
  className={`${rowColor} ${row.depth > 0 ? `depth-sub-row-${row.depth}` : ""}`}
190
196
  id={`${row.index}-${row.id}-${row.depth}-row`}
191
197
  ref={isFirstRegularRow ? sampleRowRef : null}
198
+ style={{backgroundColor: customRowStyle?.backgroundColor, color: customRowStyle?.fontColor}}
192
199
  >
193
200
  {/* Render custom checkbox column when we want selectableRows for non-expanding tables */}
194
201
  {selectableRows && !hasAnySubRows && (
@@ -206,6 +213,7 @@ export const RegularTableView = ({
206
213
  collapsibleTrail={collapsibleTrail}
207
214
  columnDefinitions={columnDefinitions}
208
215
  columnPinning={columnPinning}
216
+ customRowStyle={customRowStyle}
209
217
  loading={loading}
210
218
  row={row}
211
219
  stickyLeftColumn={stickyLeftColumn}
@@ -1,6 +1,6 @@
1
- import React, { useContext, useLayoutEffect, useState, useEffect, useRef } from "react"
1
+ import React, { useContext, useLayoutEffect, useState, useEffect } from "react"
2
2
  import classnames from "classnames"
3
- import { flexRender, Cell, Row } from "@tanstack/react-table"
3
+ import { flexRender, Cell } from "@tanstack/react-table"
4
4
  import { VirtualItem } from "@tanstack/react-virtual"
5
5
 
6
6
  import { GenericObject } from "../../types"
@@ -10,8 +10,6 @@ import { getVirtualizedRowStyle } from "../Utilities/TableContainerStyles"
10
10
 
11
11
  import LoadingInline from "../../pb_loading_inline/_loading_inline"
12
12
  import Checkbox from "../../pb_checkbox/_checkbox"
13
- import Detail from "../../pb_detail/_detail"
14
- import Flex from "../../pb_flex/_flex"
15
13
 
16
14
  import { SubRowHeaderRow } from "../Components/SubRowHeaderRow"
17
15
  import { LoadingCell } from "../Components/LoadingCell"
@@ -22,13 +20,11 @@ import AdvancedTableContext from "../Context/AdvancedTableContext"
22
20
  type VirtualizedTableViewProps = {
23
21
  collapsibleTrail?: boolean
24
22
  subRowHeaders?: string[]
25
- isFetching: boolean
26
23
  }
27
24
 
28
25
  export const VirtualizedTableView = ({
29
26
  collapsibleTrail = true,
30
27
  subRowHeaders,
31
- isFetching,
32
28
  }: VirtualizedTableViewProps) => {
33
29
  const {
34
30
  enableToggleExpansion,
@@ -40,7 +36,6 @@ export const VirtualizedTableView = ({
40
36
  hasAnySubRows,
41
37
  virtualizer,
42
38
  flattenedItems,
43
- totalAvailableCount,
44
39
  } = useContext(AdvancedTableContext)
45
40
 
46
41
  const columnPinning = table.getState().columnPinning || { left: [] };
@@ -126,7 +121,19 @@ export const VirtualizedTableView = ({
126
121
  }
127
122
 
128
123
  // Get virtual items
129
- const virtualItems: VirtualItem[] = virtualizer.getVirtualItems?.() || [];
124
+ let virtualItems: VirtualItem[] = [];
125
+ try {
126
+ virtualItems = virtualizer.getVirtualItems();
127
+ } catch (err) {
128
+ return (
129
+ <tr>
130
+ <td colSpan={table.getAllFlatColumns().length || 1}>
131
+ Error loading virtualized data.
132
+ </td>
133
+ </tr>
134
+ );
135
+ }
136
+
130
137
  if (!virtualItems.length) {
131
138
  return (
132
139
  <tr>
@@ -136,9 +143,6 @@ export const VirtualizedTableView = ({
136
143
  </tr>
137
144
  );
138
145
  }
139
-
140
- // Establish # of Parent Rows (so that Footer count does not include every single row)
141
- const topLevelRowCount = table.getRowModel().flatRows.filter((row: Row<GenericObject>) => row.depth === 0).length;
142
146
 
143
147
  return (
144
148
  <>
@@ -173,7 +177,7 @@ export const VirtualizedTableView = ({
173
177
  if (item.type === 'row') {
174
178
  const row = item.row;
175
179
  const isExpandable = row.getIsExpanded();
176
- const rowHasNoChildren = row.original?.children && !row.original.children.length;
180
+ const rowHasNoChildren = row.original?.children && !row.original.children.length ? true : false;
177
181
  const rowBackground = isExpandable && ((!inlineRowLoading && row.getCanExpand()) || (inlineRowLoading && rowHasNoChildren));
178
182
  const rowColor = row.getIsSelected() ? "bg-row-selection" : rowBackground ? "bg-silver" : "bg-white";
179
183
 
@@ -262,30 +266,6 @@ export const VirtualizedTableView = ({
262
266
  );
263
267
  }
264
268
 
265
- if (item.type === 'footer') {
266
- // Render footer
267
- return (
268
- <tr
269
- className="virtualized-table-row virtualized-footer"
270
- key={`footer-row`}
271
- style={virtualItemStyle}
272
- >
273
- <td colSpan={table.getAllFlatColumns().length}>
274
- <Flex align="center"
275
- justify="center"
276
- >
277
-
278
- {isFetching ? (
279
- <LoadingInline />
280
- ) : (
281
- <Detail text={`Showing ${topLevelRowCount} of ${totalAvailableCount} rows`} />
282
- )}
283
- </Flex>
284
- </td>
285
- </tr>
286
- )
287
- }
288
-
289
269
  return null;
290
270
  })}
291
271
  </>
@@ -8,7 +8,7 @@ import { getRowHeightEstimate } from '../Utilities/TableContainerStyles';
8
8
  const AdvancedTableContext = createContext<any>({});
9
9
 
10
10
  interface FlattenedItem {
11
- type: 'header' | 'row' | 'loading' | 'footer';
11
+ type: 'header' | 'row' | 'loading';
12
12
  row: Row<GenericObject>;
13
13
  id: string;
14
14
  }
@@ -116,17 +116,6 @@ export const AdvancedTableProvider = ({ children, ...props }: {
116
116
  }
117
117
  });
118
118
 
119
- const isFetching = props.isFetching || false;
120
- const shouldAddFooter = table && !isFetching && tableRows.length > 0
121
-
122
- if (shouldAddFooter) {
123
- items.push({
124
- type: 'footer',
125
- row: {} as Row<GenericObject>,
126
- id: `footer-row`,
127
- });
128
- }
129
-
130
119
  return items;
131
120
  }, [
132
121
  isVirtualized,
@@ -170,11 +159,10 @@ export const AdvancedTableProvider = ({ children, ...props }: {
170
159
  useEffect(() => {
171
160
  if (isVirtualized && virtualizer && table && containerRef.current) {
172
161
  // Force recalculation of all virtual items
173
- virtualizer.setOptions({
174
- ...virtualizer.options,
175
- count: flattenedItems.length,
176
- });
177
162
  virtualizer.measure();
163
+
164
+ // Reset scroll position when sorting changes
165
+ containerRef.current.scrollTop = 0;
178
166
  }
179
167
  }, [
180
168
  isVirtualized,
@@ -182,8 +170,7 @@ export const AdvancedTableProvider = ({ children, ...props }: {
182
170
  table,
183
171
  containerRef,
184
172
  JSON.stringify(table?.getState().sorting || []),
185
- JSON.stringify(table?.getState().expanded || {}),
186
- flattenedItems.length,
173
+ JSON.stringify(table?.getState().expanded || {})
187
174
  ]);
188
175
 
189
176
  const contextValue = {
@@ -1,4 +1,4 @@
1
- import { useCallback, useEffect, useRef, useState } from "react";
1
+ import { useCallback, useEffect } from 'react';
2
2
  import { Row, RowPinningState } from "@tanstack/react-table";
3
3
  import { GenericObject } from "../../types";
4
4
  import { updateExpandAndCollapseState } from "../Utilities/ExpansionControlHelpers";
@@ -19,21 +19,13 @@ export function useTableActions({
19
19
  onRowSelectionChange
20
20
  }: UseTableActionsProps) {
21
21
 
22
- // State to achieve 1 second delay before fetching more rows
23
- const [bottomReached, setBottomReached] = useState(false)
24
- const bottomTimeout = useRef<NodeJS.Timeout | null>(null)
25
-
26
22
  // Handle expand/collapse
27
23
  const handleExpandOrCollapse = useCallback(async (row: Row<GenericObject>) => {
28
- if (onToggleExpansionClick) onToggleExpansionClick(row)
29
- const updatedExpandedState = await updateExpandAndCollapseState(
30
- table.getRowModel(),
31
- expanded,
32
- row?.parentId,
33
- undefined
34
- )
35
-
36
- setExpanded(updatedExpandedState)
24
+ onToggleExpansionClick && onToggleExpansionClick(row);
25
+ const expandedState = expanded;
26
+ const targetParent = row?.parentId;
27
+ const updatedRows = await updateExpandAndCollapseState(table.getRowModel(), expandedState, targetParent, undefined);
28
+ setExpanded(updatedRows);
37
29
  }, [expanded, setExpanded, onToggleExpansionClick, table]);
38
30
 
39
31
  // Handle pagination
@@ -43,32 +35,20 @@ export function useTableActions({
43
35
 
44
36
  // Handle scroll detection for infinite scroll/virtualization
45
37
  const fetchMoreOnBottomReached = useCallback((
46
- containerRef: HTMLDivElement | null,
47
- fetchNextPage: () => void,
48
- isFetching: boolean,
49
- totalFetched: number,
50
- totalDBRowCount: number
38
+ containerRefElement: HTMLDivElement | null,
39
+ fetchNextPage: () => void,
40
+ isFetching: boolean,
41
+ totalFetched: number,
42
+ totalDBRowCount: number
51
43
  ) => {
52
- if (!containerRef || isFetching || totalFetched >= totalDBRowCount) return
53
- const { scrollTop, scrollHeight, clientHeight } = containerRef
54
- const distanceFromBottom = scrollHeight - scrollTop - clientHeight
55
- // If user scrolls near bottom, fetch more data after 1 second delay
56
- if (distanceFromBottom < 50) {
57
- if (!bottomReached) {
58
- setBottomReached(true)
59
- bottomTimeout.current = setTimeout(() => {
60
- fetchNextPage()
61
- setBottomReached(false)
62
- }, 1000)
63
- }
64
- } else {
65
- setBottomReached(false)
66
- if (bottomTimeout.current) {
67
- clearTimeout(bottomTimeout.current)
68
- bottomTimeout.current = null
44
+ if (containerRefElement) {
45
+ const { scrollHeight, scrollTop, clientHeight } = containerRefElement;
46
+ // If user scrolls near bottom, fetch more data
47
+ if (scrollHeight - scrollTop - clientHeight < 500 && !isFetching && totalFetched < totalDBRowCount) {
48
+ fetchNextPage();
69
49
  }
70
50
  }
71
- },[bottomReached]);
51
+ }, []);
72
52
 
73
53
  // Update selection state
74
54
  useEffect(() => {
@@ -32,6 +32,7 @@ interface UseTableStateProps {
32
32
  tableOptions?: GenericObject;
33
33
  onRowSelectionChange?: (arg: RowSelectionState) => void;
34
34
  columnVisibilityControl?: GenericObject;
35
+ rowStyling?: GenericObject;
35
36
  }
36
37
 
37
38
  export function useTableState({
@@ -49,6 +50,7 @@ export function useTableState({
49
50
  tableOptions,
50
51
  columnVisibilityControl,
51
52
  pinnedRows,
53
+ rowStyling
52
54
  }: UseTableStateProps) {
53
55
  // Create a local state for expanded and setExpanded if expandedControl not used
54
56
  const [localExpanded, setLocalExpanded] = useState({});
@@ -102,7 +104,8 @@ export function useTableState({
102
104
  column.customRenderer,
103
105
  isFirstColumn,
104
106
  onRowToggleClick,
105
- selectableRows
107
+ selectableRows,
108
+ rowStyling
106
109
  );
107
110
  }
108
111
 
@@ -165,7 +168,7 @@ export function useTableState({
165
168
  enableSortingRemoval: false,
166
169
  sortDescFirst: true,
167
170
  onRowSelectionChange: setRowSelection,
168
- getRowId: (selectableRows || pinnedRows) ? row => row.id : undefined,
171
+ getRowId: (selectableRows || pinnedRows || rowStyling) ? row => row.id : undefined,
169
172
  onColumnVisibilityChange: setColumnVisibility,
170
173
  meta: {
171
174
  columnDefinitions
@@ -16,7 +16,6 @@ type TableBodyProps = {
16
16
  dark?: boolean
17
17
  id?: string
18
18
  subRowHeaders?: string[]
19
- isFetching: boolean
20
19
  }
21
20
 
22
21
  export const TableBody = ({
@@ -25,7 +24,6 @@ export const TableBody = ({
25
24
  dark = false,
26
25
  id,
27
26
  subRowHeaders,
28
- isFetching,
29
27
  ...props
30
28
  }: TableBodyProps) => {
31
29
 
@@ -65,7 +63,6 @@ export const TableBody = ({
65
63
  // Virtualized table view
66
64
  <VirtualizedTableView
67
65
  collapsibleTrail={collapsibleTrail}
68
- isFetching={isFetching}
69
66
  subRowHeaders={subRowHeaders}
70
67
  />
71
68
  ) : (
@@ -40,13 +40,9 @@ export const TableHeader = ({
40
40
  showActionsBar,
41
41
  selectableRows,
42
42
  responsive,
43
- headerRef,
44
- virtualizedRows,
45
- enableVirtualization,
43
+ headerRef
46
44
  } = useContext(AdvancedTableContext)
47
45
 
48
- const isVirtualized = virtualizedRows || enableVirtualization;
49
-
50
46
  const classes = classnames(
51
47
  buildCss("pb_advanced_table_header"),
52
48
  globalProps(props),
@@ -61,93 +57,46 @@ export const TableHeader = ({
61
57
  `${isChrome() ? "chrome-styles" : ""}`,
62
58
  `${responsive === "scroll" && "pinned-left"}`,
63
59
  );
64
-
65
- const renderRegularTableHeader = () => (
66
- <thead className={classes}
67
- id={id}
68
- >
69
- {table.getHeaderGroups().map((headerGroup: HeaderGroup<GenericObject>, index: number) => (
70
- <tr
71
- key={`${headerGroup.id}-headerGroup`}
72
- ref={index === 0 ? headerRef : null}
73
- >
74
- {!hasAnySubRows && selectableRows && (
75
- <th className={customCellClassnames}>
76
- <Checkbox
77
- checked={table?.getIsAllRowsSelected()}
78
- indeterminate={table?.getIsSomeRowsSelected()}
79
- onChange={table?.getToggleAllRowsSelectedHandler()}
80
- />
81
- </th>
82
- )}
83
- {headerGroup.headers.map(header => {
84
- const isPinnedLeft = columnPinning.left.includes(header.id)
85
- return (
86
- <TableHeaderCell
87
- enableSorting={enableSorting}
88
- enableToggleExpansion={enableToggleExpansion}
89
- handleExpandOrCollapse={handleExpandOrCollapse}
90
- header={header}
91
- headerChildren={children}
92
- isPinnedLeft={isPinnedLeft}
93
- key={`${header.id}-header`}
94
- loading={loading}
95
- sortIcon={sortIcon}
96
- table={table}
97
- />
98
- )
99
- })}
100
- </tr>
101
- ))}
102
- </thead>
103
- );
104
-
105
- const renderVirtualizedTableHeader = () => (
106
- <thead
107
- className={classes}
108
- data-virtualized="true"
109
- id={id}
110
- >
111
- {table.getHeaderGroups().map((headerGroup: HeaderGroup<GenericObject>, index: number) => (
112
- <tr
113
- className="virtualized-header-row-header"
114
- key={`${headerGroup.id}-headerGroup-virtualized`}
115
- ref={index === 0 ? headerRef : null}
116
- >
117
- {!hasAnySubRows && selectableRows && (
118
- <th className={classnames(customCellClassnames, "virtualized-header-cell")}>
119
- <Checkbox
120
- checked={table?.getIsAllRowsSelected()}
121
- indeterminate={table?.getIsSomeRowsSelected()}
122
- onChange={table?.getToggleAllRowsSelectedHandler()}
123
- />
124
- </th>
125
- )}
126
- {headerGroup.headers.map(header => {
127
- const isPinnedLeft = columnPinning.left.includes(header.id)
128
- return (
129
- <TableHeaderCell
130
- enableSorting={enableSorting}
131
- enableToggleExpansion={enableToggleExpansion}
132
- handleExpandOrCollapse={handleExpandOrCollapse}
133
- header={header}
134
- headerChildren={children}
135
- isPinnedLeft={isPinnedLeft}
136
- isVirtualized
137
- key={`${header.id}-header-virtualized`}
138
- loading={loading}
139
- sortIcon={sortIcon}
140
- table={table}
141
- />
142
- )
143
- })}
144
- </tr>
145
- ))}
146
- </thead>
147
- );
148
60
  return (
149
- <>
150
- {isVirtualized ? renderVirtualizedTableHeader() : renderRegularTableHeader()}
61
+ <>
62
+ <thead className={classes}
63
+ id={id}
64
+ >
65
+ {/* Get the header groups (only one in this example) */}
66
+ {table.getHeaderGroups().map((headerGroup: HeaderGroup<GenericObject>, index: number) => (
67
+ <tr
68
+ key={`${headerGroup.id}-headerGroup`}
69
+ ref={index === 0 ? headerRef : null}
70
+ >
71
+ {!hasAnySubRows && selectableRows && (
72
+ <th className={customCellClassnames}>
73
+ <Checkbox
74
+ checked={table?.getIsAllRowsSelected()}
75
+ indeterminate={table?.getIsSomeRowsSelected()}
76
+ onChange={table?.getToggleAllRowsSelectedHandler()}
77
+ />
78
+ </th>
79
+ )}
80
+ {headerGroup.headers.map(header => {
81
+ const isPinnedLeft = columnPinning.left.includes(header.id)
82
+ return (
83
+ <TableHeaderCell
84
+ enableSorting={enableSorting}
85
+ enableToggleExpansion={enableToggleExpansion}
86
+ handleExpandOrCollapse={handleExpandOrCollapse}
87
+ header={header}
88
+ headerChildren={children}
89
+ isPinnedLeft={isPinnedLeft}
90
+ key={`${header.id}-header`}
91
+ loading={loading}
92
+ sortIcon={sortIcon}
93
+ table={table}
94
+ />
95
+ )
96
+ })}
97
+ </tr>
98
+ ))}
99
+ </thead>
151
100
  </>
152
101
  )
153
102
  }
@@ -17,7 +17,8 @@ export const createCellFunction = (
17
17
  customRenderer?: (row: Row<GenericObject>, value: any) => JSX.Element,
18
18
  isFirstColumn?: boolean,
19
19
  onRowToggleClick?: (row: Row<GenericObject>) => void,
20
- selectableRows?: boolean
20
+ selectableRows?: boolean,
21
+ rowStyling?: GenericObject
21
22
  ) => {
22
23
  // Add display name to the returned function
23
24
  const cellRenderer = ({
@@ -28,6 +29,7 @@ export const createCellFunction = (
28
29
  getValue: Getter<string>
29
30
  }) => {
30
31
  const rowData = row.original;
32
+ const customStyle = rowStyling?.length > 0 && rowStyling?.find((s:GenericObject) => s?.rowId === row.id);
31
33
 
32
34
  if (isFirstColumn) {
33
35
  switch (row.depth) {
@@ -35,6 +37,7 @@ export const createCellFunction = (
35
37
  return (
36
38
  <CustomCell
37
39
  customRenderer={customRenderer}
40
+ customStyle={customStyle}
38
41
  getValue={getValue}
39
42
  onRowToggleClick={onRowToggleClick}
40
43
  row={row}
@@ -57,6 +57,7 @@ export const getVirtualizedContainerStyles = (maxHeight?: string): React.CSSProp
57
57
  position: 'absolute',
58
58
  top: 0,
59
59
  left: 0,
60
+ width: '100%',
60
61
  height: '40px', // Match standard table row height
61
62
  transform: `translateY(${startPosition}px)`,
62
63
  tableLayout: 'fixed',
@@ -66,14 +67,12 @@ export const getVirtualizedContainerStyles = (maxHeight?: string): React.CSSProp
66
67
  /**
67
68
  * Get height estimates for different row types
68
69
  */
69
- export const getRowHeightEstimate = (rowType: 'header' | 'row' | 'loading' | 'footer') => {
70
+ export const getRowHeightEstimate = (rowType: 'header' | 'row' | 'loading') => {
70
71
  switch (rowType) {
71
72
  case 'header':
72
73
  return 40; // Header height
73
74
  case 'loading':
74
75
  return 30; // Loading indicator height
75
- case 'footer':
76
- return 40
77
76
  case 'row':
78
77
  default:
79
78
  return 40; // Standard row height - match this to your design system
@@ -63,30 +63,11 @@
63
63
  width: 100%;
64
64
  }
65
65
 
66
- // Virtualized Table and Rows for Infinite Scroll
67
- scrollbar-gutter: stable right-edges;
68
- .virtualized-header-row-header {
69
- width: 100% !important;
70
- .table-header-cells:first-child {
71
- min-width: 180px;
72
- }
73
- }
74
-
75
- .virtualized-footer {
76
- width: 100% !important;
77
- td {
78
- border-bottom-left-radius: 4px !important;
79
- border-bottom-right-radius: 4px !important;
80
- display: flex;
81
- justify-content: center;
82
- align-items: center;
83
- }
84
- }
85
-
66
+ // Virtualized table styles
86
67
  .virtualized-table-row {
87
68
  display: table !important;
88
69
  table-layout: fixed !important;
89
- box-sizing: border-box !important;
70
+ width: 100% !important;
90
71
 
91
72
  td {
92
73
  display: table-cell !important;
@@ -123,7 +104,7 @@
123
104
 
124
105
  -ms-overflow-style: none !important;
125
106
  scrollbar-width: none !important;
126
- }
107
+ }
127
108
 
128
109
 
129
110
  .row-selection-actions-card {
@@ -212,6 +193,7 @@
212
193
 
213
194
  // Fix virtualized row borders
214
195
  tr.virtualized-table-row {
196
+ border-bottom: 1px solid $border_light;
215
197
 
216
198
  &.bg-silver {
217
199
  td:first-child {
@@ -624,16 +606,6 @@
624
606
  td.sticky-left {
625
607
  border-right: 1px solid $border_light !important;
626
608
  }
627
- // Virtualized Table in Responsive Styles
628
- .virtualized-header,
629
- .virtualized-header-row-header,
630
- .virtualized-table-row,
631
- .virtualized-footer {
632
- border-right: 1px solid $border_light !important;
633
- .table-header-cells:first-child {
634
- box-shadow: 0 0 10px 0 rgba($shadow, 0.16) !important;
635
- }
636
- }
637
609
  }
638
610
  }
639
611
  }