diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 1bfb48f8535..bcf724a80f0 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.7.0" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-prerelease.13", + "@patternfly/patternfly": "6.0.0-prerelease.15", "case-anything": "^2.1.13", "css": "^3.0.0", "fs-extra": "^11.2.0" diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx index 1fa0bd2f413..2f3413a8e03 100644 --- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx +++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx @@ -21,13 +21,6 @@ export enum MenuToggleSize { export type MenuToggleElement = HTMLDivElement | HTMLButtonElement; -export interface SplitButtonOptions { - /** Elements to display before the toggle button. When included, renders the menu toggle as a split button. */ - items: React.ReactNode[]; - /** Variant of split button toggle */ - variant?: 'action' | 'checkbox'; -} - export interface MenuToggleProps extends Omit< React.DetailedHTMLProps< @@ -51,8 +44,8 @@ export interface MenuToggleProps isFullWidth?: boolean; /** Flag indicating the toggle contains placeholder text */ isPlaceholder?: boolean; - /** Object used to configure a split button menu toggle */ - splitButtonOptions?: SplitButtonOptions; + /** Elements to display before the toggle button. When included, renders the menu toggle as a split button. */ + splitButtonItems?: React.ReactNode[]; /** Variant styles of the menu toggle */ variant?: 'default' | 'plain' | 'primary' | 'plainText' | 'secondary' | 'typeahead'; /** Status styles of the menu toggle */ @@ -107,7 +100,7 @@ class MenuToggleBase extends React.Component { isFullHeight, isFullWidth, isPlaceholder, - splitButtonOptions, + splitButtonItems, variant, status, statusIcon, @@ -204,17 +197,10 @@ class MenuToggleBase extends React.Component { ); } - if (splitButtonOptions) { + if (splitButtonItems) { return ( -
} - className={css( - commonStyles, - styles.modifiers.splitButton, - splitButtonOptions?.variant === 'action' && styles.modifiers.action - )} - > - {splitButtonOptions?.items} +
} className={css(commonStyles, styles.modifiers.splitButton)}> + {splitButtonItems}