From 422f1a4c3d174661f6eb0aff6e7fdb62d15d64b7 Mon Sep 17 00:00:00 2001
From: Jon Rohan <yes@jonrohan.codes>
Date: Tue, 8 Oct 2024 18:29:45 +0000
Subject: [PATCH 1/4] Move Button CSS module feature flag from staff to ga

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

diff --git a/packages/react/src/Button/ButtonBase.tsx b/packages/react/src/Button/ButtonBase.tsx
index 06f819dfe3b..32d20fa23de 100644
--- a/packages/react/src/Button/ButtonBase.tsx
+++ b/packages/react/src/Button/ButtonBase.tsx
@@ -64,7 +64,7 @@ const ButtonBase = forwardRef(
       ...rest
     } = props
 
-    const enabled = useFeatureFlag('primer_react_css_modules_staff')
+    const enabled = useFeatureFlag('primer_react_css_modules_ga')
     const innerRef = React.useRef<HTMLButtonElement>(null)
     useRefObjectAsForwardedRef(forwardedRef, innerRef)
 

From 1cf95747ec011437f20d5a2add3f001447086de9 Mon Sep 17 00:00:00 2001
From: Jon Rohan <yes@jonrohan.codes>
Date: Tue, 8 Oct 2024 14:15:00 -0700
Subject: [PATCH 2/4] Create pink-lemons-clean.md

---
 .changeset/pink-lemons-clean.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/pink-lemons-clean.md

diff --git a/.changeset/pink-lemons-clean.md b/.changeset/pink-lemons-clean.md
new file mode 100644
index 00000000000..f144d1577b5
--- /dev/null
+++ b/.changeset/pink-lemons-clean.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Move Button CSS module feature flag from staff to ga

From b4a9a4e520d7129b9476f9d7794179dff3315cc0 Mon Sep 17 00:00:00 2001
From: Jon Rohan <yes@jonrohan.codes>
Date: Tue, 8 Oct 2024 23:00:27 +0000
Subject: [PATCH 3/4] Replace flag in test also

---
 packages/react/src/Button/__tests__/Button.test.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react/src/Button/__tests__/Button.test.tsx b/packages/react/src/Button/__tests__/Button.test.tsx
index 4705433bde0..0a6b8122fd0 100644
--- a/packages/react/src/Button/__tests__/Button.test.tsx
+++ b/packages/react/src/Button/__tests__/Button.test.tsx
@@ -302,12 +302,12 @@ describe('Button', () => {
     expect(triggerEl.getAttribute('aria-describedby')).toEqual(expect.stringContaining(tooltipEl.id))
   })
 
-  describe('with primer_react_css_modules_staff enabled', () => {
+  describe('with primer_react_css_modules_ga enabled', () => {
     it('iconbutton should support custom `className` along with default classnames', () => {
       const {container} = render(
         <FeatureFlags
           flags={{
-            primer_react_css_modules_staff: true,
+            primer_react_css_modules_ga: true,
           }}
         >
           <IconButton className="test" aria-label="Test" icon={HeartIcon} />
@@ -320,7 +320,7 @@ describe('Button', () => {
       const {container} = render(
         <FeatureFlags
           flags={{
-            primer_react_css_modules_staff: true,
+            primer_react_css_modules_ga: true,
           }}
         >
           <Button className="test">Hello</Button>
@@ -333,7 +333,7 @@ describe('Button', () => {
       const {container} = render(
         <FeatureFlags
           flags={{
-            primer_react_css_modules_staff: true,
+            primer_react_css_modules_ga: true,
           }}
         >
           <LinkButton className="test">Hello</LinkButton>

From 82fea932283012cc21a6202712b3bf1b3b41b818 Mon Sep 17 00:00:00 2001
From: Jon Rohan <yes@jonrohan.codes>
Date: Thu, 17 Oct 2024 16:10:14 -0700
Subject: [PATCH 4/4] Update Button.test.tsx

---
 .../src/Button/__tests__/Button.test.tsx      | 83 ++++++++++---------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/packages/react/src/Button/__tests__/Button.test.tsx b/packages/react/src/Button/__tests__/Button.test.tsx
index bea2fb83a6a..3a5a253ff0e 100644
--- a/packages/react/src/Button/__tests__/Button.test.tsx
+++ b/packages/react/src/Button/__tests__/Button.test.tsx
@@ -25,6 +25,48 @@ const StatefulLoadingButton = (props: StatefulLoadingButtonProps) => {
   return <Button loading={isLoading} onClick={handleClick} {...props} />
 }
 
+describe('IconButton', () => {
+  it('should support `className` on the outermost element', () => {
+    const Element = () => <IconButton className={'test-class-name'} icon={SearchIcon} aria-label="Search button" />
+    const FeatureFlagElement = () => {
+      return (
+        <FeatureFlags
+          flags={{
+            primer_react_css_modules_team: true,
+            primer_react_css_modules_staff: true,
+            primer_react_css_modules_ga: true,
+          }}
+        >
+          <Element />
+        </FeatureFlags>
+      )
+    }
+    expect(render(<Element />).container.firstChild).toHaveClass('test-class-name')
+    expect(render(<FeatureFlagElement />).container.firstChild).toHaveClass('test-class-name')
+  })
+})
+
+describe('LinkButton', () => {
+  it('should support `className` on the outermost element', () => {
+    const Element = () => <LinkButton className={'test-class-name'} />
+    const FeatureFlagElement = () => {
+      return (
+        <FeatureFlags
+          flags={{
+            primer_react_css_modules_team: true,
+            primer_react_css_modules_staff: true,
+            primer_react_css_modules_ga: true,
+          }}
+        >
+          <Element />
+        </FeatureFlags>
+      )
+    }
+    expect(render(<Element />).container.firstChild).toHaveClass('test-class-name')
+    expect(render(<FeatureFlagElement />).container.firstChild).toHaveClass('test-class-name')
+  })
+})
+
 describe('Button', () => {
   behavesAsComponent({
     Component: TestButton,
@@ -320,45 +362,4 @@ describe('Button', () => {
     expect(tooltipEl).toBeInTheDocument()
     expect(triggerEl.getAttribute('aria-describedby')).toEqual(expect.stringContaining(tooltipEl.id))
   })
-
-  describe('with primer_react_css_modules_ga enabled', () => {
-    it('iconbutton should support custom `className` along with default classnames', () => {
-      const {container} = render(
-        <FeatureFlags
-          flags={{
-            primer_react_css_modules_ga: true,
-          }}
-        >
-          <IconButton className="test" aria-label="Test" icon={HeartIcon} />
-        </FeatureFlags>,
-      )
-      expect(container.firstChild).toHaveClass('IconButton')
-    })
-
-    it('button should support custom `className` along with default classnames', () => {
-      const {container} = render(
-        <FeatureFlags
-          flags={{
-            primer_react_css_modules_ga: true,
-          }}
-        >
-          <Button className="test">Hello</Button>
-        </FeatureFlags>,
-      )
-      expect(container.firstChild).toHaveClass('ButtonBase')
-    })
-
-    it('linkbutton should support custom `className` along with default classnames', () => {
-      const {container} = render(
-        <FeatureFlags
-          flags={{
-            primer_react_css_modules_ga: true,
-          }}
-        >
-          <LinkButton className="test">Hello</LinkButton>
-        </FeatureFlags>,
-      )
-      expect(container.firstChild).toHaveClass('ButtonBase')
-    })
-  })
 })