playbook_ui 14.23.0.pre.alpha.PLAY2329atstickypinnedborderbug9151 → 14.23.0.pre.alpha.PLAY2330removewalkthrough9176

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. checksums.yaml +4 -4
  2. data/app/pb_kits/playbook/_playbook.scss +0 -1
  3. data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.scss +0 -170
  4. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_pinned_rows.jsx +1 -1
  5. data/app/pb_kits/playbook/pb_advanced_table/scss_partials/advanced_table_sticky_mixin.scss +9 -44
  6. data/app/pb_kits/playbook/pb_dropdown/_dropdown.scss +17 -1
  7. data/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx +6 -0
  8. data/app/pb_kits/playbook/pb_dropdown/_dropdown_mixin.scss +36 -0
  9. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options.jsx +90 -0
  10. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options_react.md +4 -0
  11. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_radio_options.jsx +1 -0
  12. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_radio_options_react.md +1 -1
  13. data/app/pb_kits/playbook/pb_dropdown/docs/example.yml +3 -2
  14. data/app/pb_kits/playbook/pb_dropdown/docs/index.js +2 -1
  15. data/app/pb_kits/playbook/pb_dropdown/dropdown.test.jsx +24 -0
  16. data/app/pb_kits/playbook/pb_dropdown/subcomponents/DropdownOption.tsx +11 -1
  17. data/app/pb_kits/playbook/pb_select/select.rb +4 -2
  18. data/dist/chunks/_weekday_stacked-BF1N4Z9h.js +37 -0
  19. data/dist/chunks/vendor.js +1 -1
  20. data/dist/menu.yml +0 -7
  21. data/dist/playbook-doc.js +2 -2
  22. data/dist/playbook.css +1 -1
  23. data/lib/playbook/version.rb +1 -1
  24. metadata +6 -14
  25. data/app/pb_kits/playbook/pb_walkthrough/_walkthrough.scss +0 -0
  26. data/app/pb_kits/playbook/pb_walkthrough/_walkthrough.tsx +0 -202
  27. data/app/pb_kits/playbook/pb_walkthrough/docs/_walkthrough_continuous.jsx +0 -69
  28. data/app/pb_kits/playbook/pb_walkthrough/docs/_walkthrough_default.jsx +0 -71
  29. data/app/pb_kits/playbook/pb_walkthrough/docs/_walkthrough_multi_beacon.jsx +0 -110
  30. data/app/pb_kits/playbook/pb_walkthrough/docs/_walkthrough_no_beacon.jsx +0 -76
  31. data/app/pb_kits/playbook/pb_walkthrough/docs/_walkthrough_no_overlay.jsx +0 -76
  32. data/app/pb_kits/playbook/pb_walkthrough/docs/_walkthrough_styled.jsx +0 -76
  33. data/app/pb_kits/playbook/pb_walkthrough/docs/example.yml +0 -10
  34. data/app/pb_kits/playbook/pb_walkthrough/docs/index.js +0 -6
  35. data/app/pb_kits/playbook/pb_walkthrough/walkthrough.test.jsx +0 -34
  36. data/dist/chunks/_weekday_stacked-CoOhQc3y.js +0 -61
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e8849282c22bb4870841f96e110bc89eaca2ed4e4dfbef18b709b6c2e93a701b
4
- data.tar.gz: 6d844177bce8a58692b5e383ceae03ea8c607e29e357c37c2931a0b9df9ee02d
3
+ metadata.gz: 02efd0660039e5a7b7feded3c762b0512229efd0969763d72c4dbb9ad6b67dfb
4
+ data.tar.gz: 17a35b1f152c7c57ec490d5eaddb4cebf2ee8216d8403d62e3d0dab6f3ba12f6
5
5
  SHA512:
6
- metadata.gz: a4cfa9a835da85fbd7af7c6c5aacabf227d5e01e284f748e71eceb2c5d1c7337336e1a69a8d00ffce7cd32b903b9c0fa18ce7644cfe1faeea85fb65d6f32727f
7
- data.tar.gz: 8821b2b62bfc362fb5b688ba476489d8284bd22734102d00829097f05024ac5400b11c22216d4a14d03abb60e9a03d2360b68804b726c5c7c8e6835278db93c8
6
+ metadata.gz: abfa3c42375a34b984b331b3fc0d28a814355dd6b4f4f995b156c67683b7a834ebae444a89db79e15a1ab06f3e45ab33720555b0235fea24537921c79a4c90d4
7
+ data.tar.gz: cc20c9590ab8471770c406898fe93aabdd9aaa9bc94e228579d49b1aa13a95fac4b9a95ee1b64ec4495be940b52060e67c6d1f3def412299b5ec743202691088
@@ -107,7 +107,6 @@
107
107
  @import 'pb_typeahead/typeahead';
108
108
  @import 'pb_user/user';
109
109
  @import 'pb_user_badge/user_badge';
110
- @import 'pb_walkthrough/walkthrough';
111
110
  @import 'pb_weekday_stacked/weekday_stacked';
112
111
  @import 'pb_empty_state/empty_state';
113
112
  @import 'utilities/mixins';
@@ -593,101 +593,6 @@
593
593
  }
594
594
  }
595
595
 
596
- // Ensure vertical borders work with non-container tables
597
- .pb_table:not(.table-card) {
598
- &.vertical-border {
599
- // Sticky header with vertical borders
600
- &.sticky-header {
601
- thead th:not(:last-child) {
602
- border-right: 1px solid $border_light !important;
603
- }
604
- }
605
-
606
- // Regular table cells with vertical borders
607
- td:not(:last-child),
608
- th:not(:last-child),
609
- .pb_table_td:not(:last-child),
610
- .pb_table_th:not(:last-child) {
611
- border-right: 1px solid $border_light !important;
612
- }
613
- }
614
- }
615
-
616
- // Pinned rows should maintain vertical borders regardless of container prop
617
- .pinned-row {
618
- position: sticky !important;
619
- z-index: 2 !important;
620
-
621
- &.pb_table_tr,
622
- tr {
623
- // Apply right border to ALL cells including last one when verticalBorder is true
624
- td,
625
- .pb_table_td {
626
- border-right: 1px solid var(--column-border-color, $border_light) !important;
627
- }
628
- }
629
- }
630
-
631
- // Specific fixes for vertical borders with sticky elements
632
- .pb_table.vertical-border {
633
-
634
- // Sticky header - apply borders to ALL cells including last
635
- &.sticky-header {
636
- thead th {
637
- border-right: 1px solid $border_light !important;
638
- border-left: none !important;
639
- border-top: none !important;
640
- }
641
- }
642
-
643
- // Regular pinned rows
644
- .pinned-row {
645
- td,
646
- .pb_table_td {
647
- border-right: 1px solid var(--column-border-color, $border_light) !important;
648
- // Ensure no unwanted borders
649
- border-left: none !important;
650
- border-top: none !important;
651
- }
652
- }
653
-
654
- // Ensure non-container tables don't get unwanted borders
655
- &:not(.table-card) {
656
- thead th,
657
- td,
658
- .pb_table_td {
659
- border-left: none !important;
660
- border-top: none !important;
661
- }
662
- }
663
- }
664
-
665
- // Firefox-specific
666
- @-moz-document url-prefix() {
667
- .pb_table.vertical-border {
668
-
669
- &.sticky-header {
670
- thead th {
671
- border: none !important;
672
- // Use box-shadow for both right border AND bottom border
673
- box-shadow:
674
- inset -1px 0 0 0 $border_light, // Right border
675
- inset 0 -1px 0 0 $border_light !important; // Bottom border
676
- }
677
- }
678
-
679
- .pinned-row {
680
- td,
681
- .pb_table_td {
682
- border-right: none !important;
683
- border-left: none !important;
684
- border-top: none !important;
685
- box-shadow: inset -1px 0 0 0 var(--column-border-color, $border_light) !important;
686
- }
687
- }
688
- }
689
- }
690
-
691
596
  @include chrome_styles($border-color);
692
597
 
693
598
  tr:hover {
@@ -867,81 +772,6 @@
867
772
  box-shadow: 1px 0px 0px 0px var(--column-border-color) !important;
868
773
  }
869
774
 
870
- // Dark mode adjustments for non-container tables
871
- .pb_table:not(.table-card) {
872
- &.vertical-border {
873
- &.sticky-header {
874
- thead th:not(:last-child) {
875
- border-right: 1px solid $border_dark !important;
876
- }
877
- }
878
-
879
- td:not(:last-child),
880
- th:not(:last-child),
881
- .pb_table_td:not(:last-child),
882
- .pb_table_th:not(:last-child) {
883
- border-right: 1px solid $border_dark !important;
884
- }
885
- }
886
- }
887
-
888
- // Dark mode pinned rows
889
- .pinned-row {
890
- &.pb_table_tr,
891
- tr {
892
- td,
893
- .pb_table_td {
894
- border-right: 1px solid var(--column-border-color, $border_dark) !important;
895
- }
896
- }
897
- }
898
-
899
- // Dark mode browser-specific fixes
900
- .pb_table.vertical-border {
901
- &.sticky-header {
902
- thead th {
903
- border-right: 1px solid $border_dark !important;
904
- border-left: none !important;
905
- border-top: none !important;
906
- }
907
- }
908
-
909
- .pinned-row {
910
- td,
911
- .pb_table_td {
912
- border-right: 1px solid var(--column-border-color, $border_dark) !important;
913
- border-left: none !important;
914
- border-top: none !important;
915
- }
916
- }
917
- }
918
-
919
- // Dark mode Firefox
920
- @-moz-document url-prefix() {
921
- .pb_table.vertical-border {
922
-
923
- &.sticky-header {
924
- thead th {
925
- border: none !important;
926
- // Use box-shadow for both right border AND bottom border
927
- box-shadow:
928
- inset -1px 0 0 0 $border_dark, // Right border
929
- inset 0 -1px 0 0 $border_dark !important; // Bottom border
930
- }
931
- }
932
-
933
- .pinned-row {
934
- td,
935
- .pb_table_td {
936
- border-right: none !important;
937
- border-left: none !important;
938
- border-top: none !important;
939
- box-shadow: inset -1px 0 0 0 var(--column-border-color, $border_dark) !important;
940
- }
941
- }
942
- }
943
- }
944
-
945
775
  // Apply border colors in dark mode
946
776
  &[class*="column-group-border-"] {
947
777
  // For top-level column groups (ENROLLMENT DATA, PERFORMANCE DATA)
@@ -44,7 +44,7 @@ const AdvancedTableRowPinning = (props) => {
44
44
  maxHeight="xs"
45
45
  pinnedRows={{value: pinnedRows, onChange: setPinnedRows}}
46
46
  tableData={MOCK_DATA}
47
- tableProps={{sticky: true, verticalBorder: true, container: false}}
47
+ tableProps={{sticky: true}}
48
48
  {...props}
49
49
  >
50
50
  <AdvancedTable.Header enableSorting />
@@ -8,29 +8,24 @@
8
8
  border-radius: 4px;
9
9
  box-shadow: 1px 0 0 0px $border-color, -1px 0 0 0px $border-color;
10
10
  display: block;
11
-
12
- // Handle both table-card and non-table-card cases
13
11
  [class^="pb_table"].table-sm.table-card thead tr th:first-child,
14
- [class^="pb_table"].table-sm:not(.no-hover).table-card tbody tr td:first-child,
15
- [class^="pb_table"].table-sm:not(.table-card) thead tr th:first-child,
16
- [class^="pb_table"].table-sm:not(.no-hover):not(.table-card) tbody tr td:first-child {
12
+ [class^="pb_table"].table-sm:not(.no-hover).table-card
13
+ tbody
14
+ tr
15
+ td:first-child {
17
16
  border-left-width: 0px !important;
18
17
  }
19
-
20
18
  [class^="pb_table"].table-sm.table-card thead tr th:last-child,
21
- [class^="pb_table"].table-sm:not(.no-hover).table-card tbody tr td:last-child,
22
- [class^="pb_table"].table-sm:not(.table-card) thead tr th:last-child,
23
- [class^="pb_table"].table-sm:not(.no-hover):not(.table-card) tbody tr td:last-child {
19
+ [class^="pb_table"].table-sm:not(.no-hover).table-card
20
+ tbody
21
+ tr
22
+ td:last-child {
24
23
  border-right-width: 0px;
25
24
  }
26
-
27
25
  [class^="pb_table"].table-sm.table-card tbody tr:last-child td:first-child,
28
- [class^="pb_table"].table-sm.table-card tbody tr:last-child td:last-child,
29
- [class^="pb_table"].table-sm:not(.table-card) tbody tr:last-child td:first-child,
30
- [class^="pb_table"].table-sm:not(.table-card) tbody tr:last-child td:last-child {
26
+ [class^="pb_table"].table-sm.table-card tbody tr:last-child td:last-child {
31
27
  border-radius: 0 0 0 0;
32
28
  }
33
-
34
29
  .table-header-cells:first-child,
35
30
  td:first-child,
36
31
  .pb_table_td:first-child,
@@ -44,42 +39,12 @@
44
39
  z-index: 2;
45
40
  }
46
41
 
47
- // For tables with verticalBorder, ensure sticky elements maintain their borders
48
- [class^="pb_table"].vertical-border {
49
- .table-header-cells:first-child,
50
- td:first-child,
51
- .pb_table_td:first-child,
52
- .checkbox-cell.checkbox-cell-header:first-child,
53
- .table-header-cells.sticky-left {
54
- // Maintain right border for vertical border styling when sticky
55
- &:not(:last-child) {
56
- border-right: 1px solid $border-color !important;
57
- }
58
- }
59
-
60
- // Ensure pinned rows maintain vertical borders
61
- .pinned-row {
62
- td:not(:last-child),
63
- .pb_table_td:not(:last-child) {
64
- border-right: 1px solid $border-color !important;
65
- }
66
- }
67
-
68
- // Handle sticky header with vertical borders
69
- &.sticky-header thead th {
70
- &:not(:last-child) {
71
- border-right: 1px solid $border-color !important;
72
- }
73
- }
74
- }
75
-
76
42
  .bg-silver {
77
43
  td:first-child,
78
44
  .sticky-left {
79
45
  background-color: $bg-secondary;
80
46
  }
81
47
  }
82
-
83
48
  .bg-row-selection {
84
49
  td:first-child,
85
50
  .sticky-left {
@@ -8,6 +8,7 @@
8
8
  @import "../pb_textarea/textarea_mixin";
9
9
 
10
10
  @import "./scss_partials/dropdown_animation";
11
+ @import "dropdown_mixin";
11
12
 
12
13
  [class*="pb_dropdown"] {
13
14
  .dropdown_wrapper {
@@ -98,9 +99,23 @@
98
99
  [class^="pb_title_kit"], a {
99
100
  color: $white !important;
100
101
  }
102
+ border-bottom: 1px solid $border_light;
101
103
  &:hover {
102
- background-color: $product_1_background !important;
104
+ background-color: $product_1_background;
105
+ }
106
+
107
+ // activeStyle font color map
108
+ @each $name, $color in $font-colors {
109
+ &.font-#{$name} {
110
+ @include apply-font-color($color);
111
+ }
103
112
  }
113
+ // activeStyle background color map (no difference between selected and selected+hover custom colors)
114
+ @each $name, $bg in $background-colors {
115
+ &.bg-#{$name} {
116
+ background-color: $bg;
117
+ }
118
+ }
104
119
  }
105
120
  }
106
121
 
@@ -267,6 +282,7 @@
267
282
  }
268
283
  &[class*="selected"] {
269
284
  background-color: $primary;
285
+ border-bottom: rgba($white, 0.15);
270
286
  }
271
287
  }
272
288
  }
@@ -39,6 +39,10 @@ type DropdownProps = {
39
39
  options: GenericObject;
40
40
  separators?: boolean;
41
41
  variant?: "default" | "subtle";
42
+ activeStyle?: {
43
+ backgroundColor?: string;
44
+ fontColor?: string;
45
+ };
42
46
  };
43
47
 
44
48
  interface DropdownComponent
@@ -69,6 +73,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
69
73
  options,
70
74
  separators = true,
71
75
  variant = "default",
76
+ activeStyle,
72
77
  } = props;
73
78
 
74
79
  const ariaProps = buildAriaProps(aria);
@@ -251,6 +256,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
251
256
  >
252
257
  <DropdownContext.Provider
253
258
  value={{
259
+ activeStyle,
254
260
  autocomplete,
255
261
  dropdownContainerRef,
256
262
  filteredOptions,
@@ -0,0 +1,36 @@
1
+ @import "../tokens/colors";
2
+
3
+ // activeStyle fontColor sass map to go through text colors + set of custom colors
4
+ $custom-font-colors: (
5
+ primary: $primary
6
+ );
7
+
8
+ $merged-font-colors: map-merge($text_colors, $custom-font-colors);
9
+
10
+ $font-colors: ();
11
+
12
+ @each $key, $val in $merged-font-colors {
13
+ $font-colors: map-merge($font-colors, ($key: $val));
14
+ }
15
+
16
+ @mixin apply-font-color($color) {
17
+ color: $color;
18
+
19
+ [class^="pb_body"],
20
+ [class^="pb_title_kit"],
21
+ a {
22
+ color: $color !important;
23
+ }
24
+ }
25
+
26
+ // activeStyle backgroundColor map (set of custom colors)
27
+ $custom-background-colors: (
28
+ "bg_light": $bg_light,
29
+ "white": $white,
30
+ );
31
+
32
+ $background-colors: ();
33
+
34
+ @each $key, $val in $custom-background-colors {
35
+ $background-colors: map-merge($background-colors, ($key: $val));
36
+ }
@@ -0,0 +1,90 @@
1
+ import React from 'react'
2
+ import Dropdown from '../_dropdown'
3
+
4
+ const DropdownCustomActiveStyleOptions = (props) => {
5
+
6
+
7
+ const options = [
8
+ {
9
+ label: "United States",
10
+ value: "unitedStates",
11
+ id: "us"
12
+ },
13
+ {
14
+ label: "Canada",
15
+ value: "canada",
16
+ id: "ca"
17
+ },
18
+ {
19
+ label: "Pakistan",
20
+ value: "pakistan",
21
+ id: "pk"
22
+ }
23
+ ];
24
+
25
+
26
+ return (
27
+ <div>
28
+ <Dropdown
29
+ activeStyle={{
30
+ backgroundColor: "bg_light",
31
+ fontColor: "primary",
32
+ }}
33
+ label="Background Color: bg_light; Font Color: primary"
34
+ marginBottom="sm"
35
+ options={options}
36
+ {...props}
37
+ >
38
+ <Dropdown.Trigger/>
39
+ <Dropdown.Container>
40
+ {options.map((option) => (
41
+ <Dropdown.Option key={option.id}
42
+ option={option}
43
+ />
44
+ ))}
45
+ </Dropdown.Container>
46
+ </Dropdown>
47
+ <Dropdown
48
+ activeStyle={{
49
+ backgroundColor: "white",
50
+ fontColor: "primary",
51
+ }}
52
+ label="Background Color: white; Font Color: primary"
53
+ marginBottom="sm"
54
+ options={options}
55
+ {...props}
56
+ />
57
+ <Dropdown
58
+ activeStyle={{
59
+ backgroundColor: "bg_light",
60
+ fontColor: "text_lt_default",
61
+ }}
62
+ autocomplete
63
+ label="Background Color: bg_light; Font Color: text_lt_default"
64
+ marginBottom="sm"
65
+ options={options}
66
+ {...props}
67
+ />
68
+ <Dropdown
69
+ activeStyle={{
70
+ fontColor: "text_lt_lighter",
71
+ }}
72
+ label="Font Color: text_lt_lighter"
73
+ marginBottom="sm"
74
+ options={options}
75
+ {...props}
76
+ >
77
+ <Dropdown.Trigger/>
78
+ <Dropdown.Container>
79
+ {options.map((option) => (
80
+ <Dropdown.Option key={option.id}
81
+ option={option}
82
+ />
83
+ ))}
84
+ </Dropdown.Container>
85
+ </Dropdown>
86
+ </div>
87
+ )
88
+ }
89
+
90
+ export default DropdownCustomActiveStyleOptions
@@ -0,0 +1,4 @@
1
+ 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.
2
+
3
+ `backgroundColor` **Type**: String | **Values**: bg_light | white | **Default**: (no selection) is primary
4
+ `fontColor` **Type**: String | **Values**: primary | all [Playbook Text Colors](https://playbook.powerapp.cloud/visual_guidelines/colors) | **Default**: (no selection) is white
@@ -18,6 +18,7 @@ const DropdownCustomRadioOptions = (props) => {
18
18
  return (
19
19
  <div>
20
20
  <Dropdown
21
+ activeStyle={{ backgroundColor: "bg_light", fontColor: "text_lt_default" }}
21
22
  label="Select Item"
22
23
  onSelect={(selectedItem) => setSelectedValue(selectedItem?.value)}
23
24
  options={options}
@@ -1 +1 @@
1
- Radio inputs can be used inside `Dropdown.Option` for a custom layout that mimics form-like selection within a dropdown.
1
+ 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.
@@ -16,7 +16,7 @@ examples:
16
16
  - dropdown_with_search_rails: Custom Trigger Dropdown with Search
17
17
  - dropdown_with_custom_padding: Custom Option Padding
18
18
  - dropdown_with_custom_icon_options: Custom Icon Options
19
- # - 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)
19
+ # - 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)
20
20
  - dropdown_error: Dropdown with Error
21
21
  - dropdown_default_value: Default Value
22
22
  - dropdown_multi_select_with_default: Multi Select Default Value
@@ -39,8 +39,9 @@ examples:
39
39
  - dropdown_with_custom_trigger: Custom Trigger
40
40
  - dropdown_with_search: Custom Trigger Dropdown with Search
41
41
  - dropdown_with_custom_padding: Custom Option Padding
42
+ - dropdown_with_custom_active_style_options: Custom Active Style Options
42
43
  - dropdown_with_custom_icon_options: Custom Icon Options
43
- # - 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)
44
+ - dropdown_with_custom_radio_options: Custom Radio Options
44
45
  - dropdown_error: Dropdown with Error
45
46
  - dropdown_default_value: Default Value
46
47
  - dropdown_multi_select_with_default: Multi Select Default Value
@@ -21,4 +21,5 @@ export { default as DropdownMultiSelectWithAutocomplete } from './_dropdown_mult
21
21
  export { default as DropdownMultiSelectWithDefault } from './_dropdown_multi_select_with_default.jsx'
22
22
  export { default as DropdownMultiSelectWithCustomOptions } from './_dropdown_multi_select_with_custom_options.jsx'
23
23
  export {default as DropdownWithCustomIconOptions} from './_dropdown_with_custom_icon_options.jsx'
24
- export {default as DropdownWithCustomRadioOptions} from './_dropdown_with_custom_radio_options.jsx'
24
+ export {default as DropdownWithCustomRadioOptions} from './_dropdown_with_custom_radio_options.jsx'
25
+ export {default as DropdownWithCustomActiveStyleOptions} from './_dropdown_with_custom_active_style_options.jsx'
@@ -369,4 +369,28 @@ test("defaultValue works with multiSelect", () => {
369
369
  const option2 = Array.from(kit.querySelectorAll(".pb_dropdown_option_list"));
370
370
  const firstOpt = options[0].label
371
371
  expect(option2[0]).not.toHaveTextContent(firstOpt)
372
+ })
373
+
374
+ test("applies activeStyle backgroundColor and fontColor when selected", () => {
375
+ render(
376
+ <Dropdown
377
+ activeStyle={{
378
+ backgroundColor: "bg_light",
379
+ fontColor: "primary",
380
+ }}
381
+ data={{ testid: testId }}
382
+ options={options}
383
+ />
384
+ )
385
+
386
+ const kit = screen.getByTestId(testId)
387
+ const option = kit.querySelectorAll(".pb_dropdown_option_list")[1]
388
+
389
+ fireEvent.click(option)
390
+
391
+ const selected = kit.querySelector(".pb_dropdown_option_selected")
392
+
393
+ expect(selected).toBeInTheDocument()
394
+ expect(selected).toHaveClass("bg-bg_light")
395
+ expect(selected).toHaveClass("font-primary")
372
396
  })
@@ -41,6 +41,7 @@ const DropdownOption = (props: DropdownOptionProps) => {
41
41
  } = props;
42
42
 
43
43
  const {
44
+ activeStyle,
44
45
  filteredOptions,
45
46
  filterItem,
46
47
  focusedOptionIndex,
@@ -59,7 +60,6 @@ const DropdownOption = (props: DropdownOptionProps) => {
59
60
  ? selected.some((item) => item.label === option?.label)
60
61
  : (selected as GenericObject)?.label === option?.label;
61
62
 
62
-
63
63
  if (!isItemMatchingFilter(option) || (multiSelect && isSelected)) {
64
64
  return null;
65
65
  }
@@ -70,6 +70,14 @@ const DropdownOption = (props: DropdownOptionProps) => {
70
70
 
71
71
  const selectedClass = isSelected ? "selected" : "list";
72
72
 
73
+
74
+ const bgTokenClass = activeStyle?.backgroundColor
75
+ ? `bg-${activeStyle.backgroundColor}`
76
+ : "";
77
+ const fontTokenClass = activeStyle?.fontColor
78
+ ? `font-${activeStyle.fontColor}`
79
+ : "";
80
+
73
81
  const ariaProps = buildAriaProps(aria);
74
82
  const dataProps = buildDataProps(data);
75
83
  const htmlProps = buildHtmlProps(htmlOptions);
@@ -79,6 +87,8 @@ const DropdownOption = (props: DropdownOptionProps) => {
79
87
  selectedClass,
80
88
  focusedClass,
81
89
  ),
90
+ bgTokenClass,
91
+ fontTokenClass,
82
92
  globalProps(props),
83
93
  className
84
94
  );
@@ -24,7 +24,9 @@ module Playbook
24
24
  prop :validation_message, type: Playbook::Props::String, default: ""
25
25
 
26
26
  def classnames
27
- classname + inline_class + compact_class + show_arrow_class
27
+ ([classname] + [inline_class, compact_class, show_arrow_class])
28
+ .reject(&:empty?)
29
+ .join(" ")
28
30
  end
29
31
 
30
32
  def all_attributes
@@ -44,7 +46,7 @@ module Playbook
44
46
  end
45
47
 
46
48
  def inline_class
47
- inline ? " inline " : " "
49
+ inline ? "inline" : ""
48
50
  end
49
51
 
50
52
  def compact_class