playbook_ui 15.1.0.pre.rc.4 → 15.1.0.pre.rc.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 781c39ad9c1ce4cc93b33c4b8e8c1942922316fba49d5d4041c6bf432fd614e6
-  data.tar.gz: 4a35169f2420a0a8c7cf62128ceec089057b426d8f1afb4ec1de23199f42c467
+  metadata.gz: be07820eae48f55751ee29b773175ce6a997726cfc93fd85c641b0b52e3522ba
+  data.tar.gz: b6336435bb6e7682901c6d01b93f3e23d4dbbb4dd693432561528858eeed30ee
 SHA512:
-  metadata.gz: ffe7f4d984d663bcacf8250915d4146f1e3c35b124a432cc45e98ed779c9f9ddc92389c2020e76beaa531b23b4cfe9f29e86543f212afc84bcaf8a892549d68a
-  data.tar.gz: 12e04d9185e482e6938b55252794c988b3b52d5fbcd168ba3d17ada9131e611036f7dc888410c1469a6d50229df70bd70df60ff6a428960af0ff876981f8ec7e
+  metadata.gz: f9f46ecb93d48913e5a9dc8758ea1e23bdff305741e4f0a7f0ce00692a098034ccbfba2acc78781df0375281eb092a6a17b8ee6481528ed074b501a9c8cae80c
+  data.tar.gz: 7549d29737a7ecfa6acba26b5c622d5ee35d6164961c762012d867f1009539933ba45f4778a7b3c792c315ddc1a648fa1090cb61aee29055068801754a813023

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

@@ -5,6 +5,7 @@ import { flexRender, Row, Cell } from "@tanstack/react-table"
 import { GenericObject } from "../../types"
 import { isChrome } from "../Utilities/BrowserCheck"
 import { findColumnDefByAccessor } from "../Utilities/ColumnStylingHelper"
+import { getRowColorClass, shouldShowLoadingIndicator } from "../Utilities/RowUtils"
 
 import LoadingInline from "../../pb_loading_inline/_loading_inline"
 import Checkbox from "../../pb_checkbox/_checkbox"
@@ -60,7 +61,7 @@ const TableCellRenderer = ({
         const cellAlignment = colDef?.columnStyling?.cellAlignment ?? "right"
         const paddingValue = colDef?.columnStyling?.cellPadding ?? customRowStyle?.cellPadding
         const paddingClass = paddingValue ? `p_${paddingValue}` : undefined
-        
+
         return (
           <td
               align={cellAlignment}
@@ -132,6 +133,7 @@ export const RegularTableView = ({
 
   const columnPinning = table.getState().columnPinning || { left: [] };
   const columnDefinitions = table.options.meta?.columnDefinitions || [];
+
   // Row pinning
   function PinnedRow({ row }: { row: Row<any> }) {
     const customRowStyle = rowStyling?.length > 0 && rowStyling?.find((s: GenericObject) => s?.rowId === row.id);
@@ -144,7 +146,7 @@ export const RegularTableView = ({
             backgroundColor: customRowStyle?.backgroundColor ? customRowStyle?.backgroundColor : 'white',
             color: customRowStyle?.fontColor,
             position: 'sticky',
-            top:   
+            top:
               row.getIsPinned() === 'top'
                   ? `${row.getPinnedIndex() * rowHeight + headerHeight}px`
                   : undefined,
@@ -169,21 +171,20 @@ export const RegularTableView = ({
   return (
     <>
       {pinnedRows && table.getTopRows().map((row: Row<GenericObject>) => (
-        <PinnedRow key={row.id} 
-            row={row} 
+        <PinnedRow key={row.id}
+            row={row}
         />
       ))}
       {totalRows.map((row: Row<GenericObject>, rowIndex: number) => {
-        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";
         const isFirstRegularRow = rowIndex === 0 && !row.getIsPinned();
         const customRowStyle = rowStyling?.length > 0 && rowStyling?.find((s: GenericObject) => s?.rowId === row.id);
 
+        // Use functions from RowUtils for consistent cell coloring
+        const rowColor = getRowColorClass(row, inlineRowLoading || false);
+        const isDataLoading = shouldShowLoadingIndicator(row, inlineRowLoading || false, columnDefinitions[0]?.cellAccessors?.length || 0);
+
         return (
           <React.Fragment key={`${row.index}-${row.id}-${row.depth}-row`}>
             {isFirstChildofSubrow && subRowHeaders && (
@@ -228,7 +229,7 @@ export const RegularTableView = ({
 
             {/* Display LoadingInline if Row Data is querying and there are no children already */}
             {isDataLoading && (
-              <tr key={`${row.id}-row`}>
+              <tr key={`${row.id}-loading-row`}>
                 <td colSpan={numberOfColumns}
                     style={{ paddingLeft: `${row.depth === 0 ? 0.5 : (row.depth * 2)}em` }}
                 >
@@ -243,4 +244,4 @@ export const RegularTableView = ({
   );
 }
 
-export default RegularTableView;
+export default RegularTableView;

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

@@ -7,6 +7,7 @@ import { GenericObject } from "../../types"
 
 import { isChrome } from "../Utilities/BrowserCheck"
 import { getVirtualizedRowStyle } from "../Utilities/TableContainerStyles"
+import { getRowColorClass } from "../Utilities/RowUtils"
 
 import LoadingInline from "../../pb_loading_inline/_loading_inline"
 import Checkbox from "../../pb_checkbox/_checkbox"
@@ -45,10 +46,10 @@ export const VirtualizedTableView = ({
 
   const columnPinning = table.getState().columnPinning || { left: [] };
   const sortingState = JSON.stringify(table.getState().sorting || []);
-  
+
   // Store column widths extracted from header
   const [columnWidths, setColumnWidths] = useState<{[key: string]: string}>({});
-  
+
   // Function to get header cell widths
   const getHeaderCellWidths = () => {
     const widths: {[key: string]: string} = {};
@@ -136,7 +137,7 @@ export const VirtualizedTableView = ({
       </tr>
     );
   }
-  
+
   // Establish # of Parent Rows (so that Footer count does not include every single row)
   const topLevelRowCount = table.getRowModel().flatRows.filter((row: Row<GenericObject>) => row.depth === 0).length;
 
@@ -172,10 +173,9 @@ export const VirtualizedTableView = ({
 
         if (item.type === 'row') {
           const row = item.row;
-          const isExpandable = row.getIsExpanded();
-          const rowHasNoChildren = row.original?.children && !row.original.children.length;
-          const rowBackground = isExpandable && ((!inlineRowLoading && row.getCanExpand()) || (inlineRowLoading && rowHasNoChildren));
-          const rowColor = row.getIsSelected() ? "bg-row-selection" : rowBackground ? "bg-silver" : "bg-white";
+
+          // Use the utility function to get consistent row color
+          const rowColor = getRowColorClass(row, inlineRowLoading || false);
 
           return (
             <tr

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

@@ -10,9 +10,14 @@ export const getRowColorClass = (
 ): string => {
   const isExpandable = row.getIsExpanded();
   const rowHasNoChildren = row.original?.children && !row.original.children.length ? true : false;
-  const rowBackground = isExpandable && ((!inlineRowLoading && row.getCanExpand()) || (inlineRowLoading && rowHasNoChildren));
 
-  return row.getIsSelected() ? "bg-row-selection" : rowBackground ? "bg-silver" : "bg-white";
+  // Check if row can expand or is currently expanded
+  const shouldShowExpandedBackground = isExpandable && (
+    (!inlineRowLoading && row.getCanExpand()) ||
+    (inlineRowLoading && (rowHasNoChildren || row.getCanExpand()))
+  );
+
+  return row.getIsSelected() ? "bg-row-selection" : shouldShowExpandedBackground ? "bg-silver" : "bg-white";
 }
 
 /**

data/app/pb_kits/playbook/pb_contact/_contact.tsx

@@ -17,6 +17,7 @@ const contactTypeMap: { [key: string]: string } = {
   'work': 'phone-office',
   'work-cell': 'phone-laptop',
   'wrong-phone': 'phone-slash',
+  'international': 'globe',
 }
 
 const envelopeIcon = getAllIcons()["envelope"].icon as unknown as { [key: string]: SVGElement }
@@ -24,6 +25,10 @@ const envelopeIcon = getAllIcons()["envelope"].icon as unknown as { [key: string
 const formatContact = (contactString: string, contactType: string) => {
   if (contactType === 'email') return contactString
 
+  // International phone numbers are unformatted
+  if (contactType === 'international') return contactString
+  
+  // Format US numbers
   const cleaned = contactString.replace(/\D/g, '')
   const phoneNumber = cleaned.match(/^(1|)?(\d{3})(\d{3})(\d{4})$/)
 

data/app/pb_kits/playbook/pb_contact/contact.rb

@@ -29,6 +29,8 @@ module Playbook
           "phone-slash"
         when "extension"
           "phone-plus"
+        when "international"
+          "globe"
         else # "unknown" || "other"
           "phone"
         end
@@ -39,6 +41,8 @@ module Playbook
           contact_value
         elsif contact_type == "extension" && contact_value.match(/^\d{4}$/)
           contact_value
+        elsif contact_type == "international"
+          contact_value
         else
           number_to_phone(formatted_value, area_code: true)
         end

data/app/pb_kits/playbook/pb_contact/contact.test.js

@@ -66,6 +66,12 @@ test('returns correct icon', () => {
           contactValue="1234"
           data={{ testid: 'test-extension' }}
       />
+      <Contact
+          contactDetail="International"
+          contactType="international"
+          contactValue="+44 20 7946 0958"
+          data={{ testid: 'test-international' }}
+      />
       <Contact
           contactDetail=""
           contactType=""
@@ -83,10 +89,11 @@ test('returns correct icon', () => {
   expect(screen.getByTestId('test-wrong-phone').querySelector('.pb_custom_icon')).toBeInTheDocument()
   expect(screen.getByTestId('test-wrong-type').querySelector('.pb_custom_icon')).toBeInTheDocument()
   expect(screen.getByTestId('test-extension').querySelector('.pb_custom_icon')).toBeInTheDocument()
+  expect(screen.getByTestId('test-international').querySelector('.pb_custom_icon')).toBeInTheDocument()
   expect(screen.getByTestId('test-empty').querySelector('.pb_custom_icon')).toBeInTheDocument()
 })
 
-test("not compliant values return null in phone related contact types", () => {
+test("not compliant values return null in US phone related contact types", () => {
   const notCompliantValues = [
     "349-185-998223",
     "349-1858",
@@ -129,3 +136,16 @@ test("not compliant values return null in phone related contact types", () => {
     )
   })
 })
+
+test('international contact type preserves original format', () => {
+  render(
+    <Contact
+        contactType="international"
+        contactValue="+44 20 7946 0958"
+        data={{ testid: 'test-international-format' }}
+    />
+  )
+
+  const kit = screen.getByTestId('test-international-format')
+  expect(kit).toHaveTextContent('+44 20 7946 0958')
+})

data/app/pb_kits/playbook/pb_contact/docs/_contact_default.html.erb

@@ -13,7 +13,7 @@
 }) %>
 
 <%= pb_rails("contact", props: {
-  contact_type: "wrong number",
+  contact_type: "work",
   contact_value: "3245627482",
 }) %>
 
@@ -21,3 +21,18 @@
   contact_type: "work-cell",
   contact_value: "349-185-9988",
 }) %>
+
+<%= pb_rails("contact", props: {
+  contact_type: "wrong-phone",
+  contact_value: "2124396666",
+}) %>
+
+<%= pb_rails("contact", props: {
+  contact_type: "extension",
+  contact_value: "1233",
+}) %>
+
+<%= pb_rails("contact", props: {
+  contact_type: "international",
+  contact_value: "+44 7700 900461",
+}) %>

data/app/pb_kits/playbook/pb_contact/docs/_contact_default.jsx

@@ -28,6 +28,21 @@ const ContactDefault = (props) => {
           contactValue="3245627482"
           {...props}
       />
+      <Contact
+          contactType="wrong-phone"
+          contactValue="2124396666"
+          {...props}
+      />
+      <Contact
+          contactType='extension'
+          contactValue="1234"
+          {...props}
+      />
+      <Contact
+          contactType="international"
+          contactValue="+44 7700 900461"
+          {...props}
+      />
     </div>
   )
 }

data/app/pb_kits/playbook/pb_contact/docs/_contact_default.md

@@ -0,0 +1,5 @@
+The Contact kit automatically formats US phone numbers when the `contactType` / `contact_type` is one of: `home` (default), `work`, `cell`, `work-cell`, `wrong-phone`.
+
+- Use `email` to display emails.
+- Use `international` to display International phone numbers exactly as provided (no formatting applied).
+- Use `extension` to display four digit phone extensions.

data/app/pb_kits/playbook/pb_contact/docs/_contact_with_detail.html.erb

@@ -26,3 +26,9 @@
   contact_value: "1233",
   contact_detail: "Ext",
 }) %>
+
+<%= pb_rails("contact", props: {
+  contact_type: "international",
+  contact_value: "+44 7700 900461",
+  contact_detail: "International",
+}) %>

data/app/pb_kits/playbook/pb_contact/docs/_contact_with_detail.jsx

@@ -33,6 +33,12 @@ const ContactDefault = (props) => {
           contactValue="1234"
           {...props}
       />
+      <Contact
+          contactDetail="International"
+          contactType="international"
+          contactValue="+44 7700 900461"
+          {...props}
+      />
     </div>
   )
 }

data/app/pb_kits/playbook/pb_section_separator/_section_separator.scss

@@ -53,10 +53,13 @@ $section_colors_dark: (
 .pb_section_separator_vertical {
   margin-left: $space_xs;
   margin-right: $space_xs;
+  flex-direction: column;
   &::before {
-    display: none;
+    flex: 1;
+    @include section_separator_vertical(false);
   }
   &::after {
+    flex: 1;
     @include section_separator_vertical(false);
   }
 }
@@ -87,7 +90,7 @@ $section_colors_dark: (
         background: none;
       }
       &.pb_section_separator_vertical {
-        &::after {
+        &::before, &::after {
           border: 1px dashed $color_value;
           background: none;
         }
@@ -106,7 +109,7 @@ $section_colors_dark: (
   }
   
   &.pb_section_separator_vertical {
-    &::after {
+    &::before, &::after {
       @include section_separator_vertical(true);
     }
   }
@@ -115,6 +118,11 @@ $section_colors_dark: (
     &::before, &::after {
       @include section_separator_dashed(true);
     }
+    &.pb_section_separator_vertical {
+      &::before, &::after {
+        @include section_separator_dashed(true);
+      }
+    }
   }
 }
 
@@ -126,7 +134,7 @@ $section_colors_dark: (
     }
 
     &.pb_section_separator_vertical {
-      &::after {
+      &::before, &::after {
         @include section_separator_vertical(false);
         background: $color_value;
       }
@@ -138,7 +146,7 @@ $section_colors_dark: (
         background: none;
       }
       &.pb_section_separator_vertical {
-        &::after {
+        &::before, &::after {
           border: 1px dashed $color_value;
           background: none;
         }

data/app/pb_kits/playbook/pb_section_separator/docs/_section_separator_children.html.erb

@@ -11,4 +11,27 @@
             padding_right: "xs" 
         }) %>
     <% end %>
+<% end %>
+
+<%= pb_rails("flex", props: { classname: "flex-container", margin_top: "lg", vertical: "stretch" }) do %>
+    <%= pb_rails("body", props: { classname: "flex-item" }) do %>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua
+    <% end %>
+    <%= pb_rails("section_separator", props: { orientation: "vertical" }) do %>
+        <%= pb_rails("card", props: {
+            border_radius: "rounded",
+            justify_content: "center",
+            padding: "none"
+        })  do %>
+            <%= pb_rails("caption", props: {
+                text: "TODAY",
+                size: "xs",
+                padding_left: "xs",
+                padding_right: "xs" 
+            }) %>
+        <% end %>
+    <% end %>
+    <%= pb_rails("body", props: { classname: "flex-item" }) do %>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua
+    <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_section_separator/docs/_section_separator_children.jsx

@@ -2,8 +2,25 @@ import React from 'react'
 import Card from '../../pb_card/_card'
 import Caption from '../../pb_caption/_caption'
 import SectionSeparator from '../../pb_section_separator/_section_separator'
+import Flex from '../../pb_flex/_flex'
+import FlexItem from '../../pb_flex/_flex_item'
 
-const children = (
+const childrenHorizontal = (
+    <Card
+        borderRadius="rounded"
+        justifyContent="center"
+        padding="none"
+    >
+        <Caption
+            paddingLeft="xs"
+            paddingRight="xs"
+            size="xs"
+            text="TODAY"
+        />
+    </Card>
+)
+
+const childrenVertical = (
     <Card
         borderRadius="rounded"
         justifyContent="center"
@@ -20,12 +37,33 @@ const children = (
 
 const SectionSeparatorChildren = (props) => {
     return (
-        <SectionSeparator
-            {...props}
-            lineStyle='dashed'
-        >
-            {children}
-        </SectionSeparator>
+        <>
+            <SectionSeparator
+                {...props}
+                lineStyle='dashed'
+            >
+                {childrenHorizontal}
+            </SectionSeparator>
+            <Flex
+                inline="flex-container"
+                marginTop="lg"
+                vertical="stretch"
+            >
+                <FlexItem>
+                    {'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua'}
+                </FlexItem>
+                    <SectionSeparator
+                        orientation="vertical"
+                        {...props}
+                    >
+                        {childrenVertical}
+                    </SectionSeparator>
+                <FlexItem>
+                    {'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua'}
+                </FlexItem>
+            </Flex>
+        </>
+        
     )
 }
 

data/app/pb_kits/playbook/pb_section_separator/section_separator.html.erb

@@ -7,7 +7,10 @@
         <% end %>
     <% end %>
     <% if object.orientation === 'vertical' %>
-        <%= pb_rails("flex", props: { orientation: "column"}) do %>
+        <% if content %>
+            <%= content %>
+        <% elsif object.text %>
+            <span><%= pb_rails("caption", props: { text: object.text }) %></span>
         <% end %>
     <%end%>
 <% end %>

data/app/pb_kits/playbook/pb_section_separator/section_separator.test.js

@@ -0,0 +1,165 @@
+import React from 'react'
+import { render, screen } from '../utilities/test-utils'
+
+import SectionSeparator from './_section_separator'
+
+const testId = "section-separator-kit"
+
+describe("Section Separator Kit", () => {
+    test("renders basic section separator with default props", () => {
+        render(
+            <SectionSeparator
+                data={{ testid: testId }}
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_card pb_section_separator_horizontal pb_section_separator_solid pb_section_separator_color_default")
+    })
+
+    test("renders with text prop", () => {
+        const text = "Section Title"
+        render(
+            <SectionSeparator
+                data={{ testid: testId }}
+                text={text}
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        const textElement = screen.getByText(text)
+        
+        expect(kit).toHaveClass("pb_section_separator_kit")
+        expect(textElement).toBeInTheDocument()
+    })
+
+    test("renders with children", () => {
+        const childText = "Custom Content"
+        render(
+            <SectionSeparator
+                data={{ testid: testId }}
+            >
+                <span>{childText}</span>
+            </SectionSeparator>
+        )
+
+        const kit = screen.getByTestId(testId)
+        const childElement = screen.getByText(childText)
+        
+        expect(kit).toHaveClass("pb_section_separator_kit")
+        expect(childElement).toBeInTheDocument()
+    })
+
+    test("renders vertical orientation", () => {
+        render(
+            <SectionSeparator
+                data={{ testid: testId }}
+                orientation="vertical"
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_card pb_section_separator_vertical pb_section_separator_solid pb_section_separator_color_default")
+    })
+
+    test("renders background variant", () => {
+        render(
+            <SectionSeparator
+                data={{ testid: testId }}
+                variant="background"
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_background pb_section_separator_horizontal pb_section_separator_solid pb_section_separator_color_default")
+    })
+
+    test("renders dashed line style", () => {
+        render(
+            <SectionSeparator
+                data={{ testid: testId }}
+                lineStyle="dashed"
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_card pb_section_separator_horizontal pb_section_separator_dashed pb_section_separator_color_default")
+    })
+
+    test("renders primary color", () => {
+        render(
+            <SectionSeparator
+                color="primary"
+                data={{ testid: testId }}
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_card pb_section_separator_horizontal pb_section_separator_solid pb_section_separator_color_primary")
+    })
+
+    test("renders dark mode", () => {
+        render(
+            <SectionSeparator
+                dark
+                data={{ testid: testId }}
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_card pb_section_separator_horizontal pb_section_separator_solid pb_section_separator_color_default")
+    })
+
+    test("renders with custom className", () => {
+        const customClass = "custom-class"
+        render(
+            <SectionSeparator
+                className={customClass}
+                data={{ testid: testId }}
+            />
+        )
+
+        const kit = screen.getByTestId(testId)
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_card pb_section_separator_horizontal pb_section_separator_solid pb_section_separator_color_default custom-class")
+    })
+
+    test("renders vertical with children", () => {
+        const childText = "Vertical Content"
+        render(
+            <SectionSeparator
+                data={{ testid: testId }}
+                orientation="vertical"
+            >
+                <span>{childText}</span>
+            </SectionSeparator>
+        )
+
+        const kit = screen.getByTestId(testId)
+        const childElement = screen.getByText(childText)
+        
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_card pb_section_separator_vertical pb_section_separator_solid pb_section_separator_color_default")
+        expect(childElement).toBeInTheDocument()
+    })
+
+    test("renders all props combined", () => {
+        const text = "Combined Props"
+        render(
+            <SectionSeparator
+                color="primary"
+                dark
+                data={{ testid: testId }}
+                lineStyle="dashed"
+                orientation="vertical"
+                variant="background"
+            >
+                <span>{text}</span>
+            </SectionSeparator>
+        )
+
+        const kit = screen.getByTestId(testId)
+        const childElement = screen.getByText(text)
+        
+        expect(kit).toHaveClass("pb_section_separator_kit pb_section_separator_background pb_section_separator_vertical pb_section_separator_dashed pb_section_separator_color_primary")
+        expect(childElement).toBeInTheDocument()
+    })
+})