playbook_ui 14.14.0.pre.alpha.PBNTR907reactfilterpopoverpropswidthbug6557 → 14.14.0.pre.alpha.pbntr500currencykithandlingofnullvalues6275

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e71493edb454fa009f102b97bbfc9b3a544a93adae8d21b467aa23a038c6e102
-  data.tar.gz: a225a1f853ce4f0ecad9dc24f3516bc9b06eca5c6d03d09a8ca4e45d7921d69d
+  metadata.gz: 4c6ef102f160200110b47477b34a9a06798b4ef4f1122151a12341775c20c9a5
+  data.tar.gz: 14eb41101975901c5f557d1d8b6721fc9301e9b54a30ec0c335b8717dccbe508
 SHA512:
-  metadata.gz: fbf1933e62f0f9bebf42d8e49804a04ce5cfb74982fdc0dd85cf611a92638d46b11e96d426538ff330f322a060b25037412f94b6fbde118de8b0ceb1129a07c2
-  data.tar.gz: 3573fadc3564ef9728135d5f3527014acd33b456cab081698e26da7aefcd7a22b0a4cc48ddba1392d98875622e77e4d4e9eecff7c56fedd73186bdffb193000c
+  metadata.gz: 301d0b715331e1e388be9b554865dc59f79b88f5ef11f3a7f038554f215c7b72d6541465d027adcf0c8f9a0fea2dd4e9e1e6f608c6b0d9b9f5360fc52a70ffc8
+  data.tar.gz: 6e1bc33d1fbe6b1bebe4b112b42c73107685786fbc7ddd01df4f95fe302d015e1225edcfbe042e2931728dcd655fe97a9d3629417c639392fa3753a7cb533ee6

data/app/pb_kits/playbook/pb_advanced_table/Context/AdvancedTableContext.tsx

@@ -1,145 +1,5 @@
-import React, { createContext, useRef, useMemo, useEffect } from 'react';
-import { useVirtualizer } from '@tanstack/react-virtual';
+import { createContext } from "react"
 
-import { Row } from "@tanstack/react-table";
-import { GenericObject } from "../../types";
-import { getRowHeightEstimate } from '../Utilities/TableContainerStyles';
+const AdvancedTableContext = createContext<any>({})
 
-const AdvancedTableContext = createContext<any>({});
-
-interface FlattenedItem {
-    type: 'header' | 'row' | 'loading';
-    row: Row<GenericObject>;
-    id: string;
-}
-
-export const AdvancedTableProvider = ({ children, ...props }: {
-    children: React.ReactNode,
-    [key: string]: any
-}) => {
-  // Always initialize refs and state unconditionally, even if not used
-  const tableContainerRef = useRef(null);
-  const containerRef = props.tableContainerRef || tableContainerRef;
-
-  const table = props.table;
-  const isVirtualized = props.virtualizedRows || props.enableVirtualization;
-
-  // Create a flattened data array that includes ALL components for virtualization
-  const flattenedItems = useMemo(() => {
-    if (!isVirtualized || !table) {
-      return [];
-    }
-
-    const tableRows = table.getRowModel().rows;
-    const items: FlattenedItem[] = [];
-    const subRowHeaders = props.subRowHeaders;
-    const inlineRowLoading = props.inlineRowLoading;
-    const columnDefinitions = props.columnDefinitions;
-
-    // Process each row and insert special components
-    tableRows.forEach((row: Row<GenericObject>, index: number) => {
-      const isFirstChildofSubrow = row.depth > 0 && row.index === 0;
-
-      if (isFirstChildofSubrow && subRowHeaders) {
-        items.push({
-          type: 'header',
-          row: row,
-          id: `header-${row.id}-${index}`,
-        });
-      }
-
-      items.push({
-        type: 'row',
-        row: row,
-        id: `row-${row.id}-${index}`
-      });
-
-      const isExpandable = row.getIsExpanded();
-      const rowHasNoChildren = row.original?.children && !row.original.children.length ? true : false;
-      const isDataLoading = isExpandable && (inlineRowLoading && rowHasNoChildren) && 
-        (row.depth < (columnDefinitions[0]?.cellAccessors?.length || 0));
-
-      if (isDataLoading) {
-        items.push({
-          type: 'loading',
-          row: row,
-          id: `loading-${row.id}-${index}`
-        });
-      }
-    });
-
-    return items;
-  }, [
-    isVirtualized,
-    table,
-    props.subRowHeaders,
-    props.inlineRowLoading,
-    props.columnDefinitions,
-    // Add dependency on row model hash to refresh when data changes
-    table?.getRowModel().rows.length,
-    // Important: Add sorting state as a dependency to refresh when sorting changes
-    JSON.stringify(table?.getState().sorting || []),
-    // Also add expanded state as a dependency
-    JSON.stringify(table?.getState().expanded || {}),
-  ]);
-
-  // Always initialize the virtualizer, even if we don't use it
-  // This satisfies the React hooks rules by ensuring hooks are called unconditionally
-  const virtualizer = useVirtualizer({
-    count: isVirtualized && flattenedItems.length > 0 ? flattenedItems.length : 0,
-    getScrollElement: () => containerRef.current,
-    estimateSize: (index) => {
-      // Skip if virtualization isn't enabled
-      if (!isVirtualized || flattenedItems.length === 0) return 0;
-
-      // Use consistent row height estimates
-      const item = flattenedItems[index];
-      if (!item) return getRowHeightEstimate('row'); // Default
-
-      return getRowHeightEstimate(item.type);
-    },
-    overscan: 10, // Load more items for smoother scrolling
-    getItemKey: (index) => {
-      if (!isVirtualized || flattenedItems.length === 0 || index >= flattenedItems.length) {
-        return `item-${index}`;
-      }
-      return flattenedItems[index]?.id || `item-${index}`;
-    },
-  });
-
-  // Reset virtualizer scroll position when important state changes
-  useEffect(() => {
-    if (isVirtualized && virtualizer && table && containerRef.current) {
-      // Force recalculation of all virtual items
-      virtualizer.measure();
-
-      // Reset scroll position when sorting changes
-      containerRef.current.scrollTop = 0;
-    }
-  }, [
-    isVirtualized,
-    virtualizer,
-    table,
-    containerRef,
-    JSON.stringify(table?.getState().sorting || []),
-    JSON.stringify(table?.getState().expanded || {})
-  ]);
-
-  const contextValue = {
-    ...props,
-    table,
-    tableContainerRef: containerRef,
-    virtualizer: isVirtualized ? virtualizer : null,
-    flattenedItems,
-    virtualizedRows: isVirtualized,
-    enableVirtualization: isVirtualized
-  };
-
-  return (
-    <AdvancedTableContext.Provider value={contextValue}>
-      {children}
-    </AdvancedTableContext.Provider>
-  );
-};
-
-export default AdvancedTableContext;
+export default AdvancedTableContext

data/app/pb_kits/playbook/pb_advanced_table/SubKits/TableBody.tsx

@@ -1,14 +1,21 @@
 import React, { useContext } from "react"
 import classnames from "classnames"
+import { flexRender, Row } from "@tanstack/react-table"
 
 import { GenericObject } from "../../types"
 
 import { buildCss } from "../../utilities/props"
 import { globalProps } from "../../utilities/globalProps"
+import { isChrome } from "../Utilities/BrowserCheck"
+
+import LoadingInline from "../../pb_loading_inline/_loading_inline"
+import Checkbox from "../../pb_checkbox/_checkbox"
+
+import { SubRowHeaderRow } from "../Components/SubRowHeaderRow"
+import { LoadingCell } from "../Components/LoadingCell"
+import { renderCollapsibleTrail } from "../Components/CollapsibleTrail"
 
 import AdvancedTableContext from "../Context/AdvancedTableContext"
-import { RegularTableView } from "../Components/RegularTableView"
-import { VirtualizedTableView } from "../Components/VirtualizedTableView"
 
 type TableBodyProps = {
   className?: string
@@ -28,15 +35,18 @@ export const TableBody = ({
 }: TableBodyProps) => {
 
   const {
-    responsive,
+    columnDefinitions,
+    enableToggleExpansion,
+    handleExpandOrCollapse,
     isPinnedLeft = false,
-    virtualizer,
-    virtualizedRows,
-    enableVirtualization
+    inlineRowLoading,
+    loading,
+    responsive,
+    table,
+    selectableRows,
+    hasAnySubRows
   } = useContext(AdvancedTableContext)
 
-  const isVirtualized = virtualizedRows || enableVirtualization;
-
   const classes = classnames(
     buildCss("pb_advanced_table_body"),
     { 'pinned-left': responsive === "scroll" && isPinnedLeft },
@@ -44,49 +54,93 @@ export const TableBody = ({
     className
   )
 
-  // Style for virtualized table container
-  const style: React.CSSProperties = virtualizer ? {
-    height: `${virtualizer.getTotalSize()}px`, // tells scrollbar how big the table is
-    position: 'relative', // needed for absolute positioning of rows
-    width: '100%',
-  } : {};
+  const columnPinning = table.getState().columnPinning;
 
   return (
     <>
-      <tbody
-          className={classes}
-          data-virtualized={isVirtualized ? 'true' : 'false'}
+      <tbody className={classes} 
           id={id}
-          style={style}
       >
-        {isVirtualized && virtualizer ? (
-          // Virtualized table view
-          <VirtualizedTableView
-              collapsibleTrail={collapsibleTrail}
-              subRowHeaders={subRowHeaders}
-          />
-        ) : (
-          // Regular non-virtualized table view
-          <RegularTableView
-              collapsibleTrail={collapsibleTrail}
-              subRowHeaders={subRowHeaders}
-          />
-        )}
-
-        {/* Fallback for when virtualization should be enabled but virtualizer isn't available */}
-        {isVirtualized && !virtualizer && (
-          <tr>
-            <td
-                colSpan={999}
-                style={{ padding: '10px', textAlign: 'center' }}
+        {table.getRowModel().rows.map((row: Row<GenericObject>) => {
+          const isExpandable = row.getIsExpanded()
+          const isFirstChildofSubrow = row.depth > 0 && row.index === 0
+          const rowHasNoChildren = row.original.children && !row.original.children.length ? true : false
+          const numberOfColumns = table.getAllFlatColumns().length
+          const isDataLoading = isExpandable && (inlineRowLoading && rowHasNoChildren) && (row.depth < columnDefinitions[0].cellAccessors?.length)
+          const rowBackground = isExpandable && ((!inlineRowLoading && row.getCanExpand()) || (inlineRowLoading && rowHasNoChildren))
+          const rowColor = row.getIsSelected() ? "bg-row-selection" : rowBackground ? "bg-silver" : "bg-white"
+          return (
+            <React.Fragment key={`${row.index}-${row.id}-${row.depth}-row`}>
+              {isFirstChildofSubrow && subRowHeaders && (
+                <SubRowHeaderRow
+                    collapsibleTrail={collapsibleTrail}
+                    enableToggleExpansion={enableToggleExpansion}
+                    onClick={handleExpandOrCollapse}
+                    row={row}
+                    subRowHeaders={subRowHeaders}
+                    table={table}
+                />
+              )}
+            <tr
+                className={`${rowColor} ${
+                  row.depth > 0 ? `depth-sub-row-${row.depth}` : ""
+              }`}
+                id={`${row.index}-${row.id}-${row.depth}-row`}
             >
-              <div>No data to display.</div>
-            </td>
-          </tr>
-        )}
+              {/* Render custom checkbox column when we want selectableRows for non-expanding tables */}
+              {selectableRows && !hasAnySubRows && (
+                  <td className="checkbox-cell">
+                    <Checkbox
+                        checked={row.getIsSelected()}
+                        disabled={!row.getCanSelect()}
+                        indeterminate={row.getIsSomeSelected()}
+                        name={row.id}
+                        onChange={row.getToggleSelectedHandler()}
+                    />
+                  </td>
+                )}
+              {row.getVisibleCells().map((cell, i) => {
+                const isPinnedLeft = columnPinning.left.includes(cell.column.id)
+                const isLastCell = cell.column.parent?.columns.at(-1)?.id === cell.column.id
+
+                return (
+                  <td
+                      align="right"
+                      className={classnames(
+                        `${cell.id}-cell position_relative`,
+                        isChrome() ? "chrome-styles" : "",
+                        isPinnedLeft && 'pinned-left',
+                        isLastCell && 'last-cell',
+                      )}
+                      key={`${cell.id}-data`}
+                  >
+                    {collapsibleTrail && i === 0 && row.depth > 0 && renderCollapsibleTrail(row.depth)}
+                    <span id={`${cell.id}-span`}>
+                      {loading ? (
+                        <LoadingCell />
+                      ) : (
+                        flexRender(cell.column.columnDef.cell, cell.getContext())
+                      )}
+                    </span>
+                  </td>
+                )
+              })}
+            </tr>
+
+              {/* Display LoadingInline if Row Data is querying and there are no children already */}
+              {isDataLoading ? (
+                <tr key={`${row.id}-row`}>
+                  <td colSpan={numberOfColumns}
+                      style={{ paddingLeft: `${row.depth === 0 ? 0.5 : (row.depth * 2)}em` }}
+                  >
+                    <LoadingInline />
+                  </td>
+                </tr>
+              ) : null}
+            </React.Fragment>
+          )
+        })}
       </tbody>
     </>
-  );
+  )
 }
-
-export default TableBody;

data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.scss

@@ -31,46 +31,12 @@
     width: 100%;
   }
 
-  // Virtualized table styles
-  .virtualized-table-row {
-    display: table !important;
-    table-layout: fixed !important;
-    width: 100% !important;
-
-    td {
-      display: table-cell !important;
-      box-sizing: border-box !important;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
+    .row-selection-actions-card {
+      border-bottom-right-radius: 0px !important;
+      border-bottom-left-radius: 0px !important;
+      border-bottom-color: transparent;
+      transition: height 300ms ease;
     }
-
-    // Ensure the first column has proper width
-    td:first-child {
-      min-width: 180px;
-    }
-
-    // First column (typically the checkbox column)
-    td:first-child.checkbox-cell {
-      width: 40px !important; // Set a fixed width that matches header
-      min-width: 40px !important;
-      box-sizing: border-box !important;
-      text-align: center;
-    }
-
-    // Ensure the first data column has proper alignment with header
-    td:first-of-type:not(.checkbox-cell) {
-      min-width: 180px;
-      text-align: left;
-    }
-  }
-
-  .row-selection-actions-card {
-    border-bottom-right-radius: 0px !important;
-    border-bottom-left-radius: 0px !important;
-    border-bottom-color: transparent;
-    transition: height 300ms ease;
-  }
   .table-header-cells:first-child {
     min-width: 180px;
   }
@@ -101,23 +67,6 @@
       border-top-left-radius: 0px !important;
       border-top-right-radius: 0px !important;
     }
-
-    // Set fixed width for header cells to match table body
-    th {
-      box-sizing: border-box !important;
-      // Apply min-width to ensure consistent sizing
-      &.table-header-cells:first-child,
-      &.table-header-cells-custom:first-child {
-        min-width: 180px;
-      }
-
-      // Set fixed width for checkbox column
-      &.table-header-cells-custom {
-        width: 40px !important;
-        min-width: 40px !important;
-        box-sizing: border-box !important;
-      }
-    }
   }
 
   .pb_advanced_table_body {
@@ -138,29 +87,6 @@
         padding-left: 0px;
       }
     }
-
-    // Fix virtualized row borders
-    tr.virtualized-table-row {
-      border-bottom: 1px solid $border_light;
-
-      &.bg-silver {
-        td:first-child {
-          background-color: lighten($silver, $opacity_7);
-        }
-      }
-
-      &.bg-white {
-        td:first-child {
-          background-color: $white;
-        }
-      }
-
-      &.bg-row-selection {
-        td:first-child {
-          background-color: $info_subtle;
-        }
-      }
-    }
   }
 
   .table-header-cells-active:first-child {
@@ -203,6 +129,7 @@
     max-height: 1920px;
     overflow-y: auto;
   }
+  
   // Icons
   .button-icon {
     display: flex;
@@ -324,19 +251,6 @@
       .bg-white td:first-child {
           background-color: $white;
       }
-
-      .virtualized-table-row {
-        &.bg-silver td:first-child {
-          background-color: lighten($silver, $opacity_7);
-        }
-        &.bg-white td:first-child {
-          background-color: $white;
-        }
-        &.bg-row-selection td:first-child {
-          background-color: $info_subtle;
-        }
-      }
-
       .row-selection-actions-card {
         border-right-width: 0px;
         border-left-width: 0px;
@@ -375,25 +289,6 @@
       background: $bg_dark;
     }
 
-    // Dark mode virtualized rows
-    .virtualized-table-row {
-      &.bg-white {
-        background: $bg_dark_card !important;
-
-        td:first-child {
-          background: $bg_dark_card !important;
-        }
-      }
-
-      &.bg-silver {
-        background: $bg_dark;
-
-        td:first-child {
-          background: $bg_dark;
-        }
-      }
-    }
-
     .table-header-cells:first-child, td:first-child, .pb_table_td:first-child {
       box-shadow: 1px 0px 0px 0px $border_dark !important;
     }
@@ -464,17 +359,6 @@
         .bg-white td:first-child {
           background-color: $bg_dark_card;
         }
-
-        // Dark mode virtualized rows
-        .virtualized-table-row {
-          &.bg-silver td:first-child {
-            background-color: $bg_dark;
-          }
-          &.bg-white td:first-child {
-            background-color: $bg_dark_card;
-          }
-        }
-
         .sticky-header {
           thead {
             th:first-child {
@@ -486,4 +370,4 @@
       }
     }
   }
-}
+}