playbook_ui 15.0.0.pre.alpha.PLAY2316advancedtablerightsidedoubleborder10726 → 15.0.0.pre.alpha.PLAY2361datepickerarrownav10322

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ef0658e6d9c23d41ea65c00be38569176f4d7b8911c7fdd425a67b2858c9b2a
-  data.tar.gz: 2ec1f5620e998f4b029fb672df45a92821dd529fe58337fcf4f86a44cc9e7a38
+  metadata.gz: 31438297024b3fbb6e584829495fe6e8aa6ea98094112fea6c18121768f7bec5
+  data.tar.gz: 9c4f9ad913d1b459fe57544d70905181911fc09d7c0e48777e75998d44dd4e32
 SHA512:
-  metadata.gz: 8a6a22d86257dd916986a0736dbfc8d71a8bbe403e85686bf6e0c09c0752e9dc5ec10f6fcf543e179b0dc74b119e2e6a797077ad3ea7383ba22c0c788c3cc758
-  data.tar.gz: 7e326e0a94d9754290b59e0f888ff462f2dba08ba0eacb1596d9c2b1f638423bd8f6d42d4991370fdd174bb5e933465a6ba219fdcfede0361bec9eb89a3b0202
+  metadata.gz: b66ec13b8b0fa36915feb7b9b1aad85ce4e800059c555b54b96c67c0f9603c48ffcc2a8d5a678ef612cad8aeeaa4bef705b93cfbf2301b007850580a4943cae0
+  data.tar.gz: 1e7c437b51419f24422599984a12fdd2963c582c92177a342bb5f7dc9b2b7a6942785ac6b6b27c4903a49043b7c3c8fcd487d2c2d4f1ba8ee9fbd88c06c38fdf

data/app/pb_kits/playbook/_playbook.scss

@@ -1,6 +1,5 @@
 
 
-
 @import 'pb_advanced_table/advanced_table';
 @import 'pb_avatar/avatar';
 @import 'pb_background/background';
@@ -109,8 +108,6 @@
 @import 'pb_user_badge/user_badge';
 @import 'pb_weekday_stacked/weekday_stacked';
 @import 'pb_empty_state/empty_state';
-@import 'pb_pb_bar_graph/pb_bar_graph';
-@import 'pb_pb_circle_chart/pb_circle_chart';
 @import 'utilities/mixins';
 @import 'utilities/spacing';
 @import 'utilities/cursor';

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

@@ -5,7 +5,6 @@ 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"
@@ -30,7 +29,6 @@ const TableCellRenderer = ({
   columnPinning,
   customRowStyle,
   columnDefinitions,
-  isMultiHeaderColumn = false,
 }: {
   row: Row<GenericObject>
   collapsibleTrail?: boolean
@@ -39,18 +37,12 @@ const TableCellRenderer = ({
   columnPinning: { left: string[] }
   customRowStyle?: GenericObject
   columnDefinitions?: {[key:string]:any}[]
-  isMultiHeaderColumn?: boolean
 }) => {
   return (
     <>
       {row.getVisibleCells().map((cell: Cell<GenericObject, unknown>, i: number) => {
         const isPinnedLeft = columnPinning.left.includes(cell.column.id);
-        // Add a border to the right of each group of columns for multi-header column tables
         const isLastCell = (() => {
-          if (!isMultiHeaderColumn) {
-            return false;
-          }
-
           const parent = cell.column.parent;
           if (!parent) {
             const last = row.getVisibleCells().at(-1);
@@ -68,7 +60,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}
@@ -140,10 +132,6 @@ export const RegularTableView = ({
 
   const columnPinning = table.getState().columnPinning || { left: [] };
   const columnDefinitions = table.options.meta?.columnDefinitions || [];
-  const isMultiHeaderColumn = columnDefinitions.some(
-    (obj: Record<string, unknown>) => "columns" in obj
-  );
-
   // Row pinning
   function PinnedRow({ row }: { row: Row<any> }) {
     const customRowStyle = rowStyling?.length > 0 && rowStyling?.find((s: GenericObject) => s?.rowId === row.id);
@@ -156,7 +144,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,
@@ -168,7 +156,6 @@ export const RegularTableView = ({
             columnDefinitions={columnDefinitions}
             columnPinning={columnPinning}
             customRowStyle={customRowStyle}
-            isMultiHeaderColumn={isMultiHeaderColumn}
             loading={loading}
             row={row}
             stickyLeftColumn={stickyLeftColumn}
@@ -182,20 +169,21 @@ 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 && (
@@ -232,7 +220,6 @@ export const RegularTableView = ({
                   columnDefinitions={columnDefinitions}
                   columnPinning={columnPinning}
                   customRowStyle={customRowStyle}
-                  isMultiHeaderColumn={isMultiHeaderColumn}
                   loading={loading}
                   row={row}
                   stickyLeftColumn={stickyLeftColumn}
@@ -241,7 +228,7 @@ export const RegularTableView = ({
 
             {/* Display LoadingInline if Row Data is querying and there are no children already */}
             {isDataLoading && (
-              <tr key={`${row.id}-loading-row`}>
+              <tr key={`${row.id}-row`}>
                 <td colSpan={numberOfColumns}
                     style={{ paddingLeft: `${row.depth === 0 ? 0.5 : (row.depth * 2)}em` }}
                 >
@@ -256,4 +243,4 @@ export const RegularTableView = ({
   );
 }
 
-export default RegularTableView;
+export default RegularTableView;

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

@@ -7,7 +7,6 @@ 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"
@@ -46,10 +45,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} = {};
@@ -137,7 +136,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;
 
@@ -173,9 +172,10 @@ export const VirtualizedTableView = ({
 
         if (item.type === 'row') {
           const row = item.row;
-
-          // Use the utility function to get consistent row color
-          const rowColor = getRowColorClass(row, inlineRowLoading || false);
+          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";
 
           return (
             <tr

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

@@ -10,14 +10,9 @@ 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));
 
-  // 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";
+  return row.getIsSelected() ? "bg-row-selection" : rowBackground ? "bg-silver" : "bg-white";
 }
 
 /**

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

@@ -249,10 +249,8 @@
   }
 
   .pb_advanced_table_body {
-    tr {
-      .last-cell:not(:last-of-type) {
-        border-right: 1px solid $border_light !important;
-      }
+    .last-cell {
+      border-right: 1px solid $border_light !important;
     }
     tr td:first-child {
       padding-left: 8px !important;
@@ -703,14 +701,6 @@
           }
         }
       }
-
-      .pb_advanced_table_header {
-        > tr {
-          .last-header-cell:last-of-type {
-            border-right-width: 0 !important;
-          }
-        }
-      }
     }
   }
 
@@ -985,14 +975,14 @@
   // Firefox-specific fix for last-header-cell and last-cell vertical borders
   @-moz-document url-prefix() {
     .pb_advanced_table_header {
-      .last-header-cell:not(:last-child) {
+      .last-header-cell {
         border-right: none !important;
         box-shadow: 1px 0 0 0 $border_light !important;
       }
     }
 
     .pb_advanced_table_body {
-      .last-cell:not(:last-child) {
+      .last-cell {
         border-right: none !important;
         box-shadow: 1px 0 0 0 $border_light !important;
       }
@@ -1001,14 +991,14 @@
     // Dark mode Firefox fixes
     &.dark {
       .pb_advanced_table_header {
-        .last-header-cell:not(:last-child) {
+        .last-header-cell {
           border-right: none !important;
           box-shadow: 1px 0 0 0 $border_dark !important;
         }
       }
 
       .pb_advanced_table_body {
-        .last-cell:not(:last-child) {
+        .last-cell {
           border-right: none !important;
           box-shadow: 1px 0 0 0 $border_dark !important;
         }
@@ -1021,62 +1011,18 @@
 .pb-advanced-table-popover-option:hover {
   background-color: $bg_light;
 }
-
 // Removes borders when Wrapped inside the Card Kit
-.pb_card_kit > .pb_advanced_table {
-  // Remove right border only from the actual last column
-  .pb_advanced_table_body tr td:last-child,
-  .pb_advanced_table_header tr th:last-child {
-    box-shadow: none !important; // prevents double up of borders on Firefox when in Card Kit
+.pb_card_kit > .pb_advanced_table .pb_advanced_table_body .last-cell,
+.pb_card_kit > .pb_advanced_table .pb_advanced_table_header .last-header-cell,
+.pb_card_kit > .pb_advanced_table .pb_advanced_table_body tr td:last-child,
+.pb_card_kit > .pb_advanced_table .pb_advanced_table_header tr th:last-child {
     border-right: none !important;
-  }
-
-  // Without vertical border, remove all last-cell borders
-  // Specifically for header to prevent thicker borders in firefox.
-  .pb_table:not(.vertical-border) {
-    .pb_advanced_table_header .last-header-cell {
-      box-shadow: none !important;
-    }
-  }
-  // Firefox fix
-  @-moz-document url-prefix() {
-    .pb_advanced_table_header {
-      .last-header-cell {
-        box-shadow: 1px 0 0 0 $border_light !important;
-      }
-    }
-  }
-
-  // For tables WITH vertical borders, only remove border from actual last column
-  .pb_table.vertical-border {
-    .pb_advanced_table_body .last-cell:not(:last-child),
-    .pb_advanced_table_header .last-header-cell:not(:last-child) {
-      box-shadow: none !important;
-      border-right: 1px solid $border_light !important;
-    }
-
-    // Dark mode
-    &.dark {
-      .pb_advanced_table_body .last-cell:not(:last-child),
-      .pb_advanced_table_header .last-header-cell:not(:last-child) {
-        border-right: 1px solid $border_dark !important;
-      }
-    }
-  }
-
-  // Support column group border colors
-  &.pb_advanced_table[class*="column-group-border-"] {
-    .pb_advanced_table_body .last-cell:not(:last-child),
-    .pb_advanced_table_header .last-header-cell:not(:last-child) {
-      border-right: 1px solid var(--column-border-color) !important;
-    }
-  }
 }
 
-// Removes bottom borders when wrapped inside the Card Kit (keep existing behavior)
-.pb_card_kit > .pb_advanced_table tr:last-child,
+//  Removes borders when Wrapped inside the Card Kit
+.pb_card_kit > .pb_advanced_table tr:last-child, 
 .pb_card_kit > .pb_advanced_table .last-row-cell {
   td {
-    border-bottom: none !important;
+    border-bottom: none !important; 
   }
 }

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_headers_vertical_border.html.erb

@@ -39,7 +39,5 @@
     ],
   },
 ] %>
-<%# Adjusting for test purposes. Will revert prior to commit. %>
-<%= pb_rails("card", props: {})  do %>
-  <%= pb_rails("advanced_table", props: { id: "table_multi_headers_vertical_borders", table_data: @table_data, column_definitions: column_definitions, table_props: { container: false, vertical_border: true } }) %>
-<% end %>
+
+<%= pb_rails("advanced_table", props: { id: "table_multi_headers_vertical_borders", table_data: @table_data, column_definitions: column_definitions, table_props: { vertical_border: true } }) %>

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_headers_vertical_border.jsx

@@ -1,5 +1,4 @@
 import React from "react"
-import Card from "../../pb_card/_card"
 import AdvancedTable from '../../pb_advanced_table/_advanced_table'
 import MOCK_DATA from "./advanced_table_mock_data.json"
 
@@ -45,21 +44,19 @@ const AdvancedTableColumnHeadersVerticalBorder = (props) => {
       ],
     },
   ];
-
+  
   const tableProps = {
-    sticky: true,
+    verticalBorder: true
   }
-// Adjusted for testing purposes. Will revert prior to commit.
+
   return (
     <>
-      <Card>
-        <AdvancedTable
-            columnDefinitions={columnDefinitions}
-            tableData={MOCK_DATA}
-            tableProps={tableProps}
-            {...props}
-        />
-      </Card>
+      <AdvancedTable
+          columnDefinitions={columnDefinitions}
+          tableData={MOCK_DATA}
+          tableProps={tableProps}
+          {...props}
+      />
     </>
   )
 }

data/app/pb_kits/playbook/pb_bar_graph/docs/example.yml

@@ -4,6 +4,7 @@ examples:
   - bar_graph_default: Default
   - bar_graph_legend: Legend
   - bar_graph_legend_position: Legend Position
+  - bar_graph_legend_non_clickable: Legend Non Clickable
   - bar_graph_height: Height
   - bar_graph_spline: Spline
   - bar_graph_colors: Color Overrides

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

@@ -20,7 +20,7 @@
 // Dark mode
 .pb_card_kit.dark {
   @include pb_card_dark;
-
+  
   &.pb_card_kit_selected {
     @include pb_card_selected_dark;
   }
@@ -33,8 +33,7 @@
 
 // Highlight styles
 .pb_card_kit_highlight_top,
-.pb_card_kit_highlight_side,
-.pb_card_kit_highlight_right_side {
+.pb_card_kit_highlight_side {
   overflow: hidden;
 }
 
@@ -53,20 +52,13 @@
   }
 }
 
-// Highlight side variants
+// Highlight side variants  
 @each $color_name, $color_value in $pb_card_highlight_colors {
   .pb_card_kit_highlight_side.pb_card_kit_highlight_#{$color_name}::before {
     @include pb_card_highlight($pb_card_highlight_size, 100%, $color_value);
   }
 }
 
-// Highlight side right variants
-@each $color_name, $color_value in $pb_card_highlight_colors {
-  .pb_card_kit_highlight_right_side.pb_card_kit_highlight_#{$color_name}::before {
-    @include pb_card_right_highlight($pb_card_highlight_size, 100%, $color_value);
-  }
-}
-
 // Card Header
 .pb_card_header_kit {
   flex-grow: 0;
@@ -76,7 +68,7 @@
   padding: $space_sm;
   border: 0;
   border-radius: $pb_card_header_border_radius $pb_card_header_border_radius 0px 0px;
-
+  
   // Inherit border radius from parent card
   .pb_card_kit_border_radius_xs & {
     border-radius: $border_radius_xs $border_radius_xs 0px 0px;

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

@@ -26,7 +26,7 @@ type CardPropTypes = {
   dragHandle?: boolean,
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
   highlight?: {
-    position?: "side" | "right_side" | "top",
+    position?: "side" | "top",
     color?: string,
   },
   id?: string,
@@ -56,7 +56,7 @@ const Header = (props: CardHeaderProps) => {
   const { children, className, headerColor = 'category_1', headerColorStriped = false } = props
   const headerColorCSS = `pb_card_header_kit_${headerColor}`
   const headerStripedCSS = headerColorStriped ? `pb_card_header_kit_${headerColor}_striped` : ''
-
+  
   const headerCSS = classnames(
     'pb_card_header_kit',
     headerColorCSS,
@@ -108,7 +108,7 @@ const Card = (props: CardPropTypes): React.ReactElement => {
   const borderRadiusCSS = borderRadius !== 'md' ? `pb_card_kit_border_radius_${borderRadius}` : ''
   const highlightPositionCSS = highlight.position ? `pb_card_kit_highlight_${highlight.position}` : ''
   const highlightColorCSS = highlight.color ? `pb_card_kit_highlight_${highlight.color}` : ''
-
+  
   const cardCss = classnames(
     'pb_card_kit', // Base class
     selectedCSS,

data/app/pb_kits/playbook/pb_card/_card_mixin.scss

@@ -87,16 +87,6 @@ $pb_card_header_colors: map-merge(map-merge(map-merge($product_colors, $addition
   background: $background;
 }
 
-@mixin pb_card_right_highlight($width, $height, $background){
-  content: "";
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: $width;
-  height: $height;
-  background: $background;
-}
-
 @mixin pb_card_header_color($header_color) {
   background: $header_color;
 }

data/app/pb_kits/playbook/pb_card/docs/_card_highlight.html.erb

@@ -4,9 +4,6 @@
 <%= pb_rails("card", props: {highlight: {position: "top", color:"warning"}, margin_bottom: "sm"}) do %>
   Top Position & Warning Color
 <% end %>
-<%= pb_rails("card", props: {highlight: {position: "right_side", color:"product_5_highlight"}, margin_bottom: "sm"}) do %>
-  Right Side Position & Product 5 Highlight Color
-<% end %>
 <%= pb_rails("card", props: {highlight: {position: "side", color:"category_2"}, margin_bottom: "sm"}) do %>
   Side Position & Category 2 Color
 <% end %>

data/app/pb_kits/playbook/pb_card/docs/_card_highlight.jsx

@@ -21,14 +21,6 @@ const CardHighlight = (props) => {
         {'Top Position & Warning Color'}
       </Card>
 
-      <Card
-          {...props}
-          highlight={{ position: 'right_side', color: 'product_5_highlight' }}
-          marginBottom="sm"
-      >
-        {'Right Side Position & Product 5 Highlight Color'}
-      </Card>
-
       <Card
           {...props}
           highlight={{ position: 'side', color: 'category_2' }}

data/app/pb_kits/playbook/pb_circle_icon_button/_circle_icon_button.tsx

@@ -65,7 +65,6 @@ const CircleIconButton = (props: CircleIconButtonProps): React.ReactElement => {
         id={id}
     >
       <Button
-          aria={aria}
           dark={dark}
           disabled={disabled}
           htmlType={type}
@@ -79,7 +78,6 @@ const CircleIconButton = (props: CircleIconButtonProps): React.ReactElement => {
       >
         <Icon
             fixedWidth
-            htmlOptions={{'aria-hidden': true}}
             icon={icon}
         />
       </Button>

data/app/pb_kits/playbook/pb_circle_icon_button/circle_icon_button.html.erb

@@ -1,6 +1,5 @@
 <%= pb_content_tag do %>
   <%= pb_rails("button", props: {
-    aria: object.aria,
     type: object.type, 
     loading: object.loading, 
     link: object.link, 

data/app/pb_kits/playbook/pb_collapsible/__snapshots__/collapsible.test.js.snap

@@ -28,7 +28,6 @@ exports[`html structure is correct 1`] = `
               style="vertical-align: middle; color: rgb(193, 205, 214);"
             >
               <svg
-                aria-label="chevron-down icon"
                 class="pb_custom_icon svg-inline--fa svg_lg svg_fw"
                 color="currentColor"
                 fill="none"

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

@@ -17,7 +17,6 @@ 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 }
@@ -25,10 +24,6 @@ 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,8 +29,6 @@ module Playbook
           "phone-slash"
         when "extension"
           "phone-plus"
-        when "international"
-          "globe"
         else # "unknown" || "other"
           "phone"
         end
@@ -41,8 +39,6 @@ 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,12 +66,6 @@ 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=""
@@ -89,11 +83,10 @@ 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 US phone related contact types", () => {
+test("not compliant values return null in phone related contact types", () => {
   const notCompliantValues = [
     "349-185-998223",
     "349-1858",
@@ -136,16 +129,3 @@ test("not compliant values return null in US 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: "work",
+  contact_type: "wrong number",
   contact_value: "3245627482",
 }) %>
 
@@ -21,18 +21,3 @@
   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",
-}) %>