playbook_ui 13.21.0 → 13.22.0.pre.alpha.PLAY1297updatetextstyles2636

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c19fad05505af542ad2b4998d9d9d6f225ad3b46568420e87f7a3d72847cf2
-  data.tar.gz: '05208a0115fc90b97569c6c96c3847211b2136550f95817eb2dd8eb3eac2c90a'
+  metadata.gz: a9d631d6063955e4082ee2bb66fa6162307d09377139c768a20ad19d1e703f2b
+  data.tar.gz: 17df419e0eda40163cfcbc42931c13305ef74f830b5ef12a30ddefd19f5ef744
 SHA512:
-  metadata.gz: adad3d8a3607b475d9f16c1cc34ee1937fb52b4d2e3af4c7dd481a5a258ba972aa6df89bcbc1c59bb833300b3b9ff9d5988741321bfb5908d6e3706449f7b397
-  data.tar.gz: 1636c11fdc69b49524df0d8c0d17e91dc732f356fe279b78fc90287053bec7c7529377376acd1cb22d2b6903552d1ea448e91e3730c2738b47f62fdc4a15452e
+  metadata.gz: 9c200eee812ac24322dcc7a3b412b0248e70867a47138217513205a411f6b917e7befa9dc4ff08adc1e74ed12a37c112338d1078241be4c601b92b2d484ff393
+  data.tar.gz: 8d349186f3cf2f474bffeb8166bade747d150ffe9a466f550015c821b883f664be14da953d552d51c29e885440b0ca229e3291b0b836b806f27870f0ffa6fd26

data/app/pb_kits/playbook/pb_advanced_table/Components/CustomCell.tsx

@@ -1,19 +1,21 @@
-import React, { useContext } from "react";
+import React, { useContext } from "react"
+import { Getter, Row } from "@tanstack/react-table"
 
-import Flex from "../../pb_flex/_flex";
-import FlexItem from "../../pb_flex/_flex_item";
-import Icon from "../../pb_icon/_icon";
-import { GlobalProps } from "../../utilities/globalProps";
+import { GenericObject } from "../../types"
 
-import { Getter, Row } from "@tanstack/react-table";
-import { DataType } from "../Utilities/types";
-import AdvancedTableContext from "../Context/AdvancedTableContext";
+import { GlobalProps } from "../../utilities/globalProps"
+
+import Flex from "../../pb_flex/_flex"
+import FlexItem from "../../pb_flex/_flex_item"
+import Icon from "../../pb_icon/_icon"
+
+import AdvancedTableContext from "../Context/AdvancedTableContext"
 
 interface CustomCellProps {
-  getValue?: Getter<string>;
-  onRowToggleClick?: (arg: Row<DataType>) => void;
-  row: Row<DataType>;
-  value?: string;
+  getValue?: Getter<string>
+  onRowToggleClick?: (arg: Row<GenericObject>) => void
+  row: Row<GenericObject>
+  value?: string
 } 
 
 export const CustomCell = ({
@@ -22,12 +24,16 @@ export const CustomCell = ({
   row,
   value,
 }: CustomCellProps & GlobalProps) => {
-  const { setExpanded, expanded, inlineRowLoading } = useContext(AdvancedTableContext);
+  const { setExpanded, expanded, expandedControl, inlineRowLoading } = useContext(AdvancedTableContext);
 
-  const handleOnExpand = (row: Row<DataType>) => {
+  const handleOnExpand = (row: Row<GenericObject>) => {
     onRowToggleClick && onRowToggleClick(row);
-    setExpanded({ ...expanded, [row.id]: !row.getIsExpanded() });
+    
+    if (!expandedControl) {
+      setExpanded({ ...expanded, [row.id]: !row.getIsExpanded() });
+    }
   };
+
   const RowHasChildren = row.original.children ? true : false
   const renderButton = inlineRowLoading ? RowHasChildren : row.getCanExpand()
 
@@ -59,5 +65,5 @@ export const CustomCell = ({
         </FlexItem>
       </Flex>
     </div>
-  );
-};
+  )
+}

data/app/pb_kits/playbook/pb_advanced_table/Components/SortIconButton.tsx

@@ -1,11 +1,14 @@
 import React from "react"
-import Icon from "../../pb_icon/_icon"
 import { Header } from "@tanstack/react-table"
-import { DataType } from "../Utilities/types"
+
+import { GenericObject } from "../../types"
+
+import Icon from "../../pb_icon/_icon"
+
 import { displayIcon } from "../Utilities/IconHelpers"
 
 type SortIconButtonProps = {
-  header: Header<DataType, unknown>
+  header: Header<GenericObject, unknown>
   sortIcon?: string | string[]
 }
 export const SortIconButton = ({ header, sortIcon }: SortIconButtonProps) => {

data/app/pb_kits/playbook/pb_advanced_table/Components/SubRowHeaderRow.tsx

@@ -1,23 +1,27 @@
 import React, { useContext } from "react"
+import { Row, Table } from "@tanstack/react-table"
+
+import { GenericObject } from "../../types"
+
+import { GlobalProps } from "../../utilities/globalProps"
+
 import Flex from "../../pb_flex/_flex"
 import Caption from "../../pb_caption/_caption"
-import { Row, Table } from "@tanstack/react-table"
 
-import AdvancedTableContext from "../Context/AdvancedTableContext";
 import { ToggleIconButton } from "./ToggleIconButton"
 import { renderCollapsibleTrail } from "./CollapsibleTrail"
 
 import { isChrome } from "../Utilities/BrowserCheck"
-import { DataType } from "../Utilities/types"
-import { GlobalProps } from "../../utilities/globalProps"
+
+import AdvancedTableContext from "../Context/AdvancedTableContext"
 
 interface SubRowHeaderRowProps {
   collapsibleTrail?: boolean
   enableToggleExpansion?: "all" | "header" | "none"
-  onClick: (row: Row<DataType>) => void
-  row: Row<DataType>
+  onClick: (row: Row<GenericObject>) => void
+  row: Row<GenericObject>
   subRowHeaders?: string[]
-  table: Table<DataType>
+  table: Table<GenericObject>
 }
 
 export const SubRowHeaderRow = ({
@@ -28,7 +32,7 @@ export const SubRowHeaderRow = ({
   subRowHeaders,
   table,
 }: SubRowHeaderRowProps & GlobalProps) => {
-  const { inlineRowLoading } = useContext(AdvancedTableContext);
+  const { inlineRowLoading } = useContext(AdvancedTableContext)
 
   const numberOfColumns = table.getAllFlatColumns().length
   const rowHasChildren = row.original.children ? true : false

data/app/pb_kits/playbook/pb_advanced_table/Components/TableHeaderCell.tsx

@@ -1,20 +1,25 @@
 import React, { useContext } from "react"
-import classnames from "classnames";
-import Flex from "../../pb_flex/_flex"
+import classnames from "classnames"
 import { flexRender, Header } from "@tanstack/react-table"
 
+import { GenericObject } from "../../types"
+
+import { GlobalProps } from "../../utilities/globalProps"
+
+import Flex from "../../pb_flex/_flex"
+
 import { SortIconButton } from "./SortIconButton"
 import { ToggleIconButton } from "./ToggleIconButton"
+
 import { isChrome } from "../Utilities/BrowserCheck"
-import { DataType } from "../Utilities/types"
+
 import AdvancedTableContext from "../Context/AdvancedTableContext"
-import { GlobalProps } from "../../utilities/globalProps"
 
 type TableHeaderCellProps = {
   enableSorting?: boolean
   enableToggleExpansion?: "all" | "header" | "none"
   handleExpandOrCollapse?: () => void
-  header?: Header<DataType, unknown>
+  header?: Header<GenericObject, unknown>
   headerChildren?: React.ReactNode | React.ReactNode[]
   loading?: boolean
   sortIcon?: string | string[]
@@ -45,24 +50,24 @@ export const TableHeaderCell = ({
 const cellClassName = classnames("table-header-cells", 
   `${isChrome() ? "chrome-styles" : ""}`, 
   `${enableSorting ? "table-header-cells-active" : ""}`
-);
+)
 
 const cellId = `${loading ? 
     `loading-${header.id}`
     : `${header.id}`
-}`;
+}`
 
 const isToggleExpansionEnabledLoading =
   header.index === 0 &&
   loading &&
   (enableToggleExpansion === "all" || "header") &&
-  enableToggleExpansion !== "none";
+  enableToggleExpansion !== "none"
   
 const isToggleExpansionEnabled =
   header.index === 0 &&
   !loading &&
   (enableToggleExpansion === "all" || "header") &&
-  enableToggleExpansion !== "none";
+  enableToggleExpansion !== "none"
 
   return (
     <th

data/app/pb_kits/playbook/pb_advanced_table/Components/ToggleIconButton.tsx

@@ -1,13 +1,17 @@
 import React, { useContext } from "react"
-import Icon from "../../pb_icon/_icon"
 import { Row } from "@tanstack/react-table"
-import AdvancedTableContext from "../Context/AdvancedTableContext"
-import { DataType } from "../Utilities/types"
+
+import { GenericObject } from "../../types"
+
+import Icon from "../../pb_icon/_icon"
+
 import { displayIcon } from "../Utilities/IconHelpers"
 
+import AdvancedTableContext from "../Context/AdvancedTableContext"
+
 interface ToggleIconButtonProps {
-  onClick: (row: Row<DataType>) => void
-  row?: Row<DataType>
+  onClick: (row: Row<GenericObject>) => void
+  row?: Row<GenericObject>
 }
 
 export const ToggleIconButton = ({ row, onClick }: ToggleIconButtonProps) => {

data/app/pb_kits/playbook/pb_advanced_table/README.md

@@ -81,7 +81,7 @@ const MOCK_DATA = [
             graduatedStudents: "43",
             children: [
               {
-                year: "2011",
+                year: "2021",
                 quarter: "Q1",
                 month: "February",
                 day: "15",
@@ -173,7 +173,7 @@ const MOCK_DATA = [
             graduatedStudents: "43",
             children: [
               {
-                year: "2011",
+                year: "2022",
                 quarter: "Q1",
                 month: "May",
                 day: "2",

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

@@ -1,22 +1,26 @@
 import React, { useContext } from "react"
-import classnames from "classnames";
-import { buildCss } from "../../utilities/props";
-import { globalProps } from "../../utilities/globalProps";
-import LoadingInline from "../../pb_loading_inline/_loading_inline"
+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 { SubRowHeaderRow } from "../Components/SubRowHeaderRow"
 import { LoadingCell } from "../Components/LoadingCell"
 import { renderCollapsibleTrail } from "../Components/CollapsibleTrail"
+
 import AdvancedTableContext from "../Context/AdvancedTableContext"
-import { isChrome } from "../Utilities/BrowserCheck"
-import { DataType } from "../Utilities/types"
 
 type TableBodyProps = {
-  className?: string;
+  className?: string
   collapsibleTrail?: boolean
-  dark?: boolean,
-  id?: string;
+  dark?: boolean
+  id?: string
   subRowHeaders?: string[]
 }
 
@@ -42,14 +46,14 @@ export const TableBody = ({
     buildCss("pb_advanced_table_body"),
     globalProps(props),
     className
-  );
+  )
 
   return (
     <>
       <tbody className={classes} 
           id={id}
       >
-        {table.getRowModel().rows.map((row: Row<DataType>) => {
+        {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

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

@@ -1,18 +1,22 @@
 import React, { useContext } from "react"
-import classnames from "classnames";
-import { buildCss } from "../../utilities/props";
-import { globalProps } from "../../utilities/globalProps";
+import classnames from "classnames"
 import { HeaderGroup } from "@tanstack/react-table"
-import AdvancedTableContext from "../Context/AdvancedTableContext"
+
+import { GenericObject } from "../../types"
+
+import { buildCss } from "../../utilities/props"
+import { globalProps } from "../../utilities/globalProps"
+
 import { TableHeaderCell } from "../Components/TableHeaderCell"
-import { DataType } from "../Utilities/types"
+
+import AdvancedTableContext from "../Context/AdvancedTableContext"
 
 type TableHeaderProps = {
   children?: React.ReactNode | React.ReactNode[]
   className?: string
   dark?: boolean,
   enableSorting?: boolean
-  id?: string;
+  id?: string
   sortIcon?: string | string[]
 }
 
@@ -36,7 +40,7 @@ export const TableHeader = ({
     buildCss("pb_advanced_table_header"),
     globalProps(props),
     className
-  );
+  )
 
 
   return (
@@ -45,7 +49,7 @@ export const TableHeader = ({
           id={id}
       >
         {/* Get the header groups (only one in this example) */}
-        {table.getHeaderGroups().map((headerGroup: HeaderGroup<DataType>) => (
+        {table.getHeaderGroups().map((headerGroup: HeaderGroup<GenericObject>) => (
           <tr key={`${headerGroup.id}-headerGroup`}>
             {headerGroup.headers.map(header => (
               <TableHeaderCell

data/app/pb_kits/playbook/pb_advanced_table/Utilities/ExpansionControlHelpers.tsx

@@ -1,5 +1,6 @@
 import { RowModel } from "@tanstack/react-table"
-import { DataType, ExpandedStateObject } from "./types"
+import { ExpandedStateObject } from "./types"
+import { GenericObject } from "../../types"
 
 const filterExpandableRows = (expandedState: Record<string, boolean>) => {
   for (const expandedRow in expandedState) {
@@ -11,46 +12,31 @@ const filterExpandableRows = (expandedState: Record<string, boolean>) => {
 }
 
 export const updateExpandAndCollapseState = (
-  tableRows: RowModel<DataType>,
+  tableRows: RowModel<GenericObject>,
   expanded: Record<string, boolean>,
   targetParent: string
 ) => {
-  const updateExpandedRows: Record<string, boolean> = {}
-  const rows = tableRows.flatRows
-  // Variable checks if all rows in a section have same expansion state or not
-  let isExpansionConsistent = true
-  const areRowsExpanded = new Set<boolean>()
+  const updateExpandedRows: Record<string, boolean> = {};
+  const rows = tableRows.rows;
+
+  let isExpansionConsistent = true;
+  const areRowsExpanded = new Set<boolean>();
 
-  // Update isExpansionConsistent variable
   for (const row of rows) {
-    if (
-      targetParent === undefined
-        ? row.depth === 0
-        : targetParent === row.parentId
-    ) {
-      areRowsExpanded.add(row.getIsExpanded())
-      if (areRowsExpanded.size > 1) {
-        isExpansionConsistent = false
-        break
-      }
-    }
-  }
+    const shouldBeUpdated = targetParent === undefined ? row.depth === 0 : targetParent === row.parentId;
+    
+    if (shouldBeUpdated) {
+      const isExpanded = row.getIsExpanded();
+      areRowsExpanded.add(isExpanded);
 
-  // The if statement runs only for row depth 0, the else statement for the rest
-  if (targetParent === undefined) {
-    rows.forEach(row => {
-      if (row.depth === 0) {
-        updateExpandedRows[row.id] = !isExpansionConsistent
-          ? true
-          : !row.getIsExpanded()
-      }
-    })
-  } else {
-    for (const row of rows) {
-      if (targetParent === row.parentId) {
-        updateExpandedRows[row.id] = !isExpansionConsistent
-          ? true
-          : !row.getIsExpanded()
+      updateExpandedRows[row.id] = !isExpansionConsistent ? true : !isExpanded;
+
+      if (areRowsExpanded.size > 1) {
+        isExpansionConsistent = false;
+        // If expansion inconsistent, ensure all target rows are set to expand
+        for (const key in updateExpandedRows) {
+          updateExpandedRows[key] = true;
+        }
       }
     }
   }
@@ -58,5 +44,5 @@ export const updateExpandAndCollapseState = (
   return filterExpandableRows({
     ...(expanded as ExpandedStateObject),
     ...updateExpandedRows,
-  })
-}
+  });
+};

data/app/pb_kits/playbook/pb_advanced_table/Utilities/types.ts

@@ -4,5 +4,3 @@ export type ExpandedStateObject = Extract<
   ExpandedState,
   Record<string, boolean>
 >
-
-export type DataType = { [key: string]: any }

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

@@ -4,6 +4,7 @@
 @import "../tokens/spacing";
 @import "./scss_partials/loading";
 @import "./scss_partials/pseudo_states";
+@import "./scss_partials/chrome_styles";
 
 .pb_advanced_table {
   $border-color: 1px solid $border_light !important;
@@ -82,18 +83,15 @@
 
   // Vertical separator
   .table-header-cells:first-child,
-  td:first-child {
-    box-shadow: 1px 0px 0px 0px #e4e8f0 !important;
+  td:first-child,
+  .pb_table_td:first-child {
+    box-shadow: 1px 0px 0px 0px $border_light !important;
   }
 
-  .chrome-styles:first-child {
-    border-right: $border-color;
-  }
+  @include chrome_styles($border-color);
 
-  .table-card {
-    .chrome-styles:first-child {
-      border-right: $transparent !important;
-    }
+  tr:hover {
+    position: relative;
   }
 
   &.dark {