playbook_ui 14.23.0.pre.alpha.PLAY2329atstickypinnedborderbug9151 → 14.23.0.pre.alpha.PLAY2329atstickypinnedborderbug9195

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8849282c22bb4870841f96e110bc89eaca2ed4e4dfbef18b709b6c2e93a701b
-  data.tar.gz: 6d844177bce8a58692b5e383ceae03ea8c607e29e357c37c2931a0b9df9ee02d
+  metadata.gz: b96d3a0381d1287381a4e4710195c3de301ad5111d253b7696bcc924ee07d64b
+  data.tar.gz: a7edecaa9a5b25b1ade245fcc75f676b81afba59a1854de383e21455a59cd457
 SHA512:
-  metadata.gz: a4cfa9a835da85fbd7af7c6c5aacabf227d5e01e284f748e71eceb2c5d1c7337336e1a69a8d00ffce7cd32b903b9c0fa18ce7644cfe1faeea85fb65d6f32727f
-  data.tar.gz: 8821b2b62bfc362fb5b688ba476489d8284bd22734102d00829097f05024ac5400b11c22216d4a14d03abb60e9a03d2360b68804b726c5c7c8e6835278db93c8
+  metadata.gz: 423154dcdaf011bd7a264a4d8c99a8c39325369b06f1ff532b8441560efec2d5e160cd71280cc5666fa2cdf5dea1e442c434c7352fd940d148f83c346c3cda03
+  data.tar.gz: 29ed4759baa9ed51cc06f4aa1dc98996b9fed1ccb2b4da994be9cc4ef68055300cc19048751b7e8615a24ae9fd7930d129df8a60fc74ea02241b3213e0737b30

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

@@ -631,7 +631,6 @@
   // Specific fixes for vertical borders with sticky elements
   .pb_table.vertical-border {
 
-    // Sticky header - apply borders to ALL cells including last
     &.sticky-header {
       thead th {
         border-right: 1px solid $border_light !important;
@@ -640,12 +639,10 @@
       }
     }
 
-    // Regular pinned rows
     .pinned-row {
       td,
       .pb_table_td {
         border-right: 1px solid var(--column-border-color, $border_light) !important;
-        // Ensure no unwanted borders
         border-left: none !important;
         border-top: none !important;
       }
@@ -679,12 +676,29 @@
       .pinned-row {
         td,
         .pb_table_td {
+          border: none !important;
+          // Use box-shadow for right border on ALL cells including last
+          box-shadow: inset -1px 0 0 0 var(--column-border-color, $border_light) !important;
+        }
+      }
+
+      // Override regular table cells to use consistent border method
+      &:not(.table-card) {
+        td:not(.pinned-row td),
+        .pb_table_td:not(.pinned-row .pb_table_td) {
+          // Remove conflicting borders and use box-shadow instead
           border-right: none !important;
           border-left: none !important;
           border-top: none !important;
-          box-shadow: inset -1px 0 0 0 var(--column-border-color, $border_light) !important;
+          // Apply consistent right border using box-shadow
+          box-shadow: inset -1px 0 0 0 $border_light !important;
         }
       }
+
+      // Override the original left border shadow from main style, but keep other shadows
+      .pb_table_td:nth-child(2) {
+        box-shadow: none !important;
+      }
     }
   }
 
@@ -889,6 +903,7 @@
     .pinned-row {
       &.pb_table_tr,
       tr {
+        // Apply right border to ALL cells including last one in dark mode
         td,
         .pb_table_td {
           border-right: 1px solid var(--column-border-color, $border_dark) !important;
@@ -933,20 +948,35 @@
         .pinned-row {
           td,
           .pb_table_td {
+            border: none !important;
+            // Use box-shadow for right border on ALL cells including last
+            box-shadow: inset -1px 0 0 0 var(--column-border-color, $border_dark) !important;
+          }
+        }
+
+        // Override regular table cells to use consistent border method in dark mode
+        &:not(.table-card) {
+          td:not(.pinned-row td),
+          .pb_table_td:not(.pinned-row .pb_table_td) {
+            // Remove conflicting borders and use box-shadow instead
             border-right: none !important;
             border-left: none !important;
             border-top: none !important;
-            box-shadow: inset -1px 0 0 0 var(--column-border-color, $border_dark) !important;
+            // Apply consistent right border using box-shadow
+            box-shadow: inset -1px 0 0 0 $border_dark !important;
           }
         }
+
+        // Override the original left border shadow from main CSS, but keep other shadows
+        .pb_table_td:nth-child(2) {
+          box-shadow: none !important;
+        }
       }
     }
 
     // Apply border colors in dark mode
     &[class*="column-group-border-"] {
-      // For top-level column groups (ENROLLMENT DATA, PERFORMANCE DATA)
       .pb_advanced_table_header {
-        // The main column group headers - NOT the last column
         > tr:first-child {
           th[colspan]:not([colspan="1"]):not(:last-child) {
             border-right: 1px solid var(--column-border-color) !important;

data/app/pb_kits/playbook/pb_advanced_table/scss_partials/advanced_table_sticky_mixin.scss

@@ -31,9 +31,8 @@
     border-radius: 0 0 0 0;
   }
 
+  // Only apply sticky positioning to specific elements
   .table-header-cells:first-child,
-  td:first-child,
-  .pb_table_td:first-child,
   .checkbox-cell.checkbox-cell-header:first-child,
   .table-header-cells.sticky-left,
   [class*="pinned-left"] {
@@ -44,11 +43,21 @@
     z-index: 2;
   }
 
+  // Only apply to pinned rows
+  .pinned-row {
+    td:first-child,
+    .pb_table_td:first-child {
+      background-color: $bg-main;
+      box-shadow: $shadow_deep !important;
+      position: sticky !important;
+      left: 0;
+      z-index: 3; // Higher z-index for pinned rows
+    }
+  }
+
   // For tables with verticalBorder, ensure sticky elements maintain their borders
   [class^="pb_table"].vertical-border {
     .table-header-cells:first-child,
-    td:first-child,
-    .pb_table_td:first-child,
     .checkbox-cell.checkbox-cell-header:first-child,
     .table-header-cells.sticky-left {
       // Maintain right border for vertical border styling when sticky
@@ -74,35 +83,47 @@
   }
 
   .bg-silver {
-    td:first-child,
+    .table-header-cells:first-child,
+    .pinned-row td:first-child,
+    .pinned-row .pb_table_td:first-child,
     .sticky-left {
       background-color: $bg-secondary;
     }
   }
 
   .bg-row-selection {
-    td:first-child,
+    .table-header-cells:first-child,
+    .pinned-row td:first-child,
+    .pinned-row .pb_table_td:first-child,
     .sticky-left {
       background-color: $highlight;
     }
   }
 
   .bg-white {
-    td:first-child,
+    .table-header-cells:first-child,
+    .pinned-row td:first-child,
+    .pinned-row .pb_table_td:first-child,
     .sticky-left {
       background-color: $bg-main;
     }
   }
 
   .virtualized-table-row {
-    &.bg-silver td:first-child {
-      background-color: $bg-secondary;
+    &.bg-silver {
+      &.pinned-row td:first-child {
+        background-color: $bg-secondary;
+      }
     }
-    &.bg-white td:first-child {
-      background-color: $bg-main;
+    &.bg-white {
+      &.pinned-row td:first-child {
+        background-color: $bg-main;
+      }
     }
-    &.bg-row-selection td:first-child {
-      background-color: $highlight;
+    &.bg-row-selection {
+      &.pinned-row td:first-child {
+        background-color: $highlight;
+      }
     }
   }
 
@@ -140,14 +161,17 @@
 
   &.dark {
     .bg-row-selection {
-      td:first-child,
+      .pinned-row td:first-child,
+      .pinned-row .pb_table_td:first-child,
       .sticky-left {
         background-color: $highlight-dark;
       }
     }
     .virtualized-table-row {
-      &.bg-row-selection td:first-child {
-        background-color: $highlight-dark;
+      &.bg-row-selection {
+        &.pinned-row td:first-child {
+          background-color: $highlight-dark;
+        }
       }
     }
   }

data/app/pb_kits/playbook/pb_dropdown/_dropdown.scss

@@ -8,6 +8,7 @@
 @import "../pb_textarea/textarea_mixin";
 
 @import "./scss_partials/dropdown_animation";
+@import "dropdown_mixin";
 
 [class*="pb_dropdown"] {
   .dropdown_wrapper {
@@ -98,9 +99,23 @@
           [class^="pb_title_kit"], a {
             color: $white !important;
           }
+          border-bottom: 1px solid $border_light;
           &:hover {
-            background-color: $product_1_background !important;
+            background-color: $product_1_background;
+          }
+ 
+          // activeStyle font color map
+          @each $name, $color in $font-colors {
+            &.font-#{$name} {
+              @include apply-font-color($color);
+            }
           }
+          // activeStyle background color map (no difference between selected and selected+hover custom colors)
+          @each $name, $bg in $background-colors {
+            &.bg-#{$name} {
+              background-color: $bg;
+            }
+          }     
         }
       }
 
@@ -267,6 +282,7 @@
         }
         &[class*="selected"] {
           background-color: $primary;
+          border-bottom: rgba($white, 0.15);
         }
       }
     }

data/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx

@@ -39,6 +39,10 @@ type DropdownProps = {
     options: GenericObject;
     separators?: boolean;
     variant?: "default" | "subtle";
+    activeStyle?: {
+      backgroundColor?: string;
+      fontColor?: string;
+    };
 };
 
 interface DropdownComponent
@@ -69,6 +73,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
         options,
         separators = true,
         variant = "default",
+        activeStyle,
     } = props;
 
     const ariaProps = buildAriaProps(aria);
@@ -251,6 +256,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
         >
             <DropdownContext.Provider
                 value={{
+                    activeStyle,
                     autocomplete,
                     dropdownContainerRef,
                     filteredOptions,

data/app/pb_kits/playbook/pb_dropdown/_dropdown_mixin.scss

@@ -0,0 +1,36 @@
+@import "../tokens/colors";
+
+// activeStyle fontColor sass map to go through text colors + set of custom colors
+$custom-font-colors: (
+  primary: $primary
+);
+
+$merged-font-colors: map-merge($text_colors, $custom-font-colors);
+
+$font-colors: ();
+
+@each $key, $val in $merged-font-colors {
+  $font-colors: map-merge($font-colors, ($key: $val));
+}
+
+@mixin apply-font-color($color) {
+  color: $color;
+
+  [class^="pb_body"],
+  [class^="pb_title_kit"],
+  a {
+    color: $color !important;
+  }
+}
+
+// activeStyle backgroundColor map (set of custom colors)
+$custom-background-colors: (
+  "bg_light": $bg_light,
+  "white": $white,
+);
+
+$background-colors: ();
+
+@each $key, $val in $custom-background-colors {
+  $background-colors: map-merge($background-colors, ($key: $val));
+}

data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options.jsx

@@ -0,0 +1,90 @@
+import React from 'react'
+import Dropdown from '../_dropdown'
+
+const DropdownCustomActiveStyleOptions = (props) => {
+
+
+  const options = [
+    {
+      label: "United States",
+      value: "unitedStates",
+      id: "us"
+    },
+    {
+      label: "Canada",
+      value: "canada",
+      id: "ca"
+    },
+    {
+      label: "Pakistan",
+      value: "pakistan",
+      id: "pk"
+    }
+  ];  
+
+
+  return (
+  <div>
+    <Dropdown
+        activeStyle={{
+          backgroundColor: "bg_light",
+          fontColor: "primary",
+        }}
+        label="Background Color: bg_light; Font Color: primary"
+        marginBottom="sm"
+        options={options}
+        {...props}
+    >
+      <Dropdown.Trigger/>
+      <Dropdown.Container>
+        {options.map((option) => (
+          <Dropdown.Option key={option.id} 
+              option={option}
+          />
+        ))}
+      </Dropdown.Container>
+    </Dropdown>
+    <Dropdown
+        activeStyle={{
+          backgroundColor: "white",
+          fontColor: "primary",
+        }}
+        label="Background Color: white; Font Color: primary"
+        marginBottom="sm"
+        options={options}
+        {...props}
+    />
+    <Dropdown
+        activeStyle={{
+          backgroundColor: "bg_light",
+          fontColor: "text_lt_default",
+        }}
+        autocomplete
+        label="Background Color: bg_light; Font Color: text_lt_default"
+        marginBottom="sm"
+        options={options}
+        {...props}
+    />
+    <Dropdown
+        activeStyle={{
+          fontColor: "text_lt_lighter",
+        }}
+        label="Font Color: text_lt_lighter"
+        marginBottom="sm"
+        options={options}
+        {...props}
+    >
+      <Dropdown.Trigger/>
+      <Dropdown.Container>
+        {options.map((option) => (
+          <Dropdown.Option key={option.id} 
+              option={option}
+          />
+        ))}
+      </Dropdown.Container>
+    </Dropdown>
+  </div>
+  )
+}
+
+export default  DropdownCustomActiveStyleOptions

data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options_react.md

@@ -0,0 +1,4 @@
+The `activeStyle` prop can be used to customize the appearance of the dropdown selection indicator. It accepts an object with the following keys: `backgroundColor` sets the background color of the selected item (and its hover state); `fontColor` sets the font color of the selected item.
+
+`backgroundColor` **Type**: String | **Values**: bg_light | white | **Default**: (no selection) is primary
+`fontColor` **Type**: String | **Values**: primary | all [Playbook Text Colors](https://playbook.powerapp.cloud/visual_guidelines/colors) | **Default**: (no selection) is white

data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_radio_options.jsx

@@ -18,6 +18,7 @@ const DropdownCustomRadioOptions = (props) => {
   return (
   <div>
       <Dropdown
+          activeStyle={{ backgroundColor: "bg_light", fontColor: "text_lt_default" }}
           label="Select Item"
           onSelect={(selectedItem) => setSelectedValue(selectedItem?.value)}
           options={options}

data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_radio_options_react.md

@@ -1 +1 @@
-Radio inputs can be used inside `Dropdown.Option` for a custom layout that mimics form-like selection within a dropdown.
+Radio inputs can be used inside `Dropdown.Option` for a custom layout that mimics form-like selection within a dropdown. Use the [activeStyle](https://playbook.powerapp.cloud/kits/dropdown/react#custom-active-style-options) `backgroundColor` and `fontColor` props to create contrast between the Radio selection indicator and the Dropdown selection background indicator.

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

@@ -16,7 +16,7 @@ examples:
   - dropdown_with_search_rails: Custom Trigger Dropdown with Search
   - dropdown_with_custom_padding: Custom Option Padding
   - dropdown_with_custom_icon_options: Custom Icon Options
-  # - dropdown_with_custom_radio_options: Custom Radio Options # TODO: Update and publish doc ex in [PLAY-2146](https://runway.powerhrg.com/backlog_items/PLAY-2146) (remove this comment afterwards)
+  # - dropdown_with_custom_radio_options: Custom Radio Options # TODO: Update and publish doc ex in the Rails follow up to [PLAY-2146](https://runway.powerhrg.com/backlog_items/PLAY-2146) (remove this comment afterwards)
   - dropdown_error: Dropdown with Error
   - dropdown_default_value: Default Value
   - dropdown_multi_select_with_default: Multi Select Default Value
@@ -39,8 +39,9 @@ examples:
   - dropdown_with_custom_trigger: Custom Trigger
   - dropdown_with_search: Custom Trigger Dropdown with Search
   - dropdown_with_custom_padding: Custom Option Padding
+  - dropdown_with_custom_active_style_options: Custom Active Style Options
   - dropdown_with_custom_icon_options: Custom Icon Options
-  # - dropdown_with_custom_radio_options: Custom Radio Options # TODO: Update and publish doc ex in [PLAY-2146](https://runway.powerhrg.com/backlog_items/PLAY-2146) (remove this comment afterwards)
+  - dropdown_with_custom_radio_options: Custom Radio Options
   - dropdown_error: Dropdown with Error
   - dropdown_default_value: Default Value
   - dropdown_multi_select_with_default: Multi Select Default Value

data/app/pb_kits/playbook/pb_dropdown/docs/index.js

@@ -21,4 +21,5 @@ export { default as DropdownMultiSelectWithAutocomplete } from './_dropdown_mult
 export { default as DropdownMultiSelectWithDefault } from './_dropdown_multi_select_with_default.jsx'
 export { default as DropdownMultiSelectWithCustomOptions } from './_dropdown_multi_select_with_custom_options.jsx'
 export {default as DropdownWithCustomIconOptions} from './_dropdown_with_custom_icon_options.jsx'
-export {default as DropdownWithCustomRadioOptions} from './_dropdown_with_custom_radio_options.jsx'
+export {default as DropdownWithCustomRadioOptions} from './_dropdown_with_custom_radio_options.jsx'
+export {default as DropdownWithCustomActiveStyleOptions} from './_dropdown_with_custom_active_style_options.jsx'

data/app/pb_kits/playbook/pb_dropdown/dropdown.test.jsx

@@ -369,4 +369,28 @@ test("defaultValue works with multiSelect", () => {
     const option2 = Array.from(kit.querySelectorAll(".pb_dropdown_option_list"));
     const firstOpt = options[0].label
     expect(option2[0]).not.toHaveTextContent(firstOpt)
+  })
+
+test("applies activeStyle backgroundColor and fontColor when selected", () => {
+    render(
+      <Dropdown
+          activeStyle={{
+            backgroundColor: "bg_light",
+            fontColor: "primary",
+          }}
+          data={{ testid: testId }}
+          options={options}
+      />
+    )
+  
+    const kit = screen.getByTestId(testId)
+    const option = kit.querySelectorAll(".pb_dropdown_option_list")[1]
+  
+    fireEvent.click(option)
+  
+    const selected = kit.querySelector(".pb_dropdown_option_selected")
+
+    expect(selected).toBeInTheDocument()
+    expect(selected).toHaveClass("bg-bg_light")
+    expect(selected).toHaveClass("font-primary")
   })

data/app/pb_kits/playbook/pb_dropdown/subcomponents/DropdownOption.tsx

@@ -41,6 +41,7 @@ const DropdownOption = (props: DropdownOptionProps) => {
   } = props;
 
   const {
+    activeStyle,
     filteredOptions,
     filterItem,
     focusedOptionIndex,
@@ -59,7 +60,6 @@ const DropdownOption = (props: DropdownOptionProps) => {
    ? selected.some((item) => item.label === option?.label)
    : (selected as GenericObject)?.label === option?.label;
 
-  
   if (!isItemMatchingFilter(option) || (multiSelect && isSelected)) {
     return null;
   }
@@ -70,6 +70,14 @@ const DropdownOption = (props: DropdownOptionProps) => {
 
   const selectedClass = isSelected ? "selected" : "list";
 
+
+  const bgTokenClass = activeStyle?.backgroundColor
+      ? `bg-${activeStyle.backgroundColor}`
+      : "";
+  const fontTokenClass = activeStyle?.fontColor
+    ? `font-${activeStyle.fontColor}`
+    : "";
+
   const ariaProps = buildAriaProps(aria);
   const dataProps = buildDataProps(data);
   const htmlProps = buildHtmlProps(htmlOptions);
@@ -79,6 +87,8 @@ const DropdownOption = (props: DropdownOptionProps) => {
       selectedClass,
       focusedClass,
     ),
+    bgTokenClass, 
+    fontTokenClass,
     globalProps(props),
     className
   );

data/app/pb_kits/playbook/pb_select/select.rb

@@ -24,7 +24,9 @@ module Playbook
       prop :validation_message, type: Playbook::Props::String, default: ""
 
       def classnames
-        classname + inline_class + compact_class + show_arrow_class
+        ([classname] + [inline_class, compact_class, show_arrow_class])
+          .reject(&:empty?)
+          .join(" ")
       end
 
       def all_attributes
@@ -44,7 +46,7 @@ module Playbook
       end
 
       def inline_class
-        inline ? " inline " : " "
+        inline ? "inline" : ""
       end
 
       def compact_class