playbook_ui 15.3.0.pre.alpha.PLAY2601advancedtablecustomcellmultiheaderrails12030 → 15.3.0.pre.alpha.PLAY258611978

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 (38) hide show
  1. checksums.yaml +4 -4
  2. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header.jsx +0 -16
  3. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_rails.html.erb +1 -1
  4. data/app/pb_kits/playbook/pb_advanced_table/docs/example.yml +0 -1
  5. data/app/pb_kits/playbook/pb_advanced_table/table_header.rb +20 -90
  6. data/app/pb_kits/playbook/pb_date_picker/date_picker_helper.ts +16 -4
  7. data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_and_dropdown_range..md +14 -0
  8. data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_and_dropdown_range.jsx +38 -0
  9. data/app/pb_kits/playbook/pb_date_picker/docs/example.yml +2 -1
  10. data/app/pb_kits/playbook/pb_date_picker/docs/index.js +2 -1
  11. data/app/pb_kits/playbook/pb_dropdown/_dropdown.scss +1 -0
  12. data/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx +111 -6
  13. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick.jsx +18 -0
  14. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick.md +4 -0
  15. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_default_dates.jsx +18 -0
  16. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_default_dates.md +1 -0
  17. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_range_end.jsx +19 -0
  18. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_range_end.md +1 -0
  19. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_with_date_pickers.jsx +38 -0
  20. data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_with_date_pickers.md +14 -0
  21. data/app/pb_kits/playbook/pb_dropdown/docs/example.yml +5 -0
  22. data/app/pb_kits/playbook/pb_dropdown/docs/index.js +5 -1
  23. data/app/pb_kits/playbook/pb_dropdown/dropdown.test.jsx +148 -2
  24. data/app/pb_kits/playbook/pb_dropdown/quickpick/index.ts +60 -0
  25. data/dist/chunks/{_line_graph-CqE0-dq5.js → _line_graph-BokgW0SI.js} +1 -1
  26. data/dist/chunks/{_typeahead-3ZAbZUqU.js → _typeahead-BR-uKbcO.js} +1 -1
  27. data/dist/chunks/{_weekday_stacked-BFB3mjtE.js → _weekday_stacked-n_2SPgc2.js} +2 -2
  28. data/dist/chunks/{lib-CGxXTQ75.js → lib-BXBHAZMY.js} +1 -1
  29. data/dist/chunks/{pb_form_validation-DebqlUKZ.js → pb_form_validation-BZppqQZM.js} +1 -1
  30. data/dist/chunks/vendor.js +1 -1
  31. data/dist/playbook-doc.js +1 -1
  32. data/dist/playbook-rails-react-bindings.js +1 -1
  33. data/dist/playbook-rails.js +1 -1
  34. data/dist/playbook.css +1 -1
  35. data/lib/playbook/version.rb +1 -1
  36. metadata +18 -9
  37. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header_rails.html.erb +0 -104
  38. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header_rails.md +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 71c946c57721add9d100ccfbec820fa90be3f3c94be0afdf39695628deca73e9
4
- data.tar.gz: 7522b3287f188f339d1a6b2505a536844d499ae958cc7c0229b8ced157560d93
3
+ metadata.gz: a1a62cafaa16e4da926d69ebca037e59cce874784adfe55e1650cd94f7152f08
4
+ data.tar.gz: c3689d869441ef31917edf4c5e124e0a0a1b42f66d9753fea748897b15a20d2e
5
5
  SHA512:
6
- metadata.gz: 020af161b8745bb423001fc445750e262af8e58755f92a780080190387dcf99cbb27d8bea2c5993684a652ef19929de83f590131bc26027bee3d156f67af0cd6
7
- data.tar.gz: 334c51dd3a74487207f3b8a7c74c61738245c232239f0dc5c10da4d3f03b9a42042c6a572ab2d608e3716856783f4245edf67368de6efdc5e682f66068ac9c44
6
+ metadata.gz: f1274d98903345d89ebb1ab7cf7aa5d07f138aa90fd36e6f5d6fdee3ce3ca242999a02b4f97bfc338408d1f33628c01c0d0277a266ce1abe50b8518c7d298eb7
7
+ data.tar.gz: be5e89b4822ed1af5030fa5abcc219e36c6cb97fd95b6b414ac91c2e4814686ad834e7b8dca0da3cdaaf0e7ba27abb27911b5247ce54381bf5385f199fb34c81
@@ -76,22 +76,6 @@ const columnDefinitions = [
76
76
  {
77
77
  label: "Attendance",
78
78
  id: "attendance",
79
- header: () => (
80
- <Flex alignItems="center"
81
- justifyContent="center"
82
- >
83
- <Caption marginRight="xs">Attendance</Caption>
84
- <Tooltip placement="top"
85
- text="Whoa. I'm a Tooltip Too!"
86
- zIndex={10}
87
- >
88
- <Icon cursor="pointer"
89
- icon="info"
90
- size="xs"
91
- />
92
- </Tooltip>
93
- </Flex>
94
- ),
95
79
  columns: [
96
80
  {
97
81
  accessor: "attendanceRate",
@@ -12,7 +12,7 @@
12
12
  capture do
13
13
  pb_rails("flex", props: { align_items: "center", justify_content: "center" }) do
14
14
  pb_rails("caption", props: { margin_right: "xs", text: "New Enrollments" }) +
15
- pb_rails("icon", props: { id: "tooltip-interact", icon: "info", size: "xs", cursor: "pointer" }) +
15
+ pb_rails("icon", props: { id: "tooltip-interact", icon: "info", size: "xs" }) +
16
16
  pb_rails("tooltip", props: {
17
17
  trigger_element_id: "tooltip-interact",
18
18
  tooltip_id: "example-custom-tooltip",
@@ -11,7 +11,6 @@ examples:
11
11
  - advanced_table_responsive: Responsive Tables
12
12
  - advanced_table_custom_cell_rails: Custom Components for Cells
13
13
  - advanced_table_with_custom_header_rails: Custom Header Cell
14
- - advanced_table_with_custom_header_multi_header_rails: Custom Header with Multiple Headers
15
14
  - advanced_table_column_headers: Multi-Header Columns
16
15
  - advanced_table_column_headers_multiple: Multi-Header Columns (Multiple Levels)
17
16
  - advanced_table_column_headers_vertical_border: Multi-Header Columns with Vertical Borders
@@ -82,62 +82,32 @@ module Playbook
82
82
  end
83
83
  end
84
84
 
85
- # Get original column definition for custom rendering by accessor
85
+ # Get original column definition for custom rendering
86
86
  def find_original_column_def(accessor)
87
87
  find_column_def_by_accessor(column_definitions, accessor)
88
88
  end
89
89
 
90
- # Get original column definition for custom rendering by id
91
- def find_original_column_def_by_id(id)
92
- find_column_def_by_id(column_definitions, id)
93
- end
94
-
95
90
  # Check if a header cell has a custom renderer
96
91
  def has_header_renderer?(cell)
97
- original_def = find_original_column_def_for_cell(cell)
98
- original_def&.dig(:header).present?
99
- rescue
100
- false
92
+ return false unless cell[:accessor].present?
93
+
94
+ original_def = find_original_column_def(cell[:accessor])
95
+ original_def && original_def[:header].present?
101
96
  end
102
97
 
103
98
  # Render custom header content
104
99
  def render_header(cell)
105
100
  return cell[:label] unless has_header_renderer?(cell)
106
101
 
107
- original_def = find_original_column_def_for_cell(cell)
108
- return cell[:label] unless original_def
109
-
102
+ original_def = find_original_column_def(cell[:accessor])
110
103
  custom_renderer = original_def[:header]
111
- return cell[:label] unless custom_renderer
112
104
 
113
105
  # Call the custom renderer with the cell data and label
114
- begin
115
- result = custom_renderer.call(cell, cell[:label])
116
- result.present? ? result.to_s : cell[:label]
117
- rescue
118
- cell[:label]
119
- end
106
+ custom_renderer.call(cell, cell[:label])
120
107
  end
121
108
 
122
109
  private
123
110
 
124
- # Find the original column definition for a cell
125
- def find_original_column_def_for_cell(cell)
126
- # Try accessor first (for leaf columns)
127
- if cell[:accessor].present?
128
- found = find_original_column_def(cell[:accessor])
129
- return found if found
130
- end
131
-
132
- # Try id if accessor lookup didn't find it (for grouped columns or leaf columns with id)
133
- if cell[:id].present?
134
- found = find_original_column_def_by_id(cell[:id])
135
- return found if found
136
- end
137
-
138
- nil
139
- end
140
-
141
111
  def compute_max_depth(columns)
142
112
  columns.map do |col|
143
113
  col[:columns] ? 1 + compute_max_depth(col[:columns]) : 1
@@ -148,24 +118,21 @@ module Playbook
148
118
  total_columns = columns.size
149
119
  columns.each_with_index do |col, index|
150
120
  is_last = index == total_columns - 1
151
- nested_columns = col[:columns]
152
- if nested_columns
153
- colspan = compute_leaf_columns(nested_columns)
154
- cell_hash = {
121
+ if col[:columns]
122
+ colspan = compute_leaf_columns(col[:columns])
123
+ rows[current_depth] << {
155
124
  label: col[:label],
156
125
  colspan: colspan,
157
126
  is_last_in_group: is_last && current_depth.positive?,
158
127
  }
159
- cell_hash[:id] = col[:id] if col[:id].present?
160
- rows[current_depth] << cell_hash
161
128
 
162
- process_columns(nested_columns, rows, current_depth + 1, max_depth)
129
+ process_columns(col[:columns], rows, current_depth + 1, max_depth)
163
130
  else
164
- raw_styling = col[:column_styling] || {}
165
- header_alignment = raw_styling[:header_alignment]
131
+ raw_styling = col[:column_styling] || {}
132
+ header_alignment = raw_styling[:header_alignment]
166
133
 
167
134
  colspan = 1
168
- cell_hash = {
135
+ rows[current_depth] << {
169
136
  label: col[:label],
170
137
  colspan: colspan,
171
138
  accessor: col[:accessor],
@@ -173,8 +140,6 @@ module Playbook
173
140
  is_last_in_group: is_last && current_depth.positive?,
174
141
  header_alignment: header_alignment,
175
142
  }
176
- cell_hash[:id] = col[:id] if col[:id].present?
177
- rows[current_depth] << cell_hash
178
143
  end
179
144
  end
180
145
  end
@@ -189,15 +154,11 @@ module Playbook
189
154
  max_depth = compute_max_depth(column_definitions)
190
155
 
191
156
  column_definitions.map do |col|
192
- if col[:columns]
193
- nested_columns = col[:columns]
194
- wrapped = {
157
+ if col.key?(:columns)
158
+ {
195
159
  label: col[:label],
196
- columns: wrap_leaf_columns(nested_columns),
160
+ columns: wrap_leaf_columns(col[:columns]),
197
161
  }
198
- wrapped[:id] = col[:id] if col[:id].present?
199
- wrapped[:header] = col[:header] if col[:header].present?
200
- wrapped
201
162
  else
202
163
  # For leaf columns, wrap with empty labels up to max depth to get proper structure
203
164
  wrap_leaf_column(col, max_depth)
@@ -212,7 +173,6 @@ module Playbook
212
173
  sort_menu: col[:sort_menu] || nil,
213
174
  column_styling: col[:column_styling] || {},
214
175
  }
215
- wrapped[:id] = col[:id] if col[:id].present?
216
176
  (max_depth - 1).times do
217
177
  wrapped = { label: "", columns: [wrapped] }
218
178
  end
@@ -220,41 +180,11 @@ module Playbook
220
180
  end
221
181
 
222
182
  def find_column_def_by_accessor(defs, target_accessor)
223
- return nil if target_accessor.blank?
224
-
225
183
  defs.each do |col|
226
- col_accessor = col[:accessor]
227
- next if col_accessor.blank?
228
-
229
- return col if col_accessor.to_s == target_accessor.to_s
230
-
231
- nested_columns = col[:columns]
232
- if nested_columns.is_a?(Array)
233
- found = find_column_def_by_accessor(nested_columns, target_accessor)
234
- return found if found
235
- end
236
- end
237
- nil
238
- end
239
-
240
- def find_column_def_by_id(defs, target_id)
241
- return nil if target_id.blank?
242
-
243
- defs.each do |col|
244
- col_id = col[:id]
245
-
246
- return col if col_id.present? && col_id.to_s == target_id.to_s
247
-
248
- # Recursively search nested columns, even if current col has no id or doesn't match
249
- nested_columns = col[:columns]
250
-
251
- next unless nested_columns.present?
252
-
253
- # Convert to array if needed (for edge cases where is_a?(Array) might fail)
254
- array_columns = Array(nested_columns)
184
+ return col if col[:accessor] == target_accessor
255
185
 
256
- if array_columns.any?
257
- found = find_column_def_by_id(array_columns, target_id)
186
+ if col[:columns].is_a?(Array)
187
+ found = find_column_def_by_accessor(col[:columns], target_accessor)
258
188
  return found if found
259
189
  end
260
190
  end
@@ -350,8 +350,14 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
350
350
  if (syncStartWith) {
351
351
  picker.config.onClose.push((selectedDates: string) => {
352
352
  if (selectedDates?.length) {
353
- const quickpick = (document.querySelector(`#${syncStartWith}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
354
- quickpick?.clear();
353
+ const element = document.querySelector(`#${syncStartWith}`) as any;
354
+ // Check if it's a Dropdown QuickPick (has _dropdownRef) or DatePicker QuickPick (has _flatpickr)
355
+ if (element?._dropdownRef?.current) {
356
+ element._dropdownRef.current.clearSelected();
357
+ } else {
358
+ const quickpick = element?._flatpickr;
359
+ quickpick?.clear();
360
+ }
355
361
  }
356
362
  });
357
363
  }
@@ -360,8 +366,14 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
360
366
  if (syncEndWith) {
361
367
  picker.config.onClose.push((selectedDates: string) => {
362
368
  if (selectedDates?.length) {
363
- const quickpick = (document.querySelector(`#${syncEndWith}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
364
- quickpick?.clear();
369
+ const element = document.querySelector(`#${syncEndWith}`) as any;
370
+ // Check if it's a Dropdown QuickPick (has _dropdownRef) or DatePicker QuickPick (has _flatpickr)
371
+ if (element?._dropdownRef?.current) {
372
+ element._dropdownRef.current.clearSelected();
373
+ } else {
374
+ const quickpick = element?._flatpickr;
375
+ quickpick?.clear();
376
+ }
365
377
  }
366
378
  });
367
379
  }
@@ -0,0 +1,14 @@
1
+ You can link a Dropdown (`quickpick` variant) to standard DatePickers using the following props:
2
+
3
+ **For the Dropdown**:
4
+ `controlsStartId`: ID of the DatePicker that should receive the start date.
5
+
6
+ `controlsEndId`: ID of the DatePicker that should receive the end date.
7
+
8
+ When a quickpick option like “This Year” is selected, it automatically populates the linked start and end inputs.
9
+
10
+ **For the Start/End DatePickers**:
11
+ `syncStartWith`: ID of the quickpick this start date is synced to.
12
+ `syncEndWith`: ID of the quickpick this end date is synced to.
13
+
14
+ When a user manually edits the start or end date, it clears the selected quickpick to prevent conflicting values.
@@ -0,0 +1,38 @@
1
+ import React from "react";
2
+ import Dropdown from "../../pb_dropdown/_dropdown";
3
+ import DatePicker from "../../pb_date_picker/_date_picker";
4
+
5
+ const DatePickerAndDropdownRange = (props) => {
6
+ return (
7
+ <>
8
+ <Dropdown
9
+ controlsEndId="end-date-picker1"
10
+ controlsStartId="start-date-picker1"
11
+ id="dropdown-as-quickpick"
12
+ label="Date Range"
13
+ marginBottom="sm"
14
+ placeholder="Select a Date Range"
15
+ variant="quickpick"
16
+ {...props}
17
+ />
18
+
19
+ <DatePicker
20
+ label="Start Date"
21
+ pickerId="start-date-picker1"
22
+ placeholder="Select a Start Date"
23
+ syncStartWith="dropdown-as-quickpick"
24
+ {...props}
25
+ />
26
+
27
+ <DatePicker
28
+ label="End Date"
29
+ pickerId="end-date-picker1"
30
+ placeholder="Select an End Date"
31
+ syncEndWith="dropdown-as-quickpick"
32
+ {...props}
33
+ />
34
+ </>
35
+ );
36
+ };
37
+
38
+ export default DatePickerAndDropdownRange;
@@ -48,7 +48,8 @@ examples:
48
48
  - date_picker_quick_pick_custom: Custom Quick Pick Dates
49
49
  - date_picker_quick_pick_custom_override: Custom Quick Pick Dates (append to defaults)
50
50
  - date_picker_quick_pick_default_date: Range (Quick Pick w/ Default Date)
51
- - date_picker_range_pattern: Range with 2 Date Pickers and a Quick Pick
51
+ # - date_picker_range_pattern: Range with 2 Date Pickers and a Quick Pick
52
+ - date_picker_and_dropdown_range: Range with Dropdown and 2 Date Pickers
52
53
  - date_picker_format: Format
53
54
  - date_picker_disabled: Disabled Dates
54
55
  - date_picker_min_max: Min Max
@@ -26,4 +26,5 @@ export { default as DatePickerOnClose } from './_date_picker_on_close.jsx'
26
26
  export { default as DatePickerQuickPickCustom } from './_date_picker_quick_pick_custom'
27
27
  export { default as DatePickerQuickPickCustomOverride } from './_date_picker_quick_pick_custom_override'
28
28
  export { default as DatePickerQuickPickDefaultDate } from './_date_picker_quick_pick_default_date'
29
- export { default as DatePickerRangePattern } from './_date_picker_range_pattern'
29
+ export { default as DatePickerRangePattern } from './_date_picker_range_pattern'
30
+ export { default as DatePickerAndDropdownRange } from './_date_picker_and_dropdown_range.jsx'
@@ -12,6 +12,7 @@
12
12
 
13
13
  .pb_dropdown_default,
14
14
  .pb_dropdown_subtle,
15
+ .pb_dropdown_quickpick,
15
16
  .pb_dropdown_default_separators_hidden,
16
17
  .pb_dropdown_subtle_separators_hidden {
17
18
  .dropdown_wrapper {
@@ -12,6 +12,7 @@ import DropdownContext from "./context";
12
12
  import DropdownOption from "./subcomponents/DropdownOption";
13
13
  import DropdownTrigger from "./subcomponents/DropdownTrigger";
14
14
  import useDropdown from "./hooks/useDropdown";
15
+ import getQuickPickOptions from "./quickpick";
15
16
 
16
17
  import {
17
18
  separateChildComponents,
@@ -36,9 +37,12 @@ type DropdownProps = {
36
37
  label?: string;
37
38
  multiSelect?: boolean;
38
39
  onSelect?: (arg: GenericObject) => null;
39
- options: GenericObject;
40
+ options?: GenericObject;
40
41
  separators?: boolean;
41
- variant?: "default" | "subtle";
42
+ variant?: "default" | "subtle" | "quickpick";
43
+ rangeEndsToday?: boolean;
44
+ controlsStartId?: string;
45
+ controlsEndId?: string;
42
46
  activeStyle?: {
43
47
  backgroundColor?: string;
44
48
  fontColor?: string;
@@ -71,6 +75,9 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
71
75
  formPillProps,
72
76
  onSelect,
73
77
  options,
78
+ rangeEndsToday = false,
79
+ controlsStartId,
80
+ controlsEndId,
74
81
  separators = true,
75
82
  variant = "default",
76
83
  activeStyle,
@@ -85,11 +92,25 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
85
92
  globalProps(props),
86
93
  className
87
94
  );
95
+ // ------------- Quick Pick ---------------------------------
96
+ // Use QuickPick options when variant is "quickpick"
97
+ const dropdownOptions = variant === "quickpick"
98
+ ? getQuickPickOptions(rangeEndsToday)
99
+ : (options || []);
100
+ // ----------------------------------------------------------
88
101
 
89
102
  const [isDropDownClosed, setIsDropDownClosed, toggleDropdown] = useDropdown(isClosed);
90
103
 
91
104
  const [filterItem, setFilterItem] = useState("");
92
105
  const initialSelected = useMemo(() => {
106
+ // Handle quickpick variant with string defaultValue (e.g., "This Month")
107
+ if (variant === "quickpick" && typeof defaultValue === "string" && defaultValue) {
108
+ const matchedOption = dropdownOptions.find(
109
+ (opt: GenericObject) => opt.label?.toLowerCase() === (defaultValue as string).toLowerCase()
110
+ );
111
+ return matchedOption || {};
112
+ }
113
+
93
114
  if (multiSelect) {
94
115
  if (Array.isArray(defaultValue)) return defaultValue;
95
116
  return defaultValue && Object.keys(defaultValue).length
@@ -97,7 +118,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
97
118
  : [];
98
119
  }
99
120
  return defaultValue || {};
100
- }, [multiSelect, defaultValue]);
121
+ }, [multiSelect, defaultValue, variant, dropdownOptions]);
101
122
 
102
123
  const [selected, setSelected] = useState<GenericObject | GenericObject[]>(
103
124
  initialSelected
@@ -151,7 +172,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
151
172
  }, [isClosed])
152
173
 
153
174
  const blankSelectionOption: GenericObject = blankSelection ? [{ label: blankSelection, value: "" }] : [];
154
- const optionsWithBlankSelection = blankSelectionOption.concat(options);
175
+ const optionsWithBlankSelection = blankSelectionOption.concat(dropdownOptions);
155
176
 
156
177
  const availableOptions = useMemo(()=> {
157
178
  if (!multiSelect) return optionsWithBlankSelection;
@@ -203,6 +224,21 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
203
224
  setFilterItem("");
204
225
  setIsDropDownClosed(true);
205
226
  onSelect && onSelect(clickedItem);
227
+
228
+ // Sync with DatePickers if this is a quickpick variant
229
+ if (variant === "quickpick" && Array.isArray(clickedItem.value)) {
230
+ const [start, end] = clickedItem.value;
231
+
232
+ if (controlsStartId) {
233
+ const startPicker = (document.querySelector(`#${controlsStartId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
234
+ startPicker?.setDate(start, true);
235
+ }
236
+
237
+ if (controlsEndId) {
238
+ const endPicker = (document.querySelector(`#${controlsEndId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
239
+ endPicker?.setDate(end, true);
240
+ }
241
+ }
206
242
  }
207
243
  };
208
244
 
@@ -219,6 +255,19 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
219
255
  setSelected({});
220
256
  onSelect && onSelect(null);
221
257
  setFocusedOptionIndex(-1);
258
+
259
+ // Clear linked DatePickers as well if this is a quickpick variant with controls
260
+ if (variant === "quickpick") {
261
+ if (controlsStartId) {
262
+ const startPicker = (document.querySelector(`#${controlsStartId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
263
+ startPicker?.clear();
264
+ }
265
+
266
+ if (controlsEndId) {
267
+ const endPicker = (document.querySelector(`#${controlsEndId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
268
+ endPicker?.clear();
269
+ }
270
+ }
222
271
  }
223
272
  };
224
273
 
@@ -232,7 +281,8 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
232
281
  dark
233
282
  });
234
283
 
235
- useImperativeHandle(ref, () => ({
284
+ // Create an internal ref object that holds the imperative handle methods
285
+ const imperativeRef = useRef({
236
286
  clearSelected: () => {
237
287
  if (multiSelect) {
238
288
  setSelected([]);
@@ -244,7 +294,61 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
244
294
  setFilterItem("");
245
295
  setIsDropDownClosed(true);
246
296
  },
247
- }));
297
+ });
298
+
299
+ // Update imperativeRef whenever dependencies change
300
+ // (needed for external clearing of normal Dropdown + DatePicker-synced QuickPick Dropdown)
301
+ useEffect(() => {
302
+ imperativeRef.current = {
303
+ clearSelected: () => {
304
+ if (multiSelect) {
305
+ setSelected([]);
306
+ onSelect && onSelect([]);
307
+ } else {
308
+ setSelected({});
309
+ onSelect && onSelect(null);
310
+ }
311
+ setFilterItem("");
312
+ setIsDropDownClosed(true);
313
+ },
314
+ };
315
+ }, [multiSelect, onSelect, setSelected, setFilterItem, setIsDropDownClosed]);
316
+
317
+ useImperativeHandle(ref, () => imperativeRef.current);
318
+
319
+ // Create a ref to the outer div to attach the dropdown ref for DatePicker sync
320
+ const outerDivRef = useRef<HTMLDivElement>(null);
321
+
322
+ useEffect(() => {
323
+ // Attach the ref to the DOM element so DatePicker can access it
324
+ if (outerDivRef.current && variant === "quickpick" && id) {
325
+ (outerDivRef.current as any)._dropdownRef = imperativeRef;
326
+ }
327
+ }, [variant, id]);
328
+
329
+ // Sync defaultValue with DatePickers on mount when 3 input pattern is used
330
+ useEffect(() => {
331
+ if (variant === "quickpick" && initialSelected && typeof initialSelected === "object" && !Array.isArray(initialSelected)) {
332
+ const value = initialSelected.value;
333
+
334
+ if (Array.isArray(value) && value.length === 2) {
335
+ const [start, end] = value;
336
+
337
+ // Wait for DatePickers to be initialized
338
+ setTimeout(() => {
339
+ if (controlsStartId) {
340
+ const startPicker = (document.querySelector(`#${controlsStartId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
341
+ startPicker?.setDate(start, true);
342
+ }
343
+
344
+ if (controlsEndId) {
345
+ const endPicker = (document.querySelector(`#${controlsEndId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
346
+ endPicker?.setDate(end, true);
347
+ }
348
+ }, 0);
349
+ }
350
+ }
351
+ }, [variant, initialSelected, controlsStartId, controlsEndId]);
248
352
 
249
353
  return (
250
354
  <div {...ariaProps}
@@ -252,6 +356,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
252
356
  {...htmlProps}
253
357
  className={classes}
254
358
  id={id}
359
+ ref={outerDivRef}
255
360
  style={{position: "relative"}}
256
361
  >
257
362
  <DropdownContext.Provider
@@ -0,0 +1,18 @@
1
+ import React from 'react'
2
+ import Dropdown from '../../pb_dropdown/_dropdown'
3
+
4
+ const DropdownQuickpick = (props) => {
5
+
6
+ return (
7
+ <div>
8
+ <Dropdown
9
+ label="Date Range"
10
+ onSelect={(selectedItem) => console.log(selectedItem)}
11
+ variant="quickpick"
12
+ {...props}
13
+ />
14
+ </div>
15
+ )
16
+ }
17
+
18
+ export default DropdownQuickpick
@@ -0,0 +1,4 @@
1
+ The QuickPick variant provides predefined date based options when `variant="quickpick"` is used.
2
+
3
+ Open the Dropdown above to see the default options.
4
+
@@ -0,0 +1,18 @@
1
+ import React from 'react'
2
+ import Dropdown from '../../pb_dropdown/_dropdown'
3
+
4
+ const DropdownQuickpickDefaultDates = (props) => {
5
+
6
+ return (
7
+ <div>
8
+ <Dropdown
9
+ defaultValue="This Year"
10
+ label="Date Range"
11
+ variant="quickpick"
12
+ {...props}
13
+ />
14
+ </div>
15
+ )
16
+ }
17
+
18
+ export default DropdownQuickpickDefaultDates
@@ -0,0 +1 @@
1
+ To set a default value for the Dropdown, you can use the label of the range you want set as default, for example "This Year", "Today", etc.
@@ -0,0 +1,19 @@
1
+ import React from 'react'
2
+ import Dropdown from '../../pb_dropdown/_dropdown'
3
+
4
+ const DropdownQuickpickRangeEnd = (props) => {
5
+
6
+ return (
7
+ <div>
8
+ <Dropdown
9
+ label="Date Range"
10
+ onSelect={(selectedItem) => console.log(selectedItem)}
11
+ rangeEndsToday
12
+ variant="quickpick"
13
+ {...props}
14
+ />
15
+ </div>
16
+ )
17
+ }
18
+
19
+ export default DropdownQuickpickRangeEnd
@@ -0,0 +1 @@
1
+ The optional `rangeEndsToday` prop can be used with the quickpick variant to set end date on all ranges that start with 'this' to today's date. For instance, by default 'This Year' will set end day to 12/31/(current year), but if `rangeEndsToday` prop is used, end date on that range will be today's date.
@@ -0,0 +1,38 @@
1
+ import React from "react";
2
+ import Dropdown from "../../pb_dropdown/_dropdown";
3
+ import DatePicker from "../../pb_date_picker/_date_picker";
4
+
5
+ const DropdownQuickpickWithDatePickers = (props) => {
6
+ return (
7
+ <>
8
+ <Dropdown
9
+ controlsEndId="end-date-picker"
10
+ controlsStartId="start-date-picker"
11
+ id="dropdown-quickpick"
12
+ label="Range"
13
+ marginBottom="sm"
14
+ placeholder="Select a Date Range"
15
+ variant="quickpick"
16
+ {...props}
17
+ />
18
+
19
+ <DatePicker
20
+ label="Start Date"
21
+ pickerId="start-date-picker"
22
+ placeholder="Select a Start Date"
23
+ syncStartWith="dropdown-quickpick"
24
+ {...props}
25
+ />
26
+
27
+ <DatePicker
28
+ label="End Date"
29
+ pickerId="end-date-picker"
30
+ placeholder="Select an End Date"
31
+ syncEndWith="dropdown-quickpick"
32
+ {...props}
33
+ />
34
+ </>
35
+ );
36
+ };
37
+
38
+ export default DropdownQuickpickWithDatePickers;