@patternfly/react-core 4.201.1 → 4.202.1
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.
- package/CHANGELOG.md +27 -0
- package/dist/esm/components/DescriptionList/DescriptionList.d.ts +13 -3
- package/dist/esm/components/DescriptionList/DescriptionList.d.ts.map +1 -1
- package/dist/esm/components/DescriptionList/DescriptionList.js +10 -6
- package/dist/esm/components/DescriptionList/DescriptionList.js.map +1 -1
- package/dist/esm/components/Menu/MenuContent.d.ts.map +1 -1
- package/dist/esm/components/Menu/MenuContent.js +21 -2
- package/dist/esm/components/Menu/MenuContent.js.map +1 -1
- package/dist/esm/components/Popover/Popover.d.ts +1 -1
- package/dist/esm/components/Select/Select.d.ts +5 -3
- package/dist/esm/components/Select/Select.d.ts.map +1 -1
- package/dist/esm/components/Select/Select.js +36 -17
- package/dist/esm/components/Select/Select.js.map +1 -1
- package/dist/esm/components/Select/SelectOption.d.ts.map +1 -1
- package/dist/esm/components/Select/SelectOption.js +3 -3
- package/dist/esm/components/Select/SelectOption.js.map +1 -1
- package/dist/esm/components/Select/SelectToggle.d.ts +1 -1
- package/dist/esm/components/Select/SelectToggle.d.ts.map +1 -1
- package/dist/esm/components/Select/SelectToggle.js +14 -14
- package/dist/esm/components/Select/SelectToggle.js.map +1 -1
- package/dist/esm/components/Select/selectConstants.d.ts +1 -0
- package/dist/esm/components/Select/selectConstants.d.ts.map +1 -1
- package/dist/esm/components/Select/selectConstants.js.map +1 -1
- package/dist/esm/components/TimePicker/TimePicker.d.ts +6 -4
- package/dist/esm/components/TimePicker/TimePicker.d.ts.map +1 -1
- package/dist/esm/components/TimePicker/TimePicker.js +15 -8
- package/dist/esm/components/TimePicker/TimePicker.js.map +1 -1
- package/dist/js/components/DescriptionList/DescriptionList.d.ts +13 -3
- package/dist/js/components/DescriptionList/DescriptionList.d.ts.map +1 -1
- package/dist/js/components/DescriptionList/DescriptionList.js +10 -6
- package/dist/js/components/DescriptionList/DescriptionList.js.map +1 -1
- package/dist/js/components/Menu/MenuContent.d.ts.map +1 -1
- package/dist/js/components/Menu/MenuContent.js +21 -2
- package/dist/js/components/Menu/MenuContent.js.map +1 -1
- package/dist/js/components/Popover/Popover.d.ts +1 -1
- package/dist/js/components/Select/Select.d.ts +5 -3
- package/dist/js/components/Select/Select.d.ts.map +1 -1
- package/dist/js/components/Select/Select.js +36 -17
- package/dist/js/components/Select/Select.js.map +1 -1
- package/dist/js/components/Select/SelectOption.d.ts.map +1 -1
- package/dist/js/components/Select/SelectOption.js +3 -3
- package/dist/js/components/Select/SelectOption.js.map +1 -1
- package/dist/js/components/Select/SelectToggle.d.ts +1 -1
- package/dist/js/components/Select/SelectToggle.d.ts.map +1 -1
- package/dist/js/components/Select/SelectToggle.js +14 -14
- package/dist/js/components/Select/SelectToggle.js.map +1 -1
- package/dist/js/components/Select/selectConstants.d.ts +1 -0
- package/dist/js/components/Select/selectConstants.d.ts.map +1 -1
- package/dist/js/components/Select/selectConstants.js.map +1 -1
- package/dist/js/components/TimePicker/TimePicker.d.ts +6 -4
- package/dist/js/components/TimePicker/TimePicker.d.ts.map +1 -1
- package/dist/js/components/TimePicker/TimePicker.js +15 -8
- package/dist/js/components/TimePicker/TimePicker.js.map +1 -1
- package/dist/umd/react-core.css +31 -2
- package/dist/umd/react-core.js +106 -52
- package/dist/umd/react-core.min.css +31 -2
- package/dist/umd/react-core.min.js +2 -2
- package/package.json +6 -6
- package/src/components/CodeBlock/examples/CodeBlock.md +2 -195
- package/src/components/CodeBlock/examples/CodeBlockBasic.tsx +59 -0
- package/src/components/CodeBlock/examples/CodeBlockExpandable.tsx +88 -0
- package/src/components/DescriptionList/DescriptionList.tsx +52 -31
- package/src/components/DescriptionList/examples/DescriptionList.md +87 -28
- package/src/components/Menu/MenuContent.tsx +27 -2
- package/src/components/Popover/Popover.tsx +1 -1
- package/src/components/Select/Select.tsx +39 -18
- package/src/components/Select/SelectOption.tsx +7 -4
- package/src/components/Select/SelectToggle.tsx +15 -15
- package/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap +2 -0
- package/src/components/Select/examples/Select.md +93 -40
- package/src/components/Select/selectConstants.tsx +1 -0
- package/src/components/TimePicker/TimePicker.tsx +20 -11
- package/src/components/TimePicker/examples/TimePicker.md +2 -0
|
@@ -67,7 +67,7 @@ export interface PopoverProps {
|
|
|
67
67
|
/** Distance of the popover to its target, defaults to 25 */
|
|
68
68
|
distance?: number;
|
|
69
69
|
/**
|
|
70
|
-
* If true, tries to keep the popover in view by flipping it if necessary
|
|
70
|
+
* If true, tries to keep the popover in view by flipping it if necessary.
|
|
71
71
|
* If the position is set to 'auto', this prop is ignored
|
|
72
72
|
*/
|
|
73
73
|
enableFlip?: boolean;
|
|
@@ -122,7 +122,7 @@ export interface SelectProps
|
|
|
122
122
|
isPlaceholder?: boolean
|
|
123
123
|
) => void;
|
|
124
124
|
/** Callback for toggle button behavior */
|
|
125
|
-
onToggle: (isExpanded: boolean) => void;
|
|
125
|
+
onToggle: (isExpanded: boolean, event: React.MouseEvent | React.ChangeEvent | React.KeyboardEvent | Event) => void;
|
|
126
126
|
/** Callback for typeahead clear button */
|
|
127
127
|
onClear?: (event: React.MouseEvent) => void;
|
|
128
128
|
/** Optional callback for custom filtering */
|
|
@@ -159,6 +159,8 @@ export interface SelectProps
|
|
|
159
159
|
isInputValuePersisted?: boolean;
|
|
160
160
|
/** @beta Flag for retaining filter results on blur from keyboard-entered typeahead text */
|
|
161
161
|
isInputFilterPersisted?: boolean;
|
|
162
|
+
/** Flag indicating the typeahead input value should reset upon selection */
|
|
163
|
+
shouldResetOnSelect?: boolean;
|
|
162
164
|
/** Content rendered in the footer of the select menu */
|
|
163
165
|
footer?: React.ReactNode;
|
|
164
166
|
}
|
|
@@ -232,7 +234,8 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
232
234
|
chipGroupComponent: null,
|
|
233
235
|
isInputValuePersisted: false,
|
|
234
236
|
isInputFilterPersisted: false,
|
|
235
|
-
isCreateSelectOptionObject: false
|
|
237
|
+
isCreateSelectOptionObject: false,
|
|
238
|
+
shouldResetOnSelect: true
|
|
236
239
|
};
|
|
237
240
|
|
|
238
241
|
state: SelectState = {
|
|
@@ -328,7 +331,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
328
331
|
this.setState({ focusFirstOption: true });
|
|
329
332
|
};
|
|
330
333
|
|
|
331
|
-
onToggle = (isExpanded: boolean) => {
|
|
334
|
+
onToggle = (isExpanded: boolean, e: React.MouseEvent | React.ChangeEvent | React.KeyboardEvent | Event) => {
|
|
332
335
|
const { isInputValuePersisted, onSelect, onToggle, hasInlineFilter } = this.props;
|
|
333
336
|
if (!isExpanded && isInputValuePersisted && onSelect) {
|
|
334
337
|
onSelect(undefined, this.inputRef.current ? this.inputRef.current.value : '');
|
|
@@ -338,7 +341,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
338
341
|
focusFirstOption: true
|
|
339
342
|
});
|
|
340
343
|
}
|
|
341
|
-
onToggle(isExpanded);
|
|
344
|
+
onToggle(isExpanded, e);
|
|
342
345
|
};
|
|
343
346
|
|
|
344
347
|
onClose = () => {
|
|
@@ -358,7 +361,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
358
361
|
|
|
359
362
|
onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
360
363
|
if (e.target.value.toString() !== '' && !this.props.isOpen) {
|
|
361
|
-
this.onToggle(true);
|
|
364
|
+
this.onToggle(true, e);
|
|
362
365
|
}
|
|
363
366
|
|
|
364
367
|
if (this.props.onTypeaheadInputChanged) {
|
|
@@ -503,9 +506,9 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
503
506
|
});
|
|
504
507
|
};
|
|
505
508
|
|
|
506
|
-
onClick = (
|
|
509
|
+
onClick = (e: React.MouseEvent) => {
|
|
507
510
|
if (!this.props.isOpen) {
|
|
508
|
-
this.onToggle(true);
|
|
511
|
+
this.onToggle(true, e);
|
|
509
512
|
}
|
|
510
513
|
};
|
|
511
514
|
|
|
@@ -678,10 +681,20 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
678
681
|
typeaheadCurrIndex !== -1 && // do not allow selection without moving to an initial option
|
|
679
682
|
(typeaheadActiveChild || (this.refCollection[0] && this.refCollection[0][0]))
|
|
680
683
|
) {
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
684
|
+
if (typeaheadActiveChild) {
|
|
685
|
+
const hasDescriptionElm = typeaheadActiveChild.childElementCount > 1;
|
|
686
|
+
const typeaheadActiveChildText = hasDescriptionElm
|
|
687
|
+
? (typeaheadActiveChild.firstChild as HTMLElement).innerText
|
|
688
|
+
: typeaheadActiveChild.innerText;
|
|
689
|
+
this.setState({
|
|
690
|
+
typeaheadInputValue: typeaheadActiveChildText
|
|
691
|
+
});
|
|
692
|
+
} else {
|
|
693
|
+
this.setState({
|
|
694
|
+
typeaheadInputValue: this.refCollection[0][0].innerText
|
|
695
|
+
});
|
|
696
|
+
}
|
|
697
|
+
|
|
685
698
|
if (typeaheadActiveChild) {
|
|
686
699
|
typeaheadActiveChild.click();
|
|
687
700
|
} else {
|
|
@@ -755,7 +768,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
755
768
|
} else {
|
|
756
769
|
// Close if there is no footer
|
|
757
770
|
if (!this.props.footer) {
|
|
758
|
-
this.onToggle(false);
|
|
771
|
+
this.onToggle(false, null);
|
|
759
772
|
this.onClose();
|
|
760
773
|
} else {
|
|
761
774
|
// has footer
|
|
@@ -764,14 +777,14 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
764
777
|
if (this.inputRef.current === document.activeElement) {
|
|
765
778
|
if (shiftKey) {
|
|
766
779
|
// close toggle if shift key and tab on input
|
|
767
|
-
this.onToggle(false);
|
|
780
|
+
this.onToggle(false, null);
|
|
768
781
|
this.onClose();
|
|
769
782
|
} else {
|
|
770
783
|
// tab to first tabbable item in footer
|
|
771
784
|
if (tabbableItems[0]) {
|
|
772
785
|
tabbableItems[0].focus();
|
|
773
786
|
} else {
|
|
774
|
-
this.onToggle(false);
|
|
787
|
+
this.onToggle(false, null);
|
|
775
788
|
this.onClose();
|
|
776
789
|
}
|
|
777
790
|
}
|
|
@@ -791,7 +804,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
791
804
|
tabbableItems[currentElementIndex + 1].focus();
|
|
792
805
|
} else {
|
|
793
806
|
// no next item, close toggle
|
|
794
|
-
this.onToggle(false);
|
|
807
|
+
this.onToggle(false, null);
|
|
795
808
|
this.inputRef.current.focus();
|
|
796
809
|
this.onClose();
|
|
797
810
|
}
|
|
@@ -947,6 +960,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
947
960
|
footer,
|
|
948
961
|
loadingVariant,
|
|
949
962
|
isCreateSelectOptionObject,
|
|
963
|
+
shouldResetOnSelect,
|
|
950
964
|
...props
|
|
951
965
|
} = this.props;
|
|
952
966
|
const {
|
|
@@ -1085,7 +1099,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
1085
1099
|
} else if (event.key === KeyTypes.Tab && variant !== SelectVariant.checkbox && this.props.footer) {
|
|
1086
1100
|
// tab to footer or close menu if shift key
|
|
1087
1101
|
if (event.shiftKey) {
|
|
1088
|
-
this.onToggle(false);
|
|
1102
|
+
this.onToggle(false, event);
|
|
1089
1103
|
} else {
|
|
1090
1104
|
const tabbableItems = findTabbableElements(this.footerRef, SelectFooterTabbableItems);
|
|
1091
1105
|
if (tabbableItems.length > 0) {
|
|
@@ -1093,7 +1107,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
1093
1107
|
event.stopPropagation();
|
|
1094
1108
|
event.preventDefault();
|
|
1095
1109
|
} else {
|
|
1096
|
-
this.onToggle(false);
|
|
1110
|
+
this.onToggle(false, event);
|
|
1097
1111
|
}
|
|
1098
1112
|
}
|
|
1099
1113
|
} else if (event.key === KeyTypes.Tab && variant === SelectVariant.checkbox) {
|
|
@@ -1367,7 +1381,14 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
|
|
|
1367
1381
|
<GenerateId>
|
|
1368
1382
|
{randomId => (
|
|
1369
1383
|
<SelectContext.Provider
|
|
1370
|
-
value={{
|
|
1384
|
+
value={{
|
|
1385
|
+
onSelect,
|
|
1386
|
+
onFavorite,
|
|
1387
|
+
onClose: this.onClose,
|
|
1388
|
+
variant,
|
|
1389
|
+
inputIdPrefix: inputIdPrefix || randomId,
|
|
1390
|
+
shouldResetOnSelect
|
|
1391
|
+
}}
|
|
1371
1392
|
>
|
|
1372
1393
|
{menuAppendTo === 'inline' ? (
|
|
1373
1394
|
mainContainer
|
|
@@ -245,7 +245,8 @@ export class SelectOption extends React.Component<SelectOptionProps> {
|
|
|
245
245
|
onClose: () => void,
|
|
246
246
|
variant: string,
|
|
247
247
|
inputIdPrefix: string,
|
|
248
|
-
onFavorite: (itemId: string, isFavorite: boolean) => void
|
|
248
|
+
onFavorite: (itemId: string, isFavorite: boolean) => void,
|
|
249
|
+
shouldResetOnSelect: boolean
|
|
249
250
|
) => {
|
|
250
251
|
if (variant !== SelectVariant.checkbox && isLoading && isGrouped) {
|
|
251
252
|
return (
|
|
@@ -323,7 +324,7 @@ export class SelectOption extends React.Component<SelectOptionProps> {
|
|
|
323
324
|
if (!isDisabled) {
|
|
324
325
|
onClick(event);
|
|
325
326
|
onSelect(event, value, isPlaceholder);
|
|
326
|
-
onClose();
|
|
327
|
+
shouldResetOnSelect && onClose();
|
|
327
328
|
}
|
|
328
329
|
}}
|
|
329
330
|
role="option"
|
|
@@ -449,8 +450,10 @@ export class SelectOption extends React.Component<SelectOptionProps> {
|
|
|
449
450
|
|
|
450
451
|
return (
|
|
451
452
|
<SelectConsumer>
|
|
452
|
-
{({ onSelect, onClose, variant, inputIdPrefix, onFavorite }) => (
|
|
453
|
-
<React.Fragment>
|
|
453
|
+
{({ onSelect, onClose, variant, inputIdPrefix, onFavorite, shouldResetOnSelect }) => (
|
|
454
|
+
<React.Fragment>
|
|
455
|
+
{renderOption(onSelect, onClose, variant, inputIdPrefix, onFavorite, shouldResetOnSelect)}
|
|
456
|
+
</React.Fragment>
|
|
454
457
|
)}
|
|
455
458
|
</SelectConsumer>
|
|
456
459
|
);
|
|
@@ -18,7 +18,7 @@ export interface SelectToggleProps extends React.HTMLProps<HTMLElement> {
|
|
|
18
18
|
/** Flag to indicate if select is open */
|
|
19
19
|
isOpen?: boolean;
|
|
20
20
|
/** Callback called when toggle is clicked */
|
|
21
|
-
onToggle?: (isExpanded: boolean) => void;
|
|
21
|
+
onToggle?: (isExpanded: boolean, event: React.MouseEvent | React.ChangeEvent | React.KeyboardEvent | Event) => void;
|
|
22
22
|
/** Callback for toggle open on keyboard entry */
|
|
23
23
|
onEnter?: () => void;
|
|
24
24
|
/** Callback for toggle close */
|
|
@@ -105,7 +105,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
105
105
|
const clickedWithinMenu =
|
|
106
106
|
menuRef && menuRef.current && menuRef.current.contains && menuRef.current.contains(event.target as Node);
|
|
107
107
|
if (isOpen && !(clickedOnToggle || clickedWithinMenu)) {
|
|
108
|
-
onToggle(false);
|
|
108
|
+
onToggle(false, event);
|
|
109
109
|
onClose();
|
|
110
110
|
}
|
|
111
111
|
};
|
|
@@ -140,7 +140,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
140
140
|
|
|
141
141
|
// If no tabbable item in footer close select
|
|
142
142
|
if (tabbableItems.length <= 0) {
|
|
143
|
-
onToggle(false);
|
|
143
|
+
onToggle(false, event);
|
|
144
144
|
onClose();
|
|
145
145
|
this.toggle.current.focus();
|
|
146
146
|
return;
|
|
@@ -151,7 +151,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
151
151
|
if (event.shiftKey) {
|
|
152
152
|
if (variant !== 'checkbox') {
|
|
153
153
|
// only close non checkbox variation on shift clicked
|
|
154
|
-
onToggle(false);
|
|
154
|
+
onToggle(false, event);
|
|
155
155
|
onClose();
|
|
156
156
|
this.toggle.current.focus();
|
|
157
157
|
}
|
|
@@ -175,7 +175,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
175
175
|
tabbableItems[currentElementIndex + 1].focus();
|
|
176
176
|
} else {
|
|
177
177
|
// no more footer items close menu
|
|
178
|
-
onToggle(false);
|
|
178
|
+
onToggle(false, event);
|
|
179
179
|
onClose();
|
|
180
180
|
this.toggle.current.focus();
|
|
181
181
|
}
|
|
@@ -189,7 +189,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
189
189
|
(event.key === KeyTypes.Escape || event.key === KeyTypes.Tab) &&
|
|
190
190
|
(escFromToggle || escFromWithinMenu)
|
|
191
191
|
) {
|
|
192
|
-
onToggle(false);
|
|
192
|
+
onToggle(false, event);
|
|
193
193
|
onClose();
|
|
194
194
|
this.toggle.current.focus();
|
|
195
195
|
}
|
|
@@ -206,7 +206,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
206
206
|
if (isOpen) {
|
|
207
207
|
handleTypeaheadKeys('enter');
|
|
208
208
|
} else {
|
|
209
|
-
onToggle(!isOpen);
|
|
209
|
+
onToggle(!isOpen, event);
|
|
210
210
|
}
|
|
211
211
|
}
|
|
212
212
|
}
|
|
@@ -221,11 +221,11 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
221
221
|
}
|
|
222
222
|
event.preventDefault();
|
|
223
223
|
if ((event.key === KeyTypes.Tab || event.key === KeyTypes.Enter || event.key === KeyTypes.Space) && isOpen) {
|
|
224
|
-
onToggle(!isOpen);
|
|
224
|
+
onToggle(!isOpen, event);
|
|
225
225
|
onClose();
|
|
226
226
|
this.toggle.current.focus();
|
|
227
227
|
} else if ((event.key === KeyTypes.Enter || event.key === KeyTypes.Space) && !isOpen) {
|
|
228
|
-
onToggle(!isOpen);
|
|
228
|
+
onToggle(!isOpen, event);
|
|
229
229
|
onEnter();
|
|
230
230
|
}
|
|
231
231
|
};
|
|
@@ -290,8 +290,8 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
290
290
|
)}
|
|
291
291
|
aria-label={ariaLabel}
|
|
292
292
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
293
|
-
onClick={
|
|
294
|
-
onToggle(!isOpen);
|
|
293
|
+
onClick={event => {
|
|
294
|
+
onToggle(!isOpen, event);
|
|
295
295
|
if (isOpen) {
|
|
296
296
|
onClose();
|
|
297
297
|
}
|
|
@@ -318,9 +318,9 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
318
318
|
className
|
|
319
319
|
)}
|
|
320
320
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
321
|
-
onClick={
|
|
321
|
+
onClick={event => {
|
|
322
322
|
if (!isDisabled) {
|
|
323
|
-
onToggle(!isOpen);
|
|
323
|
+
onToggle(!isOpen, event);
|
|
324
324
|
if (isOpen) {
|
|
325
325
|
onClose();
|
|
326
326
|
}
|
|
@@ -334,8 +334,8 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
|
|
|
334
334
|
type={type}
|
|
335
335
|
className={css(buttonStyles.button, styles.selectToggleButton, styles.modifiers.plain)}
|
|
336
336
|
aria-label={ariaLabel}
|
|
337
|
-
onClick={
|
|
338
|
-
onToggle(!isOpen);
|
|
337
|
+
onClick={event => {
|
|
338
|
+
onToggle(!isOpen, event);
|
|
339
339
|
if (isOpen) {
|
|
340
340
|
onClose();
|
|
341
341
|
}
|
|
@@ -1184,6 +1184,7 @@ exports[`select custom select filter filters properly 1`] = `
|
|
|
1184
1184
|
position="left"
|
|
1185
1185
|
removeSelectionAriaLabel="Remove"
|
|
1186
1186
|
selections={Array []}
|
|
1187
|
+
shouldResetOnSelect={true}
|
|
1187
1188
|
toggleAriaLabel="Options menu"
|
|
1188
1189
|
toggleIcon={null}
|
|
1189
1190
|
toggleId="custom-select-filters"
|
|
@@ -3123,6 +3124,7 @@ exports[`typeahead select test select existing option on a non-creatable select
|
|
|
3123
3124
|
position="left"
|
|
3124
3125
|
removeSelectionAriaLabel="Remove"
|
|
3125
3126
|
selections={Array []}
|
|
3127
|
+
shouldResetOnSelect={true}
|
|
3126
3128
|
toggleAriaLabel="Options menu"
|
|
3127
3129
|
toggleIcon={null}
|
|
3128
3130
|
toggleId={null}
|
|
@@ -299,7 +299,9 @@ class GroupedSingleSelectInput extends React.Component {
|
|
|
299
299
|
}
|
|
300
300
|
}
|
|
301
301
|
```
|
|
302
|
+
|
|
302
303
|
### Validated
|
|
304
|
+
|
|
303
305
|
```js
|
|
304
306
|
import React from 'react';
|
|
305
307
|
import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
|
|
@@ -384,12 +386,15 @@ class ValidatedSelect extends React.Component {
|
|
|
384
386
|
>
|
|
385
387
|
{this.options}
|
|
386
388
|
</Select>
|
|
387
|
-
<div aria-live="polite" id="validated-helper" hidden>
|
|
389
|
+
<div aria-live="polite" id="validated-helper" hidden>
|
|
390
|
+
{validated}
|
|
391
|
+
</div>
|
|
388
392
|
</div>
|
|
389
393
|
);
|
|
390
394
|
}
|
|
391
395
|
}
|
|
392
396
|
```
|
|
397
|
+
|
|
393
398
|
### Checkbox input
|
|
394
399
|
|
|
395
400
|
```js
|
|
@@ -467,6 +472,7 @@ class CheckboxSelectInput extends React.Component {
|
|
|
467
472
|
}
|
|
468
473
|
}
|
|
469
474
|
```
|
|
475
|
+
|
|
470
476
|
### Checkbox input with counts
|
|
471
477
|
|
|
472
478
|
```js
|
|
@@ -719,7 +725,7 @@ class FilteringSingleSelectInput extends React.Component {
|
|
|
719
725
|
selected: '',
|
|
720
726
|
isCreatable: false,
|
|
721
727
|
isInputValuePersisted: false,
|
|
722
|
-
isInputFilterPersisted: false
|
|
728
|
+
isInputFilterPersisted: false
|
|
723
729
|
};
|
|
724
730
|
|
|
725
731
|
this.options = [
|
|
@@ -742,8 +748,7 @@ class FilteringSingleSelectInput extends React.Component {
|
|
|
742
748
|
};
|
|
743
749
|
|
|
744
750
|
this.onSelect = (event, selection) => {
|
|
745
|
-
this.setState({ selected: selection, isOpen: false }),
|
|
746
|
-
console.log('selected: ', selection);
|
|
751
|
+
this.setState({ selected: selection, isOpen: false }), console.log('selected: ', selection);
|
|
747
752
|
};
|
|
748
753
|
|
|
749
754
|
this.onFilter = (_, textInput) => {
|
|
@@ -784,7 +789,14 @@ class FilteringSingleSelectInput extends React.Component {
|
|
|
784
789
|
}
|
|
785
790
|
|
|
786
791
|
render() {
|
|
787
|
-
const {
|
|
792
|
+
const {
|
|
793
|
+
isOpen,
|
|
794
|
+
selected,
|
|
795
|
+
filteredOptions,
|
|
796
|
+
isInputValuePersisted,
|
|
797
|
+
isInputFilterPersisted,
|
|
798
|
+
isCreatable
|
|
799
|
+
} = this.state;
|
|
788
800
|
const titleId = 'single-filtering-select-id';
|
|
789
801
|
return (
|
|
790
802
|
<div>
|
|
@@ -1199,7 +1211,8 @@ class TypeaheadSelectInput extends React.Component {
|
|
|
1199
1211
|
isCreatable: false,
|
|
1200
1212
|
isInputValuePersisted: false,
|
|
1201
1213
|
isInputFilterPersisted: false,
|
|
1202
|
-
hasOnCreateOption: false
|
|
1214
|
+
hasOnCreateOption: false,
|
|
1215
|
+
resetOnSelect: true
|
|
1203
1216
|
};
|
|
1204
1217
|
|
|
1205
1218
|
this.onToggle = isOpen => {
|
|
@@ -1213,7 +1226,7 @@ class TypeaheadSelectInput extends React.Component {
|
|
|
1213
1226
|
else {
|
|
1214
1227
|
this.setState({
|
|
1215
1228
|
selected: selection,
|
|
1216
|
-
isOpen: false
|
|
1229
|
+
isOpen: this.state.resetOnSelect ? false : this.state.isOpen
|
|
1217
1230
|
});
|
|
1218
1231
|
console.log('selected:', selection);
|
|
1219
1232
|
}
|
|
@@ -1262,10 +1275,26 @@ class TypeaheadSelectInput extends React.Component {
|
|
|
1262
1275
|
isInputFilterPersisted: checked
|
|
1263
1276
|
});
|
|
1264
1277
|
};
|
|
1278
|
+
|
|
1279
|
+
this.toggleResetOnSelect = checked => {
|
|
1280
|
+
this.setState({
|
|
1281
|
+
resetOnSelect: checked
|
|
1282
|
+
});
|
|
1283
|
+
};
|
|
1265
1284
|
}
|
|
1266
1285
|
|
|
1267
1286
|
render() {
|
|
1268
|
-
const {
|
|
1287
|
+
const {
|
|
1288
|
+
isOpen,
|
|
1289
|
+
selected,
|
|
1290
|
+
isDisabled,
|
|
1291
|
+
isCreatable,
|
|
1292
|
+
hasOnCreateOption,
|
|
1293
|
+
isInputValuePersisted,
|
|
1294
|
+
isInputFilterPersisted,
|
|
1295
|
+
resetOnSelect,
|
|
1296
|
+
options
|
|
1297
|
+
} = this.state;
|
|
1269
1298
|
const titleId = 'typeahead-select-id-1';
|
|
1270
1299
|
return (
|
|
1271
1300
|
<div>
|
|
@@ -1287,6 +1316,7 @@ class TypeaheadSelectInput extends React.Component {
|
|
|
1287
1316
|
isDisabled={isDisabled}
|
|
1288
1317
|
isCreatable={isCreatable}
|
|
1289
1318
|
onCreateOption={(hasOnCreateOption && this.onCreateOption) || undefined}
|
|
1319
|
+
shouldResetOnSelect={resetOnSelect}
|
|
1290
1320
|
>
|
|
1291
1321
|
{options.map((option, index) => (
|
|
1292
1322
|
<SelectOption
|
|
@@ -1337,6 +1367,14 @@ class TypeaheadSelectInput extends React.Component {
|
|
|
1337
1367
|
id="toggle-input-filter-persisted"
|
|
1338
1368
|
name="toggle-input-filter-persisted"
|
|
1339
1369
|
/>
|
|
1370
|
+
<Checkbox
|
|
1371
|
+
label="shouldResetOnSelect"
|
|
1372
|
+
isChecked={this.state.resetOnSelect}
|
|
1373
|
+
onChange={this.toggleResetOnSelect}
|
|
1374
|
+
aria-label="toggle reset checkbox"
|
|
1375
|
+
id="toggle-reset-typeahead"
|
|
1376
|
+
name="toggle-reset-typeahead"
|
|
1377
|
+
/>
|
|
1340
1378
|
</div>
|
|
1341
1379
|
);
|
|
1342
1380
|
}
|
|
@@ -1580,7 +1618,8 @@ class MultiTypeaheadSelectInput extends React.Component {
|
|
|
1580
1618
|
selected: [],
|
|
1581
1619
|
isCreatable: false,
|
|
1582
1620
|
hasOnCreateOption: false,
|
|
1583
|
-
hasDisabledOption: false
|
|
1621
|
+
hasDisabledOption: false,
|
|
1622
|
+
resetOnSelect: true
|
|
1584
1623
|
};
|
|
1585
1624
|
|
|
1586
1625
|
this.onCreateOption = newValue => {
|
|
@@ -1629,18 +1668,24 @@ class MultiTypeaheadSelectInput extends React.Component {
|
|
|
1629
1668
|
});
|
|
1630
1669
|
};
|
|
1631
1670
|
|
|
1632
|
-
this.toggleOptionDisabled =
|
|
1671
|
+
this.toggleOptionDisabled = toggleIndex => () => {
|
|
1633
1672
|
this.setState(prevState => ({
|
|
1634
1673
|
hasDisabledOption: !prevState.hasDisabledOption,
|
|
1635
1674
|
options: prevState.options.map((option, index) =>
|
|
1636
1675
|
index === toggleIndex ? { ...option, disabled: !option.disabled } : option
|
|
1637
|
-
)
|
|
1676
|
+
)
|
|
1638
1677
|
}));
|
|
1639
1678
|
};
|
|
1679
|
+
|
|
1680
|
+
this.toggleResetOnSelect = checked => {
|
|
1681
|
+
this.setState({
|
|
1682
|
+
resetOnSelect: checked
|
|
1683
|
+
});
|
|
1684
|
+
};
|
|
1640
1685
|
}
|
|
1641
1686
|
|
|
1642
1687
|
render() {
|
|
1643
|
-
const { isOpen, selected, isCreatable, hasOnCreateOption, options } = this.state;
|
|
1688
|
+
const { isOpen, selected, isCreatable, hasOnCreateOption, resetOnSelect, options } = this.state;
|
|
1644
1689
|
const titleId = 'multi-typeahead-select-id-1';
|
|
1645
1690
|
|
|
1646
1691
|
return (
|
|
@@ -1660,6 +1705,7 @@ class MultiTypeaheadSelectInput extends React.Component {
|
|
|
1660
1705
|
placeholderText="Select a state"
|
|
1661
1706
|
isCreatable={isCreatable}
|
|
1662
1707
|
onCreateOption={(hasOnCreateOption && this.onCreateOption) || undefined}
|
|
1708
|
+
shouldResetOnSelect={resetOnSelect}
|
|
1663
1709
|
>
|
|
1664
1710
|
{options.map((option, index) => (
|
|
1665
1711
|
<SelectOption
|
|
@@ -1694,6 +1740,14 @@ class MultiTypeaheadSelectInput extends React.Component {
|
|
|
1694
1740
|
id="toggle-disable-first-option"
|
|
1695
1741
|
name="toggle-disable-first-option"
|
|
1696
1742
|
/>
|
|
1743
|
+
<Checkbox
|
|
1744
|
+
label="shouldResetOnSelect"
|
|
1745
|
+
isChecked={this.state.resetOnSelect}
|
|
1746
|
+
onChange={this.toggleResetOnSelect}
|
|
1747
|
+
aria-label="toggle multi reset checkbox"
|
|
1748
|
+
id="toggle-reset-multi-typeahead"
|
|
1749
|
+
name="toggle-reset-multi-typeahead"
|
|
1750
|
+
/>
|
|
1697
1751
|
</div>
|
|
1698
1752
|
);
|
|
1699
1753
|
}
|
|
@@ -2379,8 +2433,6 @@ class SelectWithFooter extends React.Component {
|
|
|
2379
2433
|
};
|
|
2380
2434
|
}
|
|
2381
2435
|
|
|
2382
|
-
|
|
2383
|
-
|
|
2384
2436
|
render() {
|
|
2385
2437
|
const { isOpen, selected, isDisabled, direction, isToggleIcon } = this.state;
|
|
2386
2438
|
const titleId = 'title-id-footer';
|
|
@@ -2400,11 +2452,13 @@ class SelectWithFooter extends React.Component {
|
|
|
2400
2452
|
aria-labelledby={titleId}
|
|
2401
2453
|
isDisabled={isDisabled}
|
|
2402
2454
|
direction={direction}
|
|
2403
|
-
footer={
|
|
2404
|
-
|
|
2405
|
-
|
|
2406
|
-
|
|
2407
|
-
|
|
2455
|
+
footer={
|
|
2456
|
+
<>
|
|
2457
|
+
<Button variant="link" isInline>
|
|
2458
|
+
Action
|
|
2459
|
+
</Button>
|
|
2460
|
+
</>
|
|
2461
|
+
}
|
|
2408
2462
|
>
|
|
2409
2463
|
{this.options}
|
|
2410
2464
|
</Select>
|
|
@@ -2483,7 +2537,11 @@ class SelectWithFooterCheckbox extends React.Component {
|
|
|
2483
2537
|
isOpen={isOpen}
|
|
2484
2538
|
placeholderText="Filter by status"
|
|
2485
2539
|
aria-labelledby={titleId}
|
|
2486
|
-
footer={
|
|
2540
|
+
footer={
|
|
2541
|
+
<Button variant="link" isInline>
|
|
2542
|
+
Action
|
|
2543
|
+
</Button>
|
|
2544
|
+
}
|
|
2487
2545
|
>
|
|
2488
2546
|
{this.options}
|
|
2489
2547
|
</Select>
|
|
@@ -2497,11 +2555,7 @@ class SelectWithFooterCheckbox extends React.Component {
|
|
|
2497
2555
|
|
|
2498
2556
|
```js isBeta
|
|
2499
2557
|
import React from 'react';
|
|
2500
|
-
import {
|
|
2501
|
-
Select,
|
|
2502
|
-
SelectOption,
|
|
2503
|
-
SelectVariant
|
|
2504
|
-
} from '@patternfly/react-core';
|
|
2558
|
+
import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
|
|
2505
2559
|
|
|
2506
2560
|
class SelectViewMore extends React.Component {
|
|
2507
2561
|
constructor(props) {
|
|
@@ -2578,7 +2632,10 @@ class SelectViewMore extends React.Component {
|
|
|
2578
2632
|
selections={selected}
|
|
2579
2633
|
isOpen={isOpen}
|
|
2580
2634
|
aria-labelledby={titleId}
|
|
2581
|
-
{...(!isLoading &&
|
|
2635
|
+
{...(!isLoading &&
|
|
2636
|
+
numOptions < this.options.length && {
|
|
2637
|
+
loadingVariant: { text: 'View more', onClick: this.onViewMoreClick }
|
|
2638
|
+
})}
|
|
2582
2639
|
{...(isLoading && { loadingVariant: 'spinner' })}
|
|
2583
2640
|
>
|
|
2584
2641
|
{this.options.slice(0, numOptions)}
|
|
@@ -2593,11 +2650,7 @@ class SelectViewMore extends React.Component {
|
|
|
2593
2650
|
|
|
2594
2651
|
```js isBeta
|
|
2595
2652
|
import React from 'react';
|
|
2596
|
-
import {
|
|
2597
|
-
Select,
|
|
2598
|
-
SelectOption,
|
|
2599
|
-
SelectVariant,
|
|
2600
|
-
} from '@patternfly/react-core';
|
|
2653
|
+
import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
|
|
2601
2654
|
|
|
2602
2655
|
class SelectViewMoreCheckbox extends React.Component {
|
|
2603
2656
|
constructor(props) {
|
|
@@ -2649,7 +2702,6 @@ class SelectViewMoreCheckbox extends React.Component {
|
|
|
2649
2702
|
});
|
|
2650
2703
|
};
|
|
2651
2704
|
|
|
2652
|
-
|
|
2653
2705
|
this.simulateNetworkCall = callback => {
|
|
2654
2706
|
setTimeout(callback, 2000);
|
|
2655
2707
|
};
|
|
@@ -2682,7 +2734,10 @@ class SelectViewMoreCheckbox extends React.Component {
|
|
|
2682
2734
|
isOpen={isOpen}
|
|
2683
2735
|
placeholderText="Filter by status"
|
|
2684
2736
|
aria-labelledby={titleId}
|
|
2685
|
-
{...(!isLoading &&
|
|
2737
|
+
{...(!isLoading &&
|
|
2738
|
+
numOptions < this.options.length && {
|
|
2739
|
+
loadingVariant: { text: 'View more', onClick: this.onViewMoreClick }
|
|
2740
|
+
})}
|
|
2686
2741
|
{...(isLoading && { loadingVariant: 'spinner' })}
|
|
2687
2742
|
>
|
|
2688
2743
|
{this.options.slice(0, numOptions)}
|
|
@@ -2690,7 +2745,6 @@ class SelectViewMoreCheckbox extends React.Component {
|
|
|
2690
2745
|
</div>
|
|
2691
2746
|
);
|
|
2692
2747
|
}
|
|
2693
|
-
|
|
2694
2748
|
}
|
|
2695
2749
|
```
|
|
2696
2750
|
|
|
@@ -2701,8 +2755,8 @@ import React from 'react';
|
|
|
2701
2755
|
import { Select, SelectOption } from '@patternfly/react-core';
|
|
2702
2756
|
|
|
2703
2757
|
function SelectWithPlaceholderStyle() {
|
|
2704
|
-
const [
|
|
2705
|
-
const [
|
|
2758
|
+
const [isOpen, setIsOpen] = React.useState(false);
|
|
2759
|
+
const [selected, setSelected] = React.useState([]);
|
|
2706
2760
|
|
|
2707
2761
|
const options = [
|
|
2708
2762
|
<SelectOption key={0} value="Active" />,
|
|
@@ -2748,7 +2802,6 @@ function SelectWithPlaceholderStyle() {
|
|
|
2748
2802
|
}
|
|
2749
2803
|
```
|
|
2750
2804
|
|
|
2751
|
-
|
|
2752
2805
|
### With a style applied to the placeholder option
|
|
2753
2806
|
|
|
2754
2807
|
```js
|
|
@@ -2756,11 +2809,11 @@ import React from 'react';
|
|
|
2756
2809
|
import { Select, SelectOption } from '@patternfly/react-core';
|
|
2757
2810
|
|
|
2758
2811
|
function SelectWithPlaceholderStyle() {
|
|
2759
|
-
const [
|
|
2760
|
-
const [
|
|
2812
|
+
const [isOpen, setIsOpen] = React.useState(false);
|
|
2813
|
+
const [selected, setSelected] = React.useState([]);
|
|
2761
2814
|
|
|
2762
2815
|
const options = [
|
|
2763
|
-
<SelectOption key={0} value="Filter by status" isPlaceholder/>,
|
|
2816
|
+
<SelectOption key={0} value="Filter by status" isPlaceholder />,
|
|
2764
2817
|
<SelectOption key={1} value="Active" />,
|
|
2765
2818
|
<SelectOption key={2} value="Cancelled" />,
|
|
2766
2819
|
<SelectOption key={3} value="Paused" />
|
|
@@ -11,6 +11,7 @@ export interface SelectContextInterface {
|
|
|
11
11
|
onFavorite: (itemId: string, isFavorite: boolean) => void;
|
|
12
12
|
variant: string;
|
|
13
13
|
inputIdPrefix: string;
|
|
14
|
+
shouldResetOnSelect: boolean;
|
|
14
15
|
}
|
|
15
16
|
|
|
16
17
|
export const SelectContext = React.createContext<SelectContextInterface | null>(null);
|