diff --git a/packages/react/src/components/ComboBox/ComboBox-story.js b/packages/react/src/components/ComboBox/ComboBox-story.js index 86da4685af19..9843b7b6782d 100644 --- a/packages/react/src/components/ComboBox/ComboBox-story.js +++ b/packages/react/src/components/ComboBox/ComboBox-story.js @@ -7,7 +7,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; -import { boolean, select, text } from '@storybook/addon-knobs'; +import { boolean, object, select, text } from '@storybook/addon-knobs'; import ComboBox from '../ComboBox'; import mdx from './ComboBox.mdx'; @@ -91,17 +91,29 @@ const props = () => ({ 'Warning state text (warnText)', 'This mode may perform worse on older machines' ), + listBoxMenuIconTranslationIds: object( + 'Listbox menu icon translation IDs (for translateWithId callback)', + { + 'close.menu': 'Close menu', + 'open.menu': 'Open menu', + 'clear.selection': 'Clear selection', + } + ), }); -export const Playground = () => ( -
- (item ? item.text : '')} - {...props()} - /> -
-); +export const Playground = () => { + const { listBoxMenuIconTranslationIds, ...comboBoxProps } = props(); + return ( +
+ (item ? item.text : '')} + translateWithId={(id) => listBoxMenuIconTranslationIds[id]} + /> +
+ ); +}; export const disabled = () => (
diff --git a/packages/react/src/components/Dropdown/Dropdown-story.js b/packages/react/src/components/Dropdown/Dropdown-story.js index 547ff8038464..6834255f49a6 100644 --- a/packages/react/src/components/Dropdown/Dropdown-story.js +++ b/packages/react/src/components/Dropdown/Dropdown-story.js @@ -7,7 +7,13 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; -import { withKnobs, boolean, select, text } from '@storybook/addon-knobs'; +import { + withKnobs, + boolean, + object, + select, + text, +} from '@storybook/addon-knobs'; import Dropdown from '../Dropdown'; import DropdownSkeleton from './Dropdown.Skeleton'; import mdx from './Dropdown.mdx'; @@ -78,6 +84,13 @@ const props = () => ({ 'Warning state text (warnText)', 'This mode may perform worse on older machines' ), + listBoxMenuIconTranslationIds: object( + 'Listbox menu icon translation IDs (for translateWithId callback)', + { + 'close.menu': 'Close menu', + 'open.menu': 'Open menu', + } + ), }); export default { @@ -125,12 +138,14 @@ export const Inline = () => ( ); export const Playground = () => { + const { listBoxMenuIconTranslationIds, ...dropdownProps } = props(); return (
(item ? item.text : '')} + translateWithId={(id) => listBoxMenuIconTranslationIds[id]} />
); diff --git a/packages/react/src/components/ListBox/next/ListBoxTrigger.js b/packages/react/src/components/ListBox/next/ListBoxTrigger.js index 816db162ebfd..c2924f03d804 100644 --- a/packages/react/src/components/ListBox/next/ListBoxTrigger.js +++ b/packages/react/src/components/ListBox/next/ListBoxTrigger.js @@ -36,6 +36,7 @@ const ListBoxTrigger = ({ isOpen, translateWithId: t, ...rest }) => {