diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap index ab21890c40c..1a498637c78 100644 --- a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap +++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap @@ -219,10 +219,11 @@ exports[`ApplicationLauncher custom icon 1`] = `
  • -
  • -
  • + } context={ Object { "keyHandler": [Function], @@ -697,26 +703,28 @@ exports[`ApplicationLauncher custom icon 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={4} isDisabled={false} isHovered={false} isPlainText={false} onClick={[Function]} - role="none" + role="separator" tooltipProps={Object {}} - variant="item" >
  • -
  • @@ -747,6 +755,7 @@ exports[`ApplicationLauncher custom icon 1`] = ` } enterTriggersArrowDown={false} href={null} + icon={null} index={5} isDisabled={false} isHovered={false} @@ -757,7 +766,6 @@ exports[`ApplicationLauncher custom icon 1`] = ` tabIndex={-1} tooltip={null} tooltipProps={null} - variant="item" >
  • -
  • -
  • + } context={ Object { "keyHandler": [Function], @@ -2075,26 +2089,28 @@ exports[`ApplicationLauncher expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={4} isDisabled={false} isHovered={false} isPlainText={false} onClick={[Function]} - role="none" + role="separator" tooltipProps={Object {}} - variant="item" >
  • -
  • @@ -2125,6 +2141,7 @@ exports[`ApplicationLauncher expanded 1`] = ` } enterTriggersArrowDown={false} href={null} + icon={null} index={5} isDisabled={false} isHovered={false} @@ -2135,7 +2152,6 @@ exports[`ApplicationLauncher expanded 1`] = ` tabIndex={-1} tooltip={null} tooltipProps={null} - variant="item" >
  • = ({ children = null, className = '', component = 'a', - variant = 'item', isDisabled = false, isPlainText = false, isHovered = false, @@ -51,6 +50,7 @@ export const DropdownItem: React.FunctionComponent = ({ ref, // Types of Ref are different for React.FC vs React.Component additionalChild, customChild, + icon = null, ...props }: DropdownItemProps) => ( @@ -61,7 +61,6 @@ export const DropdownItem: React.FunctionComponent = ({ tabIndex={-1} className={className} component={component} - variant={variant} isDisabled={isDisabled} isPlainText={isPlainText} isHovered={isHovered} @@ -72,6 +71,7 @@ export const DropdownItem: React.FunctionComponent = ({ onClick={onClick} additionalChild={additionalChild} customChild={customChild} + icon={icon} {...props} > {children} diff --git a/packages/react-core/src/components/Dropdown/DropdownItemIcon.tsx b/packages/react-core/src/components/Dropdown/DropdownItemIcon.tsx deleted file mode 100644 index c4b7cf33938..00000000000 --- a/packages/react-core/src/components/Dropdown/DropdownItemIcon.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import * as React from 'react'; -import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/react-styles/css/components/Dropdown/dropdown'; - -export interface DropdownItemIconProps extends React.HTMLProps { - /** Icon to be rendered in the dropdown item */ - children?: React.ReactNode; - /** Classes applied to span element of dropdown icon item */ - className?: string; -} - -export const DropdownItemIcon: React.FunctionComponent = ({ - children, - className = '', - ...props -}: DropdownItemIconProps) => ( - - {children} - -); diff --git a/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx b/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx index a5828802271..1954667870c 100644 --- a/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx +++ b/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { DropdownArrowContext } from './dropdownConstants'; import { InternalDropdownItem } from './InternalDropdownItem'; -import { Divider } from '../Divider'; +import { Divider, DividerVariant } from '../Divider'; export interface SeparatorProps extends React.HTMLProps { /** Classes applied to root element of dropdown item */ @@ -17,6 +17,14 @@ export const DropdownSeparator: React.FunctionComponent = ({ ...props }: SeparatorProps) => ( - {context => } + {context => ( + } + className={className} + role="separator" + /> + )} ); diff --git a/packages/react-core/src/components/Dropdown/InternalDropdownItem.tsx b/packages/react-core/src/components/Dropdown/InternalDropdownItem.tsx index 035a0c0b48c..dc3e6262575 100644 --- a/packages/react-core/src/components/Dropdown/InternalDropdownItem.tsx +++ b/packages/react-core/src/components/Dropdown/InternalDropdownItem.tsx @@ -14,8 +14,6 @@ export interface InternalDropdownItemProps extends React.HTMLProps { @@ -57,7 +57,6 @@ export class InternalDropdownItem extends React.Component {}, sendRef: () => {} }, - enterTriggersArrowDown: false + enterTriggersArrowDown: false, + icon: null }; componentDidMount() { @@ -134,7 +134,6 @@ export class InternalDropdownItem extends React.Component tooltip ? ( @@ -175,10 +174,10 @@ export class InternalDropdownItem extends React.Component {({ onSelect, itemClass, disabledClass, plainTextClass }) => { if (this.props.role === 'separator') { - classes = css(variant === 'icon' && styles.modifiers.icon, className); + classes = css(icon && styles.modifiers.icon, className); } else { classes = css( - variant === 'icon' && styles.modifiers.icon, + icon && styles.modifiers.icon, className, isDisabled && disabledClass, isPlainText && plainTextClass, @@ -211,6 +210,7 @@ export class InternalDropdownItem extends React.Component + {icon && {icon}} {children} ) diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownItem.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownItem.test.tsx index f353c53368b..9849794b2f8 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownItem.test.tsx +++ b/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownItem.test.tsx @@ -14,14 +14,15 @@ it('DropdownItem should match snapshot (auto-generated)', () => { className={"''"} listItemClassName={'string'} component={'a'} - variant={'item'} isDisabled={false} + isPlainText={false} isHovered={false} - href={"''"} + href={'string'} tooltip={null} tooltipProps={undefined} additionalChild={
    ReactNode
    } customChild={
    ReactNode
    } + icon={null} /> ); expect(view).toMatchSnapshot(); diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownItemIcon.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownItemIcon.test.tsx deleted file mode 100644 index 170ddd90a5e..00000000000 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownItemIcon.test.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/** - * This test was generated - */ -import * as React from 'react'; -import { shallow } from 'enzyme'; -import { DropdownItemIcon } from '../../DropdownItemIcon'; -// any missing imports can usually be resolved by adding them here -import {} from '../..'; - -it('DropdownItemIcon should match snapshot (auto-generated)', () => { - const view = shallow(ReactNode} className={"''"} />); - expect(view).toMatchSnapshot(); -}); diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownToggle.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownToggle.test.tsx index cc30d6f10ae..9872a061d44 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownToggle.test.tsx +++ b/packages/react-core/src/components/Dropdown/__tests__/Generated/DropdownToggle.test.tsx @@ -16,17 +16,16 @@ it('DropdownToggle should match snapshot (auto-generated)', () => { isOpen={false} onToggle={(_isOpen: boolean) => undefined as any} parentRef={null} - isFocused={false} - isHovered={false} isActive={false} isPlain={false} isDisabled={false} isPrimary={false} - iconComponent={() =>

    ReactElementType

    } + icon={null} + toggleIndicator={() =>

    ReactElementType

    } splitButtonItems={[]} splitButtonVariant={'checkbox'} aria-label={'string'} - ariaHasPopup={true} + aria-haspopup={true} type={'button'} onEnter={(event?: React.MouseEvent) => undefined as void} /> diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/InternalDropdownItem.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Generated/InternalDropdownItem.test.tsx index a1faa5da5d7..758adc82387 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/InternalDropdownItem.test.tsx +++ b/packages/react-core/src/components/Dropdown/__tests__/Generated/InternalDropdownItem.test.tsx @@ -14,11 +14,11 @@ it('InternalDropdownItem should match snapshot (auto-generated)', () => { className={"''"} listItemClassName={'string'} component={'a'} - variant={'item'} role={"'none'"} isDisabled={false} + isPlainText={false} isHovered={false} - href={"''"} + href={'string'} tooltip={
    ReactNode
    } tooltipProps={undefined} index={-1} @@ -32,6 +32,7 @@ it('InternalDropdownItem should match snapshot (auto-generated)', () => { additionalChild={
    ReactNode
    } customChild={
    ReactNode
    } enterTriggersArrowDown={false} + icon={
    ReactNode
    } /> ); expect(view).toMatchSnapshot(); diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/KebabToggle.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Generated/KebabToggle.test.tsx index 4a61d3c8a79..083e874399c 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/KebabToggle.test.tsx +++ b/packages/react-core/src/components/Dropdown/__tests__/Generated/KebabToggle.test.tsx @@ -17,12 +17,11 @@ it('KebabToggle should match snapshot (auto-generated)', () => { aria-label={"'Actions'"} onToggle={() => undefined as void} parentRef={null} - isFocused={false} - isHovered={false} isActive={false} isDisabled={false} isPlain={false} type={'button'} + bubbleEvent={false} /> ); expect(view).toMatchSnapshot(); diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/Toggle.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Generated/Toggle.test.tsx index 00a37f05c7f..50be9bcbac3 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/Toggle.test.tsx +++ b/packages/react-core/src/components/Dropdown/__tests__/Generated/Toggle.test.tsx @@ -18,14 +18,13 @@ it('Toggle should match snapshot (auto-generated)', () => { onToggle={() => {}} onEnter={() => {}} parentRef={'any'} - isFocused={false} - isHovered={false} isActive={false} isDisabled={false} isPlain={false} isPrimary={false} isSplitButton={false} - ariaHasPopup={true} + aria-haspopup={true} + bubbleEvent={false} /> ); expect(view).toMatchSnapshot(); diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/DropdownItemIcon.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/DropdownItemIcon.test.tsx.snap deleted file mode 100644 index 10a74e6fe19..00000000000 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/DropdownItemIcon.test.tsx.snap +++ /dev/null @@ -1,11 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`DropdownItemIcon should match snapshot (auto-generated) 1`] = ` - -
    - ReactNode -
    -
    -`; diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/KebabToggle.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/KebabToggle.test.tsx.snap index 71e065df743..0114845339b 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/KebabToggle.test.tsx.snap +++ b/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/KebabToggle.test.tsx.snap @@ -8,8 +8,6 @@ exports[`KebabToggle should match snapshot (auto-generated) 1`] = ` id="''" isActive={false} isDisabled={false} - isFocused={false} - isHovered={false} isOpen={false} isPlain={false} isPrimary={false} diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap index 598427b5ffc..b3580305aa4 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap +++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap @@ -218,6 +218,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -225,7 +226,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -239,6 +239,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -246,7 +247,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -260,6 +260,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -267,7 +268,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -281,6 +281,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -288,7 +289,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -303,6 +303,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -310,7 +311,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -324,6 +324,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -331,7 +332,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -360,6 +360,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -367,7 +368,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -381,6 +381,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -388,7 +389,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -402,6 +402,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -409,7 +410,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -423,6 +423,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -430,7 +431,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -445,6 +445,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -452,7 +453,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -466,6 +466,7 @@ exports[`KebabToggle dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -473,7 +474,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -647,6 +647,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -654,7 +655,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -668,6 +668,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -675,7 +676,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -689,6 +689,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -696,7 +697,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -710,6 +710,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -717,7 +718,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -732,6 +732,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -739,7 +740,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -753,6 +753,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -760,7 +761,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -788,6 +788,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -795,7 +796,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -809,6 +809,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -816,7 +817,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -830,6 +830,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -837,7 +838,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -851,6 +851,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -858,7 +859,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -873,6 +873,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -880,7 +881,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -894,6 +894,7 @@ exports[`KebabToggle dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -901,7 +902,6 @@ exports[`KebabToggle dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -1074,6 +1074,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1081,7 +1082,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -1095,6 +1095,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1102,7 +1103,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -1116,6 +1116,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -1123,7 +1124,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -1137,6 +1137,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -1144,7 +1145,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -1159,6 +1159,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1166,7 +1167,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -1180,6 +1180,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1187,7 +1188,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -1216,6 +1216,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1223,7 +1224,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -1237,6 +1237,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1244,7 +1245,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -1258,6 +1258,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -1265,7 +1266,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -1279,6 +1279,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -1286,7 +1287,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -1301,6 +1301,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1308,7 +1309,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -1322,6 +1322,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1329,7 +1330,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -1439,10 +1439,11 @@ exports[`KebabToggle expanded 1`] = `
  • -
  • -
  • + } context={ Object { "keyHandler": [Function], @@ -1803,26 +1809,28 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={4} isDisabled={false} isHovered={false} isPlainText={false} onClick={[Function]} - role="none" + role="separator" tooltipProps={Object {}} - variant="item" >
  • -
  • @@ -1838,6 +1846,7 @@ exports[`KebabToggle expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={5} isDisabled={false} isHovered={false} @@ -1846,7 +1855,6 @@ exports[`KebabToggle expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" >
  • Link , @@ -1939,6 +1947,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -1946,7 +1955,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -1960,6 +1968,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -1967,7 +1976,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -1981,6 +1989,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -1988,7 +1997,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -2003,6 +2011,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2010,7 +2019,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -2024,6 +2032,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2031,7 +2040,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -2060,6 +2068,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2067,7 +2076,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -2081,6 +2089,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2088,7 +2097,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -2102,6 +2110,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2109,7 +2118,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -2123,6 +2131,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2130,7 +2139,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -2145,6 +2153,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2152,7 +2161,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -2166,6 +2174,7 @@ exports[`KebabToggle plain 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2173,7 +2182,6 @@ exports[`KebabToggle plain 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -2346,6 +2354,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2353,7 +2362,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -2367,6 +2375,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2374,7 +2383,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -2388,6 +2396,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2395,7 +2404,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -2409,6 +2417,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2416,7 +2425,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -2431,6 +2439,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2438,7 +2447,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -2452,6 +2460,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2459,7 +2468,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -2487,6 +2495,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2494,7 +2503,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -2508,6 +2516,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2515,7 +2524,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -2529,6 +2537,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2536,7 +2545,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -2550,6 +2558,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2557,7 +2566,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -2572,6 +2580,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2579,7 +2588,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -2593,6 +2601,7 @@ exports[`KebabToggle regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2600,7 +2609,6 @@ exports[`KebabToggle regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -2773,6 +2781,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2780,7 +2789,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -2794,6 +2802,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2801,7 +2810,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -2815,6 +2823,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2822,7 +2831,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -2836,6 +2844,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2843,7 +2852,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -2858,6 +2866,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2865,7 +2874,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -2879,6 +2887,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2886,7 +2895,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -2915,6 +2923,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2922,7 +2931,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -2936,6 +2944,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -2943,7 +2952,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -2957,6 +2965,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2964,7 +2973,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -2978,6 +2986,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -2985,7 +2994,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -3000,6 +3008,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3007,7 +3016,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -3021,6 +3029,7 @@ exports[`KebabToggle right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3028,7 +3037,6 @@ exports[`KebabToggle right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -3432,6 +3440,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3439,7 +3448,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -3453,6 +3461,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3460,7 +3469,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -3474,6 +3482,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -3481,7 +3490,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -3495,6 +3503,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -3502,7 +3511,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -3517,6 +3525,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3524,7 +3533,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -3538,6 +3546,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3545,7 +3554,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -3576,6 +3584,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3583,7 +3592,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -3597,6 +3605,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3604,7 +3613,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -3618,6 +3626,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -3625,7 +3634,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -3639,6 +3647,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -3646,7 +3655,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -3661,6 +3669,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3668,7 +3677,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -3682,6 +3690,7 @@ exports[`dropdown dropup + right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3689,7 +3698,6 @@ exports[`dropdown dropup + right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -3888,6 +3896,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3895,7 +3904,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -3909,6 +3917,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3916,7 +3925,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -3930,6 +3938,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -3937,7 +3946,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -3951,6 +3959,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -3958,7 +3967,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -3973,6 +3981,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -3980,7 +3989,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -3994,6 +4002,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4001,7 +4010,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -4031,6 +4039,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4038,7 +4047,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -4052,6 +4060,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4059,7 +4068,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -4073,6 +4081,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -4080,7 +4089,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -4094,6 +4102,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -4101,7 +4110,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -4116,6 +4124,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4123,7 +4132,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -4137,6 +4145,7 @@ exports[`dropdown dropup 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4144,7 +4153,6 @@ exports[`dropdown dropup 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -4342,6 +4350,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4349,7 +4358,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -4363,6 +4371,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4370,7 +4379,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -4384,6 +4392,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -4391,7 +4400,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -4405,6 +4413,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -4412,7 +4421,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -4427,6 +4435,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4434,7 +4443,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -4448,6 +4456,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4455,7 +4464,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -4486,6 +4494,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4493,7 +4502,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -4507,6 +4515,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4514,7 +4523,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -4528,6 +4536,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -4535,7 +4544,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -4549,6 +4557,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -4556,7 +4565,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -4571,6 +4579,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4578,7 +4587,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -4592,6 +4600,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -4599,7 +4608,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -4719,10 +4727,11 @@ exports[`dropdown expanded 1`] = `
  • -
  • -
  • + } context={ Object { "keyHandler": [Function], @@ -5098,26 +5112,28 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={4} isDisabled={false} isHovered={false} isPlainText={false} onClick={[Function]} - role="none" + role="separator" tooltipProps={Object {}} - variant="item" >
  • -
  • @@ -5133,6 +5149,7 @@ exports[`dropdown expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={5} isDisabled={false} isHovered={false} @@ -5141,7 +5158,6 @@ exports[`dropdown expanded 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" >
  • Link , @@ -5234,6 +5250,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5241,7 +5258,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -5255,6 +5271,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5262,7 +5279,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -5276,6 +5292,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5283,7 +5300,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -5298,6 +5314,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5305,7 +5322,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -5319,6 +5335,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5326,7 +5343,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -5357,6 +5373,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5364,7 +5381,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -5378,6 +5394,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5385,7 +5402,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -5399,6 +5415,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5406,7 +5423,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -5420,6 +5436,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5427,7 +5444,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -5442,6 +5458,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5449,7 +5466,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -5463,6 +5479,7 @@ exports[`dropdown primary 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5470,7 +5487,6 @@ exports[`dropdown primary 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -5670,6 +5686,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5677,7 +5694,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -5691,6 +5707,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5698,7 +5715,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -5712,6 +5728,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5719,7 +5736,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -5733,6 +5749,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5740,7 +5757,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -5755,6 +5771,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5762,7 +5779,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -5776,6 +5792,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5783,7 +5800,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -5813,6 +5829,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5820,7 +5837,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -5834,6 +5850,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5841,7 +5858,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -5855,6 +5871,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5862,7 +5879,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -5876,6 +5892,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -5883,7 +5900,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -5898,6 +5914,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5905,7 +5922,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -5919,6 +5935,7 @@ exports[`dropdown regular 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -5926,7 +5943,6 @@ exports[`dropdown regular 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -6124,6 +6140,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6131,7 +6148,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -6145,6 +6161,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6152,7 +6169,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -6166,6 +6182,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -6173,7 +6190,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -6187,6 +6203,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -6194,7 +6211,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -6209,6 +6225,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6216,7 +6233,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -6230,6 +6246,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6237,7 +6254,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , @@ -6268,6 +6284,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6275,7 +6292,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Link , @@ -6289,6 +6305,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6296,7 +6313,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Action , @@ -6310,6 +6326,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -6317,7 +6334,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Link , @@ -6331,6 +6347,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={true} isHovered={false} @@ -6338,7 +6355,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Disabled Action , @@ -6353,6 +6369,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6360,7 +6377,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Link , @@ -6374,6 +6390,7 @@ exports[`dropdown right aligned 1`] = ` } } enterTriggersArrowDown={false} + icon={null} index={-1} isDisabled={false} isHovered={false} @@ -6381,7 +6398,6 @@ exports[`dropdown right aligned 1`] = ` onClick={[Function]} role="none" tooltipProps={Object {}} - variant="item" > Separated Action , diff --git a/packages/react-core/src/components/Dropdown/examples/Dropdown.md b/packages/react-core/src/components/Dropdown/examples/Dropdown.md index dc7a4fc79a6..94194384cf2 100644 --- a/packages/react-core/src/components/Dropdown/examples/Dropdown.md +++ b/packages/react-core/src/components/Dropdown/examples/Dropdown.md @@ -7,7 +7,7 @@ propComponents: typescript: true --- -import { Dropdown, DropdownToggle, DropdownToggleCheckbox, DropdownItem, DropdownItemIcon, DropdownSeparator, DropdownPosition, DropdownDirection, KebabToggle, DropdownGroup, DropdownToggleAction } from '@patternfly/react-core'; +import { Dropdown, DropdownToggle, DropdownToggleCheckbox, DropdownItem, DropdownSeparator, DropdownPosition, DropdownDirection, KebabToggle, DropdownGroup, DropdownToggleAction } from '@patternfly/react-core'; import { ThIcon, CaretDownIcon, CogIcon, BellIcon, CubesIcon, UserIcon } from '@patternfly/react-icons'; import { Link } from '@reach/router'; @@ -944,7 +944,6 @@ import { DropdownToggle, DropdownToggleAction, DropdownItem, - DropdownItemIcon, DropdownSeparator, DropdownPosition, DropdownDirection, @@ -1001,22 +1000,13 @@ class SplitButtonActionDropdown extends React.Component { ]; const dropdownIconItems = [ - - - - + }> Action , - - - - + } isDisabled> Disabled action , - - - - + }> Other action ]; diff --git a/packages/react-core/src/components/Dropdown/index.ts b/packages/react-core/src/components/Dropdown/index.ts index e441287571b..7d67000cacb 100644 --- a/packages/react-core/src/components/Dropdown/index.ts +++ b/packages/react-core/src/components/Dropdown/index.ts @@ -4,7 +4,6 @@ export * from './DropdownWithContext'; export * from './dropdownConstants'; export * from './DropdownGroup'; export * from './DropdownItem'; -export * from './DropdownItemIcon'; export * from './DropdownSeparator'; export * from './KebabToggle'; export * from './DropdownToggle'; diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap index d73961f9b8c..e5abd179139 100644 --- a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap +++ b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap @@ -720,6 +720,7 @@ exports[`optionsMenu expanded 1`] = ` } } enterTriggersArrowDown={false} + icon={null} id="" index={-1} isDisabled={false} @@ -730,7 +731,6 @@ exports[`optionsMenu expanded 1`] = ` tabIndex={-1} tooltip={null} tooltipProps={Object {}} - variant="item" >
  • { ]; const dropdownIconItems = [ - - - - + }> Action , - - - - + } isDisabled> Disabled action , - - - - + }> Other action ];