@patternfly/react-core 6.3.0-prerelease.9 → 6.3.1-prerelease.0

package/src/components/Form/InternalFormFieldGroup.tsx

@@ -18,6 +18,11 @@ export interface InternalFormFieldGroupProps extends Omit<React.HTMLProps<HTMLDi
   onToggle?: () => void;
   /** Aria-label to use on the form field group toggle button */
   toggleAriaLabel?: string;
+  /** Flag indicating whether an expandable form field group has animations. This will always render
+   * nested field group content rather than dynamically rendering them. This prop will be removed in
+   * the next breaking change release in favor of defaulting to always-rendered items.
+   */
+  hasAnimations?: boolean;
 }
 
 export const InternalFormFieldGroup: React.FunctionComponent<InternalFormFieldGroupProps> = ({
@@ -28,6 +33,7 @@ export const InternalFormFieldGroup: React.FunctionComponent<InternalFormFieldGr
   isExpanded,
   onToggle,
   toggleAriaLabel,
+  hasAnimations,
   ...props
 }: InternalFormFieldGroupProps) => {
   const headerTitleText = header ? header.props.titleText : null;
@@ -40,7 +46,12 @@ export const InternalFormFieldGroup: React.FunctionComponent<InternalFormFieldGr
   }
   return (
     <div
-      className={css(styles.formFieldGroup, isExpanded && isExpandable && styles.modifiers.expanded, className)}
+      className={css(
+        styles.formFieldGroup,
+        isExpanded && isExpandable && styles.modifiers.expanded,
+        hasAnimations && isExpandable && styles.modifiers.expandable,
+        className
+      )}
       role="group"
       {...(headerTitleText && { 'aria-labelledby': `${header.props.titleText.id}` })}
       {...props}
@@ -59,8 +70,13 @@ export const InternalFormFieldGroup: React.FunctionComponent<InternalFormFieldGr
         </GenerateId>
       )}
       {header && header}
-      {(!isExpandable || (isExpandable && isExpanded)) && (
-        <div className={css(styles.formFieldGroupBody)}>{children}</div>
+      {(!isExpandable || (isExpandable && isExpanded) || (hasAnimations && isExpandable)) && (
+        <div
+          className={css(styles.formFieldGroupBody)}
+          {...(hasAnimations && isExpandable && !isExpanded && { inert: '' })}
+        >
+          {children}
+        </div>
       )}
     </div>
   );

package/src/components/Form/__tests__/FormFieldGroupExpandable.test.tsx

@@ -0,0 +1,55 @@
+import { render, screen } from '@testing-library/react';
+import { FormFieldGroupExpandable } from '../FormFieldGroupExpandable';
+import styles from '@patternfly/react-styles/css/components/Form/form';
+
+test('Does not render children by default', () => {
+  render(<FormFieldGroupExpandable toggleAriaLabel="Toggle label">Child content</FormFieldGroupExpandable>);
+
+  expect(screen.queryByText('Child content')).not.toBeInTheDocument();
+});
+
+test('Renders children when isExpanded is true', () => {
+  render(
+    <FormFieldGroupExpandable isExpanded toggleAriaLabel="Toggle label">
+      Child content
+    </FormFieldGroupExpandable>
+  );
+
+  expect(screen.getByText('Child content')).toBeInTheDocument();
+});
+
+test('Renders children with inert attribute by default when hasAnimations is true', () => {
+  render(
+    <FormFieldGroupExpandable hasAnimations toggleAriaLabel="Toggle label">
+      Child content
+    </FormFieldGroupExpandable>
+  );
+
+  expect(screen.getByText('Child content')).toHaveAttribute('inert', '');
+});
+
+test('Does not render children with inert attribute when hasAnimations and isExpanded are true', () => {
+  render(
+    <FormFieldGroupExpandable hasAnimations isExpanded toggleAriaLabel="Toggle label">
+      Child content
+    </FormFieldGroupExpandable>
+  );
+
+  expect(screen.getByText('Child content')).not.toHaveAttribute('inert');
+});
+
+test(`Does not render with class ${styles.modifiers.expandable} by default`, () => {
+  render(<FormFieldGroupExpandable toggleAriaLabel="Toggle label">Child content</FormFieldGroupExpandable>);
+
+  expect(screen.getByRole('group')).not.toHaveClass(styles.modifiers.expandable);
+});
+
+test(`Renders with class ${styles.modifiers.expandable} when hasAnimations is true`, () => {
+  render(
+    <FormFieldGroupExpandable hasAnimations toggleAriaLabel="Toggle label">
+      Child content
+    </FormFieldGroupExpandable>
+  );
+
+  expect(screen.getByRole('group')).toHaveClass(styles.modifiers.expandable);
+});

package/src/components/Form/examples/FormFieldGroups.tsx

@@ -52,6 +52,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
         <TextInput isRequired id="0-label2" name="0-label2" value={inputValues['0-label2']} onChange={handleChange} />
       </FormGroup>
       <FormFieldGroupExpandable
+        hasAnimations
         isExpanded
         toggleAriaLabel="Details"
         header={
@@ -67,6 +68,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
         }
       >
         <FormFieldGroupExpandable
+          hasAnimations
           isExpanded
           toggleAriaLabel="Details"
           header={
@@ -97,6 +99,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
           </FormGroup>
         </FormFieldGroupExpandable>
         <FormFieldGroupExpandable
+          hasAnimations
           toggleAriaLabel="Details"
           header={
             <FormFieldGroupHeader
@@ -125,6 +128,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
           </FormGroup>
         </FormFieldGroupExpandable>
         <FormFieldGroupExpandable
+          hasAnimations
           toggleAriaLabel="Details"
           header={
             <FormFieldGroupHeader
@@ -173,6 +177,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
         </FormGroup>
       </FormFieldGroupExpandable>
       <FormFieldGroupExpandable
+        hasAnimations
         toggleAriaLabel="Details"
         header={
           <FormFieldGroupHeader
@@ -194,6 +199,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
         </FormGroup>
       </FormFieldGroupExpandable>
       <FormFieldGroupExpandable
+        hasAnimations
         isExpanded
         toggleAriaLabel="Details"
         header={
@@ -273,7 +279,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
         header={
           <FormFieldGroupHeader
             titleText={{ text: 'Field group 4 (non-expandable)', id: 'field-group4-non-expandable-titleText-id' }}
-            titleDescription="Field group 4 description text."
+            titleDescription="Field group 4 description text fdgsdg."
             actions={
               <>
                 <Button variant="link">Delete all</Button> <Button variant="secondary">Add parameter</Button>

package/src/components/Label/Label.tsx

@@ -145,13 +145,75 @@ export const Label: React.FunctionComponent<LabelProps> = ({
   }
 
   useEffect(() => {
+    const onDocMouseDown = (event: MouseEvent) => {
+      if (
+        isEditableActive &&
+        editableInputRef &&
+        editableInputRef.current &&
+        !editableInputRef.current.contains(event.target as Node)
+      ) {
+        if (editableInputRef.current.value) {
+          onEditComplete && onEditComplete(event, editableInputRef.current.value);
+        }
+        setIsEditableActive(false);
+      }
+    };
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      const key = event.key;
+      if (
+        (!isEditableActive &&
+          (!editableButtonRef ||
+            !editableButtonRef.current ||
+            !editableButtonRef.current.contains(event.target as Node))) ||
+        (isEditableActive &&
+          (!editableInputRef || !editableInputRef.current || !editableInputRef.current.contains(event.target as Node)))
+      ) {
+        return;
+      }
+      if (isEditableActive && (key === 'Enter' || key === 'Tab')) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+        if (editableInputRef.current.value) {
+          onEditComplete && onEditComplete(event, editableInputRef.current.value);
+        }
+        setIsEditableActive(false);
+        editableButtonRef?.current?.focus();
+      }
+      if (isEditableActive && key === 'Escape') {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+        // Reset div text to initial children prop - pre-edit
+        if (editableInputRef.current.value) {
+          editableInputRef.current.value = children as string;
+          onEditCancel && onEditCancel(event, children as string);
+        }
+        setIsEditableActive(false);
+        editableButtonRef?.current?.focus();
+      }
+      if (!isEditableActive && key === 'Enter') {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+        setIsEditableActive(true);
+
+        // Set cursor position to end of text
+        const el = event.target as HTMLElement;
+        const range = document.createRange();
+        const sel = window.getSelection();
+        range.selectNodeContents(el);
+        range.collapse(false);
+        sel.removeAllRanges();
+        sel.addRange(range);
+      }
+    };
+
     document.addEventListener('mousedown', onDocMouseDown);
     document.addEventListener('keydown', onKeyDown);
     return () => {
       document.removeEventListener('mousedown', onDocMouseDown);
       document.removeEventListener('keydown', onKeyDown);
     };
-  });
+  }, [isEditableActive, editableInputRef, editableButtonRef, onEditComplete, onEditCancel, children]);
 
   useEffect(() => {
     if (onLabelClick && href) {
@@ -167,68 +229,6 @@ export const Label: React.FunctionComponent<LabelProps> = ({
     }
   }, [onLabelClick, href, isEditable]);
 
-  const onDocMouseDown = (event: MouseEvent) => {
-    if (
-      isEditableActive &&
-      editableInputRef &&
-      editableInputRef.current &&
-      !editableInputRef.current.contains(event.target as Node)
-    ) {
-      if (editableInputRef.current.value) {
-        onEditComplete && onEditComplete(event, editableInputRef.current.value);
-      }
-      setIsEditableActive(false);
-    }
-  };
-
-  const onKeyDown = (event: KeyboardEvent) => {
-    const key = event.key;
-    if (
-      (!isEditableActive &&
-        (!editableButtonRef ||
-          !editableButtonRef.current ||
-          !editableButtonRef.current.contains(event.target as Node))) ||
-      (isEditableActive &&
-        (!editableInputRef || !editableInputRef.current || !editableInputRef.current.contains(event.target as Node)))
-    ) {
-      return;
-    }
-    if (isEditableActive && (key === 'Enter' || key === 'Tab')) {
-      event.preventDefault();
-      event.stopImmediatePropagation();
-      if (editableInputRef.current.value) {
-        onEditComplete && onEditComplete(event, editableInputRef.current.value);
-      }
-      setIsEditableActive(false);
-      editableButtonRef?.current?.focus();
-    }
-    if (isEditableActive && key === 'Escape') {
-      event.preventDefault();
-      event.stopImmediatePropagation();
-      // Reset div text to initial children prop - pre-edit
-      if (editableInputRef.current.value) {
-        editableInputRef.current.value = children as string;
-        onEditCancel && onEditCancel(event, children as string);
-      }
-      setIsEditableActive(false);
-      editableButtonRef?.current?.focus();
-    }
-    if (!isEditableActive && key === 'Enter') {
-      event.preventDefault();
-      event.stopImmediatePropagation();
-      setIsEditableActive(true);
-
-      // Set cursor position to end of text
-      const el = event.target as HTMLElement;
-      const range = document.createRange();
-      const sel = window.getSelection();
-      range.selectNodeContents(el);
-      range.collapse(false);
-      sel.removeAllRanges();
-      sel.addRange(range);
-    }
-  };
-
   const isClickableDisabled = (href || onLabelClick) && isDisabled;
 
   const defaultCloseButton = (

package/src/components/Masthead/examples/MastheadBasic.tsx

@@ -7,13 +7,12 @@ import {
   MastheadContent,
   Button
 } from '@patternfly/react-core';
-import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 
 export const MastheadBasic: React.FunctionComponent = () => (
   <Masthead id="basic-example">
     <MastheadMain>
       <MastheadToggle>
-        <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
+        <Button variant="plain" isHamburger onClick={() => {}} aria-label="Global navigation" />
       </MastheadToggle>
       <MastheadBrand>
         <MastheadLogo component="a">Logo</MastheadLogo>

package/src/components/Masthead/examples/MastheadBasicMixedContent.tsx

@@ -9,13 +9,12 @@ import {
   Flex,
   FlexItem
 } from '@patternfly/react-core';
-import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 
 export const MastheadBasicMixedContent: React.FunctionComponent = () => (
   <Masthead id="basic-mixed">
     <MastheadMain>
       <MastheadToggle>
-        <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
+        <Button variant="plain" isHamburger onClick={() => {}} aria-label="Global navigation" />
       </MastheadToggle>
       <MastheadBrand>
         <MastheadLogo component="a">Logo</MastheadLogo>

package/src/components/Masthead/examples/MastheadDisplayInline.tsx

@@ -7,13 +7,12 @@ import {
   MastheadContent,
   Button
 } from '@patternfly/react-core';
-import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 
 export const MastheadDisplayInline: React.FunctionComponent = () => (
   <Masthead id="inline-masthead" display={{ default: 'inline' }}>
     <MastheadMain>
       <MastheadToggle>
-        <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
+        <Button variant="plain" isHamburger onClick={() => {}} aria-label="Global navigation" />
       </MastheadToggle>
       <MastheadBrand>
         <MastheadLogo component="a">Logo</MastheadLogo>

package/src/components/Masthead/examples/MastheadDisplayStack.tsx

@@ -7,13 +7,12 @@ import {
   MastheadContent,
   Button
 } from '@patternfly/react-core';
-import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 
 export const MastheadDisplayStack: React.FunctionComponent = () => (
   <Masthead id="stack-masthead" display={{ default: 'stack' }}>
     <MastheadMain>
       <MastheadToggle>
-        <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
+        <Button variant="plain" isHamburger onClick={() => {}} aria-label="Global navigation" />
       </MastheadToggle>
       <MastheadBrand>
         <MastheadLogo component="a">Logo</MastheadLogo>

package/src/components/Masthead/examples/MastheadDisplayStackInlineResponsive.tsx

@@ -7,13 +7,12 @@ import {
   MastheadContent,
   Button
 } from '@patternfly/react-core';
-import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 
 export const MastheadDisplayStackInlineResponsive: React.FunctionComponent = () => (
   <Masthead id="stack-inline-masthead" display={{ default: 'inline', lg: 'stack', '2xl': 'inline' }}>
     <MastheadMain>
       <MastheadToggle>
-        <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
+        <Button variant="plain" isHamburger onClick={() => {}} aria-label="Global navigation" />
       </MastheadToggle>
       <MastheadBrand>
         <MastheadLogo component="a">Logo</MastheadLogo>

package/src/components/Masthead/examples/MastheadInsets.tsx

@@ -7,13 +7,12 @@ import {
   MastheadContent,
   Button
 } from '@patternfly/react-core';
-import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 
 export const MastheadInsets: React.FunctionComponent = () => (
   <Masthead id="inset-masthead" inset={{ default: 'insetSm' }}>
     <MastheadMain>
       <MastheadToggle>
-        <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
+        <Button variant="plain" isHamburger onClick={() => {}} aria-label="Global navigation" />
       </MastheadToggle>
       <MastheadBrand>
         <MastheadLogo component="a">Logo</MastheadLogo>

package/src/components/Masthead/examples/MastheadLogoCustomComponent.tsx

@@ -8,14 +8,13 @@ import {
   Button,
   Brand
 } from '@patternfly/react-core';
-import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 import pfIcon from '../../assets/PF-HorizontalLogo-Color.svg';
 
 export const MastheadLogoCustomComponent: React.FunctionComponent = () => (
   <Masthead id="icon-router-link">
     <MastheadMain>
       <MastheadToggle>
-        <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
+        <Button variant="plain" isHamburger onClick={() => {}} aria-label="Global navigation" />
       </MastheadToggle>
       <MastheadBrand>
         <MastheadLogo component={(props) => <a {...props} href="#" />}>

package/src/components/Menu/Menu.tsx

@@ -119,15 +119,15 @@ class MenuBase extends Component<MenuProps, MenuState> {
     if (this.context) {
       this.setState({ disableHover: this.context.disableHover });
     }
-    if (canUseDOM && this.props.containsDrilldown) {
-      window.addEventListener('transitionend', this.props.isRootMenu ? this.handleDrilldownTransition : null);
+    if (canUseDOM && this.props.containsDrilldown && this.props.isRootMenu) {
+      window.addEventListener('transitionend', this.handleDrilldownTransition);
     }
 
     this.allowTabFirstItem();
   }
 
   componentWillUnmount() {
-    if (canUseDOM && this.props.containsDrilldown) {
+    if (canUseDOM && this.props.containsDrilldown && this.props.isRootMenu) {
       window.removeEventListener('transitionend', this.handleDrilldownTransition);
     }
   }

package/src/components/MenuToggle/MenuToggle.tsx

@@ -3,6 +3,7 @@ import styles from '@patternfly/react-styles/css/components/MenuToggle/menu-togg
 import { css } from '@patternfly/react-styles';
 import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
 import { BadgeProps } from '../Badge';
+import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
@@ -44,6 +45,8 @@ export interface MenuToggleProps
   isFullWidth?: boolean;
   /** Flag indicating the toggle contains placeholder text */
   isPlaceholder?: boolean;
+  /** Flag indicating whether the toggle is a settings toggle. This will override the icon property */
+  isSettings?: boolean;
   /** 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 */
@@ -100,6 +103,7 @@ class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
       isFullHeight,
       isFullWidth,
       isPlaceholder,
+      isSettings,
       splitButtonItems,
       variant,
       status,
@@ -144,7 +148,7 @@ class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
 
     const content = (
       <>
-        {icon && <span className={css(styles.menuToggleIcon)}>{icon}</span>}
+        {(icon || isSettings) && <span className={css(styles.menuToggleIcon)}>{isSettings ? <CogIcon /> : icon}</span>}
         {isTypeahead ? children : children && <span className={css(styles.menuToggleText)}>{children}</span>}
         {isValidElement(badge) && <span className={css(styles.menuToggleCount)}>{badge}</span>}
         {isTypeahead ? (
@@ -177,6 +181,7 @@ class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
       isFullWidth && styles.modifiers.fullWidth,
       isDisabled && styles.modifiers.disabled,
       isPlaceholder && styles.modifiers.placeholder,
+      isSettings && styles.modifiers.settings,
       size === MenuToggleSize.sm && styles.modifiers.small,
       className
     );

package/src/components/MenuToggle/__tests__/MenuToggle.test.tsx

@@ -8,7 +8,7 @@ import { render, screen } from '@testing-library/react';
 import styles from '@patternfly/react-styles/css/components/MenuToggle/menu-toggle';
 import '@testing-library/jest-dom';
 
-describe('menu toggle', () => {
+describe('Old Snapshot tests - remove when refactoring', () => {
   test('renders successfully', () => {
     const { asFragment } = render(<MenuToggle>Toggle</MenuToggle>);
     expect(asFragment()).toMatchSnapshot();
@@ -53,54 +53,68 @@ describe('menu toggle', () => {
     const { asFragment } = render(<MenuToggle badge={<Badge>badge</Badge>}>Toggle</MenuToggle>);
     expect(asFragment()).toMatchSnapshot();
   });
+});
 
-  // Old snapshot tests end here; following tests should be kept when refactoring
-  test(`Renders with class ${styles.modifiers.small} when size="sm" is passed`, () => {
-    render(<MenuToggle size="sm">Toggle</MenuToggle>);
-    expect(screen.getByRole('button')).toHaveClass(styles.modifiers.small);
-  });
+test(`Renders with class ${styles.modifiers.small} when size="sm" is passed`, () => {
+  render(<MenuToggle size="sm">Toggle</MenuToggle>);
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.small);
+});
 
-  test(`Renders with class ${styles.modifiers.success} when status="success" is passed`, () => {
-    render(<MenuToggle status="success">Toggle</MenuToggle>);
-    expect(screen.getByRole('button')).toHaveClass(styles.modifiers.success);
-  });
+test(`Renders with class ${styles.modifiers.success} when status="success" is passed`, () => {
+  render(<MenuToggle status="success">Toggle</MenuToggle>);
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.success);
+});
 
-  test(`Renders with class ${styles.modifiers.warning} when status="success" is passed`, () => {
-    render(<MenuToggle status="warning">Toggle</MenuToggle>);
-    expect(screen.getByRole('button')).toHaveClass(styles.modifiers.warning);
-  });
+test(`Renders with class ${styles.modifiers.warning} when status="success" is passed`, () => {
+  render(<MenuToggle status="warning">Toggle</MenuToggle>);
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.warning);
+});
 
-  test(`Renders with class ${styles.modifiers.danger} when status="success" is passed`, () => {
-    render(<MenuToggle status="danger">Toggle</MenuToggle>);
-    expect(screen.getByRole('button')).toHaveClass(styles.modifiers.danger);
-  });
+test(`Renders with class ${styles.modifiers.danger} when status="success" is passed`, () => {
+  render(<MenuToggle status="danger">Toggle</MenuToggle>);
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.danger);
+});
 
-  test('split toggle passes onClick', async () => {
-    const mockClick = jest.fn();
-    const user = userEvent.setup();
-
-    render(
-      <MenuToggle
-        onClick={mockClick}
-        splitButtonItems={[
-          <MenuToggleCheckbox
-            id="split-button-checkbox-with-text-disabled-example"
-            key="split-checkbox-with-text-disabled"
-            aria-label="Select all"
-          >
-            10 selected
-          </MenuToggleCheckbox>
-        ]}
-        aria-label="Menu toggle with checkbox split button and text"
-      />
-    );
-
-    await user.click(screen.getByRole(`button`) as Element);
-    expect(mockClick).toHaveBeenCalled();
-  });
+test('split toggle passes onClick', async () => {
+  const mockClick = jest.fn();
+  const user = userEvent.setup();
+
+  render(
+    <MenuToggle
+      onClick={mockClick}
+      splitButtonItems={[
+        <MenuToggleCheckbox
+          id="split-button-checkbox-with-text-disabled-example"
+          key="split-checkbox-with-text-disabled"
+          aria-label="Select all"
+        >
+          10 selected
+        </MenuToggleCheckbox>
+      ]}
+      aria-label="Menu toggle with checkbox split button and text"
+    />
+  );
+
+  await user.click(screen.getByRole(`button`) as Element);
+  expect(mockClick).toHaveBeenCalled();
+});
 
-  test(`Renders with class ${styles.modifiers.placeholder} when isPlaceholder is passed`, () => {
-    render(<MenuToggle isPlaceholder>Toggle</MenuToggle>);
-    expect(screen.getByRole('button')).toHaveClass(styles.modifiers.placeholder);
-  });
+test(`Renders with class ${styles.modifiers.placeholder} when isPlaceholder is passed`, () => {
+  render(<MenuToggle isPlaceholder>Toggle</MenuToggle>);
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.placeholder);
+});
+
+test(`Renders with class ${styles.modifiers.settings} when isSettings is passed`, () => {
+  render(<MenuToggle isSettings>Settings</MenuToggle>);
+
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.settings);
+});
+
+test('Does not render custom icon when icon prop and isSettings are passed', () => {
+  render(
+    <MenuToggle isSettings icon={<div>Custom icon</div>}>
+      Settings
+    </MenuToggle>
+  );
+  expect(screen.queryByText('Custom icon')).not.toBeInTheDocument();
 });