playbook_ui 14.25.0.pre.alpha.PLAY2419dialogaccessibility9839 → 14.25.0.pre.alpha.PLAY2419dialogaccessibility10271

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

@@ -1,107 +1,144 @@
 @import "card_mixin";
 @import "../utilities/colors";
+@import "../tokens/border_radius";
 
-[class^=pb_card_kit] {
+.pb_card_kit {
   @include pb_card;
   padding: $space_md;
 
-  &[class*=_selected] {
-    @include pb_card_selected;
+  .card_draggable_handle {
+    align-self: center;
+    color: $text_lt_light;
   }
+}
 
-  &.dark {
-    @include pb_card_dark;
+// Selected state
+.pb_card_kit_selected {
+  @include pb_card_selected;
+}
 
-    &[class*=_selected] {
-      @include pb_card_selected_dark;
-    }
+// Dark mode
+.pb_card_kit.dark {
+  @include pb_card_dark;
+  
+  &.pb_card_kit_selected {
+    @include pb_card_selected_dark;
   }
+}
 
-  &[class*=_border_none] {
-    border-width: 0px;
-  }
+// Border styles
+.pb_card_kit_border_none {
+  border-width: 0px;
+}
 
-  @function ends-with($string, $suffix) {
-    $suffix-length: str-length($suffix);
-    @if $suffix-length == 0 {
-      @return true;
-    }
-    @return str-slice($string, -$suffix-length) == $suffix;
+// Highlight styles
+.pb_card_kit_highlight_top,
+.pb_card_kit_highlight_side {
+  overflow: hidden;
+}
+
+@function ends-with($string, $suffix) {
+  $suffix-length: str-length($suffix);
+  @if $suffix-length == 0 {
+    @return true;
   }
+  @return str-slice($string, -$suffix-length) == $suffix;
+}
 
-  [class^=pb_card_header_kit] {
-    flex-grow: 0;
-    flex-shrink: 0;
-    flex-basis: auto;
-    min-height: 1px;
-    padding: $space_sm;
-    border: 0;
-    border-radius: $pb_card_header_border_radius $pb_card_header_border_radius 0px 0px;
-    @each $color_name, $color_value in $pb_card_header_colors {
-      @if not ends-with($color_name, '_subtle') {
-        &[class*="_#{$color_name}"] {
-          @include pb_card_header_color($color_value);
-          color: lightenText($color_value);
-        }
-      }
-    }
-    @each $color_name, $color_value in $pb_card_header_colors {
-      @if ends-with($color_name, '_subtle') {
-        &[class*="_#{$color_name}"] {
-          @include pb_card_header_color($color_value);
-          color: lightenText($color_value);
-        }
-      }
-    }
-    @each $color_name, $color_value in $pb_card_header_colors {
-      &[class*=_#{$color_name}_striped] {
-        @if ((type-of($color_value) == color)) {
-          background: repeating-linear-gradient(
-            45deg,
-            $color_value,
-            $color_value 10px,
-            lighten( $color_value, 5% ) 10px,
-            lighten( $color_value, 5% ) 20px
-          );
-        }
-      }
-    }
-    &[class*=_white] {
-      border-bottom: 1px solid $border_light;
-    }
+// Highlight top variants
+@each $color_name, $color_value in $pb_card_highlight_colors {
+  .pb_card_kit_highlight_top.pb_card_kit_highlight_#{$color_name}::before {
+    @include pb_card_highlight(100%, $pb_card_highlight_size, $color_value);
   }
+}
 
-  [class^=pb_card_body_kit] {
-    flex-grow: 0;
-    flex-shrink: 0;
-    flex-basis: auto;
-    min-height: 1px;
-    border: 0;
-    padding: $space_md;
+// 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);
   }
+}
 
-  &[class*=_highlight] {
-    overflow: hidden;
+// Card Header
+.pb_card_header_kit {
+  flex-grow: 0;
+  flex-shrink: 0;
+  flex-basis: auto;
+  min-height: 1px;
+  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;
+  }
+  .pb_card_kit_border_radius_sm & {
+    border-radius: $border_radius_sm $border_radius_sm 0px 0px;
+  }
+  .pb_card_kit_border_radius_md & {
+    border-radius: $border_radius_md $border_radius_md 0px 0px;
+  }
+  .pb_card_kit_border_radius_lg & {
+    border-radius: $border_radius_lg $border_radius_lg 0px 0px;
+  }
+  .pb_card_kit_border_radius_xl & {
+    border-radius: $border_radius_xl $border_radius_xl 0px 0px;
   }
+  .pb_card_kit_border_radius_rounded & {
+    border-radius: $border_radius_rounded $border_radius_rounded 0px 0px;
+  }
+  .pb_card_kit_border_radius_none & {
+    border-radius: 0px;
+  }
+}
 
-  &[class*=_highlight_top] {
-    @each $color_name, $color_value in $pb_card_highlight_colors {
-      &[class*=_highlight_#{$color_name}]::before {
-        @include pb_card_highlight(100%, $pb_card_highlight_size, $color_value);
-      }
+// Header colors (non-subtle)
+@each $color_name, $color_value in $pb_card_header_colors {
+  @if not ends-with($color_name, '_subtle') {
+    .pb_card_header_kit_#{$color_name} {
+      @include pb_card_header_color($color_value);
+      color: lightenText($color_value);
     }
   }
+}
 
-  &[class*=_highlight_side] {
-    @each $color_name, $color_value in $pb_card_highlight_colors {
-      &[class*=_highlight_#{$color_name}]::before {
-        @include pb_card_highlight($pb_card_highlight_size, 100%, $color_value);
-      }
+// Header colors (subtle)
+@each $color_name, $color_value in $pb_card_header_colors {
+  @if ends-with($color_name, '_subtle') {
+    .pb_card_header_kit_#{$color_name} {
+      @include pb_card_header_color($color_value);
+      color: lightenText($color_value);
     }
   }
+}
 
-  .card_draggable_handle {
-    align-self: center;
-    color: $text_lt_light;
+// Header striped patterns
+@each $color_name, $color_value in $pb_card_header_colors {
+  .pb_card_header_kit_#{$color_name}_striped {
+    @if ((type-of($color_value) == color)) {
+      background: repeating-linear-gradient(
+        45deg,
+        $color_value,
+        $color_value 10px,
+        lighten( $color_value, 5% ) 10px,
+        lighten( $color_value, 5% ) 20px
+      );
+    }
   }
 }
+
+// White header special case
+.pb_card_header_kit_white {
+  border-bottom: 1px solid $border_light;
+}
+
+// Card Body
+.pb_card_body_kit {
+  flex-grow: 0;
+  flex-shrink: 0;
+  flex-basis: auto;
+  min-height: 1px;
+  border: 0;
+  padding: $space_md;
+}

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

@@ -5,7 +5,7 @@ import { get } from '../utilities/object'
 
 import classnames from 'classnames'
 
-import { buildAriaProps, buildCss, buildDataProps, buildHtmlProps } from '../utilities/props'
+import { buildAriaProps, buildDataProps, buildHtmlProps } from '../utilities/props'
 import { GlobalProps, globalProps, globalInlineProps } from '../utilities/globalProps'
 import type { ProductColors, CategoryColors, BackgroundColors, StatusColors } from '../types/colors'
 
@@ -54,7 +54,14 @@ type CardBodyProps = {
 // Header component
 const Header = (props: CardHeaderProps) => {
   const { children, className, headerColor = 'category_1', headerColorStriped = false } = props
-  const headerCSS = buildCss('pb_card_header_kit', `${headerColor}`, headerColorStriped ? 'striped' : '')
+  const headerColorCSS = `pb_card_header_kit_${headerColor}`
+  const headerStripedCSS = headerColorStriped ? `pb_card_header_kit_${headerColor}_striped` : ''
+  
+  const headerCSS = classnames(
+    'pb_card_header_kit',
+    headerColorCSS,
+    headerStripedCSS
+  )
 
   const headerSpacing = globalProps(props)
 
@@ -69,11 +76,10 @@ const Header = (props: CardHeaderProps) => {
 // Body component
 const Body = (props: CardBodyProps) => {
   const { children, className } = props
-  const bodyCSS = buildCss('pb_card_body_kit')
   const bodySpacing = globalProps(props)
 
   return (
-    <div className={classnames(bodyCSS, bodySpacing, className)}>
+    <div className={classnames('pb_card_body_kit', bodySpacing, className)}>
       {children}
     </div>
   )
@@ -96,13 +102,22 @@ const Card = (props: CardPropTypes): React.ReactElement => {
     selected = false,
     tag = 'div',
   } = props
-  const borderCSS = borderNone == true ? 'border_none' : ''
-  const selectedCSS = selected == true ? 'selected' : 'deselected'
-  const backgroundCSS = background == 'none' ? '' : `background_${background}`
-  const cardCss = buildCss('pb_card_kit', selectedCSS, borderCSS, `border_radius_${borderRadius}`, backgroundCSS, {
-    [`highlight_${highlight.position}`]: highlight.position,
-    [`highlight_${highlight.color}`]: highlight.color,
-  })
+  const borderCSS = borderNone == true ? 'pb_card_kit_border_none' : ''
+  const selectedCSS = selected == true ? 'pb_card_kit_selected' : ''
+  const backgroundCSS = background == 'none' ? '' : `pb_card_kit_background_${background}`
+  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,
+    borderCSS,
+    borderRadiusCSS,
+    backgroundCSS,
+    highlightPositionCSS,
+    highlightColorCSS
+  )
   const ariaProps: {[key: string]: string} = buildAriaProps(aria)
   const dataProps: {[key: string]: string} = buildDataProps(data)
   const htmlProps = buildHtmlProps(htmlOptions);

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

@@ -89,4 +89,4 @@ $pb_card_header_colors: map-merge(map-merge(map-merge($product_colors, $addition
 
 @mixin pb_card_header_color($header_color) {
   background: $header_color;
-}
+}

data/app/pb_kits/playbook/pb_card/card.rb

@@ -29,13 +29,14 @@ module Playbook
                                   default: nil
 
       def classname
-        generate_classname("pb_card_kit",
-                           selected_class,
-                           border_class,
-                           border_radius_class,
-                           background_class,
-                           highlight_position_class,
-                           highlight_color_class)
+        classes = ["pb_card_kit"]
+        classes << "pb_card_kit_selected" if selected
+        classes << "pb_card_kit_border_none" if border_none
+        classes << "pb_card_kit_border_radius_#{border_radius}" if border_radius != "md"
+        classes << "pb_card_kit_background_#{background}" if background != "none"
+        classes << "pb_card_kit_highlight_#{highlight[:position]}" if highlight[:position].present?
+        classes << "pb_card_kit_highlight_#{highlight[:color]}" if highlight[:color].present?
+        generate_classname(classes.compact.join(" "))
       end
 
     private

data/app/pb_kits/playbook/pb_card/card_header.rb

@@ -9,13 +9,17 @@ module Playbook
                                   default: false
 
       def classname
-        generate_classname("pb_card_header_kit", header_color, color_striped_classname)
+        generate_classname("pb_card_header_kit", header_color_classname, color_striped_classname, separator: " ")
       end
 
     private
 
       def color_striped_classname
-        header_color_striped ? "striped" : nil
+        header_color_striped ? "pb_card_header_kit_#{header_color}_striped" : nil
+      end
+
+      def header_color_classname
+        header_color ? "pb_card_header_kit_#{header_color}" : nil
       end
     end
   end

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

@@ -50,7 +50,7 @@
 <% end %>
 
 <%= pb_rails("card", props: { padding: "none", header: true, margin_bottom: "sm"}) do %>
-  <%= pb_rails("card/card_header", props: { padding: "sm", header_color: "bg_dark" }) do %>
+  <%= pb_rails("card/card_header", props: { padding: "sm", header_color: "dark" }) do %>
     <%= pb_rails("body", props: { text: "Dark", dark: true }) %>
   <% end %>
   <%= pb_rails("card/card_body", props: { padding: "md" }) do %>

data/app/pb_kits/playbook/pb_checkbox/_checkbox.scss

@@ -3,7 +3,16 @@
 @import "../tokens/positioning";
 $transition: $transition_cubic;
 
-[class^=pb_checkbox_kit] {
+.pb_checkbox_kit,
+.pb_checkbox_kit_on,
+.pb_checkbox_kit_off,
+.pb_checkbox_kit_checked,
+.pb_checkbox_kit_error,
+.pb_checkbox_kit_indeterminate,
+.pb_checkbox_kit_checked_error,
+.pb_checkbox_kit_checked_indeterminate,
+.pb_checkbox_kit_error_indeterminate,
+.pb_checkbox_kit_checked_error_indeterminate {
   cursor: pointer;
   display: inline-flex;
   vertical-align: middle;
@@ -159,4 +168,4 @@ $transition: $transition_cubic;
       border-color: $error;
     }
   }
-}
+}

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

@@ -37,25 +37,25 @@ $pb_button_styles: (
   }
 }
 
-[class^=pb_circle_icon_button_kit] {
+.pb_circle_icon_button_kit {
   @each $style in $pb_button_styles {
-    [class^=pb_button_kit][class*=_#{$style}] {
+    .pb_button_kit.pb_button_#{$style} {
       @include pb_circle_icon_button;
     }
   }
   :first-child {
-    &[class*=_link]  {
+    &.pb_button_kit.pb_button_link {
       @include pb_circle_icon_button_active;
     }
-    &.dark  {
-      &[class*=_link]  {
+    &.dark {
+      &.pb_button_kit.pb_button_link {
         @include pb_circle_icon_button_active_dark;
       }
     }
   }
   &.size_small {
     @each $style in $pb_button_styles {
-      [class^=pb_button_kit][class*=_#{$style}] {
+      .pb_button_kit.pb_button_#{$style} {
         width: 20px;
         height: 20px;
         min-height: 20px;
@@ -91,4 +91,4 @@ $pb_button_styles: (
       }
     }
   }
-}
+}

data/app/pb_kits/playbook/pb_circle_icon_button/circle_icon_button.test.js

@@ -26,7 +26,7 @@ test('passes loading prop to button', () => {
   )
 
   const kit = screen.getByTestId('loading-test')
-  const button = kit.querySelector('.pb_button_kit_primary_inline_enabled_loading')
+  const button = kit.querySelector('.pb_button_kit.pb_button_primary.pb_button_inline.pb_button_enabled.pb_button_loading')
   
   expect(button).toBeInTheDocument()
 })

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

@@ -11,7 +11,7 @@ exports[`html structure is correct 1`] = `
     >
       <div>
         <div
-          class="pb_flex_kit_orientation_row_justify_content_left_align_items_center_spacing_between"
+          class="pb_flex_kit pb_flex_kit_orientation_row pb_flex_kit_justify_content_left pb_flex_kit_align_items_center pb_flex_kit_spacing_between"
         >
           <div
             class="pb_flex_item_kit"

data/app/pb_kits/playbook/pb_collapsible/_collapsible.scss

@@ -1,7 +1,7 @@
 @import "tokens/colors";
 @import "tokens/spacing";
 
-[class^=pb_collapsible_kit] {
+.pb_collapsible_kit {
   padding: $space_md;
 
   .toggle-content {
@@ -28,10 +28,10 @@
   }
 }
 
-[class^=pb_collapsible_main_kit] {
+.pb_collapsible_main_kit {
   padding: $space_md;
 }
 
-[class^=pb_collapsible_content_kit] {
+.pb_collapsible_content_kit {
   padding: $space_md;
-}
+}

data/app/pb_kits/playbook/pb_copy_button/copy_button.test.jsx

@@ -52,7 +52,7 @@ test('passes text and tooltip props to button', () => {
   expect(content).toHaveTextContent("text")
 
   const kit = screen.getByTestId('text-test')
-  const button = kit.querySelector('.pb_button_kit_primary_inline_enabled')
+  const button = kit.querySelector('.pb_button_kit.pb_button_primary.pb_button_inline.pb_button_enabled')
   expect(button).toBeInTheDocument()
 
   fireEvent.click(button)