diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx index e312b83bca4..4678274d6a6 100644 --- a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx +++ b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx @@ -106,7 +106,7 @@ const buildCalendar = (year: number, month: number, weekStart: number, validator const date = new Date(firstDayOfWeek); week.push({ date, - isValid: validators.every(validator => validator(date)) + isValid: validators.every((validator) => validator(date)) }); firstDayOfWeek.setDate(firstDayOfWeek.getDate() + 1); } @@ -129,10 +129,10 @@ const today = new Date(); export const CalendarMonth = ({ date: dateProp, locale = undefined, - monthFormat = date => date.toLocaleDateString(locale, { month: 'long' }), - weekdayFormat = date => date.toLocaleDateString(locale, { weekday: 'narrow' }), - longWeekdayFormat = date => date.toLocaleDateString(locale, { weekday: 'long' }), - dayFormat = date => date.getDate(), + monthFormat = (date) => date.toLocaleDateString(locale, { month: 'long' }), + weekdayFormat = (date) => date.toLocaleDateString(locale, { weekday: 'narrow' }), + longWeekdayFormat = (date) => date.toLocaleDateString(locale, { weekday: 'long' }), + dayFormat = (date) => date.getDate(), weekStart = 0, // Use the American Sunday as a default onChange = () => {}, validators = [() => true], @@ -148,7 +148,9 @@ export const CalendarMonth = ({ inlineProps, ...props }: CalendarProps) => { - const longMonths = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map(monthNum => new Date(1990, monthNum)).map(monthFormat); + const longMonths = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + .map((monthNum) => new Date(1990, monthNum)) + .map(monthFormat); const [isSelectOpen, setIsSelectOpen] = React.useState(false); // eslint-disable-next-line prefer-const const [focusedDate, setFocusedDate] = React.useState(() => { @@ -168,7 +170,7 @@ export const CalendarMonth = ({ const [hiddenMonthId] = React.useState(getUniqueId('hidden-month-span')); const [shouldFocus, setShouldFocus] = React.useState(false); - const isValidated = (date: Date) => validators.every(validator => validator(date)); + const isValidated = (date: Date) => validators.every((validator) => validator(date)); const focusedDateValidated = isValidated(focusedDate); useEffect(() => { if (isValidDate(dateProp) && !isSameDate(focusedDate, dateProp)) { @@ -224,12 +226,10 @@ export const CalendarMonth = ({ const nextMonth = addMonth(1); const focusedYear = focusedDate.getFullYear(); const focusedMonth = focusedDate.getMonth(); - const calendar = React.useMemo(() => buildCalendar(focusedYear, focusedMonth, weekStart, validators), [ - focusedYear, - focusedMonth, - weekStart, - validators - ]); + const calendar = React.useMemo( + () => buildCalendar(focusedYear, focusedMonth, weekStart, validators), + [focusedYear, focusedMonth, weekStart, validators] + ); if (!focusedDateValidated) { const toFocus = calendar .reduce((acc, cur) => [...acc, ...cur], []) @@ -299,7 +299,7 @@ export const CalendarMonth = ({ > {longMonths.map((longMonth, index) => ( - + {longMonth} ))} diff --git a/packages/react-core/src/components/Dropdown/Dropdown.tsx b/packages/react-core/src/components/Dropdown/Dropdown.tsx index 74f139b8d01..b94c301f017 100644 --- a/packages/react-core/src/components/Dropdown/Dropdown.tsx +++ b/packages/react-core/src/components/Dropdown/Dropdown.tsx @@ -41,7 +41,7 @@ export interface DropdownProps extends MenuProps, OUIAProps { /** Flag indicating the toggle should be focused after a selection. If this use case is too restrictive, the optional toggleRef property with a node toggle may be used to control focus. */ shouldFocusToggleOnSelect?: boolean; /** Function callback called when user selects item. */ - onSelect?: (event?: React.MouseEvent, itemId?: string | number) => void; + onSelect?: (event?: React.MouseEvent, value?: string | number) => void; /** Callback to allow the dropdown component to change the open state of the menu. * Triggered by clicking outside of the menu, or by pressing any keys specificed in onOpenChangeKeys. */ onOpenChange?: (isOpen: boolean) => void; @@ -138,8 +138,8 @@ const DropdownBase: React.FunctionComponent = ({ { - onSelect && onSelect(event, itemId); + onSelect={(event, value) => { + onSelect && onSelect(event, value); shouldFocusToggleOnSelect && toggleRef.current.focus(); }} isPlain={isPlain} diff --git a/packages/react-core/src/components/Dropdown/DropdownItem.tsx b/packages/react-core/src/components/Dropdown/DropdownItem.tsx index c0bffe924d9..f33ca517012 100644 --- a/packages/react-core/src/components/Dropdown/DropdownItem.tsx +++ b/packages/react-core/src/components/Dropdown/DropdownItem.tsx @@ -18,7 +18,7 @@ export interface DropdownItemProps extends Omit, OUIAProps /** Render item as disabled option */ isDisabled?: boolean; /** Identifies the component in the dropdown onSelect callback */ - itemId?: any; + value?: any; /** Callback for item click */ onClick?: (event?: any) => void; /** Value to overwrite the randomly generated data-ouia-component-id.*/ @@ -32,7 +32,7 @@ const DropdownItemBase: React.FunctionComponent = ({ className, description, isDisabled, - itemId, + value, onClick, ouiaId, ouiaSafe, @@ -45,7 +45,7 @@ const DropdownItemBase: React.FunctionComponent = ({ className={css(className)} description={description} isDisabled={isDisabled} - itemId={itemId} + itemId={value} onClick={onClick} ref={innerRef} {...ouiaProps} @@ -56,8 +56,10 @@ const DropdownItemBase: React.FunctionComponent = ({ ); }; -export const DropdownItem = React.forwardRef((props: DropdownItemProps, ref: React.Ref) => ( - -)); +export const DropdownItem = React.forwardRef( + (props: DropdownItemProps, ref: React.Ref) => ( + + ) +); DropdownItem.displayName = 'DropdownItem'; diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx index 3b3562b9f9a..7b9b6b4f1b0 100644 --- a/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx +++ b/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx @@ -8,9 +8,9 @@ export const DropdownBasic: React.FunctionComponent = () => { setIsOpen(!isOpen); }; - const onSelect = (_event: React.MouseEvent | undefined, itemId: string | number | undefined) => { + const onSelect = (_event: React.MouseEvent | undefined, value: string | number | undefined) => { // eslint-disable-next-line no-console - console.log('selected', itemId); + console.log('selected', value); setIsOpen(false); }; @@ -28,11 +28,11 @@ export const DropdownBasic: React.FunctionComponent = () => { shouldFocusToggleOnSelect > - + Action { > Link - + Disabled Action - + Disabled Link - + Separated Action - ev.preventDefault()}> + ev.preventDefault()}> Separated Link diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx index 2b7b4d7d6a6..751dccbf546 100644 --- a/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx +++ b/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx @@ -8,9 +8,9 @@ export const DropdownWithDescriptions: React.FunctionComponent = () => { setIsOpen(!isOpen); }; - const onSelect = (_event: React.MouseEvent | undefined, itemId: string | number | undefined) => { + const onSelect = (_event: React.MouseEvent | undefined, value: string | number | undefined) => { // eslint-disable-next-line no-console - console.log('selected', itemId); + console.log('selected', value); setIsOpen(false); }; @@ -27,11 +27,11 @@ export const DropdownWithDescriptions: React.FunctionComponent = () => { shouldFocusToggleOnSelect > - + Action { > Link - + Disabled action - + Disabled link diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx index 619528ed40f..5664eb5a8f3 100644 --- a/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx +++ b/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx @@ -16,9 +16,9 @@ export const DropdownWithGroups: React.FunctionComponent = () => { setIsOpen(!isOpen); }; - const onSelect = (_event: React.MouseEvent | undefined, itemId: string | number | undefined) => { + const onSelect = (_event: React.MouseEvent | undefined, value: string | number | undefined) => { // eslint-disable-next-line no-console - console.log('selected', itemId); + console.log('selected', value); setIsOpen(false); }; @@ -36,11 +36,11 @@ export const DropdownWithGroups: React.FunctionComponent = () => { > - + Action { - + Group 2 action - ev.preventDefault()}> + ev.preventDefault()}> Group 2 link @@ -64,10 +64,10 @@ export const DropdownWithGroups: React.FunctionComponent = () => { - + Group 3 action - ev.preventDefault()}> + ev.preventDefault()}> Group 3 link diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx index 0b41bc43b10..759a4b8c8a6 100644 --- a/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx +++ b/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx @@ -9,9 +9,9 @@ export const DropdownWithKebab: React.FunctionComponent = () => { setIsOpen(!isOpen); }; - const onSelect = (_event: React.MouseEvent | undefined, itemId: string | number | undefined) => { + const onSelect = (_event: React.MouseEvent | undefined, value: string | number | undefined) => { // eslint-disable-next-line no-console - console.log('selected', itemId); + console.log('selected', value); setIsOpen(false); }; @@ -34,11 +34,11 @@ export const DropdownWithKebab: React.FunctionComponent = () => { shouldFocusToggleOnSelect > - + Action { > Link - + Disabled Action - + Disabled Link - + Separated Action - ev.preventDefault()}> + ev.preventDefault()}> Separated Link diff --git a/packages/react-core/src/components/Form/examples/FormState.tsx b/packages/react-core/src/components/Form/examples/FormState.tsx index e51d701127f..b3cbd9f53e5 100644 --- a/packages/react-core/src/components/Form/examples/FormState.tsx +++ b/packages/react-core/src/components/Form/examples/FormState.tsx @@ -76,15 +76,15 @@ export const FormState = () => { )} onOpenChange={(isOpen) => setIsSelectOpen(isOpen)} - onSelect={(_, itemId) => { - setValue('select-id', itemId as string); + onSelect={(_, value) => { + setValue('select-id', value as string); setIsSelectOpen(false); }} > - Option 1 - Option 2 - Option 3 + Option 1 + Option 2 + Option 3 diff --git a/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx b/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx index e24b6d089f4..c7b79f22040 100644 --- a/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx +++ b/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx @@ -43,11 +43,11 @@ export const HintBasicWithTitle: React.FunctionComponent = () => { )} > - + Action { > Link - + Disabled Action - + Disabled Link - + Separated Action - ev.preventDefault()}> + ev.preventDefault()}> Separated Link diff --git a/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx b/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx index 2b4432a7a2a..6274169020b 100644 --- a/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx +++ b/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx @@ -42,11 +42,11 @@ export const HintBasicWithoutTitle: React.FunctionComponent = () => { )} > - + Action { > Link - + Disabled Action - + Disabled Link - + Separated Action - ev.preventDefault()}> + ev.preventDefault()}> Separated Link diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx index 87acc8e9168..c71847a6803 100644 --- a/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx +++ b/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx @@ -37,13 +37,13 @@ export const InputGroupWithDropdown: React.FunctionComponent = () => { )} > - + Option 1 - + Option 2 - + Option 3 diff --git a/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx b/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx index fa82ac9e63f..9606508b16b 100644 --- a/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx +++ b/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx @@ -39,25 +39,25 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => { const headerUtilsOptions = ( - + {i18n.English} - + {i18n.Mandarin} - + {i18n.Hindi} - + {i18n.Spanish} - + {i18n.Portuguese} - + {i18n.Arabic} - + {i18n.Bengali} diff --git a/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx b/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx index 75e9eec07c0..12051fef113 100644 --- a/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx +++ b/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx @@ -81,11 +81,11 @@ export const ModalWithDropdown: React.FunctionComponent = () => { )} > - + Action { > Link - + Disabled Action - + Disabled Link diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx index d87f6f319d9..b7e0d79ca13 100644 --- a/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx +++ b/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx @@ -18,7 +18,7 @@ export const OverflowMenuDropdownItem: React.FunctionComponent {(value) => (!isShared || value.isBelowBreakpoint) && ( - + {children} ) diff --git a/packages/react-core/src/components/Select/Select.tsx b/packages/react-core/src/components/Select/Select.tsx index 4a492d812d5..d3f71d5862f 100644 --- a/packages/react-core/src/components/Select/Select.tsx +++ b/packages/react-core/src/components/Select/Select.tsx @@ -37,14 +37,14 @@ export interface SelectProps extends MenuProps, OUIAProps { className?: string; /** Flag to indicate if select is open */ isOpen?: boolean; - /** Single itemId for single select menus, or array of itemIds for multi select. You can also specify isSelected on the SelectOption. */ + /** Single select option value for single select menus, or array of select option values for multi select. You can also specify isSelected on the SelectOption. */ selected?: any | any[]; /** Select toggle. The toggle should either be a renderer function which forwards the given toggle ref, or a direct ReactNode that should be passed along with the toggleRef property. */ toggle: SelectToggleProps | ((toggleRef: React.RefObject) => React.ReactNode); /** Flag indicating the toggle should be focused after a selection. If this use case is too restrictive, the optional toggleRef property with a node toggle may be used to control focus. */ shouldFocusToggleOnSelect?: boolean; /** Function callback when user selects an option. */ - onSelect?: (event?: React.MouseEvent, itemId?: string | number) => void; + onSelect?: (event?: React.MouseEvent, value?: string | number) => void; /** Callback to allow the select component to change the open state of the menu. * Triggered by clicking outside of the menu, or by pressing any keys specificed in onOpenChangeKeys. */ onOpenChange?: (isOpen: boolean) => void; @@ -135,8 +135,8 @@ const SelectBase: React.FunctionComponent = ({ role={role} className={css(className)} ref={menuRef} - onSelect={(event, itemId) => { - onSelect && onSelect(event, itemId); + onSelect={(event, value) => { + onSelect && onSelect(event, value); shouldFocusToggleOnSelect && toggleRef.current.focus(); }} isPlain={isPlain} diff --git a/packages/react-core/src/components/Select/SelectOption.tsx b/packages/react-core/src/components/Select/SelectOption.tsx index 5c941f39e7e..ba050908dd2 100644 --- a/packages/react-core/src/components/Select/SelectOption.tsx +++ b/packages/react-core/src/components/Select/SelectOption.tsx @@ -14,7 +14,7 @@ export interface SelectOptionProps extends Omit { /** @hide Forwarded ref */ innerRef?: React.Ref; /** Identifies the component in the Select onSelect callback */ - itemId?: any; + value?: any; /** Indicates the option has a checkbox */ hasCheckbox?: boolean; /** Indicates the option is disabled */ @@ -37,9 +37,10 @@ const SelectOptionBase: React.FunctionComponent = ({ children, className, innerRef, + value, ...props }: SelectOptionProps) => ( - + {children} ); diff --git a/packages/react-core/src/components/Select/examples/SelectBasic.tsx b/packages/react-core/src/components/Select/examples/SelectBasic.tsx index 9a7f56af78c..a149e5d3994 100644 --- a/packages/react-core/src/components/Select/examples/SelectBasic.tsx +++ b/packages/react-core/src/components/Select/examples/SelectBasic.tsx @@ -10,11 +10,11 @@ export const SelectBasic: React.FunctionComponent = () => { setIsOpen(!isOpen); }; - const onSelect = (_event: React.MouseEvent | undefined, itemId: string | number | undefined) => { + const onSelect = (_event: React.MouseEvent | undefined, value: string | number | undefined) => { // eslint-disable-next-line no-console - console.log('selected', itemId); + console.log('selected', value); - setSelected(itemId as string); + setSelected(value as string); setIsOpen(false); }; @@ -53,9 +53,9 @@ export const SelectBasic: React.FunctionComponent = () => { shouldFocusToggleOnSelect > - Option 1 - Option 2 - Option 3 + Option 1 + Option 2 + Option 3 diff --git a/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx b/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx index c6c2fbe0e85..41525ea1803 100644 --- a/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx +++ b/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx @@ -9,14 +9,14 @@ export const SelectCheckbox: React.FunctionComponent = () => { setIsOpen(!isOpen); }; - const onSelect = (_event: React.MouseEvent | undefined, itemId: string | number | undefined) => { + const onSelect = (_event: React.MouseEvent | undefined, value: string | number | undefined) => { // eslint-disable-next-line no-console - console.log('selected', itemId); + console.log('selected', value); - if (selectedItems.includes(itemId as number)) { - setSelectedItems(selectedItems.filter((id) => id !== itemId)); + if (selectedItems.includes(value as number)) { + setSelectedItems(selectedItems.filter((id) => id !== value)); } else { - setSelectedItems([...selectedItems, itemId as number]); + setSelectedItems([...selectedItems, value as number]); } }; @@ -47,16 +47,16 @@ export const SelectCheckbox: React.FunctionComponent = () => { toggle={toggle} > - + Debug - + Info - + Warn - + Error diff --git a/packages/react-core/src/components/Select/examples/SelectFooter.tsx b/packages/react-core/src/components/Select/examples/SelectFooter.tsx index 19f14cc8dc6..5172816e5af 100644 --- a/packages/react-core/src/components/Select/examples/SelectFooter.tsx +++ b/packages/react-core/src/components/Select/examples/SelectFooter.tsx @@ -24,12 +24,12 @@ export const SelectFooter: React.FunctionComponent = () => { ); - function onSelect(event: React.MouseEvent | undefined, itemId: string | number | undefined) { - if (typeof itemId === 'undefined') { + function onSelect(event: React.MouseEvent | undefined, value: string | number | undefined) { + if (typeof value === 'undefined') { return; } - setSelected(itemId.toString()); + setSelected(value.toString()); } return ( @@ -43,9 +43,9 @@ export const SelectFooter: React.FunctionComponent = () => { selected={selected} > - Option 1 - Option 2 - Option 3 + Option 1 + Option 2 + Option 3