playbook_ui 13.21.0.pre.alpha.PBNTR224letuserresetrowexpansion2466 → 13.21.0.pre.alpha.PBNTR225advancedtablefeedback2438

Sign up to get free protection for your applications and to get access to all the features.
Files changed (155) hide show
  1. checksums.yaml +4 -4
  2. data/app/pb_kits/playbook/pb_advanced_table/Components/CustomCell.tsx +4 -8
  3. data/app/pb_kits/playbook/pb_advanced_table/README.md +2 -2
  4. data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.scss +2 -7
  5. data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.tsx +0 -1
  6. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_expanded_control.jsx +0 -5
  7. data/app/pb_kits/playbook/pb_advanced_table/docs/example.yml +0 -2
  8. data/app/pb_kits/playbook/pb_avatar/avatar.html.erb +1 -2
  9. data/app/pb_kits/playbook/pb_avatar_action_button/avatar_action_button.html.erb +1 -2
  10. data/app/pb_kits/playbook/pb_background/background.html.erb +1 -2
  11. data/app/pb_kits/playbook/pb_badge/badge.html.erb +1 -2
  12. data/app/pb_kits/playbook/pb_body/body.html.erb +1 -2
  13. data/app/pb_kits/playbook/pb_bread_crumbs/_bread_crumbs.scss +7 -0
  14. data/app/pb_kits/playbook/pb_bread_crumbs/bread_crumb_item.html.erb +1 -2
  15. data/app/pb_kits/playbook/pb_bread_crumbs/bread_crumbs.html.erb +1 -2
  16. data/app/pb_kits/playbook/pb_button/button.html.erb +1 -2
  17. data/app/pb_kits/playbook/pb_button/button.rb +3 -2
  18. data/app/pb_kits/playbook/pb_button_toolbar/button_toolbar.html.erb +1 -2
  19. data/app/pb_kits/playbook/pb_caption/caption.html.erb +1 -2
  20. data/app/pb_kits/playbook/pb_card/card.html.erb +1 -2
  21. data/app/pb_kits/playbook/pb_card/card_body.html.erb +1 -2
  22. data/app/pb_kits/playbook/pb_card/card_header.html.erb +1 -2
  23. data/app/pb_kits/playbook/pb_checkbox/checkbox.html.erb +1 -3
  24. data/app/pb_kits/playbook/pb_circle_icon_button/circle_icon_button.html.erb +1 -2
  25. data/app/pb_kits/playbook/pb_collapsible/collapsible.html.erb +1 -2
  26. data/app/pb_kits/playbook/pb_collapsible/collapsible_content.html.erb +1 -2
  27. data/app/pb_kits/playbook/pb_collapsible/collapsible_main.html.erb +1 -2
  28. data/app/pb_kits/playbook/pb_contact/contact.html.erb +1 -2
  29. data/app/pb_kits/playbook/pb_currency/currency.html.erb +1 -2
  30. data/app/pb_kits/playbook/pb_dashboard_value/dashboard_value.html.erb +1 -2
  31. data/app/pb_kits/playbook/pb_date/date.html.erb +1 -2
  32. data/app/pb_kits/playbook/pb_date_picker/_date_picker.scss +2 -1
  33. data/app/pb_kits/playbook/pb_date_picker/_date_picker.tsx +0 -3
  34. data/app/pb_kits/playbook/pb_date_picker/date_picker.html.erb +2 -4
  35. data/app/pb_kits/playbook/pb_date_picker/date_picker.rb +1 -2
  36. data/app/pb_kits/playbook/pb_date_picker/date_picker.test.js +1 -1
  37. data/app/pb_kits/playbook/pb_date_picker/date_picker_helper.ts +7 -9
  38. data/app/pb_kits/playbook/pb_date_picker/docs/example.yml +0 -2
  39. data/app/pb_kits/playbook/pb_date_picker/docs/index.js +0 -1
  40. data/app/pb_kits/playbook/pb_date_picker/sass_partials/_input_styles.scss +2 -1
  41. data/app/pb_kits/playbook/pb_date_range_inline/date_range_inline.html.erb +1 -2
  42. data/app/pb_kits/playbook/pb_date_range_stacked/date_range_stacked.html.erb +1 -2
  43. data/app/pb_kits/playbook/pb_date_stacked/date_stacked.html.erb +1 -2
  44. data/app/pb_kits/playbook/pb_date_time/date_time.html.erb +1 -2
  45. data/app/pb_kits/playbook/pb_date_time_stacked/date_time_stacked.html.erb +2 -3
  46. data/app/pb_kits/playbook/pb_date_year_stacked/date_year_stacked.html.erb +1 -2
  47. data/app/pb_kits/playbook/pb_detail/detail.html.erb +1 -2
  48. data/app/pb_kits/playbook/pb_dialog/dialog.html.erb +1 -2
  49. data/app/pb_kits/playbook/pb_dialog/dialog_body.html.erb +2 -3
  50. data/app/pb_kits/playbook/pb_dialog/dialog_footer.html.erb +1 -2
  51. data/app/pb_kits/playbook/pb_dialog/dialog_header.html.erb +2 -3
  52. data/app/pb_kits/playbook/pb_file_upload/file_upload.html.erb +1 -2
  53. data/app/pb_kits/playbook/pb_filter/filter.html.erb +1 -2
  54. data/app/pb_kits/playbook/pb_fixed_confirmation_toast/_fixed_confirmation_toast.scss +3 -8
  55. data/app/pb_kits/playbook/pb_fixed_confirmation_toast/_fixed_confirmation_toast.tsx +0 -1
  56. data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_multi_line.html.erb +1 -51
  57. data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_multi_line.jsx +11 -62
  58. data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_positions.html.erb +2 -7
  59. data/app/pb_kits/playbook/pb_fixed_confirmation_toast/fixed_confirmation_toast.html.erb +3 -4
  60. data/app/pb_kits/playbook/pb_flex/docs/_flex_spacing.html.erb +4 -0
  61. data/app/pb_kits/playbook/pb_flex/flex.html.erb +1 -2
  62. data/app/pb_kits/playbook/pb_flex/flex_item.html.erb +1 -2
  63. data/app/pb_kits/playbook/pb_form_group/form_group.html.erb +1 -2
  64. data/app/pb_kits/playbook/pb_form_pill/form_pill.html.erb +2 -2
  65. data/app/pb_kits/playbook/pb_hashtag/hashtag.html.erb +1 -2
  66. data/app/pb_kits/playbook/pb_highlight/highlight.html.erb +1 -2
  67. data/app/pb_kits/playbook/pb_home_address_street/home_address_street.html.erb +1 -2
  68. data/app/pb_kits/playbook/pb_icon/_icon.tsx +0 -1
  69. data/app/pb_kits/playbook/pb_icon/icon.html.erb +1 -2
  70. data/app/pb_kits/playbook/pb_icon/icon.rb +3 -3
  71. data/app/pb_kits/playbook/pb_icon_circle/icon_circle.html.erb +1 -2
  72. data/app/pb_kits/playbook/pb_icon_stat_value/icon_stat_value.html.erb +1 -2
  73. data/app/pb_kits/playbook/pb_icon_value/icon_value.html.erb +1 -2
  74. data/app/pb_kits/playbook/pb_image/image.html.erb +1 -2
  75. data/app/pb_kits/playbook/pb_label_pill/label_pill.html.erb +1 -2
  76. data/app/pb_kits/playbook/pb_label_value/label_value.html.erb +2 -3
  77. data/app/pb_kits/playbook/pb_layout/body.html.erb +1 -2
  78. data/app/pb_kits/playbook/pb_layout/footer.html.erb +1 -2
  79. data/app/pb_kits/playbook/pb_layout/header.html.erb +1 -2
  80. data/app/pb_kits/playbook/pb_layout/item.html.erb +1 -2
  81. data/app/pb_kits/playbook/pb_layout/layout.html.erb +1 -2
  82. data/app/pb_kits/playbook/pb_layout/sidebar.html.erb +1 -2
  83. data/app/pb_kits/playbook/pb_legend/legend.html.erb +1 -2
  84. data/app/pb_kits/playbook/pb_list/item.html.erb +1 -2
  85. data/app/pb_kits/playbook/pb_list/list.html.erb +1 -2
  86. data/app/pb_kits/playbook/pb_loading_inline/loading_inline.html.erb +1 -2
  87. data/app/pb_kits/playbook/pb_message/message.html.erb +1 -2
  88. data/app/pb_kits/playbook/pb_message/message_mention.html.erb +2 -3
  89. data/app/pb_kits/playbook/pb_multi_level_select/multi_level_select.html.erb +1 -2
  90. data/app/pb_kits/playbook/pb_multiple_users/multiple_users.html.erb +1 -2
  91. data/app/pb_kits/playbook/pb_multiple_users_stacked/multiple_users_stacked.html.erb +1 -2
  92. data/app/pb_kits/playbook/pb_nav/item.html.erb +2 -4
  93. data/app/pb_kits/playbook/pb_nav/nav.html.erb +1 -2
  94. data/app/pb_kits/playbook/pb_online_status/online_status.html.erb +1 -2
  95. data/app/pb_kits/playbook/pb_pagination/pagination.html.erb +1 -2
  96. data/app/pb_kits/playbook/pb_passphrase/passphrase.html.erb +1 -1
  97. data/app/pb_kits/playbook/pb_person/person.html.erb +1 -2
  98. data/app/pb_kits/playbook/pb_person_contact/person_contact.html.erb +1 -2
  99. data/app/pb_kits/playbook/pb_pill/pill.html.erb +1 -2
  100. data/app/pb_kits/playbook/pb_popover/popover.html.erb +1 -2
  101. data/app/pb_kits/playbook/pb_progress_pills/progress_pills.html.erb +1 -2
  102. data/app/pb_kits/playbook/pb_progress_simple/progress_simple.html.erb +1 -2
  103. data/app/pb_kits/playbook/pb_progress_step/progress_step.html.erb +1 -2
  104. data/app/pb_kits/playbook/pb_progress_step/progress_step_item.html.erb +1 -2
  105. data/app/pb_kits/playbook/pb_radio/radio.html.erb +1 -2
  106. data/app/pb_kits/playbook/pb_section_separator/section_separator.html.erb +1 -2
  107. data/app/pb_kits/playbook/pb_select/select.html.erb +1 -2
  108. data/app/pb_kits/playbook/pb_selectable_card/selectable_card.html.erb +1 -2
  109. data/app/pb_kits/playbook/pb_selectable_card_icon/selectable_card_icon.html.erb +1 -2
  110. data/app/pb_kits/playbook/pb_selectable_icon/selectable_icon.html.erb +1 -2
  111. data/app/pb_kits/playbook/pb_selectable_list/selectable_list.html.erb +1 -2
  112. data/app/pb_kits/playbook/pb_selectable_list/selectable_list_item.html.erb +1 -2
  113. data/app/pb_kits/playbook/pb_source/source.html.erb +1 -2
  114. data/app/pb_kits/playbook/pb_star_rating/star_rating.html.erb +1 -2
  115. data/app/pb_kits/playbook/pb_stat_change/stat_change.html.erb +1 -2
  116. data/app/pb_kits/playbook/pb_stat_value/stat_value.html.erb +1 -2
  117. data/app/pb_kits/playbook/pb_table/table.html.erb +2 -4
  118. data/app/pb_kits/playbook/pb_table/table_body.html.erb +3 -5
  119. data/app/pb_kits/playbook/pb_table/table_cell.html.erb +3 -5
  120. data/app/pb_kits/playbook/pb_table/table_head.html.erb +3 -5
  121. data/app/pb_kits/playbook/pb_table/table_header.html.erb +3 -5
  122. data/app/pb_kits/playbook/pb_table/table_row.html.erb +3 -5
  123. data/app/pb_kits/playbook/pb_text_input/_text_input.scss +1 -0
  124. data/app/pb_kits/playbook/pb_text_input/text_input.html.erb +1 -2
  125. data/app/pb_kits/playbook/pb_text_input/text_input.rb +1 -2
  126. data/app/pb_kits/playbook/pb_textarea/textarea.html.erb +1 -2
  127. data/app/pb_kits/playbook/pb_time/time.html.erb +1 -2
  128. data/app/pb_kits/playbook/pb_time_range_inline/time_range_inline.html.erb +2 -3
  129. data/app/pb_kits/playbook/pb_time_stacked/time_stacked.html.erb +1 -2
  130. data/app/pb_kits/playbook/pb_timeline/item.html.erb +1 -2
  131. data/app/pb_kits/playbook/pb_timeline/timeline.html.erb +1 -2
  132. data/app/pb_kits/playbook/pb_timestamp/timestamp.html.erb +1 -2
  133. data/app/pb_kits/playbook/pb_title/title.html.erb +2 -3
  134. data/app/pb_kits/playbook/pb_title_count/title_count.html.erb +1 -2
  135. data/app/pb_kits/playbook/pb_title_detail/title_detail.html.erb +1 -2
  136. data/app/pb_kits/playbook/pb_toggle/toggle.html.erb +1 -2
  137. data/app/pb_kits/playbook/pb_tooltip/tooltip.html.erb +1 -2
  138. data/app/pb_kits/playbook/pb_typeahead/typeahead.html.erb +1 -2
  139. data/app/pb_kits/playbook/pb_user/user.html.erb +1 -2
  140. data/app/pb_kits/playbook/pb_user_badge/user_badge.html.erb +1 -2
  141. data/app/pb_kits/playbook/pb_weekday_stacked/weekday_stacked.html.erb +1 -2
  142. data/dist/playbook-rails.js +4 -4
  143. data/lib/playbook/kit_base.rb +0 -18
  144. data/lib/playbook/version.rb +1 -1
  145. metadata +5 -15
  146. data/app/pb_kits/playbook/pb_advanced_table/advanced_table.html.erb +0 -14
  147. data/app/pb_kits/playbook/pb_advanced_table/advanced_table.rb +0 -19
  148. data/app/pb_kits/playbook/pb_advanced_table/table_body.html.erb +0 -9
  149. data/app/pb_kits/playbook/pb_advanced_table/table_body.rb +0 -30
  150. data/app/pb_kits/playbook/pb_advanced_table/table_header.html.erb +0 -20
  151. data/app/pb_kits/playbook/pb_advanced_table/table_header.rb +0 -21
  152. data/app/pb_kits/playbook/pb_advanced_table/table_row.html.erb +0 -37
  153. data/app/pb_kits/playbook/pb_advanced_table/table_row.rb +0 -32
  154. data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_margin_bottom.html.erb +0 -7
  155. data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_margin_bottom.jsx +0 -41
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cf18b9275cd75d7a727f6e7a3891cb3e5fba5872bc687e8abeafc44082d0d773
4
- data.tar.gz: c24eacd44ea5c95620641bf9859fc3eec5bbe5f94556c475b2ba419f6084997a
3
+ metadata.gz: f7cfb7021f51c07eb77a7166393965f50d634939c88a3d7b2a72890fc8f76aea
4
+ data.tar.gz: 4e0fd0437700056b9fcd95076dd5f700e89b616cf83f97ef9f96ae50c205352f
5
5
  SHA512:
6
- metadata.gz: fb03d54205fa39f8c058cf7031a0b3264ca98bdf56ac13396761113154f3071380b5f36217ef514ba6daa4f8db2581161b25cc9ab73afa7b383cdf261f58a4f4
7
- data.tar.gz: 535b35150645902fe5eb99fa49466bc31eb7a8ad4c7ea87a595406d33bb24b0ac42b56fa5c60aa4443e5fa4fb4af1e031acd2903ff43552e8216daec78264f50
6
+ metadata.gz: '09e5b5458d55ae87b2f8ccd44d3f8dc9a95391b8e8ae5493fa5f05408acfe0bd5f2db7c84343fa450bbc05299a597fc8bf6ca48d9976eeac0b1720d353b0cba7'
7
+ data.tar.gz: e360ce6a4f2074667af1b2e8a9067fd28e8e7a6f30136d04a69c7f7e3f1dcda3835d4cf4663be4e816dd89909698b4c9b0ac8991ff779b3666e845239dd5afa8
@@ -24,16 +24,12 @@ export const CustomCell = ({
24
24
  row,
25
25
  value,
26
26
  }: CustomCellProps & GlobalProps) => {
27
- const { setExpanded, expanded, expandedControl, inlineRowLoading } = useContext(AdvancedTableContext);
27
+ const { setExpanded, expanded, inlineRowLoading } = useContext(AdvancedTableContext)
28
28
 
29
29
  const handleOnExpand = (row: Row<GenericObject>) => {
30
- onRowToggleClick && onRowToggleClick(row);
31
-
32
- if (!expandedControl) {
33
- setExpanded({ ...expanded, [row.id]: !row.getIsExpanded() });
34
- }
35
- };
36
-
30
+ onRowToggleClick && onRowToggleClick(row)
31
+ setExpanded({ ...expanded, [row.id]: !row.getIsExpanded() })
32
+ }
37
33
  const RowHasChildren = row.original.children ? true : false
38
34
  const renderButton = inlineRowLoading ? RowHasChildren : row.getCanExpand()
39
35
 
@@ -81,7 +81,7 @@ const MOCK_DATA = [
81
81
  graduatedStudents: "43",
82
82
  children: [
83
83
  {
84
- year: "2021",
84
+ year: "2011",
85
85
  quarter: "Q1",
86
86
  month: "February",
87
87
  day: "15",
@@ -173,7 +173,7 @@ const MOCK_DATA = [
173
173
  graduatedStudents: "43",
174
174
  children: [
175
175
  {
176
- year: "2022",
176
+ year: "2011",
177
177
  quarter: "Q1",
178
178
  month: "May",
179
179
  day: "2",
@@ -83,17 +83,12 @@
83
83
 
84
84
  // Vertical separator
85
85
  .table-header-cells:first-child,
86
- td:first-child,
87
- .pb_table_td:first-child {
88
- box-shadow: 1px 0px 0px 0px $border_light !important;
86
+ td:first-child {
87
+ box-shadow: 1px 0px 0px 0px #e4e8f0 !important;
89
88
  }
90
89
 
91
90
  @include chrome_styles($border-color);
92
91
 
93
- tr:hover {
94
- position: relative;
95
- }
96
-
97
92
  &.dark {
98
93
  .bg-white {
99
94
  background: $bg_dark_card;
@@ -226,7 +226,6 @@ const AdvancedTable = (props: AdvancedTableProps) => {
226
226
  columnDefinitions,
227
227
  enableToggleExpansion,
228
228
  expanded,
229
- expandedControl,
230
229
  handleExpandOrCollapse,
231
230
  inlineRowLoading,
232
231
  loading,
@@ -44,16 +44,11 @@ const AdvancedTableExpandedControl = (props) => {
44
44
  onChange: setExpanded,
45
45
  }
46
46
 
47
- const onRowToggleClick = (row) => {
48
- setExpanded({ ...expanded, [row.id]: !expanded[row.id] })
49
- }
50
-
51
47
  return (
52
48
  <div>
53
49
  <AdvancedTable
54
50
  columnDefinitions={columnDefinitions}
55
51
  expandedControl={expandedControl}
56
- onRowToggleClick={onRowToggleClick}
57
52
  tableData={MOCK_DATA}
58
53
  {...props}
59
54
  />
@@ -1,6 +1,4 @@
1
1
  examples:
2
- # rails:
3
- # - advanced_table_default: Default (Required Props)
4
2
  react:
5
3
  - advanced_table_default: Default (Required Props)
6
4
  - advanced_table_loading: Loading State
@@ -2,8 +2,7 @@
2
2
  id: object.id,
3
3
  data: object.data.merge(initials: object.initials),
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do %>
5
+ aria: object.aria) do %>
7
6
  <%= content_tag(:div, data: { initials: object.initials }, class: "avatar_wrapper") do %>
8
7
  <%= pb_rails("image", props: { alt: object.alt_text, url: object.image_url, on_error: object.handle_img_error }) if object.image_url.present? %>
9
8
  <% end %>
@@ -2,8 +2,7 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <% if object.tooltip_text.present? %>
8
7
  <%= pb_rails("tooltip", props: {
9
8
  trigger_element_id: object.tooltip_id,
@@ -7,8 +7,7 @@
7
7
  style: "background-image: url('#{object.image_url}');
8
8
  background-repeat: #{object.background_repeat};
9
9
  background-size: #{object.background_size};
10
- background-position: #{object.background_position};",
11
- **combined_html_options
10
+ background-position: #{object.background_position};"
12
11
  ) do %>
13
12
  <%= content.presence %>
14
13
  <% end %>
@@ -2,7 +2,6 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <span><%= object.text %></span>
8
7
  <% end %>
@@ -2,7 +2,6 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <%= object.content %>
8
7
  <% end %>
@@ -1,3 +1,4 @@
1
+ @import "../tokens/border_radius";
1
2
  @import "../tokens/colors";
2
3
  @import "../tokens/opacity";
3
4
  @import "../tokens/spacing";
@@ -9,7 +10,11 @@
9
10
  display: inline-flex;
10
11
  align-items: center;
11
12
  justify-content: center;
13
+ border-radius: $border_rad_light;
12
14
  padding: 0 $space_xs/2;
15
+ border-width: 1px;
16
+ border-style: solid;
17
+ border-color: $card_light;
13
18
 
14
19
  svg {
15
20
  margin-right: 8px;
@@ -39,6 +44,8 @@
39
44
  }
40
45
 
41
46
  &.dark {
47
+ border-width: 0;
48
+
42
49
  @each $color_name, $color_value in $status_colors {
43
50
  &[class*=_#{$color_name}] {
44
51
  background: rgba(mix($bg_dark, $color_value, 10%), $opacity_2);
@@ -2,8 +2,7 @@
2
2
  id: object.id,
3
3
  data: object.data,
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do%>
5
+ aria: object.aria) do%>
7
6
  <%= content_tag(object.link ? 'a' : 'span', class: 'bread_crumb_item', href: object.link) do %>
8
7
  <%= content.presence %>
9
8
  <% end %>
@@ -2,7 +2,6 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <%= content.presence %>
8
7
  <% end %>
@@ -1,6 +1,5 @@
1
1
  <%= content_tag(object.tag,
2
- object.tag == "button" ? object.options : object.link_options,
3
- **combined_html_options) do %>
2
+ object.tag == "button" ? object.options : object.link_options) do %>
4
3
  <% if object.variant === "reaction" %>
5
4
  <% if icon && object.valid_emoji(object.icon) %>
6
5
  <%= pb_rails("flex", props:{ align: "center" }) do %>
@@ -34,8 +34,10 @@ module Playbook
34
34
  default: "far"
35
35
 
36
36
  def options
37
- options = {
37
+ {
38
+ aria: aria,
38
39
  class: classname,
40
+ data: data,
39
41
  disabled: disabled,
40
42
  id: id,
41
43
  role: "button",
@@ -44,7 +46,6 @@ module Playbook
44
46
  value: value,
45
47
  form: form,
46
48
  }.compact
47
- combined_html_options.merge!(options) if combined_html_options.present?
48
49
  end
49
50
 
50
51
  def target_attribute
@@ -2,7 +2,6 @@
2
2
  aria: object.aria,
3
3
  class: object.classname,
4
4
  data: object.data,
5
- id: object.id,
6
- **combined_html_options) do %>
5
+ id: object.id) do %>
7
6
  <%= content.presence || object.text %>
8
7
  <% end %>
@@ -2,7 +2,6 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <%= content.presence || object.text %>
8
7
  <% end %>
@@ -3,8 +3,7 @@
3
3
  data: object.data,
4
4
  class: object.classname,
5
5
  aria: object.aria,
6
- dark: object.dark,
7
- **combined_html_options) do %>
6
+ dark: object.dark) do %>
8
7
  <%= content.presence %>
9
8
  <% end %>
10
9
 
@@ -2,7 +2,6 @@
2
2
  id: object.id,
3
3
  data: object.data,
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do %>
5
+ aria: object.aria) do %>
7
6
  <%= content.presence %>
8
7
  <% end %>
@@ -2,7 +2,6 @@
2
2
  id: object.id,
3
3
  data: object.data,
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do %>
5
+ aria: object.aria) do %>
7
6
  <%= content.presence %>
8
7
  <% end %>
@@ -1,9 +1,7 @@
1
1
  <%= content_tag(:label, aria: object.aria,
2
2
  id: object.id,
3
3
  data: object.data,
4
- class: object.classname,
5
- **combined_html_options
6
- ) do %>
4
+ class: object.classname) do %>
7
5
  <%= content.presence || object.input %>
8
6
  <% if object.indeterminate %>
9
7
  <span class="pb_checkbox_indeterminate">
@@ -2,8 +2,7 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <%= pb_rails("button", props: {type: object.type, link: object.link, new_window:object.new_window, variant: object.variant, disabled: object.disabled, dark: object.dark}) do %>
8
7
  <%= pb_rails("icon", props: {icon: object.icon, fixed_width: true, dark: object.dark}) %>
9
8
  <% end %>
@@ -2,7 +2,6 @@
2
2
  aria: object.aria,
3
3
  class: object.classname,
4
4
  data: object.data,
5
- id: object.id,
6
- **combined_html_options) do %>
5
+ id: object.id) do %>
7
6
  <%= content.presence %>
8
7
  <% end %>
@@ -2,7 +2,6 @@
2
2
  id: object.id,
3
3
  data: object.data,
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do %>
5
+ aria: object.aria) do %>
7
6
  <%= content.presence %>
8
7
  <% end %>
@@ -2,8 +2,7 @@
2
2
  id: object.id,
3
3
  data: object.data,
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do %>
5
+ aria: object.aria) do %>
7
6
 
8
7
  <%= pb_rails("flex", props: {vertical: "center", spacing: "between", cursor: "pointer"}) do %>
9
8
  <%= pb_rails("flex/flex_item") do %>
@@ -2,8 +2,7 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <%= pb_rails("body", props: {
8
7
  tag: "span",
9
8
  classname: "pb_contact_kit",
@@ -2,8 +2,7 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
  <%= pb_rails("caption", props: object.caption_props) %>
8
7
 
9
8
  <div class=<%= "pb_currency_wrapper#{object.variant_class || object.emphasized_class}" %>>
@@ -2,8 +2,7 @@
2
2
  aria: object.aria,
3
3
  class: object.classname,
4
4
  data: object.data,
5
- id: object.id,
6
- **combined_html_options) do %>
5
+ id: object.id) do %>
7
6
  <% if object.stat_label.present? %>
8
7
  <%= pb_rails("body", props: { color: "light", text: object.stat_label } ) %>
9
8
  <% end %>
@@ -2,8 +2,7 @@
2
2
  id: object.id,
3
3
  data: object.data,
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do %>
5
+ aria: object.aria) do %>
7
6
 
8
7
  <% if object.unstyled %>
9
8
  <!-- icon -->
@@ -10,6 +10,7 @@
10
10
 
11
11
  [class^=pb_date_picker_kit] {
12
12
  .input_wrapper {
13
+ margin-bottom: $space_sm;
13
14
  position: relative;
14
15
 
15
16
  .flatpickr-wrapper {
@@ -75,4 +76,4 @@
75
76
  &:after {
76
77
  content: none;
77
78
  }
78
- }
79
+ }
@@ -135,9 +135,6 @@ useEffect(() => {
135
135
  }, scrollContainer)
136
136
  })
137
137
  const filteredProps = {...props}
138
- if (filteredProps.marginBottom === undefined) {
139
- filteredProps.marginBottom = "sm"
140
- }
141
138
  delete filteredProps?.position
142
139
 
143
140
  const classes = classnames(
@@ -2,8 +2,7 @@
2
2
  aria: object.aria,
3
3
  class: object.classname + object.error_class,
4
4
  data: object.data,
5
- id: object.id,
6
- **combined_html_options) do %>
5
+ id: object.id) do %>
7
6
  <div class="input_wrapper">
8
7
  <% if content.present? %>
9
8
  <%= content %>
@@ -17,7 +16,6 @@
17
16
  error: object.error,
18
17
  id: object.picker_id,
19
18
  label: object.hide_label ? nil : object.label,
20
- margin_bottom: "none",
21
19
  name: object.name,
22
20
  placeholder: object.placeholder,
23
21
  required: object.required,
@@ -82,4 +80,4 @@
82
80
  }
83
81
  })
84
82
  <% end %>
85
- <% end %>
83
+ <% end %>
@@ -75,8 +75,7 @@ module Playbook
75
75
  default: [1900, 2100]
76
76
 
77
77
  def classname
78
- default_margin_bottom = margin_bottom.present? ? "" : " mb_sm"
79
- generate_classname("pb_date_picker_kit") + default_margin_bottom
78
+ generate_classname("pb_date_picker_kit")
80
79
  end
81
80
 
82
81
  def date_picker_config
@@ -37,7 +37,7 @@ describe('DatePicker Kit', () => {
37
37
  )
38
38
 
39
39
  const kit = screen.getByTestId(testId)
40
- expect(kit).toHaveClass('pb_date_picker_kit mb_sm')
40
+ expect(kit).toHaveClass('pb_date_picker_kit')
41
41
  })
42
42
 
43
43
  test('shows DatePicker date format m/d/Y', async () => {
@@ -1,5 +1,4 @@
1
1
  import flatpickr from 'flatpickr'
2
- import { Instance } from "flatpickr/dist/types/instance"
3
2
  import { BaseOptions } from 'flatpickr/dist/types/options'
4
3
  import monthSelectPlugin from 'flatpickr/dist/plugins/monthSelect'
5
4
  import weekSelect from "flatpickr/dist/plugins/weekSelect/weekSelect"
@@ -166,9 +165,9 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
166
165
  }
167
166
 
168
167
  // two way binding
169
- const yearChangeHook = (fp: Instance) => {
170
- const yearInput = document.querySelector(`#year-${fp.input.id}`) as HTMLInputElement
171
- yearInput.value = fp.currentYear?.toString()
168
+ const initialDropdown = document.querySelector<HTMLElement & { [x: string]: any }>(`#year-${pickerId}`)
169
+ const yearChangeHook = () => {
170
+ initialDropdown.value = initialPicker.currentYear
172
171
  }
173
172
 
174
173
  // ===========================================================
@@ -200,12 +199,11 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
200
199
  if (!staticPosition && scrollContainer) detachFromScroll(scrollContainer as HTMLElement)
201
200
  onClose(selectedDates, dateStr)
202
201
  }],
203
- onChange: [(selectedDates, dateStr, fp) => {
204
- yearChangeHook(fp)
202
+ onChange: [(selectedDates, dateStr) => {
205
203
  onChange(dateStr, selectedDates)
206
204
  }],
207
- onYearChange: [(_selectedDates, _dateStr, fp) => {
208
- yearChangeHook(fp)
205
+ onYearChange: [() => {
206
+ yearChangeHook()
209
207
  }],
210
208
  plugins: setPlugins(thisRangesEndToday, customQuickPickDates),
211
209
  position,
@@ -250,7 +248,7 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
250
248
  /* Reset date picker to default value on form.reset() */
251
249
  if (defaultDate){
252
250
  picker.setDate(defaultDate)
253
- yearChangeHook(picker)
251
+ yearChangeHook()
254
252
  }
255
253
  }, 0)
256
254
  })
@@ -20,7 +20,6 @@ examples:
20
20
  - date_picker_hooks: Hooks
21
21
  - date_picker_year_range: Year Range
22
22
  - date_picker_anti_patterns: Anti-Patterns
23
- - date_picker_margin_bottom: Margin Bottom
24
23
  - date_picker_inline: Inline
25
24
  - date_picker_month_and_year: Month & Year Only
26
25
  - date_picker_week: Week
@@ -49,7 +48,6 @@ examples:
49
48
  - date_picker_flatpickr_methods: Flatpickr Methods
50
49
  - date_picker_hooks: Hooks
51
50
  - date_picker_year_range: Year Range
52
- - date_picker_margin_bottom: Margin Bottom
53
51
  - date_picker_inline: Inline
54
52
  - date_picker_month_and_year: Month & Year Only
55
53
  - date_picker_week: Week
@@ -19,7 +19,6 @@ export { default as DatePickerWeek } from './_date_picker_week.jsx'
19
19
  export { default as DatePickerPositions } from './_date_picker_positions.jsx'
20
20
  export { default as DatePickerPositionsElement } from './_date_picker_positions_element.jsx'
21
21
  export { default as DatePickerAllowInput } from './_date_picker_allow_input'
22
- export { default as DatePickerMarginBottom} from './_date_picker_margin_bottom'
23
22
  export { default as DatePickerQuickPickReact } from './_date_picker_quick_pick_react'
24
23
  export { default as DatePickerQuickPickRangeLimit } from './_date_picker_quick_pick_range_limit'
25
24
  export { default as DatePickerOnClose } from './_date_picker_on_close.jsx'
@@ -1,6 +1,7 @@
1
1
  @import "../../pb_textarea/textarea_mixin";
2
2
 
3
3
  [class^=pb_date_picker_kit] {
4
+ margin-bottom: $space_sm;
4
5
 
5
6
  .pb_date_picker_kit_label {
6
7
  margin-bottom: $space_xs;
@@ -64,4 +65,4 @@
64
65
  }
65
66
  }
66
67
  }
67
- }
68
+ }
@@ -1,8 +1,7 @@
1
1
  <%= content_tag(:div,
2
2
  id: object.id,
3
3
  data: object.data,
4
- class: object.classname,
5
- **combined_html_options) do %>
4
+ class: object.classname) do %>
6
5
  <div class="pb_date_range_inline_wrapper">
7
6
  <% if object.icon == true %>
8
7
  <%= pb_rails(object.text_kit, props: { tag: "span", dark: object.dark, color: object.icon_color, text: pb_rails("icon", props: { icon: "calendar-alt", fixed_width: true, size: object.size, classname: "pb_date_range_inline_icon" }) }) %>
@@ -1,8 +1,7 @@
1
1
  <%= content_tag(:div,
2
2
  id: object.id,
3
3
  data: object.data,
4
- class: object.classname,
5
- **combined_html_options) do %>
4
+ class: object.classname) do %>
6
5
 
7
6
  <%= pb_rails("flex", props: {vertical: "center"}) do %>
8
7
  <%= pb_rails("flex/flex_item") do %>
@@ -1,8 +1,7 @@
1
1
  <%= content_tag(:div,
2
2
  id: object.id,
3
3
  data: object.data,
4
- class: object.classname,
5
- **combined_html_options) do %>
4
+ class: object.classname) do %>
6
5
 
7
6
  <% if object.bold == false %>
8
7
 
@@ -2,8 +2,7 @@
2
2
  aria: object.aria,
3
3
  id: object.id,
4
4
  data: object.data,
5
- class: object.classname,
6
- **combined_html_options) do %>
5
+ class: object.classname) do %>
7
6
 
8
7
  <%= pb_rails("flex", props: {
9
8
  orientation: "row",
@@ -2,8 +2,7 @@
2
2
  id: object.id,
3
3
  data: object.data,
4
4
  class: object.classname,
5
- aria: object.aria,
6
- **combined_html_options) do %>
5
+ aria: object.aria) do %>
7
6
 
8
7
  <%= pb_rails("flex", props: {classname: "flex-container", vertical: "stretch"}) do %>
9
8
  <%= pb_rails("body", props: {classname: "flex-item"}) do %>
@@ -15,4 +14,4 @@
15
14
  <% end %>
16
15
  <% end %>
17
16
 
18
- <% end %>
17
+ <% end %>
@@ -1,8 +1,7 @@
1
1
  <%= content_tag(:div,
2
2
  id: object.id,
3
3
  data: object.data,
4
- class: object.classname,
5
- **combined_html_options) do %>
4
+ class: object.classname) do %>
6
5
  <%= pb_rails("title", props: { text: object.day_month, size: 4, dark: object.dark }) %>
7
6
  <%= pb_rails("body", props: { text: object.year, size: 4, color: "light", dark: object.dark }) %>
8
7
  <% end %>
@@ -2,7 +2,6 @@
2
2
  aria: object.aria,
3
3
  class: object.classname,
4
4
  data: object.data,
5
- id: object.id,
6
- **combined_html_options) do %>
5
+ id: object.id) do %>
7
6
  <%= object.content %>
8
7
  <% end %>
@@ -3,8 +3,7 @@
3
3
  aria: object.aria,
4
4
  data: object.data,
5
5
  id: object.id,
6
- class: object.classname,
7
- **combined_html_options) do %>
6
+ class: object.classname) do %>
8
7
  <% if object.status === "" && object.title %>
9
8
  <%= pb_rails("dialog/dialog_header", props: { title: object.title, id: object.id }) %>
10
9
  <% end %>