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

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

@@ -1,23 +1,38 @@
-import React, { useRef, useEffect } from "react";
-import classnames from "classnames";
+import React, { useState, useEffect, useCallback, useRef } from "react"
+import classnames from "classnames"
 
-import { GenericObject } from "../types";
-import { Row, RowSelectionState } from "@tanstack/react-table";
+import { GenericObject } from "../types"
 
-import { buildAriaProps, buildCss, buildDataProps, buildHtmlProps } from "../utilities/props";
-import { globalProps, GlobalProps } from "../utilities/globalProps";
+import {
+  createColumnHelper,
+  getCoreRowModel,
+  getExpandedRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
+  Row,
+  useReactTable,
+  Getter,
+  RowSelectionState
+} from "@tanstack/react-table"
 
-import Table from "../pb_table/_table";
-import { AdvancedTableProvider } from "./Context/AdvancedTableContext";
-import { getVirtualizedContainerStyles } from "./Utilities/TableContainerStyles";
+import { buildAriaProps, buildCss, buildDataProps, buildHtmlProps } from "../utilities/props"
+import { globalProps, GlobalProps } from "../utilities/globalProps"
 
-import { TableHeader } from "./SubKits/TableHeader";
-import { TableBody } from "./SubKits/TableBody";
-import TablePagination from "./Components/TablePagination";
-import TableActionBar from "./Components/TableActionBar";
+import Table from "../pb_table/_table"
+import Card from "../pb_card/_card"
+import Caption from "../pb_caption/_caption"
+import Flex from "../pb_flex/_flex"
+import FlexItem from "../pb_flex/_flex_item"
 
-import { useTableState } from "./Hooks/useTableState";
-import { useTableActions } from "./Hooks/useTableActions";
+import AdvancedTableContext from "./Context/AdvancedTableContext"
+
+import { updateExpandAndCollapseState } from "./Utilities/ExpansionControlHelpers"
+import { showActionBar, hideActionBar } from "./Utilities/ActionBarAnimationHelper"
+
+import { CustomCell } from "./Components/CustomCell"
+import { TableHeader } from "./SubKits/TableHeader"
+import { TableBody } from "./SubKits/TableBody"
+import Pagination from "../pb_pagination/_pagination"
 
 type AdvancedTableProps = {
   aria?: { [key: string]: string }
@@ -48,8 +63,7 @@ type AdvancedTableProps = {
   tableProps?: GenericObject
   toggleExpansionIcon?: string | string[]
   onRowSelectionChange?: (arg: RowSelectionState) => void
-  virtualizedRows?: boolean
-} & GlobalProps;
+} & GlobalProps
 
 const AdvancedTable = (props: AdvancedTableProps) => {
   const {
@@ -81,149 +95,282 @@ const AdvancedTable = (props: AdvancedTableProps) => {
     tableProps,
     toggleExpansionIcon = "arrows-from-line",
     onRowSelectionChange,
-    virtualizedRows = false,
-  } = props;
+  } = props
 
-  // Component refs
-  const tableWrapperRef = useRef<HTMLDivElement>(null);
+  const [loadingStateRowCount, setLoadingStateRowCount] = useState(
+    initialLoadingRowsCount
+  )
 
-  // Initialize table state
-  const {
-    table,
-    expanded,
-    setExpanded,
-    hasAnySubRows,
-    selectedRowsLength,
-    fetchNextPage,
-    updateLoadingStateRowCount,
-    fullData,
-    totalFetched,
-    isFetching
-  } = useTableState({
-    tableData,
-    columnDefinitions,
-    expandedControl,
-    sortControl,
-    onRowToggleClick,
-    selectableRows,
-    initialLoadingRowsCount,
-    loading,
-    pagination,
-    paginationProps,
-    virtualizedRows,
-    tableOptions,
-    onRowSelectionChange
-  });
+  // Create a local state for expanded and setExpanded if expandedControl not used
+  const [localExpanded, setLocalExpanded] = useState({})
 
-  // Initialize table actions
-  const {
-    handleExpandOrCollapse,
-    onPageChange,
-    fetchMoreOnBottomReached
-  } = useTableActions({
-    table,
-    expanded,
-    setExpanded,
-    onToggleExpansionClick,
-    onRowSelectionChange
-  });
+  // Determine whether to use the prop or the local state
+  const expanded = expandedControl ? expandedControl.value : localExpanded
+  const setExpanded = expandedControl
+    ? expandedControl.onChange
+    : setLocalExpanded
+
+  const columnHelper = createColumnHelper()
+
+  //Row Selection
+  const [rowSelection, setRowSelection] = useState<RowSelectionState>({})
+
+  //Create cells for columns, with customization for first column
+  const createCellFunction = (cellAccessors: string[], customRenderer?: (row: Row<GenericObject>, value: any) => JSX.Element, isFirstColumn?: boolean) => {
+    const columnCells = ({
+      row,
+      getValue,
+    }: {
+      row: Row<GenericObject>
+      getValue: Getter<string>
+    }) => {
+      const rowData = row.original
+
+    if (isFirstColumn) {
+      switch (row.depth) {
+        case 0: {
+          return (
+                <CustomCell
+                    customRenderer={customRenderer}
+                    getValue={getValue}
+                    onRowToggleClick={onRowToggleClick}
+                    row={row}
+                    selectableRows={selectableRows}
+                />
+          )
+        }
+        default: {
+          // Handle other depths based on cellAccessors
+          const depthAccessor = cellAccessors[row.depth - 1] // Adjust index for depth
+          const accessorValue = rowData[depthAccessor]
+          return accessorValue ? (
+            <CustomCell
+                customRenderer={customRenderer}
+                onRowToggleClick={onRowToggleClick}
+                row={row} 
+                selectableRows={selectableRows}
+                value={accessorValue} 
+            />
+          ) : (
+            "N/A"
+          )
+        }
+      }
+    }
+    return customRenderer
+    ? customRenderer(row, getValue())
+    : getValue()
+    }
+    return columnCells
+  }
+
+  const buildColumns = (columnDefinitions: GenericObject[], isRoot= true): any => {
+    return (
+      columnDefinitions &&
+      columnDefinitions.map((column, index) => {
+        const isFirstColumn = isRoot && index === 0; 
+        //Checking to see if grouped column or not
+        if (column.columns && column.columns.length > 0) {
+          return {
+            header: column.label || "",
+            columns: buildColumns(column.columns, false),
+          };
+        } else {
+          // Define the base column structure
+          const columnStructure = {
+            ...columnHelper.accessor(column.accessor, {
+              header: column.label || "",
+            }),
+          };
+
+          if (column.cellAccessors || column.customRenderer) {
+            columnStructure.cell = createCellFunction(
+              column.cellAccessors,
+              column.customRenderer,
+              isFirstColumn
+            );
+          }
+
+          return columnStructure;
+        }
+      })
+    );
+  };
+
+  //Create column array in format needed by Tanstack
+  const columns = buildColumns(columnDefinitions);
+
+  //Syntax for sorting Array if we want to manage state ourselves
+  const sorting = [
+    {
+      id: columnDefinitions[0].accessor,
+      desc:
+        sortControl && sortControl.value !== null
+          ? !sortControl.value.desc
+          : false,
+    },
+  ]
+
+  const customState = () => {
+    if (sortControl && selectableRows) {
+      return { state: { expanded, sorting, rowSelection } }
+    } else if (sortControl) {
+      return { state: { expanded, sorting } }
+    } else if (selectableRows) {
+      return { state: { expanded, rowSelection } }
+    } else {
+      return { state: { expanded } }
+    }
+  }
+
+  const paginationInitializer = pagination ? {
+    getPaginationRowModel: getPaginationRowModel(),
+    paginateExpandedRows: false,
+    initialState: {
+        pagination: {
+            pageIndex: paginationProps?.pageIndex ?? 0,
+            pageSize: paginationProps?.pageSize ??  20,
+        },
+    },
+} : {}
+
+//initialize table
+  const table = useReactTable({
+    data: loading ? Array(loadingStateRowCount).fill({}) : tableData,
+    columns,
+    onExpandedChange: setExpanded,
+    getSubRows: (row: GenericObject) => row.children,
+    getCoreRowModel: getCoreRowModel(),
+    getExpandedRowModel: getExpandedRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    enableSortingRemoval: false,
+    sortDescFirst: true,
+    onRowSelectionChange: setRowSelection,
+    getRowId: selectableRows ? row => row.id : undefined,
+    ...customState(),
+    ...paginationInitializer,
+    ...tableOptions,
+  })
+
+  const tableRows = table.getRowModel()
+
+  const hasAnySubRows = tableRows.rows.some(row => row.subRows && row.subRows.length > 0);
+  const selectedRowsLength = Object.keys(table.getState().rowSelection).length
+
+  useEffect(() => {
+    if (onRowSelectionChange) {
+      onRowSelectionChange(table.getState().rowSelection)
+    }
+  } , [table.getState().rowSelection, onRowSelectionChange])
 
   // Set table row count for loading state
+  const updateLoadingStateRowCount = useCallback(() => {
+    const rowsCount = table.getRowModel().rows.length
+    if (rowsCount !== loadingStateRowCount && rowsCount !== 0) {
+      setLoadingStateRowCount(rowsCount)
+    }
+  }, [tableData, loadingStateRowCount])
+
   useEffect(() => {
     if (!loading) {
-      updateLoadingStateRowCount();
+      updateLoadingStateRowCount()
     }
-  }, [loading, updateLoadingStateRowCount]);
+  }, [loading, updateLoadingStateRowCount])
 
-  // Check for infinite scroll
-  useEffect(() => {
-    fetchMoreOnBottomReached(
-      tableWrapperRef.current,
-      fetchNextPage,
-      isFetching,
-      totalFetched,
-      fullData.length
-    );
-  }, [fetchMoreOnBottomReached, fetchNextPage, isFetching, totalFetched, fullData.length]);
+  const handleExpandOrCollapse = async (row: Row<GenericObject>) => {
+    onToggleExpansionClick && onToggleExpansionClick(row)
+  
+    const expandedState = expanded;
+    const targetParent = row?.parentId;
+    const updatedRows = await updateExpandAndCollapseState(tableRows, expandedState, targetParent)
+    setExpanded(updatedRows)
+  }
 
-  // Build CSS classes and props
-  const ariaProps = buildAriaProps(aria);
-  const dataProps = buildDataProps(data);
-  const htmlProps = buildHtmlProps(htmlOptions);
+  const ariaProps = buildAriaProps(aria)
+  const dataProps = buildDataProps(data)
+  const htmlProps = buildHtmlProps(htmlOptions)
   const classes = classnames(
     buildCss("pb_advanced_table"),
     `advanced-table-responsive-${responsive}`,
-    maxHeight ? `advanced-table-max-height-${maxHeight}` : '',
+    maxHeight ? `advanced-table-max-height-${maxHeight}` : '', // max height as kit prop not global prop to control overflow-y
     globalProps(props),
     className
-  );
+  )
 
-  // Table wrapper styling with virtualization support
-  const tableWrapperStyle = virtualizedRows
-    ? getVirtualizedContainerStyles(maxHeight)
-    : {};
+  const onPageChange = (page: number) => {
+    table.setPageIndex(page - 1)
+  }
+//When to show the actions bar as a whole
+  const isActionBarVisible = selectableRows && showActionsBar && selectedRowsLength > 0
 
-  // Visibility flag for action bar
-  const isActionBarVisible = selectableRows && showActionsBar && selectedRowsLength > 0;
+  //Ref and useEffect for animating the actions bar
+  const cardRef = useRef(null);
+  useEffect(() => {
+    if (cardRef.current) {
+      if (isActionBarVisible) {
+        showActionBar(cardRef.current);
+      } else {
+        hideActionBar(cardRef.current);
+      }
+    }
+  }, [isActionBarVisible]);
 
   return (
-    <div
-        {...ariaProps}
-        {...dataProps}
+    <div {...ariaProps} 
+        {...dataProps} 
         {...htmlProps}
-        className={classes}
+        className={classes} 
         id={id}
-        onScroll={virtualizedRows ? e => fetchMoreOnBottomReached(
-          e.currentTarget,
-          fetchNextPage,
-          isFetching,
-          totalFetched,
-          fullData.length
-        ) : undefined}
-        ref={tableWrapperRef}
-        style={tableWrapperStyle as React.CSSProperties}
     >
-      <AdvancedTableProvider
-          columnDefinitions={columnDefinitions}
-          enableToggleExpansion={enableToggleExpansion}
-          enableVirtualization={virtualizedRows}
-          expanded={expanded}
-          expandedControl={expandedControl}
-          handleExpandOrCollapse={handleExpandOrCollapse}
-          hasAnySubRows={hasAnySubRows}
-          inlineRowLoading={inlineRowLoading}
-          isActionBarVisible={isActionBarVisible}
-          loading={loading}
-          responsive={responsive}
-          selectableRows={selectableRows}
-          setExpanded={setExpanded}
-          showActionsBar={showActionsBar}
-          sortControl={sortControl}
-          subRowHeaders={tableOptions?.subRowHeaders}
-          table={table}
-          tableContainerRef={tableWrapperRef}
-          toggleExpansionIcon={toggleExpansionIcon}
-          virtualizedRows={virtualizedRows}
+      <AdvancedTableContext.Provider
+          value={{
+            columnDefinitions,
+            enableToggleExpansion,
+            expanded,
+            expandedControl,
+            handleExpandOrCollapse,
+            inlineRowLoading,
+            isActionBarVisible,
+            loading,
+            responsive,
+            setExpanded,
+            sortControl,
+            table,
+            toggleExpansionIcon,
+            showActionsBar,
+            selectableRows,
+            hasAnySubRows
+          }}
       >
-        <React.Fragment>
-          {/* Top Pagination */}
-          {pagination && (
-            <TablePagination
-                onChange={onPageChange}
-                position="top"
-                range={paginationProps?.range}
-                table={table}
-            />
-          )}
-
-          {/* Selection Action Bar */}
-          <TableActionBar
-              actions={actions}
-              isVisible={isActionBarVisible}
-              selectedCount={selectedRowsLength}
-          />
-
-          {/* Main Table */}
+        <>
+          {pagination &&
+              <Pagination
+                  current={table.getState().pagination.pageIndex + 1}
+                  key={`pagination-top-${table.getState().pagination.pageIndex + 1}`}
+                  marginBottom="xs"
+                  onChange={onPageChange}
+                  range={paginationProps?.range ? paginationProps?.range : 5}
+                  total={table.getPageCount()}
+                  />
+          }
+          <Card
+              borderNone={!isActionBarVisible}
+              className={`${isActionBarVisible && "show-action-card row-selection-actions-card"}`}
+              htmlOptions={{ ref: cardRef as any }}
+              padding={`${isActionBarVisible ? "xs" : "none"}`}
+          >
+            <Flex alignItems="center" 
+                justify="between"
+            >
+              <Caption color="light" 
+                  paddingLeft="xs" 
+                  size="xs"
+              >
+                {selectedRowsLength} Selected
+              </Caption>
+              <FlexItem>{actions}</FlexItem>
+            </Flex>
+          </Card>
           <Table
               className={`${loading ? "content-loading" : ""}`}
               dark={dark}
@@ -241,24 +388,23 @@ const AdvancedTable = (props: AdvancedTableProps) => {
               </>
             )}
           </Table>
-
-          {/* Bottom Pagination */}
-          {pagination && (
-            <TablePagination
+          {pagination &&
+            <Pagination
+                current={table.getState().pagination.pageIndex + 1}
+                key={`pagination-bottom-${table.getState().pagination.pageIndex + 1}`}
+                marginTop="xs"
                 onChange={onPageChange}
-                position="bottom"
-                range={paginationProps?.range}
-                table={table}
+                range={paginationProps?.range ? paginationProps?.range : 5}
+                total={table.getPageCount()}
             />
-          )}
-        </React.Fragment>
-      </AdvancedTableProvider>
+          }
+        </>
+      </AdvancedTableContext.Provider>
     </div>
-  );
-};
+  )
+}
 
-// Re-export sub-components
-AdvancedTable.Header = TableHeader;
-AdvancedTable.Body = TableBody;
+AdvancedTable.Header = TableHeader
+AdvancedTable.Body = TableBody
 
-export default AdvancedTable;
+export default AdvancedTable

data/app/pb_kits/playbook/pb_card/_card.tsx

@@ -1,8 +1,7 @@
 /* eslint-disable react/no-multi-comp */
 
 import React from 'react'
-import { get } from '../utilities/object'
-
+import { get } from 'lodash'
 import classnames from 'classnames'
 
 import { buildAriaProps, buildCss, buildDataProps, buildHtmlProps } from '../utilities/props'

data/app/pb_kits/playbook/pb_currency/_currency.tsx

@@ -120,6 +120,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
         id={id}
     >
       <Caption dark={dark}>{label}</Caption>
+  
       <div className={`pb_currency_wrapper${variantClass || emphasizedClass}`}>
         {unstyled ? (
           nullDisplay && !amount ? (
@@ -174,7 +175,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
         )}
       </div>
     </div>
-  )
+  );
 }
 
 export default Currency

data/app/pb_kits/playbook/pb_currency/currency.html.erb

@@ -11,7 +11,7 @@
       <% end %>
     <% else %>
      <% if object.null_display && object.amount.blank? %>
-        <%= pb_rails("title", props: object.title_props) %>
+        <%= pb_rails("title", props: {text: object.null_display}) %>
       <% else %>
         <%= pb_rails("body", props: object.currency_wrapper_props) do %>
           <%= object.negative_sign %><%= object.symbol %>

data/app/pb_kits/playbook/pb_currency/currency.rb

@@ -68,20 +68,10 @@ module Playbook
         }
       end
 
-      def title_text
-        if null_display
-          null_display
-        elsif swap_negative
-          absolute_amount(abbr_or_format_amount)
-        else
-          abbr_or_format_amount
-        end
-      end
-
       def title_props
         {
           size: size_value,
-          text: title_text,
+          text: swap_negative ? absolute_amount(abbr_or_format_amount) : abbr_or_format_amount,
           classname: "pb_currency_value",
           dark: dark,
         }
@@ -158,10 +148,8 @@ module Playbook
           1
         when "md"
           3
-        when "sm"
-          4
         else
-          3
+          4
         end
       end
 

data/app/pb_kits/playbook/pb_currency/docs/_currency_null_display.html.erb

@@ -3,7 +3,6 @@
     label: "Nil",
     margin_bottom: "md",
     null_display: "--",
-    size: "sm"
 }) %>
 
 <%= pb_rails("currency", props: {
@@ -11,12 +10,11 @@
     label: "Nil",
     margin_bottom: "md",
     null_display: "$0.00",
-    size: "sm"
 }) %>
 
 <%= pb_rails("currency", props: {
     amount: "",
     label: "Nil",
+    margin_bottom: "md",
     null_display: " ",
-    size: "sm"
 }) %>

data/app/pb_kits/playbook/pb_date_picker/date_picker.html.erb

@@ -1,8 +1,5 @@
 <%= pb_content_tag(:div,
-    class: object.classname + object.error_class,
-    'data-pb-date-picker' => true,
-    'data-validation-message' => object.validation_message,
-      ) do %>
+    class: object.classname + object.error_class) do %>
   <div class="input_wrapper">
     <% if content.present? %>
       <%= content %>

data/app/pb_kits/playbook/pb_date_picker/date_picker.rb

@@ -75,8 +75,6 @@ module Playbook
                         default: [1900, 2100]
       prop :custom_event_type, type: Playbook::Props::String,
                                default: ""
-      prop :validation_message, type: Playbook::Props::String,
-                                default: ""
 
       def classname
         default_margin_bottom = margin_bottom.present? ? "" : " mb_sm"