playbook_ui 15.3.0.pre.alpha.PLAY2012currencyallownonstring11972 → 15.3.0.pre.alpha.PLAY2407daterangeinlineshowcurrentyear12138
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.
- checksums.yaml +4 -4
- data/app/pb_kits/playbook/pb_advanced_table/Components/RegularTableView.tsx +2 -1
- data/app/pb_kits/playbook/pb_advanced_table/advanced_table.test.jsx +63 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.html.erb +4 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_border_color.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_border_color_rails.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.jsx +3 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.md +2 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_column_headers.jsx +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_rails.html.erb +1 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_rails.md +2 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_padding_control.jsx +9 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_padding_control.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_sticky_columns_and_header.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_props_sticky_header_rails.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_props_sticky_header_react.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header.jsx +16 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header_rails.html.erb +104 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header_rails.md +1 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_rails.html.erb +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/example.yml +1 -0
- data/app/pb_kits/playbook/pb_advanced_table/table_header.rb +90 -20
- data/app/pb_kits/playbook/pb_advanced_table/table_row.rb +31 -2
- data/app/pb_kits/playbook/pb_background/background.html.erb +10 -2
- data/app/pb_kits/playbook/pb_background/docs/_background_category.md +1 -1
- data/app/pb_kits/playbook/pb_badge/_badge.tsx +4 -1
- data/app/pb_kits/playbook/pb_badge/badge.test.js +13 -0
- data/app/pb_kits/playbook/pb_card/docs/_card_background.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_header.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_highlight.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_light.md +1 -1
- data/app/pb_kits/playbook/pb_date_picker/date_picker_helper.ts +16 -4
- data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_and_dropdown_range.jsx +38 -0
- data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_and_dropdown_range.md +14 -0
- data/app/pb_kits/playbook/pb_date_picker/docs/example.yml +2 -1
- data/app/pb_kits/playbook/pb_date_picker/docs/index.js +2 -1
- data/app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.tsx +20 -13
- data/app/pb_kits/playbook/pb_date_range_inline/date_range_inline.rb +6 -4
- data/app/pb_kits/playbook/pb_date_range_inline/date_range_inline.test.js +17 -0
- data/app/pb_kits/playbook/pb_date_range_inline/docs/_date_range_inline_show_current_year.html.erb +4 -0
- data/app/pb_kits/playbook/pb_date_range_inline/docs/_date_range_inline_show_current_year.jsx +43 -0
- data/app/pb_kits/playbook/pb_date_range_inline/docs/_date_range_inline_show_current_year.md +1 -0
- data/app/pb_kits/playbook/pb_date_range_inline/docs/_description.md +1 -1
- data/app/pb_kits/playbook/pb_date_range_inline/docs/example.yml +3 -2
- data/app/pb_kits/playbook/pb_date_range_inline/docs/index.js +1 -0
- data/app/pb_kits/playbook/pb_distribution_bar/docs/_distribution_bar_custom_colors.md +1 -1
- data/app/pb_kits/playbook/pb_dropdown/_dropdown.scss +1 -0
- data/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx +111 -6
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick.jsx +18 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick.md +4 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_default_dates.jsx +18 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_default_dates.md +1 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_range_end.jsx +19 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_range_end.md +1 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_with_date_pickers.jsx +38 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_with_date_pickers.md +14 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options_react.md +1 -1
- data/app/pb_kits/playbook/pb_dropdown/docs/example.yml +5 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/index.js +5 -1
- data/app/pb_kits/playbook/pb_dropdown/dropdown.test.jsx +148 -2
- data/app/pb_kits/playbook/pb_dropdown/quickpick/index.ts +60 -0
- data/app/pb_kits/playbook/pb_filter/docs/_filter_max_width.md +1 -1
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_auto_close.html.erb +15 -1
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_multi_line.html.erb +9 -8
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_positions.html.erb +11 -10
- data/app/pb_kits/playbook/pb_form_pill/_form_pill.tsx +1 -1
- data/app/pb_kits/playbook/pb_form_pill/docs/_form_pill_truncated_text_rails.md +1 -1
- data/app/pb_kits/playbook/pb_form_pill/docs/_form_pill_truncated_text_react.md +1 -1
- data/app/pb_kits/playbook/pb_icon/docs/_icon_color.md +1 -1
- data/app/pb_kits/playbook/pb_layout/docs/_layout_collection.md +1 -1
- data/app/pb_kits/playbook/pb_nav/docs/_collapsible_nav_item_spacing.md +1 -1
- data/app/pb_kits/playbook/pb_nav/docs/_nav_with_spacing_control.md +1 -1
- data/app/pb_kits/playbook/pb_overlay/docs/_overlay_layout.md +1 -1
- data/app/pb_kits/playbook/pb_pill/docs/_description.md +1 -1
- data/app/pb_kits/playbook/pb_rich_text_editor/docs/_description.md +1 -1
- data/app/pb_kits/playbook/pb_section_separator/docs/_description.md +1 -1
- data/app/pb_kits/playbook/pb_skeleton_loading/docs/_skeleton_loading_border_radius_rails.md +1 -1
- data/app/pb_kits/playbook/pb_skeleton_loading/docs/_skeleton_loading_border_radius_react.md +1 -1
- data/app/pb_kits/playbook/pb_skeleton_loading/docs/_skeleton_loading_layout.md +1 -1
- data/app/pb_kits/playbook/pb_table/docs/_table_side_highlight.md +1 -1
- data/app/pb_kits/playbook/pb_table/docs/_table_sm.md +1 -1
- data/app/pb_kits/playbook/pb_typeahead/_typeahead.scss +7 -0
- data/app/pb_kits/playbook/pb_typeahead/_typeahead.test.jsx +64 -1
- data/app/pb_kits/playbook/pb_typeahead/components/MultiValue.tsx +33 -1
- data/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_truncated_text.md +1 -1
- data/dist/chunks/{_line_graph-CqE0-dq5.js → _line_graph-BRirnhGy.js} +1 -1
- data/dist/chunks/_typeahead-CFOqvZNu.js +6 -0
- data/dist/chunks/_weekday_stacked-DEkzyJsS.js +37 -0
- data/dist/chunks/{lib-CGxXTQ75.js → lib-BXBHAZMY.js} +1 -1
- data/dist/chunks/{pb_form_validation-DebqlUKZ.js → pb_form_validation-BZppqQZM.js} +1 -1
- data/dist/chunks/vendor.js +1 -1
- data/dist/playbook-doc.js +1 -1
- data/dist/playbook-rails-react-bindings.js +1 -1
- data/dist/playbook-rails.js +1 -1
- data/dist/playbook.css +1 -1
- data/lib/playbook/version.rb +1 -1
- metadata +23 -7
- data/dist/chunks/_typeahead-3ZAbZUqU.js +0 -6
- data/dist/chunks/_weekday_stacked-DFwAiApZ.js +0 -37
|
@@ -20,11 +20,12 @@ type BadgeProps = {
|
|
|
20
20
|
onTouchEnd?: React.TouchEventHandler<HTMLSpanElement>,
|
|
21
21
|
},
|
|
22
22
|
data?: {[key: string]: string},
|
|
23
|
-
htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
|
|
23
|
+
htmlOptions?: {[key: string]: string | number | boolean | (() => void) | ((event: any) => void) | any},
|
|
24
24
|
id?: string,
|
|
25
25
|
removeIcon?: boolean,
|
|
26
26
|
removeOnClick?: React.MouseEventHandler<HTMLSpanElement>,
|
|
27
27
|
rounded?: boolean,
|
|
28
|
+
tabIndex?: number,
|
|
28
29
|
text?: string,
|
|
29
30
|
variant?: "error" | "info" | "neutral" | "notification" | "notificationError" | "primary" | "success" | "warning",
|
|
30
31
|
} & GlobalProps
|
|
@@ -39,6 +40,7 @@ const Badge = (props: BadgeProps): React.ReactElement => {
|
|
|
39
40
|
removeIcon = false,
|
|
40
41
|
removeOnClick,
|
|
41
42
|
rounded = false,
|
|
43
|
+
tabIndex,
|
|
42
44
|
text,
|
|
43
45
|
variant = 'neutral',
|
|
44
46
|
} = props
|
|
@@ -61,6 +63,7 @@ const Badge = (props: BadgeProps): React.ReactElement => {
|
|
|
61
63
|
{...htmlProps}
|
|
62
64
|
className={css}
|
|
63
65
|
id={id}
|
|
66
|
+
tabIndex={tabIndex}
|
|
64
67
|
>
|
|
65
68
|
<span>
|
|
66
69
|
{text}
|
|
@@ -112,3 +112,16 @@ test('displays notification variants', () => {
|
|
|
112
112
|
cleanup()
|
|
113
113
|
})
|
|
114
114
|
})
|
|
115
|
+
|
|
116
|
+
test('should allow tabIndex to be set', () => {
|
|
117
|
+
render(
|
|
118
|
+
<Badge
|
|
119
|
+
data={{ testid: testId }}
|
|
120
|
+
tabIndex={0}
|
|
121
|
+
text="+1"
|
|
122
|
+
/>
|
|
123
|
+
)
|
|
124
|
+
|
|
125
|
+
const kit = screen.getByTestId(testId)
|
|
126
|
+
expect(kit).toHaveAttribute('tabIndex', '0')
|
|
127
|
+
})
|
|
@@ -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/
|
|
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/tokens/colors" target="_blank">here</a> under Product Colors and Status: Subtle Variations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Card headers pass category, product, status and background colors only. List of all category, product, status and background colors can be viewed <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Card headers pass category, product, status and background colors only. List of all category, product, status and background colors can be viewed <a href="https://playbook.powerapp.cloud/token/colors" 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/
|
|
1
|
+
Card highlight can pass status, product, and category colors. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/token/colors" target="_blank">here</a>.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Card can leverage the max-width property. Learn more in our <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Card can leverage the max-width property. Learn more in our <a href="https://playbook.powerapp.cloud/global_props/max_width" target="_blank">visual guidelines.</a>
|
|
@@ -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
|
|
354
|
-
|
|
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
|
|
364
|
-
|
|
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,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;
|
|
@@ -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.
|
|
@@ -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'
|
|
@@ -19,6 +19,7 @@ type DateRangeInlineProps = {
|
|
|
19
19
|
icon?: boolean;
|
|
20
20
|
id?: string;
|
|
21
21
|
size?: "sm" | "xs";
|
|
22
|
+
showCurrentYear?: boolean;
|
|
22
23
|
startDate?: Date;
|
|
23
24
|
};
|
|
24
25
|
|
|
@@ -45,6 +46,7 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
45
46
|
icon = false,
|
|
46
47
|
size = "sm",
|
|
47
48
|
startDate,
|
|
49
|
+
showCurrentYear = false,
|
|
48
50
|
} = props;
|
|
49
51
|
|
|
50
52
|
const dateInCurrentYear = () => {
|
|
@@ -60,13 +62,10 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
60
62
|
const htmlProps = buildHtmlProps(htmlOptions);
|
|
61
63
|
|
|
62
64
|
const renderTime = (date: Date) => {
|
|
65
|
+
const includeYear = showCurrentYear || !dateInCurrentYear();
|
|
63
66
|
return (
|
|
64
67
|
<time dateTime={dateTimeIso(date)}>
|
|
65
|
-
{
|
|
66
|
-
` ${dateTimestamp(date, false)} `
|
|
67
|
-
) : (
|
|
68
|
-
` ${dateTimestamp(date, true)} `
|
|
69
|
-
)}
|
|
68
|
+
{` ${dateTimestamp(date, includeYear)} `}
|
|
70
69
|
</time>
|
|
71
70
|
);
|
|
72
71
|
};
|
|
@@ -83,7 +82,8 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
83
82
|
{icon && (
|
|
84
83
|
<Caption
|
|
85
84
|
dark={dark}
|
|
86
|
-
tag="span"
|
|
85
|
+
tag="span"
|
|
86
|
+
>
|
|
87
87
|
<Icon
|
|
88
88
|
className="pb_date_range_inline_icon"
|
|
89
89
|
dark={dark}
|
|
@@ -96,12 +96,14 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
96
96
|
)}
|
|
97
97
|
<Caption
|
|
98
98
|
dark={dark}
|
|
99
|
-
tag="span"
|
|
99
|
+
tag="span"
|
|
100
|
+
>
|
|
100
101
|
{renderTime(startDate)}
|
|
101
102
|
</Caption>
|
|
102
103
|
<Caption
|
|
103
104
|
dark={dark}
|
|
104
|
-
tag="span"
|
|
105
|
+
tag="span"
|
|
106
|
+
>
|
|
105
107
|
<Icon
|
|
106
108
|
className="pb_date_range_inline_arrow"
|
|
107
109
|
dark={dark}
|
|
@@ -112,7 +114,8 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
112
114
|
</Caption>
|
|
113
115
|
<Caption
|
|
114
116
|
dark={dark}
|
|
115
|
-
tag="span"
|
|
117
|
+
tag="span"
|
|
118
|
+
>
|
|
116
119
|
{renderTime(endDate)}
|
|
117
120
|
</Caption>
|
|
118
121
|
</>
|
|
@@ -124,7 +127,8 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
124
127
|
<Body
|
|
125
128
|
color={"light"}
|
|
126
129
|
dark={dark}
|
|
127
|
-
tag="span"
|
|
130
|
+
tag="span"
|
|
131
|
+
>
|
|
128
132
|
<Icon
|
|
129
133
|
className="pb_date_range_inline_icon"
|
|
130
134
|
dark={dark}
|
|
@@ -137,13 +141,15 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
137
141
|
)}
|
|
138
142
|
<Body
|
|
139
143
|
dark={dark}
|
|
140
|
-
tag="span"
|
|
144
|
+
tag="span"
|
|
145
|
+
>
|
|
141
146
|
{renderTime(startDate)}
|
|
142
147
|
</Body>
|
|
143
148
|
<Body
|
|
144
149
|
color={"light"}
|
|
145
150
|
dark={dark}
|
|
146
|
-
tag="span"
|
|
151
|
+
tag="span"
|
|
152
|
+
>
|
|
147
153
|
<Icon
|
|
148
154
|
className="pb_date_range_inline_arrow"
|
|
149
155
|
dark={dark}
|
|
@@ -154,7 +160,8 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
|
|
|
154
160
|
</Body>
|
|
155
161
|
<Body
|
|
156
162
|
dark={dark}
|
|
157
|
-
tag="span"
|
|
163
|
+
tag="span"
|
|
164
|
+
>
|
|
158
165
|
{renderTime(endDate)}
|
|
159
166
|
</Body>
|
|
160
167
|
</>
|
|
@@ -14,7 +14,8 @@ module Playbook
|
|
|
14
14
|
prop :align, type: Playbook::Props::Enum,
|
|
15
15
|
values: %w[left center right],
|
|
16
16
|
default: "left"
|
|
17
|
-
|
|
17
|
+
prop :show_current_year, type: Playbook::Props::Boolean,
|
|
18
|
+
default: false
|
|
18
19
|
def classname
|
|
19
20
|
generate_classname("pb_date_range_inline_kit", dark_class, align)
|
|
20
21
|
end
|
|
@@ -38,11 +39,12 @@ module Playbook
|
|
|
38
39
|
end
|
|
39
40
|
|
|
40
41
|
def time_display(time)
|
|
42
|
+
include_year = show_current_year || !dates_in_current_year?
|
|
41
43
|
content_tag(:time, datetime: time.to_iso) do
|
|
42
|
-
if
|
|
43
|
-
"#{time.to_month_downcase} #{time.to_day}"
|
|
44
|
-
else
|
|
44
|
+
if include_year
|
|
45
45
|
"#{time.to_month_downcase} #{time.to_day}, #{time.to_year}"
|
|
46
|
+
else
|
|
47
|
+
"#{time.to_month_downcase} #{time.to_day}"
|
|
46
48
|
end
|
|
47
49
|
end
|
|
48
50
|
end
|
|
@@ -111,6 +111,23 @@ describe("DateRangeInline Kit", () => {
|
|
|
111
111
|
const text = kit.querySelector('.pb_caption_kit_md:first-child')
|
|
112
112
|
expect(text.textContent).toEqual(" Jan 15 ")
|
|
113
113
|
})
|
|
114
|
+
|
|
115
|
+
test("renders DateRangeInline with year when showCurrentYear is true", () => {
|
|
116
|
+
const currentYear = new Date().getFullYear()
|
|
117
|
+
render(
|
|
118
|
+
<DateRangeInline
|
|
119
|
+
data={{ testid: testId }}
|
|
120
|
+
endDate={new Date((`15 Aug ${currentYear}`))}
|
|
121
|
+
showCurrentYear
|
|
122
|
+
size="xs"
|
|
123
|
+
startDate={new Date(`15 Jan ${currentYear}`)}
|
|
124
|
+
/>
|
|
125
|
+
)
|
|
126
|
+
|
|
127
|
+
const kit = screen.getByTestId(testId)
|
|
128
|
+
const text = kit.querySelector('.pb_caption_kit_md:first-child')
|
|
129
|
+
expect(text.textContent).toEqual(` Jan 15, ${currentYear} `)
|
|
130
|
+
})
|
|
114
131
|
|
|
115
132
|
|
|
116
133
|
})
|
data/app/pb_kits/playbook/pb_date_range_inline/docs/_date_range_inline_show_current_year.html.erb
ADDED
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
<%= pb_rails("date_range_inline", props: { start_date: Date.new(Date.current.year, 10, 31), end_date: Date.new(Date.current.year, 12, 7), size: "xs", show_current_year: true }) %>
|
|
2
|
+
<%= pb_rails("date_range_inline", props: { start_date: Date.new(Date.current.year, 10, 31), end_date: Date.new(Date.current.year, 12, 7), show_current_year: true }) %>
|
|
3
|
+
<%= pb_rails("date_range_inline", props: { start_date: Date.new(Date.current.year, 10, 31), end_date: Date.new(Date.current.year, 12, 7), align: "center", icon: true, size: "xs", show_current_year: true }) %>
|
|
4
|
+
<%= pb_rails("date_range_inline", props: { start_date: Date.new(Date.current.year, 10, 31), end_date: Date.new(Date.current.year, 12, 7), align: "center", icon: true, show_current_year: true }) %>
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import DateRangeInline from '../_date_range_inline'
|
|
3
|
+
|
|
4
|
+
const DateRangeInlineShowCurrentYear = (props) => {
|
|
5
|
+
return (
|
|
6
|
+
<div>
|
|
7
|
+
<DateRangeInline
|
|
8
|
+
endDate={new Date(`7 Dec ${new Date().getFullYear()}`)}
|
|
9
|
+
showCurrentYear
|
|
10
|
+
size="xs"
|
|
11
|
+
startDate={new Date(`31 Oct ${new Date().getFullYear()}`)}
|
|
12
|
+
{...props}
|
|
13
|
+
/>
|
|
14
|
+
<DateRangeInline
|
|
15
|
+
endDate={new Date(`7 Dec ${new Date().getFullYear()}`)}
|
|
16
|
+
showCurrentYear
|
|
17
|
+
size="sm"
|
|
18
|
+
startDate={new Date(`31 Oct ${new Date().getFullYear()}`)}
|
|
19
|
+
{...props}
|
|
20
|
+
/>
|
|
21
|
+
<DateRangeInline
|
|
22
|
+
align="center"
|
|
23
|
+
endDate={new Date(`7 Dec ${new Date().getFullYear()}`)}
|
|
24
|
+
icon
|
|
25
|
+
showCurrentYear
|
|
26
|
+
size="xs"
|
|
27
|
+
startDate={new Date(`31 Oct ${new Date().getFullYear()}`)}
|
|
28
|
+
{...props}
|
|
29
|
+
/>
|
|
30
|
+
<DateRangeInline
|
|
31
|
+
align="center"
|
|
32
|
+
endDate={new Date(`7 Dec ${new Date().getFullYear()}`)}
|
|
33
|
+
icon
|
|
34
|
+
showCurrentYear
|
|
35
|
+
size="sm"
|
|
36
|
+
startDate={new Date(`31 Oct ${new Date().getFullYear()}`)}
|
|
37
|
+
{...props}
|
|
38
|
+
/>
|
|
39
|
+
</div>
|
|
40
|
+
)
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export default DateRangeInlineShowCurrentYear
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
By default, the Date Range Inline kit does NOT display the year if it is the current year. If you want to display the current year you can do so by setting `showCurrentYear`/`show_current_year` to true as shown here.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Use to display a date range.
|
|
1
|
+
Use to display a date range.
|
|
@@ -2,11 +2,12 @@ examples:
|
|
|
2
2
|
|
|
3
3
|
rails:
|
|
4
4
|
- date_range_inline_default: Default
|
|
5
|
-
|
|
5
|
+
- date_range_inline_show_current_year: Show Current Year
|
|
6
6
|
|
|
7
7
|
react:
|
|
8
8
|
- date_range_inline_default: Default
|
|
9
|
-
|
|
9
|
+
- date_range_inline_show_current_year: Show Current Year
|
|
10
|
+
|
|
10
11
|
swift:
|
|
11
12
|
- date_range_inline_default_swift: Default
|
|
12
13
|
- date_range_inline_props_swift: ""
|
|
@@ -1 +1 @@
|
|
|
1
|
-
You can customize the order of the colors you would like to use by using the `colors` prop. Only the data and status colors will work for Playbook charts. See the [design page](/
|
|
1
|
+
You can customize the order of the colors you would like to use by using the `colors` prop. Only the data and status colors will work for Playbook charts. See the [design page](https://playbook.powerapp.cloud/token/colors) for reference.
|
|
@@ -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
|
|
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(
|
|
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
|
-
|
|
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,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
|