diff --git a/packages/react/src/components/ComboBox/ComboBox.js b/packages/react/src/components/ComboBox/ComboBox.js index 89adac40f162..0c75d7947953 100644 --- a/packages/react/src/components/ComboBox/ComboBox.js +++ b/packages/react/src/components/ComboBox/ComboBox.js @@ -390,23 +390,26 @@ export default class ComboBox extends React.Component { {isOpen && ( {this.filterItems(items, itemToString, inputValue).map( - (item, index) => ( - - {itemToElement ? ( - - ) : ( - itemToString(item) - )} - - ) + (item, index) => { + const itemProps = getItemProps({ item, index }); + return ( + + {itemToElement ? ( + + ) : ( + itemToString(item) + )} + + ); + } )} )} diff --git a/packages/react/src/components/Dropdown/Dropdown.js b/packages/react/src/components/Dropdown/Dropdown.js index 13cc86180657..a217f085715e 100644 --- a/packages/react/src/components/Dropdown/Dropdown.js +++ b/packages/react/src/components/Dropdown/Dropdown.js @@ -185,6 +185,7 @@ export default class Dropdown extends React.Component { [`${prefix}--dropdown--inline`]: inline, [`${prefix}--dropdown--disabled`]: disabled, [`${prefix}--dropdown--light`]: light, + [`${prefix}--dropdown--${size}`]: size, }); const titleClasses = cx(`${prefix}--label`, { [`${prefix}--label--disabled`]: disabled, @@ -294,21 +295,24 @@ export default class Dropdown extends React.Component { {isOpen && ( - {items.map((item, index) => ( - - {itemToElement ? ( - - ) : ( - itemToString(item) - )} - - ))} + {items.map((item, index) => { + const itemProps = getItemProps({ item, index }); + return ( + + {itemToElement ? ( + + ) : ( + itemToString(item) + )} + + ); + })} )} diff --git a/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap b/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap index 8432d797b7da..cdaf7d6a866c 100644 --- a/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap +++ b/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap @@ -353,7 +353,7 @@ exports[`Dropdown should render custom item components 1`] = ` id="downshift-4-item-0" isActive={false} isHighlighted={false} - key="Item 0" + key="downshift-4-item-0" onClick={[Function]} onMouseDown={[Function]} onMouseMove={[Function]} @@ -370,7 +370,7 @@ exports[`Dropdown should render custom item components 1`] = ` > @@ -387,7 +387,7 @@ exports[`Dropdown should render custom item components 1`] = ` id="downshift-4-item-1" isActive={false} isHighlighted={false} - key="Item 1" + key="downshift-4-item-1" onClick={[Function]} onMouseDown={[Function]} onMouseMove={[Function]} @@ -404,7 +404,7 @@ exports[`Dropdown should render custom item components 1`] = ` > @@ -421,7 +421,7 @@ exports[`Dropdown should render custom item components 1`] = ` id="downshift-4-item-2" isActive={false} isHighlighted={false} - key="Item 2" + key="downshift-4-item-2" onClick={[Function]} onMouseDown={[Function]} onMouseMove={[Function]} @@ -438,7 +438,7 @@ exports[`Dropdown should render custom item components 1`] = ` > @@ -455,7 +455,7 @@ exports[`Dropdown should render custom item components 1`] = ` id="downshift-4-item-3" isActive={false} isHighlighted={false} - key="Item 3" + key="downshift-4-item-3" onClick={[Function]} onMouseDown={[Function]} onMouseMove={[Function]} @@ -472,7 +472,7 @@ exports[`Dropdown should render custom item components 1`] = ` > @@ -489,7 +489,7 @@ exports[`Dropdown should render custom item components 1`] = ` id="downshift-4-item-4" isActive={false} isHighlighted={false} - key="Item 4" + key="downshift-4-item-4" onClick={[Function]} onMouseDown={[Function]} onMouseMove={[Function]} @@ -506,7 +506,7 @@ exports[`Dropdown should render custom item components 1`] = ` > @@ -685,7 +685,7 @@ exports[`Dropdown should render with strings as items 1`] = ` id="downshift-3-item-0" isActive={false} isHighlighted={false} - key="zar" + key="downshift-3-item-0" onClick={[Function]} onMouseDown={[Function]} onMouseMove={[Function]} @@ -708,7 +708,7 @@ exports[`Dropdown should render with strings as items 1`] = ` id="downshift-3-item-1" isActive={false} isHighlighted={false} - key="doz" + key="downshift-3-item-1" onClick={[Function]} onMouseDown={[Function]} onMouseMove={[Function]}