*feat upgrade react-table from 7 to 8

hazelcast · Jan 15, 2025 · b84717a · b84717a
1 parent 3519e5f
commit b84717a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/packages/ui/src/Table/Table.tsx b/packages/ui/src/Table/Table.tsx
@@ -266,8 +266,8 @@ export const Table = <D extends RowData & { subRows?: D[] }>({
     getSubRows: useCallback((row: D) => row.subRows, []),
     getRowCanExpand: useCallback(
       (row: TableRow<D>) => {
-        if (!getRenderRowSubComponent() && !row.subRows) {
-          return false
+        if (getRenderRowSubComponent()) {
+          return true
         }
 
         const cb = getCanExpand()

diff --git a/packages/ui/src/Table/tableTypes.ts b/packages/ui/src/Table/tableTypes.ts
@@ -60,6 +60,7 @@ export type RowType<D extends RowData, K = any> = {
   original: D
   subRows: RowType<D, K>[]
   index: number
+  getValue: <T = K>(columnId: string) => T
 }
 
 export type CellType<D extends RowData, V = any> = {

diff --git a/packages/ui/src/Table/utils.tsx b/packages/ui/src/Table/utils.tsx
@@ -11,13 +11,15 @@ export const prepareRow = <D extends RowData>({
   subRows,
   id,
   index,
+  getValue,
 }: TableRow<D>): RowType<D> => ({
   id,
   getCanExpand,
   getIsExpanded,
   getToggleExpandedHandler,
   original,
   index,
+  getValue,
   subRows: subRows.map(prepareRow),
 })