playbook_ui 13.27.0.pre.alpha.testingcollapsible2917 → 13.27.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (75) hide show
  1. checksums.yaml +4 -4
  2. data/app/pb_kits/playbook/pb_avatar/Utilities/GetPlacementPropsHelper.tsx +0 -16
  3. data/app/pb_kits/playbook/pb_avatar/_avatar.scss +0 -16
  4. data/app/pb_kits/playbook/pb_avatar/avatar.html.erb +1 -1
  5. data/app/pb_kits/playbook/pb_avatar/avatar.rb +0 -4
  6. data/app/pb_kits/playbook/pb_avatar/avatar.test.js +0 -47
  7. data/app/pb_kits/playbook/pb_avatar/docs/_avatar_badge_component_overlay.html.erb +66 -46
  8. data/app/pb_kits/playbook/pb_avatar/docs/_avatar_badge_component_overlay.jsx +29 -8
  9. data/app/pb_kits/playbook/pb_avatar/docs/_avatar_circle_icon_component_overlay.html.erb +33 -13
  10. data/app/pb_kits/playbook/pb_avatar/docs/_avatar_circle_icon_component_overlay.jsx +67 -48
  11. data/app/pb_kits/playbook/pb_avatar/docs/_avatar_default.jsx +20 -0
  12. data/app/pb_kits/playbook/pb_avatar/docs/example.yml +2 -2
  13. data/app/pb_kits/playbook/pb_body/_body.scss +0 -3
  14. data/app/pb_kits/playbook/pb_body/_body_mixins.scss +1 -1
  15. data/app/pb_kits/playbook/pb_button/_button_mixins.scss +3 -3
  16. data/app/pb_kits/playbook/pb_caption/_caption_mixin.scss +1 -1
  17. data/app/pb_kits/playbook/pb_card/_card_mixin.scss +0 -5
  18. data/app/pb_kits/playbook/pb_card/card.rb +1 -1
  19. data/app/pb_kits/playbook/pb_card/docs/_card_background.html.erb +0 -20
  20. data/app/pb_kits/playbook/pb_card/docs/_card_background.jsx +1 -41
  21. data/app/pb_kits/playbook/pb_card/docs/_card_background.md +1 -1
  22. data/app/pb_kits/playbook/pb_card/docs/_card_header.html.erb +1 -1
  23. data/app/pb_kits/playbook/pb_card/docs/_card_header.md +1 -1
  24. data/app/pb_kits/playbook/pb_card/docs/_card_highlight.md +1 -1
  25. data/app/pb_kits/playbook/pb_collapsible/_collapsible.tsx +10 -21
  26. data/app/pb_kits/playbook/pb_collapsible/child_kits/CollapsibleMain.tsx +75 -3
  27. data/app/pb_kits/playbook/pb_collapsible/docs/example.yml +0 -3
  28. data/app/pb_kits/playbook/pb_collapsible/docs/index.js +1 -2
  29. data/app/pb_kits/playbook/pb_collapsible/index.js +6 -16
  30. data/app/pb_kits/playbook/pb_detail/_detail_mixins.scss +1 -1
  31. data/app/pb_kits/playbook/pb_docs/kit_example.html.erb +3 -3
  32. data/app/pb_kits/playbook/pb_dropdown/_dropdown.scss +1 -2
  33. data/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx +2 -4
  34. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_default.html.erb +3 -3
  35. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_default.md +1 -1
  36. data/app/pb_kits/playbook/pb_dropdown/docs/{_dropdown_subcomponent_structure_rails.html.erb → _dropdown_subcomponent_structure.html.erb} +3 -3
  37. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_subcomponent_structure.md +6 -5
  38. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_display.md +3 -3
  39. data/app/pb_kits/playbook/pb_dropdown/docs/{_dropdown_with_custom_options_rails.html.erb → _dropdown_with_custom_options.html.erb} +3 -3
  40. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_options.md +1 -1
  41. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_padding.html.erb +3 -3
  42. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_padding.md +1 -1
  43. data/app/pb_kits/playbook/pb_dropdown/docs/{_dropdown_with_custom_trigger_rails.html.erb → _dropdown_with_custom_trigger.html.erb} +3 -3
  44. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_trigger.md +1 -1
  45. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_label.html.erb +3 -3
  46. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_label.md +1 -1
  47. data/app/pb_kits/playbook/pb_dropdown/docs/example.yml +6 -6
  48. data/app/pb_kits/playbook/pb_dropdown/dropdown.html.erb +0 -1
  49. data/app/pb_kits/playbook/pb_dropdown/dropdown.rb +0 -1
  50. data/app/pb_kits/playbook/pb_dropdown/dropdown_option.html.erb +1 -1
  51. data/app/pb_kits/playbook/pb_dropdown/dropdown_option.rb +1 -1
  52. data/app/pb_kits/playbook/pb_dropdown/index.js +1 -2
  53. data/app/pb_kits/playbook/pb_dropdown/subcomponents/DropdownOption.tsx +2 -4
  54. data/app/pb_kits/playbook/pb_form_group/_form_group.scss +0 -15
  55. data/app/pb_kits/playbook/pb_multiple_users/_multiple_users.scss +0 -8
  56. data/app/pb_kits/playbook/pb_title/_title.scss +1 -5
  57. data/app/pb_kits/playbook/tokens/_titles.scss +1 -5
  58. data/dist/menu.yml +2 -2
  59. data/dist/playbook-rails.js +2 -2
  60. data/lib/playbook/version.rb +2 -2
  61. metadata +9 -22
  62. data/app/pb_kits/playbook/pb_avatar/docs/_avatar_badge_component_overlay.md +0 -3
  63. data/app/pb_kits/playbook/pb_avatar/docs/_avatar_circle_icon_component_overlay.md +0 -3
  64. data/app/pb_kits/playbook/pb_collapsible/child_kits/CollapsibleIcon.tsx +0 -92
  65. data/app/pb_kits/playbook/pb_collapsible/collapsible_icon.html.erb +0 -15
  66. data/app/pb_kits/playbook/pb_collapsible/collapsible_icon.rb +0 -37
  67. data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_custom_main.jsx +0 -73
  68. data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_custom_main.md +0 -5
  69. data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_custom_main_rails.html.erb +0 -20
  70. data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_custom_main_rails.md +0 -5
  71. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_subcomponent_structure_rails.md +0 -6
  72. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_display_rails.md +0 -5
  73. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_options_rails.md +0 -1
  74. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_trigger_rails.md +0 -1
  75. /data/app/pb_kits/playbook/pb_dropdown/docs/{_dropdown_with_custom_display_rails.html.erb → _dropdown_with_custom_display.html.erb} +0 -0
@@ -15,7 +15,7 @@ module Playbook
15
15
  values: %w[xs sm md lg xl none rounded],
16
16
  default: "md"
17
17
  prop :background, type: Playbook::Props::Enum,
18
- values: %w[white light dark product_1_background product_1_highlight product_2_background product_2_highlight product_3_background product_3_highlight product_4_background product_4_highlight product_5_background product_5_highlight product_6_background product_6_highlight product_7_background product_7_highlight product_8_background product_8_highlight product_9_background product_9_highlight product_10_background product_10_highlight windows siding doors solar roofing gutters insulation none success_subtle warning_subtle error_subtle info_subtle neutral_subtle],
18
+ values: %w[white light dark product_1_background product_1_highlight product_2_background product_2_highlight product_3_background product_3_highlight product_4_background product_4_highlight product_5_background product_5_highlight product_6_background product_6_highlight product_7_background product_7_highlight product_8_background product_8_highlight product_9_background product_9_highlight product_10_background product_10_highlight windows siding doors solar roofing gutters insulation none],
19
19
  default: "none"
20
20
 
21
21
  def classname
@@ -42,23 +42,3 @@
42
42
  dark: true
43
43
  }) %>
44
44
  <% end %>
45
-
46
- <%= pb_rails("title", props: { text: "Subtle Status Colors", tag: "h4", size: 4, margin_bottom: "sm" }) %>
47
-
48
- <%= pb_rails("card", props: { background: "success_subtle", margin_bottom: "sm" }) do %>
49
- <%= pb_rails("body", props: {
50
- text: "Success Subtle"
51
- }) %>
52
- <% end %>
53
-
54
- <%= pb_rails("card", props: { background: "warning_subtle", margin_bottom: "sm" }) do %>
55
- <%= pb_rails("body", props: {
56
- text: "Warning Subtle"
57
- }) %>
58
- <% end %>
59
-
60
- <%= pb_rails("card", props: { background: "info_subtle", margin_bottom: "sm" }) do %>
61
- <%= pb_rails("body", props: {
62
- text: "Info Subtle"
63
- }) %>
64
- <% end %>
@@ -90,47 +90,7 @@ const CardBackground = (props) => {
90
90
  />
91
91
  </Card>
92
92
 
93
-
94
- <Title
95
- {...props}
96
- marginBottom="sm"
97
- size={4}
98
- tag="h4"
99
- text="Subtle Status Colors"
100
- />
101
-
102
- <Card
103
- background="success_subtle"
104
- marginBottom="sm"
105
- {...props}
106
- >
107
- <Body
108
- text="Success Subtle"
109
- {...props}
110
- />
111
- </Card>
112
-
113
- <Card
114
- background="warning_subtle"
115
- marginBottom="sm"
116
- {...props}
117
- >
118
- <Body
119
- text="Warning Subtle"
120
- {...props}
121
- />
122
- </Card>
123
-
124
- <Card
125
- background="info_subtle"
126
- marginBottom="sm"
127
- {...props}
128
- >
129
- <Body
130
- text="Info Subtle"
131
- {...props}
132
- />
133
- </Card>
93
+
134
94
  </div>
135
95
  )
136
96
  }
@@ -1 +1 @@
1
- Add a background color by passing the color name to background. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/visual_guidelines" target="_blank">here</a> under Product Colors and Status: Subtle Variations.
1
+ Add a background color by passing the color name to background. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/visual_guidelines" target="_blank">here</a> under Product Colors.
@@ -67,4 +67,4 @@
67
67
  <%= pb_rails("card/card_body", props: { padding: "md", }) do %>
68
68
  Body
69
69
  <% end %>
70
- <% end %>
70
+ <% end %>
@@ -1 +1 @@
1
- Card headers pass category, product, and background colors only. List of all category, product, and background colors can be viewed <a href="https://playbook.powerapp.cloud/visual_guidelines/colors" target="_blank">here</a>.
1
+ Card headers pass category, product, and background colors only. List of all category, product, and background colors can be viewed <a href="https://playbook.powerapp.cloud/utilities" target="_blank">here</a>.
@@ -1 +1 @@
1
- Card highlight can pass status, product, and category colors. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/visual_guidelines/colors" target="_blank">here</a>.
1
+ Card highlight can pass status, product, and category colors. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/utilities" target="_blank">here</a>.
@@ -9,7 +9,6 @@ import CollapsibleContent from './child_kits/CollapsibleContent'
9
9
  import CollapsibleMain from './child_kits/CollapsibleMain'
10
10
  import CollapsibleContext from './context'
11
11
  import { IconSizes } from "../pb_icon/_icon"
12
- import CollapsibleIcon from './child_kits/CollapsibleIcon'
13
12
 
14
13
 
15
14
  type CollapsibleProps = {
@@ -53,15 +52,12 @@ const Collapsible = ({
53
52
  if (CollapsibleParent.length !== 2) {
54
53
  throw new Error('Collapsible requires <CollapsibleMain> and <CollapsibleContent> to function properly.')
55
54
  }
56
- const FirstChild = CollapsibleParent[0]
57
- const SecondChild = CollapsibleParent[1]
58
55
 
59
- const Main = FirstChild.type === CollapsibleMain ? FirstChild : null
60
- const Content = SecondChild.type === CollapsibleContent ? SecondChild : null
56
+ const Main = CollapsibleParent[0]
57
+ const Content = CollapsibleParent[1]
61
58
 
62
-
63
- const { children: mainChildren = null, ...mainProps } = Main ? Main.props : {}
64
- const { children: contentChildren = null, ...contentProps } = Content ? Content.props : {}
59
+ const { children: mainChildren, ...mainProps } = Main.props
60
+ const { children: contentChildren, ...contentProps } = Content.props
65
61
  const ariaProps = buildAriaProps(aria)
66
62
  const dataProps = buildDataProps(data)
67
63
  const htmlProps = buildHtmlProps(htmlOptions)
@@ -79,19 +75,13 @@ const Collapsible = ({
79
75
  className={classes}
80
76
  id={id}
81
77
  >
82
- {Main ? (
83
- <CollapsibleMain {...mainProps}>
84
- {mainChildren}
85
- </CollapsibleMain>
86
- ) : (
87
- FirstChild
88
- )}
78
+ <CollapsibleMain {...mainProps}>
79
+ {mainChildren}
80
+ </CollapsibleMain>
89
81
 
90
- {Content && (
91
- <CollapsibleContent {...contentProps}>
92
- {contentChildren}
93
- </CollapsibleContent>
94
- )}
82
+ <CollapsibleContent {...contentProps}>
83
+ {contentChildren}
84
+ </CollapsibleContent>
95
85
  </div>
96
86
  </CollapsibleContext.Provider>
97
87
  )
@@ -99,6 +89,5 @@ const Collapsible = ({
99
89
 
100
90
  Collapsible.Main = CollapsibleMain
101
91
  Collapsible.Content = CollapsibleContent
102
- Collapsible.Icon = CollapsibleIcon
103
92
 
104
93
  export default Collapsible
@@ -7,9 +7,27 @@ import { globalProps } from '../../utilities/globalProps'
7
7
 
8
8
  import Flex from '../../pb_flex/_flex'
9
9
  import FlexItem from '../../pb_flex/_flex_item'
10
- import { IconSizes } from "../../pb_icon/_icon"
10
+ import Icon, { IconSizes } from "../../pb_icon/_icon"
11
11
  import CollapsibleContext from '../context'
12
- import CollapsibleIcon from './CollapsibleIcon'
12
+
13
+
14
+ type colorMap = {
15
+ default: string,
16
+ light: string,
17
+ lighter: string,
18
+ link: string,
19
+ error: string,
20
+ success: string
21
+ }
22
+
23
+ const colorMap = {
24
+ default: "#242B42",
25
+ light: "#687887",
26
+ lighter: "#C1CDD6",
27
+ link: "#0056CF",
28
+ error: "#FF2229",
29
+ success: "#00CA74",
30
+ }
13
31
 
14
32
  type CollapsibleMainProps = {
15
33
  children: React.ReactNode[] | React.ReactNode,
@@ -20,6 +38,60 @@ type CollapsibleMainProps = {
20
38
  }
21
39
  type IconColors = "default" | "light" | "lighter" | "link" | "error" | "success"
22
40
 
41
+ type IconProps = {
42
+ collapsed: boolean | (()=> void)
43
+ icon?: string[] | string
44
+ iconColor?: IconColors
45
+ iconSize?: IconSizes
46
+ onIconClick?: ()=> void
47
+ }
48
+
49
+ const ToggleIcon = ({ collapsed, icon, iconSize, iconColor, onIconClick }: IconProps) => {
50
+ const color = colorMap[iconColor]
51
+
52
+ const showIcon = (icon: string |string[]) => {
53
+ if (typeof icon === "string") {
54
+ return [icon, icon]
55
+ }
56
+ return icon
57
+ }
58
+
59
+ const handleIconClick = (e: React.MouseEvent<HTMLElement>) => {
60
+ if (onIconClick) {
61
+ e.stopPropagation();
62
+ onIconClick()
63
+ }
64
+ }
65
+
66
+ return (
67
+ <>
68
+ {collapsed ? (
69
+ <div
70
+ className="icon_wrapper"
71
+ key={icon ? showIcon(icon)[0] : "chevron-down"}
72
+ onClick={(e)=> handleIconClick(e)}
73
+ style={{ verticalAlign: "middle", color: color }}
74
+ >
75
+ <Icon icon={icon ? showIcon(icon)[0] : "chevron-down"}
76
+ size={iconSize}
77
+ />
78
+ </div>
79
+ ) : (
80
+ <div
81
+ className="icon_wrapper"
82
+ key={icon ? showIcon(icon)[1] : "chevron-up"}
83
+ onClick={(e)=> handleIconClick(e)}
84
+ style={{ verticalAlign: "middle", color: color }}
85
+ >
86
+ <Icon icon={icon ? showIcon(icon)[1] : "chevron-up"}
87
+ size={iconSize}
88
+ />
89
+ </div>
90
+ )}
91
+ </>
92
+ );
93
+ }
94
+
23
95
  const CollapsibleMain = ({
24
96
  children,
25
97
  className,
@@ -48,7 +120,7 @@ const CollapsibleMain = ({
48
120
  >
49
121
  <FlexItem>{children}</FlexItem>
50
122
  <FlexItem>
51
- <CollapsibleIcon
123
+ <ToggleIcon
52
124
  collapsed={collapsed as () => void}
53
125
  icon={icon as string[] | string}
54
126
  iconColor={iconColor as IconColors}
@@ -7,7 +7,6 @@ examples:
7
7
  - collapsible_icons: Custom Icons
8
8
  - collapsible_external_controls: Toggle Collapsible With External Controls
9
9
  - collapsible_external_controls_multiple: Toggle All Collapsibles With One Control
10
- - collapsible_custom_main_rails: Custom Main Section
11
10
 
12
11
  react:
13
12
  - collapsible_default: Default
@@ -15,8 +14,6 @@ examples:
15
14
  - collapsible_color: Icon Color
16
15
  - collapsible_icons: Custom Icons
17
16
  - collapsible_state: useCollapsible Hook
18
- - collapsible_custom_main: Custom Main Section
19
-
20
17
 
21
18
  swift:
22
19
  - collapsible_default_swift: Default
@@ -2,5 +2,4 @@ export { default as CollapsibleDefault } from './_collapsible_default.jsx'
2
2
  export { default as CollapsibleSize } from './_collapsible_size.jsx'
3
3
  export { default as CollapsibleColor } from './_collapsible_color.jsx'
4
4
  export { default as CollapsibleIcons } from './_collapsible_icons.jsx'
5
- export { default as CollapsibleState } from './_collapsible_state.jsx'
6
- export { default as CollapsibleCustomMain } from './_collapsible_custom_main.jsx'
5
+ export {default as CollapsibleState } from './_collapsible_state.jsx'
@@ -75,23 +75,13 @@ export default class PbCollapsible extends PbEnhancedElement {
75
75
  this.displayUpArrow()
76
76
  }
77
77
 
78
- toggleArrows(showDownArrow) {
79
- const downArrow = this.element.querySelector(DOWN_ARROW_SELECTOR);
80
- const upArrow = this.element.querySelector(UP_ARROW_SELECTOR);
81
-
82
- if (downArrow) {
83
- downArrow.style.display = showDownArrow ? 'inline-block' : 'none';
84
- }
85
- if (upArrow) {
86
- upArrow.style.display = showDownArrow ? 'none' : 'inline-block';
87
- }
88
- }
89
-
90
78
  displayDownArrow() {
91
- this.toggleArrows(true);
79
+ this.element.querySelector(DOWN_ARROW_SELECTOR).style.display = 'inline-block'
80
+ this.element.querySelector(UP_ARROW_SELECTOR).style.display = 'none'
92
81
  }
93
-
82
+
94
83
  displayUpArrow() {
95
- this.toggleArrows(false);
96
- }
84
+ this.element.querySelector(UP_ARROW_SELECTOR).style.display = 'inline-block'
85
+ this.element.querySelector(DOWN_ARROW_SELECTOR).style.display = 'none'
86
+ }
97
87
  }
@@ -15,7 +15,7 @@ $pb_dark_detail_colors: (
15
15
  light: $text_dk_light,
16
16
  default: $text_dk_default,
17
17
  lighter: $text_dk_lighter,
18
- link: $active_dark,
18
+ link: $primary,
19
19
  error: $error_dark,
20
20
  success: $text_dk_success_sm,
21
21
  );
@@ -23,11 +23,11 @@
23
23
  <ul>
24
24
  <% hide_button = type == "rails" ? 'flex' : 'none' %>
25
25
  <li>
26
- <%= pb_rails("button", props: { id:"copy-html-#{example_key}", icon: "copy", text: "Copy HTML", classname: dark ? "dark" : "", variant: "link", size: "sm", display: hide_button }) %>
26
+ <%= pb_rails("button", props: { id:"copy-html-#{example_key}", icon: "copy", text: "Copy HTML", variant: "link", size: "sm", display: hide_button }) %>
27
27
  </li>
28
28
  <li>
29
- <%= pb_rails("button", props: { icon: "code", classname: dark ? "dark" : "", id:"toggle-open-opened", text: "Close Code", variant: "link", size: "sm", display: "none" }) %>
30
- <%= pb_rails("button", props: { icon: "code", classname: dark ? "dark" : "", id:"toggle-open-closed", text: "Show Code", variant: "link", size: "sm" }) %>
29
+ <%= pb_rails("button", props: { icon: "code", id:"toggle-open-opened", text: "Close Code", variant: "link", size: "sm", display: "none" }) %>
30
+ <%= pb_rails("button", props: { icon: "code", id:"toggle-open-closed", text: "Show Code", variant: "link", size: "sm" }) %>
31
31
  </li>
32
32
  </ul>
33
33
  </div>
@@ -77,9 +77,8 @@
77
77
  }
78
78
  &[class*="selected"] {
79
79
  background-color: $primary;
80
- color: $white;
81
80
  [class^="pb_body"],
82
- [class^="pb_title_kit"], a {
81
+ [class^="pb_title_kit"] {
83
82
  color: $white !important;
84
83
  }
85
84
  &:hover {
@@ -114,10 +114,8 @@ const Dropdown = (props: DropdownProps) => {
114
114
  setIsDropDownClosed(isClosed)
115
115
  },[isClosed])
116
116
 
117
- const filteredOptions = options?.filter((option: GenericObject) => {
118
- const label = typeof option.label === 'string' ? option.label.toLowerCase() : option.label;
119
- return String(label).toLowerCase().includes(filterItem.toLowerCase());
120
- }
117
+ const filteredOptions = options?.filter((option: GenericObject) =>
118
+ option.label.toLowerCase().includes(filterItem.toLowerCase())
121
119
  );
122
120
 
123
121
  // For keyboard accessibility: Set focus within dropdown to selected item if it exists
@@ -1,8 +1,8 @@
1
1
  <%
2
2
  options = [
3
- { label: 'United States', value: 'United States', id: 'us' },
4
- { label: 'Canada', value: 'Canada', id: 'ca' },
5
- { label: 'Pakistan', value: 'Pakistan', id: 'pk' },
3
+ { label: 'United States', value: 'United States' },
4
+ { label: 'Canada', value: 'Canada' },
5
+ { label: 'Pakistan', value: 'Pakistan' },
6
6
  ]
7
7
 
8
8
  %>
@@ -1 +1 @@
1
- This kit's `options` prop requires an array of objects, each of which will be used as the selectable options within the dropdown. Each option object can support any number of key-value pairs, but each must contain `label` and `value`.
1
+ The Dropdown kit accepts an `options` array and renders each object from that array as a selectable option within a dropdown container. `options` is a required prop and must be an array of objects. Each object can contain as many key/value pairs as needed but MUST contain 'label' and 'value' as the only required items within each object.
@@ -1,8 +1,8 @@
1
1
  <%
2
2
  options = [
3
- { label: 'United States', value: 'United States', id: 'us' },
4
- { label: 'Canada', value: 'Canada', id: 'ca' },
5
- { label: 'Pakistan', value: 'Pakistan', id: 'pk' },
3
+ { label: 'United States', value: 'United States' },
4
+ { label: 'Canada', value: 'Canada' },
5
+ { label: 'Pakistan', value: 'Pakistan' },
6
6
  ]
7
7
 
8
8
  %>
@@ -1,6 +1,7 @@
1
- The dropdown is built using all of the following subcomponents:
1
+ The dropdown comes with the following subcomponents that can be used to achieve various levels of customization:
2
2
 
3
- `Dropdown.Trigger` is the UI component that users interact with to toggle the dropdown.
4
- `Dropdown.Container` is the floating container that wraps the list of dropdown options.
5
- `Dropdown.Option` renders options that are passed to the container.
6
- Each of these subcomponents can be altered using global props and/or their respective props. See doc examples below for more information on each.
3
+ `Dropdown. Trigger` / `dropdown/dropdown_trigger`
4
+ `Dropdown.Container`/ `dropdown/dropdown_container`
5
+ `Dropdown.Option` / `dropdown/dropdown_option`
6
+
7
+ See the code snippet below for a visual on how to use the kit with subcomponents. Each subcomponent allows for GlobalProps in addition to any subcomponent specfic props.
@@ -1,5 +1,5 @@
1
- Optionally utilize `customDisplay` on the `Dropdown.Trigger` subcomponent to customize its content after an option is selected. The component passed to customDisplay will be rendered to the left of the default text-based display. In this example the Avatar kit is being used.
1
+ The `customDisplay` prop can be used to customize the display of the selected item by allowing devs to pass in a component that will be rendered to the left of the default text-based display. In this example the Avatar kit is being used.
2
2
 
3
- The `placeholder` prop can also be used to customize the placeholder text for the default `Dropdown.Trigger`.
3
+ The `placeholder` prop can also be used to customize the placeholder text for the default Trigger.
4
4
 
5
- The `onSelect` prop returns the selected option as an object to be utilized by the dev. In this example we are using the `onSelect` to set a state with the selected option and using it to customize the `customDisplay`.
5
+ The `onSelect` prop is a function that gives the dev one argument: the selected option. In this example we are using the `onSelect` to set a state with the selected option and using it to customize the `customDisplay`.
@@ -5,21 +5,21 @@
5
5
  value: "United States",
6
6
  areaCode: "+1",
7
7
  icon: "🇺🇸",
8
- id: "us"
8
+ id: "United-states"
9
9
  },
10
10
  {
11
11
  label: "Canada",
12
12
  value: "Canada",
13
13
  areaCode: "+1",
14
14
  icon: "🇨🇦",
15
- id: "ca"
15
+ id: "canada"
16
16
  },
17
17
  {
18
18
  label: "Pakistan",
19
19
  value: "Pakistan",
20
20
  areaCode: "+92",
21
21
  icon: "🇵🇰",
22
- id: "pk"
22
+ id: "pakistan"
23
23
  }
24
24
  ]
25
25
 
@@ -1 +1 @@
1
- `Dropdown.Option` subcomponent accepts any child components to customize the options' contents and display. By default, options are Body kit text that is set by the `label` value from the `option` object.
1
+ The Dropdown also allows for custom options that can be passed in as children to the `Dropdown.Option` subcomponent. If no children are passed to `Dropdown.Option`, the kit will render each option as text within a Body kit by default.
@@ -1,8 +1,8 @@
1
1
  <%
2
2
  options = [
3
- { label: 'United States', value: 'United States', id: 'us' },
4
- { label: 'Canada', value: 'Canada', id: 'ca' },
5
- { label: 'Pakistan', value: 'Pakistan', id: 'pk' },
3
+ { label: 'United States', value: 'United States' },
4
+ { label: 'Canada', value: 'Canada' },
5
+ { label: 'Pakistan', value: 'Pakistan' },
6
6
  ]
7
7
 
8
8
  %>
@@ -1 +1 @@
1
- By default, dropdown option padding is set to `xs`, but this padding can be overridden using our global prop spacing token. In this example we are increasing the option padding to `sm`.
1
+ By default, the padding on each option in the dropdown is set to `xs`. The `padding` Global Props however can be used to override this default. In this example, we are setting padding to `sm`.
@@ -5,21 +5,21 @@
5
5
  value: "United States",
6
6
  areaCode: "+1",
7
7
  icon: "🇺🇸",
8
- id: "us"
8
+ id: "United-states"
9
9
  },
10
10
  {
11
11
  label: "Canada",
12
12
  value: "Canada",
13
13
  areaCode: "+1",
14
14
  icon: "🇨🇦",
15
- id: "ca"
15
+ id: "canada"
16
16
  },
17
17
  {
18
18
  label: "Pakistan",
19
19
  value: "Pakistan",
20
20
  areaCode: "+92",
21
21
  icon: "🇵🇰",
22
- id: "pk"
22
+ id: "pakistan"
23
23
  }
24
24
  ]
25
25
 
@@ -1 +1 @@
1
- Optionally replace the default trigger's select element by passing child components directly to the `Dropdown.Trigger`.
1
+ The Dropdown can also be given a custom Trigger by passing children to the `Dropdown.Trigger` subcomponent as shown in this example. Here we are using the IconCircle kit.
@@ -1,8 +1,8 @@
1
1
  <%
2
2
  options = [
3
- { label: 'United States', value: 'United States', id: 'us' },
4
- { label: 'Canada', value: 'Canada', id: 'ca' },
5
- { label: 'Pakistan', value: 'Pakistan', id: 'pk' },
3
+ { label: 'United States', value: 'United States' },
4
+ { label: 'Canada', value: 'Canada' },
5
+ { label: 'Pakistan', value: 'Pakistan' },
6
6
  ]
7
7
 
8
8
  %>
@@ -1 +1 @@
1
- The top-level Dropdown component optionally accepts any string through a `label` prop to produce a label above your trigger element.
1
+ The optional `label` prop takes a string value that if present will render that string as the label for the Dropdown.
@@ -1,12 +1,12 @@
1
1
  examples:
2
2
  rails:
3
3
  - dropdown_default: Default
4
- - dropdown_subcomponent_structure_rails: Subcomponent Structure
4
+ - dropdown_subcomponent_structure: Subcomponent Structure
5
5
  - dropdown_with_label: With Label
6
- - dropdown_with_custom_options_rails: Custom Options
7
- - dropdown_with_custom_display_rails: Custom Display
8
- - dropdown_with_custom_trigger_rails: Custom Trigger
9
- - dropdown_with_custom_padding: Custom Option Padding
6
+ - dropdown_with_custom_options: Custom Options
7
+ - dropdown_with_custom_display: Custom Display
8
+ - dropdown_with_custom_trigger: Custom Trigger
9
+ - dropdown_with_custom_padding: Custom Padding for Dropdown Options
10
10
 
11
11
  react:
12
12
  - dropdown_default: Default
@@ -15,7 +15,7 @@ examples:
15
15
  - dropdown_with_custom_options: Custom Options
16
16
  - dropdown_with_custom_display: Custom Display
17
17
  - dropdown_with_custom_trigger: Custom Trigger
18
- - dropdown_with_custom_padding: Custom Option Padding
18
+ - dropdown_with_custom_padding: Custom Padding for Dropdown Options
19
19
  # - dropdown_with_autocomplete: Autocomplete
20
20
  # - dropdown_with_autocomplete_and_custom_display: Autocomplete with Custom Display
21
21
  # - dropdown_with_external_control: useDropdown Hook
@@ -8,7 +8,6 @@
8
8
  <%= pb_rails("caption", props: {text: object.label, margin_bottom:"xs"}) %>
9
9
  <% end %>
10
10
  <div class="dropdown_wrapper" style="position: relative">
11
- <input type="hidden" name="<%= object.name %>" id="dropdown-selected-option" value=""/>
12
11
  <% if content.present? %>
13
12
  <%= content.presence %>
14
13
  <% else %>
@@ -6,7 +6,6 @@ module Playbook
6
6
  prop :options, type: Playbook::Props::Array,
7
7
  default: []
8
8
  prop :label, type: Playbook::Props::String
9
- prop :name, type: Playbook::Props::String
10
9
 
11
10
  def data
12
11
  Hash(prop(:data)).merge(pb_dropdown: true)
@@ -2,7 +2,7 @@
2
2
  aria: object.aria,
3
3
  class: object.classname,
4
4
  data: object.data,
5
- id: object.option[:id],
5
+ id: object.id,
6
6
  **combined_html_options) do %>
7
7
  <%= pb_rails("list/item", props: {
8
8
  display: "flex",
@@ -3,7 +3,7 @@
3
3
  module Playbook
4
4
  module PbDropdown
5
5
  class DropdownOption < Playbook::KitBase
6
- prop :option, type: Playbook::Props::HashProp
6
+ prop :option, type: Playbook::Props::String
7
7
  prop :id, type: Playbook::Props::String
8
8
 
9
9
  def data
@@ -37,10 +37,8 @@ export default class PbDropdown extends PbEnhancedElement {
37
37
 
38
38
  handleOptionClick(event) {
39
39
  const option = event.target.closest(OPTION_SELECTOR);
40
- const hiddenInput = this.element.querySelector("#dropdown-selected-option");
41
40
  if (option) {
42
41
  const value = option.dataset.dropdownOptionLabel;
43
- hiddenInput.value = JSON.parse(value).id;
44
42
  this.onOptionSelected(value, option);
45
43
  }
46
44
  }
@@ -101,6 +99,7 @@ export default class PbDropdown extends PbEnhancedElement {
101
99
  option.classList.remove("pb_dropdown_option_selected");
102
100
  });
103
101
  selectedOption.classList.add("pb_dropdown_option_selected");
102
+ console.log(`Selected value: ${value}`);
104
103
  }
105
104
 
106
105
  get target() {
@@ -50,10 +50,8 @@ const DropdownOption = (props: DropdownOptionProps) => {
50
50
  selected,
51
51
  } = useContext(DropdownContext);
52
52
 
53
- const isItemMatchingFilter = (option: GenericObject) => {
54
- const label = typeof option.label === 'string' ? option.label.toLowerCase() : option.label;
55
- return String(label).toLowerCase().includes(filterItem.toLowerCase());
56
- }
53
+ const isItemMatchingFilter = (option: GenericObject) =>
54
+ option?.label.toLowerCase().includes(filterItem.toLowerCase());
57
55
 
58
56
  if (!isItemMatchingFilter(option)) {
59
57
  return null;