diff --git a/packages/react-core/src/components/Dropdown/DropdownItem.tsx b/packages/react-core/src/components/Dropdown/DropdownItem.tsx index 27b03562291..cb979adbf0c 100644 --- a/packages/react-core/src/components/Dropdown/DropdownItem.tsx +++ b/packages/react-core/src/components/Dropdown/DropdownItem.tsx @@ -27,8 +27,6 @@ export interface DropdownItemProps extends Omit { static defaultProps: DropdownMenuProps = { className: '', isOpen: true, - openedOnEnter: false, autoFocus: true, position: DropdownPosition.left, component: 'ul', @@ -179,8 +176,6 @@ export class DropdownMenu extends React.Component { component, isGrouped, setMenuComponentRef, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - openedOnEnter, alignments, ...props } = this.props; diff --git a/packages/react-core/src/components/Dropdown/DropdownToggle.tsx b/packages/react-core/src/components/Dropdown/DropdownToggle.tsx index cea80840736..2388f447807 100644 --- a/packages/react-core/src/components/Dropdown/DropdownToggle.tsx +++ b/packages/react-core/src/components/Dropdown/DropdownToggle.tsx @@ -29,8 +29,6 @@ export interface DropdownToggleProps extends React.HTMLProps, isText?: boolean; /** Whether or not the
has a disabled state */ isDisabled?: boolean; - /** @deprecated Use `toggleVariant` instead. Whether or not the dropdown toggle button should have primary button styling */ - isPrimary?: boolean; /** Alternate styles for the dropdown toggle button */ toggleVariant?: 'primary' | 'secondary' | 'default'; /** An image to display within the dropdown toggle, appearing before any component children */ @@ -65,7 +63,6 @@ export const DropdownToggle: React.FunctionComponent = ({ isDisabled = false, isPlain = false, isText = false, - isPrimary = false, toggleVariant = 'default', // eslint-disable-next-line @typescript-eslint/no-unused-vars isActive = false, @@ -97,7 +94,6 @@ export const DropdownToggle: React.FunctionComponent = ({ isDisabled={isDisabled} isPlain={isPlain} isText={isText} - isPrimary={isPrimary} toggleVariant={toggleVariant} onToggle={onToggle} aria-haspopup={ariaHasPopup} @@ -123,7 +119,7 @@ export const DropdownToggle: React.FunctionComponent = ({ styles.dropdownToggle, styles.modifiers.splitButton, splitButtonVariant === 'action' && styles.modifiers.action, - (toggleVariant === 'primary' || isPrimary) && splitButtonVariant === 'action' && styles.modifiers.primary, + toggleVariant === 'primary' && splitButtonVariant === 'action' && styles.modifiers.primary, toggleVariant === 'secondary' && splitButtonVariant === 'action' && styles.modifiers.secondary, isDisabled && styles.modifiers.disabled )} diff --git a/packages/react-core/src/components/Dropdown/Toggle.tsx b/packages/react-core/src/components/Dropdown/Toggle.tsx index 3b1d9175537..e5831f03ae1 100644 --- a/packages/react-core/src/components/Dropdown/Toggle.tsx +++ b/packages/react-core/src/components/Dropdown/Toggle.tsx @@ -35,8 +35,6 @@ export interface ToggleProps { isPlain?: boolean; /** Display the toggle in text only mode */ isText?: boolean; - /** @deprecated Use `toggleVariant` instead. Display the toggle with a primary button style */ - isPrimary?: boolean; /** Style the toggle as a child of a split button */ isSplitButton?: boolean; /** Alternate styles for the dropdown toggle button */ @@ -64,7 +62,6 @@ export class Toggle extends React.Component { isDisabled: false, isPlain: false, isText: false, - isPrimary: false, isSplitButton: false, onToggle: () => {}, onEnter: () => {}, @@ -138,7 +135,6 @@ export class Toggle extends React.Component { isDisabled, isPlain, isText, - isPrimary, isSplitButton, toggleVariant, onToggle, @@ -166,7 +162,6 @@ export class Toggle extends React.Component { isActive && styles.modifiers.active, isPlain && styles.modifiers.plain, isText && styles.modifiers.text, - isPrimary && styles.modifiers.primary, toggleVariant && buttonVariantStyles[toggleVariant], className )}