From 6aecf2ece6b5ea46004045e0126690cee1e96b8b Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Thu, 23 Oct 2025 09:17:10 -0400
Subject: [PATCH 1/7] feat(Button): added circle variant

---
 .../src/components/Button/Button.tsx          |  4 ++
 .../src/components/Button/examples/Button.md  |  8 +++
 .../Button/examples/ButtonCircle.tsx          | 62 +++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 packages/react-core/src/components/Button/examples/ButtonCircle.tsx

diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index dbd8c50c6bb..39b697cd785 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -107,6 +107,8 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   isHamburger?: boolean;
   /** Adjusts and animates the hamburger icon to indicate what will happen upon clicking the button. */
   hamburgerVariant?: 'expand' | 'collapse';
+  /** Flag indicating the button is a circle button. Intended for buttons that only contain an icon.. */
+  isCircle?: boolean;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Adds count number to button */
@@ -131,6 +133,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
   isSettings,
   isHamburger,
   hamburgerVariant,
+  isCircle,
   spinnerAriaValueText,
   spinnerAriaLabelledBy,
   spinnerAriaLabel,
@@ -261,6 +264,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
         variant === ButtonVariant.stateful && styles.modifiers[state],
         size === ButtonSize.sm && styles.modifiers.small,
         size === ButtonSize.lg && styles.modifiers.displayLg,
+        isCircle && 'pf-m-circle',
         className
       )}
       disabled={isButtonElement ? isDisabled : null}
diff --git a/packages/react-core/src/components/Button/examples/Button.md b/packages/react-core/src/components/Button/examples/Button.md
index 7b5f667a4e6..e0ae6ca1c20 100644
--- a/packages/react-core/src/components/Button/examples/Button.md
+++ b/packages/react-core/src/components/Button/examples/Button.md
@@ -138,6 +138,14 @@ Stateful buttons are ideal for displaying the state of notifications. Use `varia
 
 ```
 
+### Circle buttons
+
+Pass `isCircle` to a button to modify its styling from simply rounded corners to complete circles. Circle buttons are intended for buttons that only contain an icon and adequate accessible naming.
+
+```ts file="./ButtonCircle.tsx"
+
+```
+
 ## Animated examples
 
 The following `<Button>` implementations have animations built into them. When using one of the following implementations, the `icon` property will be overridden due to the animations needing specific icons internally.
diff --git a/packages/react-core/src/components/Button/examples/ButtonCircle.tsx b/packages/react-core/src/components/Button/examples/ButtonCircle.tsx
new file mode 100644
index 00000000000..0b1a1e0b091
--- /dev/null
+++ b/packages/react-core/src/components/Button/examples/ButtonCircle.tsx
@@ -0,0 +1,62 @@
+import { Button, Flex } from '@patternfly/react-core';
+import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
+import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
+import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
+import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
+
+interface LoadingPropsType {
+  spinnerAriaValueText: string;
+  spinnerAriaLabelledBy?: string;
+  spinnerAriaLabel?: string;
+  isLoading: boolean;
+}
+
+export const ButtonCircle: React.FunctionComponent = () => {
+  const [isUploading, setIsUploading] = useState<boolean>(false);
+
+  const uploadingProps = {} as LoadingPropsType;
+  uploadingProps.spinnerAriaValueText = 'Loading circle variant example';
+  uploadingProps.spinnerAriaLabel = 'Uploading circle variant example data';
+  uploadingProps.isLoading = isUploading;
+
+  return (
+    <Flex columnGap={{ default: 'columnGapSm' }}>
+      <Button isCircle icon={<PlusCircleIcon />} aria-label="Add primary circle variant example" />
+      <Button
+        variant="secondary"
+        isCircle
+        icon={<PlusCircleIcon />}
+        aria-label="Add secondary circle variant example"
+      />
+      <Button variant="tertiary" isCircle icon={<PlusCircleIcon />} aria-label="Add tertiary circle variant example" />
+      <Button variant="danger" isCircle icon={<PlusCircleIcon />} aria-label="Add danger circle variant example" />
+      <Button variant="warning" isCircle icon={<PlusCircleIcon />} aria-label="Add warning circle variant example" />
+      <Button variant="link" isCircle icon={<PlusCircleIcon />} aria-label="Add link circle variant example" />
+      <Button variant="control" isCircle icon={<CopyIcon />} aria-label="Copy control circle variant example" />
+      <Button variant="plain" isCircle icon={<TimesIcon />} aria-label="Remove plain circle variant example" />
+      <Button variant="stateful" isCircle icon={<BellIcon />} aria-label="Stateful unread circle variant example" />
+      <Button
+        variant="stateful"
+        state="read"
+        isCircle
+        icon={<BellIcon />}
+        aria-label="Stateful read circle variant example"
+      />
+      <Button
+        variant="stateful"
+        state="attention"
+        isCircle
+        icon={<BellIcon />}
+        aria-label="Stateful attention circle variant example"
+      />
+      <Button
+        variant="plain"
+        {...(!isUploading && { 'aria-label': 'Upload circle variant example' })}
+        onClick={() => setIsUploading(!isUploading)}
+        icon={<UploadIcon />}
+        {...uploadingProps}
+      />
+    </Flex>
+  );
+};

From fc895a52112e0a2f7d0c8df75b5da8370020ff99 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Thu, 23 Oct 2025 09:28:16 -0400
Subject: [PATCH 2/7] Added test

---
 .../src/components/Button/__tests__/Button.test.tsx          | 5 +++++
 .../Button/__tests__/__snapshots__/Button.test.tsx.snap      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/react-core/src/components/Button/__tests__/Button.test.tsx b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
index e7b2a50c7c5..7db5ea893aa 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -214,6 +214,11 @@ test(`Renders without class ${styles.modifiers.progress} when isLoading = false
   expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.progress);
 });
 
+test(`Renders with class pf-m-circle when isCircle is true`, () => {
+  render(<Button isCircle>Circle Button</Button>);
+  expect(screen.getByRole('button')).toHaveClass('pf-m-circle');
+});
+
 test(`Renders custom icon with class ${styles.modifiers.inProgress} when isLoading = true and icon is present`, () => {
   render(
     <Button variant="plain" isLoading aria-label="Upload" spinnerAriaValueText="Loading" icon={<div>ICON</div>} />
diff --git a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
index 16c86ef752a..55b9cd9fa17 100644
--- a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
+++ b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`Renders basic button 1`] = `
   <button
     aria-label="basic button"
     class="pf-v6-c-button pf-m-primary"
-    data-ouia-component-id="OUIA-Generated-Button-primary-66"
+    data-ouia-component-id="OUIA-Generated-Button-primary-67"
     data-ouia-component-type="PF6/Button"
     data-ouia-safe="true"
     type="button"

From 4e31acb9a65c47e0e35dbebd656b772297038150 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Thu, 23 Oct 2025 09:59:43 -0400
Subject: [PATCH 3/7] Updated prop to beta

---
 packages/react-core/src/components/Button/Button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 39b697cd785..f371686bb19 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -107,7 +107,7 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   isHamburger?: boolean;
   /** Adjusts and animates the hamburger icon to indicate what will happen upon clicking the button. */
   hamburgerVariant?: 'expand' | 'collapse';
-  /** Flag indicating the button is a circle button. Intended for buttons that only contain an icon.. */
+  /** @beta Flag indicating the button is a circle button. Intended for buttons that only contain an icon.. */
   isCircle?: boolean;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;

From 5c99f04304b16f70ef1bd451bdc4d2b7fb9f5e9c Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Fri, 24 Oct 2025 14:51:21 -0400
Subject: [PATCH 4/7] Added prop to menu toggle

---
 .../src/components/MenuToggle/MenuToggle.tsx  |  6 +++++-
 .../MenuToggle/__tests__/MenuToggle.test.tsx  | 20 +++++++++++++++++++
 .../MenuToggle/examples/MenuToggle.md         | 18 +++++++++++++++++
 .../examples/MenuTogglePlainCircle.tsx        | 11 ++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 packages/react-core/src/components/MenuToggle/examples/MenuTogglePlainCircle.tsx

diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index 941378ed5e1..5ad3ba88f5e 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -45,6 +45,8 @@ export interface MenuToggleProps
   isFullWidth?: boolean;
   /** Flag indicating the toggle contains placeholder text */
   isPlaceholder?: boolean;
+  /** @beta Flag indicating the toggle has circular styling. Can only be applied to plain toggles. */
+  isCircle?: 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. */
@@ -84,6 +86,7 @@ class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
     isFullWidth: false,
     isFullHeight: false,
     isPlaceholder: false,
+    isCircle: false,
     size: 'default',
     ouiaSafe: true
   };
@@ -103,6 +106,7 @@ class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
       isFullHeight,
       isFullWidth,
       isPlaceholder,
+      isCircle,
       isSettings,
       splitButtonItems,
       variant,
@@ -225,7 +229,7 @@ class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
 
     return (
       <button
-        className={css(commonStyles)}
+        className={css(commonStyles, isCircle && isPlain && 'pf-m-circle')}
         type="button"
         aria-label={ariaLabel}
         aria-expanded={isExpanded}
diff --git a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
index f56899cf29f..885f8a15462 100644
--- a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
+++ b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
@@ -55,6 +55,8 @@ describe('Old Snapshot tests - remove when refactoring', () => {
   });
 });
 
+const toggleVariants = ['default', 'plain', 'primary', 'plainText', 'secondary', 'typeahead'];
+
 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);
@@ -110,6 +112,24 @@ test(`Renders with class ${styles.modifiers.settings} when isSettings is passed`
   expect(screen.getByRole('button')).toHaveClass(styles.modifiers.settings);
 });
 
+test(`Renders with class pf-m-circle when variant="plain" and isCircle is true`, () => {
+  render(<MenuToggle isCircle variant="plain" aria-label="Toggle"></MenuToggle>);
+  expect(screen.getByRole('button')).toHaveClass('pf-m-circle');
+});
+
+toggleVariants
+  .filter((variant) => variant !== 'plain')
+  .forEach((variant) => {
+    test(`Does not with class pf-m-circle when variant="${variant}" and isCircle is true`, () => {
+      render(
+        <MenuToggle isCircle variant={variant as 'default' | 'primary' | 'plainText' | 'secondary' | 'typeahead'}>
+          Toggle
+        </MenuToggle>
+      );
+      expect(screen.getByRole('button')).not.toHaveClass('pf-m-circle');
+    });
+  });
+
 test('Does not render custom icon when icon prop and isSettings are passed', () => {
   render(
     <MenuToggle isSettings icon={<div>Custom icon</div>}>
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md b/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md
index 45b4f6690b6..99cb120b0a5 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md
@@ -20,6 +20,7 @@ import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 A toggle is collapsed until it is selected by a user.
 
 ```ts file="MenuToggleCollapsed.tsx"
+
 ```
 
 ### Expanded toggle
@@ -27,6 +28,7 @@ A toggle is collapsed until it is selected by a user.
 When a user selects a toggle, it becomes expanded and is styled with a blue underline. To flag expanded toggles, and apply expanded styling, use the `isExpanded` property .
 
 ```ts file ="MenuToggleExpanded.tsx"
+
 ```
 
 ### Small toggle
@@ -42,6 +44,7 @@ You can pass `size="sm"` to a MenuToggle to style it as a small toggle, such as
 To disable the selection and expansion of a toggle, use the `isDisabled` property.
 
 ```ts file="MenuToggleDisabled.tsx"
+
 ```
 
 ### With a badge
@@ -49,6 +52,7 @@ To disable the selection and expansion of a toggle, use the `isDisabled` propert
 To display a count of selected items in a toggle, use the `badge` property. You can also pass in `variant="plainText"` for a badge only toggle.
 
 ```ts file="MenuToggleBadge.tsx"
+
 ```
 
 ### Settings toggle
@@ -76,6 +80,7 @@ You can also pass images into the `icon` property. The following example passes
 This can be used alongside a text label that provides more context for the image.
 
 ```ts file="MenuToggleAvatarText.tsx"
+
 ```
 
 ### Variant styles
@@ -83,6 +88,7 @@ This can be used alongside a text label that provides more context for the image
 Variant styling can be applied to menu toggles. In the following example, the toggle uses primary styling by passing `variant="primary"` into the `<MenuToggle>` component. Additional variant options include “default”, “plain”, “plainText”, “secondary”, and “typeahead”.
 
 ```ts file="MenuToggleVariantStyles.tsx"
+
 ```
 
 ### Plain toggle with icon
@@ -92,6 +98,15 @@ To apply plain styling to a menu toggle with an icon, pass in `variant="plain"`.
 If the toggle does not have any visible text content, use the `aria-label` property to provide an accessible name.
 
 ```ts file="MenuTogglePlainIcon.tsx"
+
+```
+
+### Plain circle toggle
+
+You can also pass the `isCircle` property to a plain, icon-only toggle to adjust the styling to a complete circular shape, rather than a rounded square.
+
+```ts file="MenuTogglePlainCircle.tsx"
+
 ```
 
 ### Plain toggle with text label
@@ -99,6 +114,7 @@ If the toggle does not have any visible text content, use the `aria-label` prope
 To apply plain styling to a menu toggle with a text label, pass in `variant="plainText"`. Unlike the “plain” variant, “plainText” adds a caret pointing down in the toggle.
 
 ```ts file="MenuTogglePlainTextLabel.tsx"
+
 ```
 
 ### Split toggle with checkbox
@@ -150,6 +166,7 @@ A full height toggle fills the height of its parent. To flag a full height toggl
 In the following example, the toggle fills the size of the "80px" `<div>` element that it is within.
 
 ```ts file="MenuToggleFullHeight.tsx"
+
 ```
 
 ### Full width toggle
@@ -159,6 +176,7 @@ A full width toggle fills the width of its parent. To flag a full width toggle,
 In the following example, the toggle fills the width of its parent as the window size changes.
 
 ```ts file="MenuToggleFullWidth.tsx"
+
 ```
 
 ### Typeahead toggle
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuTogglePlainCircle.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuTogglePlainCircle.tsx
new file mode 100644
index 00000000000..bf5fb30aae4
--- /dev/null
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuTogglePlainCircle.tsx
@@ -0,0 +1,11 @@
+import { Fragment } from 'react';
+import { MenuToggle } from '@patternfly/react-core';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
+
+export const MenuTogglePlainCircle: React.FunctionComponent = () => (
+  <Fragment>
+    <MenuToggle isCircle icon={<EllipsisVIcon />} variant="plain" aria-label="plain circle kebab" />{' '}
+    <MenuToggle isCircle icon={<EllipsisVIcon />} variant="plain" isExpanded aria-label="plain circle expanded kebab" />{' '}
+    <MenuToggle isCircle icon={<EllipsisVIcon />} variant="plain" isDisabled aria-label="disabled plain circle kebab" />
+  </Fragment>
+);

From 19540196ebe1182cab0e580ef185274046d4cfa9 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Mon, 27 Oct 2025 15:02:40 -0400
Subject: [PATCH 5/7] Bumped core to pull in styles

---
 packages/react-core/package.json              |  2 +-
 .../src/components/Button/Button.tsx          |  2 +-
 .../Button/__tests__/Button.test.tsx          |  4 ++--
 .../src/components/MenuToggle/MenuToggle.tsx  |  2 +-
 .../MenuToggle/__tests__/MenuToggle.test.tsx  |  8 ++++----
 packages/react-docs/package.json              |  2 +-
 packages/react-icons/package.json             |  2 +-
 packages/react-styles/package.json            |  2 +-
 packages/react-tokens/package.json            |  4 ++--
 yarn.lock                                     | 20 +++++++++----------
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index d26c696fda1..f64851aced4 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -54,7 +54,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.3",
+    "@patternfly/patternfly": "6.5.0-prerelease.6",
     "case-anything": "^3.1.2",
     "css": "^3.0.0",
     "fs-extra": "^11.3.0"
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index f371686bb19..86b40f66826 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -264,7 +264,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
         variant === ButtonVariant.stateful && styles.modifiers[state],
         size === ButtonSize.sm && styles.modifiers.small,
         size === ButtonSize.lg && styles.modifiers.displayLg,
-        isCircle && 'pf-m-circle',
+        isCircle && styles.modifiers.circle,
         className
       )}
       disabled={isButtonElement ? isDisabled : null}
diff --git a/packages/react-core/src/components/Button/__tests__/Button.test.tsx b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
index 7db5ea893aa..2c6ec2bf4a6 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -214,9 +214,9 @@ test(`Renders without class ${styles.modifiers.progress} when isLoading = false
   expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.progress);
 });
 
-test(`Renders with class pf-m-circle when isCircle is true`, () => {
+test(`Renders with class ${styles.modifiers.circle} when isCircle is true`, () => {
   render(<Button isCircle>Circle Button</Button>);
-  expect(screen.getByRole('button')).toHaveClass('pf-m-circle');
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.circle);
 });
 
 test(`Renders custom icon with class ${styles.modifiers.inProgress} when isLoading = true and icon is present`, () => {
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index 5ad3ba88f5e..a707417af8a 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -229,7 +229,7 @@ class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
 
     return (
       <button
-        className={css(commonStyles, isCircle && isPlain && 'pf-m-circle')}
+        className={css(commonStyles, isCircle && isPlain && styles.modifiers.circle)}
         type="button"
         aria-label={ariaLabel}
         aria-expanded={isExpanded}
diff --git a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
index 885f8a15462..2adbeda6b5e 100644
--- a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
+++ b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
@@ -112,21 +112,21 @@ test(`Renders with class ${styles.modifiers.settings} when isSettings is passed`
   expect(screen.getByRole('button')).toHaveClass(styles.modifiers.settings);
 });
 
-test(`Renders with class pf-m-circle when variant="plain" and isCircle is true`, () => {
+test(`Renders with class ${styles.modifiers.circle} when variant="plain" and isCircle is true`, () => {
   render(<MenuToggle isCircle variant="plain" aria-label="Toggle"></MenuToggle>);
-  expect(screen.getByRole('button')).toHaveClass('pf-m-circle');
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.circle);
 });
 
 toggleVariants
   .filter((variant) => variant !== 'plain')
   .forEach((variant) => {
-    test(`Does not with class pf-m-circle when variant="${variant}" and isCircle is true`, () => {
+    test(`Does not with class ${styles.modifiers.circle} when variant="${variant}" and isCircle is true`, () => {
       render(
         <MenuToggle isCircle variant={variant as 'default' | 'primary' | 'plainText' | 'secondary' | 'typeahead'}>
           Toggle
         </MenuToggle>
       );
-      expect(screen.getByRole('button')).not.toHaveClass('pf-m-circle');
+      expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.circle);
     });
   });
 
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index badd572d022..811d1f82208 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -23,7 +23,7 @@
     "test:a11y": "patternfly-a11y --config patternfly-a11y.config"
   },
   "dependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.3",
+    "@patternfly/patternfly": "6.5.0-prerelease.6",
     "@patternfly/react-charts": "workspace:^",
     "@patternfly/react-code-editor": "workspace:^",
     "@patternfly/react-core": "workspace:^",
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
index b19c6856e55..552fe9c1c68 100644
--- a/packages/react-icons/package.json
+++ b/packages/react-icons/package.json
@@ -33,7 +33,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-regular-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@patternfly/patternfly": "6.5.0-prerelease.3",
+    "@patternfly/patternfly": "6.5.0-prerelease.6",
     "fs-extra": "^11.3.0",
     "tslib": "^2.8.1"
   },
diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json
index a258db9bb01..84bcde0a1aa 100644
--- a/packages/react-styles/package.json
+++ b/packages/react-styles/package.json
@@ -19,7 +19,7 @@
     "clean": "rimraf dist css"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.3",
+    "@patternfly/patternfly": "6.5.0-prerelease.6",
     "change-case": "^5.4.4",
     "fs-extra": "^11.3.0"
   },
diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json
index 1dd5fd46f75..742c927d482 100644
--- a/packages/react-tokens/package.json
+++ b/packages/react-tokens/package.json
@@ -29,8 +29,8 @@
     "clean": "rimraf dist"
   },
   "devDependencies": {
-    "@adobe/css-tools": "^4.4.2",
-    "@patternfly/patternfly": "6.5.0-prerelease.3",
+    "@adobe/css-tools": "^4.4.4",
+    "@patternfly/patternfly": "6.5.0-prerelease.6",
     "fs-extra": "^11.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index bbb1b76746f..e225f38df1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4517,10 +4517,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/patternfly@npm:6.5.0-prerelease.3":
-  version: 6.5.0-prerelease.3
-  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.3"
-  checksum: 10c0/673d6822de21bfac92cb872389b52615dd808d0c8b11d30c3bd57e36a03cfaa5f17da27f5a23d36cecaa55beb801c64457c123192546e1179825fd6745a8abb3
+"@patternfly/patternfly@npm:6.5.0-prerelease.6":
+  version: 6.5.0-prerelease.6
+  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.6"
+  checksum: 10c0/21083cc613ac17d7a06742fc7357f087a2461d8b8cb3e05488be6bbf5f665566b53c55ec827d71d0b59b82a3d136c80ddef6b90d2c5a30a71763df5ce1a53895
   languageName: node
   linkType: hard
 
@@ -4618,7 +4618,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-core@workspace:packages/react-core"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.3"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
     "@patternfly/react-icons": "workspace:^"
     "@patternfly/react-styles": "workspace:^"
     "@patternfly/react-tokens": "workspace:^"
@@ -4639,7 +4639,7 @@ __metadata:
   resolution: "@patternfly/react-docs@workspace:packages/react-docs"
   dependencies:
     "@patternfly/documentation-framework": "npm:^6.22.8"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.3"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
     "@patternfly/patternfly-a11y": "npm:5.1.0"
     "@patternfly/react-charts": "workspace:^"
     "@patternfly/react-code-editor": "workspace:^"
@@ -4679,7 +4679,7 @@ __metadata:
     "@fortawesome/free-brands-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-regular-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-solid-svg-icons": "npm:^5.15.4"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.3"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
     fs-extra: "npm:^11.3.0"
     tslib: "npm:^2.8.1"
   peerDependencies:
@@ -4764,7 +4764,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-styles@workspace:packages/react-styles"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.3"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
     change-case: "npm:^5.4.4"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
@@ -4805,8 +4805,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-tokens@workspace:packages/react-tokens"
   dependencies:
-    "@adobe/css-tools": "npm:^4.4.2"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.3"
+    "@adobe/css-tools": "npm:^4.4.4"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
   linkType: soft

From e5239cb17cb9b42070459ba33627b99d20524e22 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Mon, 27 Oct 2025 15:41:49 -0400
Subject: [PATCH 6/7] Added prop to example

---
 .../react-core/src/components/Button/examples/ButtonCircle.tsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-core/src/components/Button/examples/ButtonCircle.tsx b/packages/react-core/src/components/Button/examples/ButtonCircle.tsx
index 0b1a1e0b091..b5d4236b0e0 100644
--- a/packages/react-core/src/components/Button/examples/ButtonCircle.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonCircle.tsx
@@ -52,6 +52,7 @@ export const ButtonCircle: React.FunctionComponent = () => {
       />
       <Button
         variant="plain"
+        isCircle
         {...(!isUploading && { 'aria-label': 'Upload circle variant example' })}
         onClick={() => setIsUploading(!isUploading)}
         icon={<UploadIcon />}

From 25c23b00bfb095b30bc443b523760210238268f5 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Tue, 28 Oct 2025 15:06:18 -0400
Subject: [PATCH 7/7] Bumped to core 6.5 prerelease 9

---
 packages/react-core/package.json   |  2 +-
 packages/react-docs/package.json   |  2 +-
 packages/react-icons/package.json  |  2 +-
 packages/react-styles/package.json |  2 +-
 packages/react-tokens/package.json |  2 +-
 yarn.lock                          | 26 +++++++++++++-------------
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index f64851aced4..4b83bf814f9 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -54,7 +54,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.6",
+    "@patternfly/patternfly": "6.5.0-prerelease.9",
     "case-anything": "^3.1.2",
     "css": "^3.0.0",
     "fs-extra": "^11.3.0"
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 811d1f82208..f8294c3bf7d 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -23,7 +23,7 @@
     "test:a11y": "patternfly-a11y --config patternfly-a11y.config"
   },
   "dependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.6",
+    "@patternfly/patternfly": "6.5.0-prerelease.9",
     "@patternfly/react-charts": "workspace:^",
     "@patternfly/react-code-editor": "workspace:^",
     "@patternfly/react-core": "workspace:^",
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
index 552fe9c1c68..d1b39fc827b 100644
--- a/packages/react-icons/package.json
+++ b/packages/react-icons/package.json
@@ -33,7 +33,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-regular-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@patternfly/patternfly": "6.5.0-prerelease.6",
+    "@patternfly/patternfly": "6.5.0-prerelease.9",
     "fs-extra": "^11.3.0",
     "tslib": "^2.8.1"
   },
diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json
index 84bcde0a1aa..0034ed828e3 100644
--- a/packages/react-styles/package.json
+++ b/packages/react-styles/package.json
@@ -19,7 +19,7 @@
     "clean": "rimraf dist css"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.6",
+    "@patternfly/patternfly": "6.5.0-prerelease.9",
     "change-case": "^5.4.4",
     "fs-extra": "^11.3.0"
   },
diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json
index 742c927d482..7d6fe39310f 100644
--- a/packages/react-tokens/package.json
+++ b/packages/react-tokens/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@adobe/css-tools": "^4.4.4",
-    "@patternfly/patternfly": "6.5.0-prerelease.6",
+    "@patternfly/patternfly": "6.5.0-prerelease.9",
     "fs-extra": "^11.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index e225f38df1c..021ef07ed8b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,10 +12,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/css-tools@npm:^4.4.2":
-  version: 4.4.3
-  resolution: "@adobe/css-tools@npm:4.4.3"
-  checksum: 10c0/6d16c4d4b6752d73becf6e58611f893c7ed96e04017ff7084310901ccdbe0295171b722b158f6a2b0aa77182ef3446ffd62b39488fa5a7adab1f0dfe5ffafbae
+"@adobe/css-tools@npm:^4.4.4":
+  version: 4.4.4
+  resolution: "@adobe/css-tools@npm:4.4.4"
+  checksum: 10c0/8f3e6cfaa5e6286e6f05de01d91d060425be2ebaef490881f5fe6da8bbdb336835c5d373ea337b0c3b0a1af4be048ba18780f0f6021d30809b4545922a7e13d9
   languageName: node
   linkType: hard
 
@@ -4517,10 +4517,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/patternfly@npm:6.5.0-prerelease.6":
-  version: 6.5.0-prerelease.6
-  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.6"
-  checksum: 10c0/21083cc613ac17d7a06742fc7357f087a2461d8b8cb3e05488be6bbf5f665566b53c55ec827d71d0b59b82a3d136c80ddef6b90d2c5a30a71763df5ce1a53895
+"@patternfly/patternfly@npm:6.5.0-prerelease.9":
+  version: 6.5.0-prerelease.9
+  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.9"
+  checksum: 10c0/f3ab8f6b9a94409bffb57a9d56a823a0c4bd639c284620c33ccb7302ffddeff6d4b54bac7314da4f10cfd330177236b5504a85ce743a997d02c2bf992e8f52c3
   languageName: node
   linkType: hard
 
@@ -4618,7 +4618,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-core@workspace:packages/react-core"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.9"
     "@patternfly/react-icons": "workspace:^"
     "@patternfly/react-styles": "workspace:^"
     "@patternfly/react-tokens": "workspace:^"
@@ -4639,7 +4639,7 @@ __metadata:
   resolution: "@patternfly/react-docs@workspace:packages/react-docs"
   dependencies:
     "@patternfly/documentation-framework": "npm:^6.22.8"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.9"
     "@patternfly/patternfly-a11y": "npm:5.1.0"
     "@patternfly/react-charts": "workspace:^"
     "@patternfly/react-code-editor": "workspace:^"
@@ -4679,7 +4679,7 @@ __metadata:
     "@fortawesome/free-brands-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-regular-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-solid-svg-icons": "npm:^5.15.4"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.9"
     fs-extra: "npm:^11.3.0"
     tslib: "npm:^2.8.1"
   peerDependencies:
@@ -4764,7 +4764,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-styles@workspace:packages/react-styles"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.9"
     change-case: "npm:^5.4.4"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
@@ -4806,7 +4806,7 @@ __metadata:
   resolution: "@patternfly/react-tokens@workspace:packages/react-tokens"
   dependencies:
     "@adobe/css-tools": "npm:^4.4.4"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.6"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.9"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
   linkType: soft