From aa1036f4de822afa789c567a75a2ce76f91ec9c3 Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Mon, 3 Oct 2022 16:55:58 -0500
Subject: [PATCH 1/7] button - combine isSmall and isLarge into customSize

---
 .../Accordion/examples/AccordionBordered.tsx  |  2 +-
 .../src/components/Button/Button.tsx          | 19 +++---
 .../Button/__tests__/Button.test.tsx          |  8 +--
 .../__snapshots__/Button.test.tsx.snap        | 60 +++++++++----------
 .../src/components/Button/examples/Button.md  |  4 +-
 .../Button/examples/ButtonCallToAction.tsx    |  8 +--
 .../Button/examples/ButtonSmall.tsx           | 10 ++--
 .../demos/ButtonDemo/ButtonDemo.tsx           |  4 +-
 8 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
index aba7a806b29..6e50be22ff4 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
@@ -98,7 +98,7 @@ export const AccordionBordered: React.FunctionComponent = () => {
               Proin dictum imperdiet nibh, quis dapibus nulla. Integer sed tincidunt lectus, sit amet auctor eros.
             </AccordionExpandedContentBody>
             <AccordionExpandedContentBody>
-              <Button variant="link" isLarge isInline>
+              <Button variant="link" customSize="large" isInline>
                 Call to action <ArrowRightIcon />
               </Button>
             </AccordionExpandedContentBody>
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index e3013421b37..6c816ce2a07 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -22,6 +22,12 @@ export enum ButtonType {
   reset = 'reset'
 }
 
+export enum ButtonSize {
+  default = 'default',
+  small = 'small',
+  large = 'large'
+}
+
 export interface BadgeCountObject {
   /**  Adds styling to the badge to indicate it has been read */
   isRead?: boolean;
@@ -70,10 +76,8 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   icon?: React.ReactNode | null;
   /** Sets the button tabindex. */
   tabIndex?: number;
-  /** Adds small styling to the button */
-  isSmall?: boolean;
-  /** Adds large styling to the button */
-  isLarge?: boolean;
+  /** Adds small or large styling to the button */
+  customSize?: 'default' | 'small' | 'large';
   /** Adds danger styling to secondary or link button variants */
   isDanger?: boolean;
   /** Forwarded ref */
@@ -99,8 +103,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
   spinnerAriaValueText,
   spinnerAriaLabelledBy,
   spinnerAriaLabel,
-  isSmall = false,
-  isLarge = false,
+  customSize = ButtonSize.default,
   inoperableEvents = ['onClick', 'onKeyPress'],
   isInline = false,
   type = ButtonType.button,
@@ -157,8 +160,8 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
         isDanger && (variant === ButtonVariant.secondary || variant === ButtonVariant.link) && styles.modifiers.danger,
         isLoading !== null && children !== null && styles.modifiers.progress,
         isLoading && styles.modifiers.inProgress,
-        isSmall && styles.modifiers.small,
-        isLarge && styles.modifiers.displayLg,
+        customSize === 'small' && styles.modifiers.small,
+        customSize === 'large' && styles.modifiers.displayLg,
         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 b8d19a3472e..843d283af1c 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -84,13 +84,13 @@ describe('Button', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
-  test('isSmall', () => {
-    const { asFragment } = render(<Button isSmall>Small Button</Button>);
+  test('customSize small', () => {
+    const { asFragment } = render(<Button customSize="small">Small Button</Button>);
     expect(asFragment()).toMatchSnapshot();
   });
 
-  test('isLarge', () => {
-    const { asFragment } = render(<Button isLarge>Large Button</Button>);
+  test('customSize large', () => {
+    const { asFragment } = render(<Button customSize="large">Large Button</Button>);
     expect(asFragment()).toMatchSnapshot();
   });
 
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 29332d1d569..34a410e715b 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
@@ -31,6 +31,36 @@ exports[`Button control button 1`] = `
 </DocumentFragment>
 `;
 
+exports[`Button customSize large 1`] = `
+<DocumentFragment>
+  <button
+    aria-disabled="false"
+    class="pf-c-button pf-m-primary pf-m-display-lg"
+    data-ouia-component-id="OUIA-Generated-Button-primary-8"
+    data-ouia-component-type="PF4/Button"
+    data-ouia-safe="true"
+    type="button"
+  >
+    Large Button
+  </button>
+</DocumentFragment>
+`;
+
+exports[`Button customSize small 1`] = `
+<DocumentFragment>
+  <button
+    aria-disabled="false"
+    class="pf-c-button pf-m-primary pf-m-small"
+    data-ouia-component-id="OUIA-Generated-Button-primary-7"
+    data-ouia-component-type="PF4/Button"
+    data-ouia-safe="true"
+    type="button"
+  >
+    Small Button
+  </button>
+</DocumentFragment>
+`;
+
 exports[`Button danger button 1`] = `
 <DocumentFragment>
   <button
@@ -152,21 +182,6 @@ exports[`Button isInline 1`] = `
 </DocumentFragment>
 `;
 
-exports[`Button isLarge 1`] = `
-<DocumentFragment>
-  <button
-    aria-disabled="false"
-    class="pf-c-button pf-m-primary pf-m-display-lg"
-    data-ouia-component-id="OUIA-Generated-Button-primary-8"
-    data-ouia-component-type="PF4/Button"
-    data-ouia-safe="true"
-    type="button"
-  >
-    Large Button
-  </button>
-</DocumentFragment>
-`;
-
 exports[`Button isLoading 1`] = `
 <DocumentFragment>
   <button
@@ -240,21 +255,6 @@ exports[`Button isLoading icon only 1`] = `
 </DocumentFragment>
 `;
 
-exports[`Button isSmall 1`] = `
-<DocumentFragment>
-  <button
-    aria-disabled="false"
-    class="pf-c-button pf-m-primary pf-m-small"
-    data-ouia-component-id="OUIA-Generated-Button-primary-7"
-    data-ouia-component-type="PF4/Button"
-    data-ouia-safe="true"
-    type="button"
-  >
-    Small Button
-  </button>
-</DocumentFragment>
-`;
-
 exports[`Button link button 1`] = `
 <DocumentFragment>
   <button
diff --git a/packages/react-core/src/components/Button/examples/Button.md b/packages/react-core/src/components/Button/examples/Button.md
index 90b14770407..a4cadd247a2 100644
--- a/packages/react-core/src/components/Button/examples/Button.md
+++ b/packages/react-core/src/components/Button/examples/Button.md
@@ -43,14 +43,14 @@ To indicate that an action is currently unavailable, all button variations can b
 
 ### Small buttons
 
-To fit into tight spaces, primary, secondary, tertiary, danger, and warning button variations can be made smaller using the `isSmall` property.
+To fit into tight spaces, primary, secondary, tertiary, danger, and warning button variations can be made smaller using the `"small"` value for the `customSize` property.
 
 ```ts file="./ButtonSmall.tsx"
 ```
 
 ### Call to action (CTA) buttons
 
-CTA buttons and links direct users to complete an action. Primary, secondary, tertiary, and link button variants can be styled as CTAs using the `isLarge` property. 
+CTA buttons and links direct users to complete an action. Primary, secondary, tertiary, and link button variants can be styled as CTAs using the `"large"` value for the `customSize` property. 
 
 ```ts file="./ButtonCallToAction.tsx"
 ```
diff --git a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
index 934c57a7426..77ac327d72e 100644
--- a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
@@ -4,16 +4,16 @@ import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-i
 
 export const ButtonCallToAction: React.FunctionComponent = () => (
   <React.Fragment>
-    <Button variant="primary" isLarge>
+    <Button variant="primary" customSize="large">
       Call to action
     </Button>{' '}
-    <Button variant="secondary" isLarge>
+    <Button variant="secondary" customSize="large">
       Call to action
     </Button>{' '}
-    <Button variant="tertiary" isLarge>
+    <Button variant="tertiary" customSize="large">
       Call to action
     </Button>{' '}
-    <Button variant="link" isLarge>
+    <Button variant="link" customSize="large">
       Call to action <ArrowRightIcon />
     </Button>
     <br />
diff --git a/packages/react-core/src/components/Button/examples/ButtonSmall.tsx b/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
index 9e32fe99e65..aa4b3ec6d08 100644
--- a/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
@@ -3,19 +3,19 @@ import { Button } from '@patternfly/react-core';
 
 export const ButtonSmall: React.FunctionComponent = () => (
   <React.Fragment>
-    <Button variant="primary" isSmall>
+    <Button variant="primary" customSize="small">
       Primary
     </Button>{' '}
-    <Button variant="secondary" isSmall>
+    <Button variant="secondary" customSize="small">
       Secondary
     </Button>{' '}
-    <Button variant="tertiary" isSmall>
+    <Button variant="tertiary" customSize="small">
       Tertiary
     </Button>{' '}
-    <Button variant="danger" isSmall>
+    <Button variant="danger" customSize="small">
       Danger
     </Button>{' '}
-    <Button variant="warning" isSmall>
+    <Button variant="warning" customSize="small">
       Warning
     </Button>
     <br />
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
index 43367da1580..2486dfa8da7 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
@@ -121,10 +121,10 @@ export class ButtonDemo extends React.Component<ButtonProps, ButtonDemoState> {
             Aria-disabled with tooltip
           </Button>
         </Tooltip>
-        <Button {...this.normalButton} id="normal-btn-12" isSmall>
+        <Button {...this.normalButton} id="normal-btn-12" customSize="small">
           Small button
         </Button>
-        <Button {...this.normalButton} id="normal-btn-13" isLarge>
+        <Button {...this.normalButton} id="normal-btn-13" customSize="large">
           Large button
         </Button>
         <Button {...this.normalButton} id="normal-btn-14" variant="warning">

From 06398561f361a3184c378b8ad001d03cdfbb484f Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Mon, 3 Oct 2022 17:01:00 -0500
Subject: [PATCH 2/7] use enum

---
 packages/react-core/src/components/Button/Button.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 6c816ce2a07..050bf81873e 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -160,8 +160,8 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
         isDanger && (variant === ButtonVariant.secondary || variant === ButtonVariant.link) && styles.modifiers.danger,
         isLoading !== null && children !== null && styles.modifiers.progress,
         isLoading && styles.modifiers.inProgress,
-        customSize === 'small' && styles.modifiers.small,
-        customSize === 'large' && styles.modifiers.displayLg,
+        customSize === ButtonSize.small && styles.modifiers.small,
+        customSize === ButtonSize.large && styles.modifiers.displayLg,
         className
       )}
       disabled={isButtonElement ? isDisabled : null}

From 5e94d6ccc0dc1f1a60a78b23c783818d10431f39 Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Thu, 6 Oct 2022 12:26:31 -0500
Subject: [PATCH 3/7] use size for button prop name

---
 .../Accordion/examples/AccordionBordered.tsx  |  2 +-
 .../src/components/Button/Button.tsx          | 18 +++---
 .../Button/__tests__/Button.test.tsx          |  8 +--
 .../__snapshots__/Button.test.tsx.snap        | 60 +++++++++----------
 .../src/components/Button/examples/Button.md  |  4 +-
 .../Button/examples/ButtonCallToAction.tsx    |  8 +--
 .../Button/examples/ButtonSmall.tsx           | 10 ++--
 .../demos/ButtonDemo/ButtonDemo.tsx           |  5 +-
 8 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
index 6e50be22ff4..635f36d8524 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
@@ -98,7 +98,7 @@ export const AccordionBordered: React.FunctionComponent = () => {
               Proin dictum imperdiet nibh, quis dapibus nulla. Integer sed tincidunt lectus, sit amet auctor eros.
             </AccordionExpandedContentBody>
             <AccordionExpandedContentBody>
-              <Button variant="link" customSize="large" isInline>
+              <Button variant="link" size="lg" isInline>
                 Call to action <ArrowRightIcon />
               </Button>
             </AccordionExpandedContentBody>
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 050bf81873e..0c035a736b6 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -23,9 +23,9 @@ export enum ButtonType {
 }
 
 export enum ButtonSize {
-  default = 'default',
-  small = 'small',
-  large = 'large'
+  sm = 'sm',
+  md = 'md',
+  lg = 'lg'
 }
 
 export interface BadgeCountObject {
@@ -37,7 +37,7 @@ export interface BadgeCountObject {
   className?: string;
 }
 
-export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'ref'>, OUIAProps {
+export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'ref' | 'size'>, OUIAProps {
   /** Content rendered inside the button */
   children?: React.ReactNode;
   /** Additional classes added to the button */
@@ -64,6 +64,8 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   inoperableEvents?: string[];
   /** Adds inline styling to a link button */
   isInline?: boolean;
+  /** Adds small or large styling to the button */
+  size?: 'sm' | 'md' | 'lg';
   /** Sets button type */
   type?: 'button' | 'submit' | 'reset';
   /** Adds button variant styles */
@@ -76,8 +78,6 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   icon?: React.ReactNode | null;
   /** Sets the button tabindex. */
   tabIndex?: number;
-  /** Adds small or large styling to the button */
-  customSize?: 'default' | 'small' | 'large';
   /** Adds danger styling to secondary or link button variants */
   isDanger?: boolean;
   /** Forwarded ref */
@@ -103,7 +103,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
   spinnerAriaValueText,
   spinnerAriaLabelledBy,
   spinnerAriaLabel,
-  customSize = ButtonSize.default,
+  size = ButtonSize.md,
   inoperableEvents = ['onClick', 'onKeyPress'],
   isInline = false,
   type = ButtonType.button,
@@ -160,8 +160,8 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
         isDanger && (variant === ButtonVariant.secondary || variant === ButtonVariant.link) && styles.modifiers.danger,
         isLoading !== null && children !== null && styles.modifiers.progress,
         isLoading && styles.modifiers.inProgress,
-        customSize === ButtonSize.small && styles.modifiers.small,
-        customSize === ButtonSize.large && styles.modifiers.displayLg,
+        size === ButtonSize.sm && styles.modifiers.small,
+        size === ButtonSize.lg && styles.modifiers.displayLg,
         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 843d283af1c..7625dd1890c 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -84,13 +84,13 @@ describe('Button', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
-  test('customSize small', () => {
-    const { asFragment } = render(<Button customSize="small">Small Button</Button>);
+  test('size small', () => {
+    const { asFragment } = render(<Button size="sm">Small Button</Button>);
     expect(asFragment()).toMatchSnapshot();
   });
 
-  test('customSize large', () => {
-    const { asFragment } = render(<Button customSize="large">Large Button</Button>);
+  test('size large', () => {
+    const { asFragment } = render(<Button size="lg">Large Button</Button>);
     expect(asFragment()).toMatchSnapshot();
   });
 
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 34a410e715b..e21b606d3ca 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
@@ -31,36 +31,6 @@ exports[`Button control button 1`] = `
 </DocumentFragment>
 `;
 
-exports[`Button customSize large 1`] = `
-<DocumentFragment>
-  <button
-    aria-disabled="false"
-    class="pf-c-button pf-m-primary pf-m-display-lg"
-    data-ouia-component-id="OUIA-Generated-Button-primary-8"
-    data-ouia-component-type="PF4/Button"
-    data-ouia-safe="true"
-    type="button"
-  >
-    Large Button
-  </button>
-</DocumentFragment>
-`;
-
-exports[`Button customSize small 1`] = `
-<DocumentFragment>
-  <button
-    aria-disabled="false"
-    class="pf-c-button pf-m-primary pf-m-small"
-    data-ouia-component-id="OUIA-Generated-Button-primary-7"
-    data-ouia-component-type="PF4/Button"
-    data-ouia-safe="true"
-    type="button"
-  >
-    Small Button
-  </button>
-</DocumentFragment>
-`;
-
 exports[`Button danger button 1`] = `
 <DocumentFragment>
   <button
@@ -351,6 +321,36 @@ exports[`Button secondary button 1`] = `
 </DocumentFragment>
 `;
 
+exports[`Button size large 1`] = `
+<DocumentFragment>
+  <button
+    aria-disabled="false"
+    class="pf-c-button pf-m-primary pf-m-display-lg"
+    data-ouia-component-id="OUIA-Generated-Button-primary-8"
+    data-ouia-component-type="PF4/Button"
+    data-ouia-safe="true"
+    type="button"
+  >
+    Large Button
+  </button>
+</DocumentFragment>
+`;
+
+exports[`Button size small 1`] = `
+<DocumentFragment>
+  <button
+    aria-disabled="false"
+    class="pf-c-button pf-m-primary pf-m-small"
+    data-ouia-component-id="OUIA-Generated-Button-primary-7"
+    data-ouia-component-type="PF4/Button"
+    data-ouia-safe="true"
+    type="button"
+  >
+    Small Button
+  </button>
+</DocumentFragment>
+`;
+
 exports[`Button tertiary button 1`] = `
 <DocumentFragment>
   <button
diff --git a/packages/react-core/src/components/Button/examples/Button.md b/packages/react-core/src/components/Button/examples/Button.md
index a4cadd247a2..d9cf6b3b07c 100644
--- a/packages/react-core/src/components/Button/examples/Button.md
+++ b/packages/react-core/src/components/Button/examples/Button.md
@@ -43,14 +43,14 @@ To indicate that an action is currently unavailable, all button variations can b
 
 ### Small buttons
 
-To fit into tight spaces, primary, secondary, tertiary, danger, and warning button variations can be made smaller using the `"small"` value for the `customSize` property.
+To fit into tight spaces, primary, secondary, tertiary, danger, and warning button variations can be made smaller using the `"sm"` value for the `size` property.
 
 ```ts file="./ButtonSmall.tsx"
 ```
 
 ### Call to action (CTA) buttons
 
-CTA buttons and links direct users to complete an action. Primary, secondary, tertiary, and link button variants can be styled as CTAs using the `"large"` value for the `customSize` property. 
+CTA buttons and links direct users to complete an action. Primary, secondary, tertiary, and link button variants can be styled as CTAs using the `"lg"` value for the `size` property. 
 
 ```ts file="./ButtonCallToAction.tsx"
 ```
diff --git a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
index 77ac327d72e..8413ca91fd4 100644
--- a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
@@ -4,16 +4,16 @@ import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-i
 
 export const ButtonCallToAction: React.FunctionComponent = () => (
   <React.Fragment>
-    <Button variant="primary" customSize="large">
+    <Button variant="primary" size="lg">
       Call to action
     </Button>{' '}
-    <Button variant="secondary" customSize="large">
+    <Button variant="secondary" size="lg">
       Call to action
     </Button>{' '}
-    <Button variant="tertiary" customSize="large">
+    <Button variant="tertiary" size="lg">
       Call to action
     </Button>{' '}
-    <Button variant="link" customSize="large">
+    <Button variant="link" size="lg">
       Call to action <ArrowRightIcon />
     </Button>
     <br />
diff --git a/packages/react-core/src/components/Button/examples/ButtonSmall.tsx b/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
index aa4b3ec6d08..b4a1d30c048 100644
--- a/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
@@ -3,19 +3,19 @@ import { Button } from '@patternfly/react-core';
 
 export const ButtonSmall: React.FunctionComponent = () => (
   <React.Fragment>
-    <Button variant="primary" customSize="small">
+    <Button variant="primary" size="sm">
       Primary
     </Button>{' '}
-    <Button variant="secondary" customSize="small">
+    <Button variant="secondary" size="sm">
       Secondary
     </Button>{' '}
-    <Button variant="tertiary" customSize="small">
+    <Button variant="tertiary" size="sm">
       Tertiary
     </Button>{' '}
-    <Button variant="danger" customSize="small">
+    <Button variant="danger" size="sm">
       Danger
     </Button>{' '}
-    <Button variant="warning" customSize="small">
+    <Button variant="warning" size="sm">
       Warning
     </Button>
     <br />
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
index 2486dfa8da7..2b2d9b739fe 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Button, ButtonProps, Tooltip } from '@patternfly/react-core';
+import { ButtonSize } from '@patternfly/react-core/src/components/Button';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 import '@patternfly/react-styles/css/utilities/Spacing/spacing.css';
@@ -121,10 +122,10 @@ export class ButtonDemo extends React.Component<ButtonProps, ButtonDemoState> {
             Aria-disabled with tooltip
           </Button>
         </Tooltip>
-        <Button {...this.normalButton} id="normal-btn-12" customSize="small">
+        <Button {...this.normalButton} id="normal-btn-12" size={ButtonSize.sm}>
           Small button
         </Button>
-        <Button {...this.normalButton} id="normal-btn-13" customSize="large">
+        <Button {...this.normalButton} id="normal-btn-13" size={ButtonSize.lg}>
           Large button
         </Button>
         <Button {...this.normalButton} id="normal-btn-14" variant="warning">

From 3ebe07270174caa05e07deb4721ae206cebca617 Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Thu, 6 Oct 2022 13:01:57 -0500
Subject: [PATCH 4/7] fixing import

---
 .../demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
index 2b2d9b739fe..1c7e6db4336 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ButtonDemo/ButtonDemo.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Button, ButtonProps, Tooltip } from '@patternfly/react-core';
-import { ButtonSize } from '@patternfly/react-core/src/components/Button';
+import { Button, ButtonProps, ButtonSize, Tooltip } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 import '@patternfly/react-styles/css/utilities/Spacing/spacing.css';

From e37ed9dd8229c6cb063cbd794fc124b7f074c08d Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Thu, 6 Oct 2022 17:48:44 -0500
Subject: [PATCH 5/7] use default vs md

---
 packages/react-core/src/components/Button/Button.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 0c035a736b6..d3aa11c80eb 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -24,7 +24,7 @@ export enum ButtonType {
 
 export enum ButtonSize {
   sm = 'sm',
-  md = 'md',
+  default = 'default',
   lg = 'lg'
 }
 
@@ -65,7 +65,7 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   /** Adds inline styling to a link button */
   isInline?: boolean;
   /** Adds small or large styling to the button */
-  size?: 'sm' | 'md' | 'lg';
+  size?: 'sm' | 'default' | 'lg';
   /** Sets button type */
   type?: 'button' | 'submit' | 'reset';
   /** Adds button variant styles */
@@ -103,7 +103,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
   spinnerAriaValueText,
   spinnerAriaLabelledBy,
   spinnerAriaLabel,
-  size = ButtonSize.md,
+  size = ButtonSize.default,
   inoperableEvents = ['onClick', 'onKeyPress'],
   isInline = false,
   type = ButtonType.button,

From d65c5eccfbdfcde43ff30a5add5e7d562571cb5d Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Fri, 7 Oct 2022 15:12:04 -0500
Subject: [PATCH 6/7] reorder enum

---
 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 d3aa11c80eb..ca269654ce9 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -23,8 +23,8 @@ export enum ButtonType {
 }
 
 export enum ButtonSize {
-  sm = 'sm',
   default = 'default',
+  sm = 'sm',
   lg = 'lg'
 }
 

From 6993ba59da7e0e36bc46d695a50305331c6af422 Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Mon, 10 Oct 2022 20:45:30 -0500
Subject: [PATCH 7/7] reorder prop values, new verbiage for prop description

---
 packages/react-core/src/components/Button/Button.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index ca269654ce9..7cfdb8fe470 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -64,8 +64,8 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   inoperableEvents?: string[];
   /** Adds inline styling to a link button */
   isInline?: boolean;
-  /** Adds small or large styling to the button */
-  size?: 'sm' | 'default' | 'lg';
+  /** Adds styling which affects the size of the button */
+  size?: 'default' | 'sm' | 'lg';
   /** Sets button type */
   type?: 'button' | 'submit' | 'reset';
   /** Adds button variant styles */