From c79476fd6a27e02fc7c6ef2eea27f777bde62e37 Mon Sep 17 00:00:00 2001
From: Jon Rohan <yes@jonrohan.codes>
Date: Tue, 18 Mar 2025 20:10:49 +0000
Subject: [PATCH] Remove the CSS modules feature flag from the KeybindingHint
 Component.

---
 .changeset/rotten-rings-confess.md            |  5 ++++
 .../src/KeybindingHint/KeybindingHint.tsx     | 27 +------------------
 2 files changed, 6 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/rotten-rings-confess.md

diff --git a/.changeset/rotten-rings-confess.md b/.changeset/rotten-rings-confess.md
new file mode 100644
index 00000000000..0f0bff5c9ca
--- /dev/null
+++ b/.changeset/rotten-rings-confess.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": minor
+---
+
+Remove the CSS modules feature flag from the KeybindingHint Component.
diff --git a/packages/react/src/KeybindingHint/KeybindingHint.tsx b/packages/react/src/KeybindingHint/KeybindingHint.tsx
index 8644126ab5a..c7c9a70995a 100644
--- a/packages/react/src/KeybindingHint/KeybindingHint.tsx
+++ b/packages/react/src/KeybindingHint/KeybindingHint.tsx
@@ -3,39 +3,14 @@ import {memo} from 'react'
 import Text from '../Text'
 import type {KeybindingHintProps} from './props'
 import {accessibleSequenceString, Sequence} from './components/Sequence'
-import {useFeatureFlag} from '../FeatureFlags'
 
 import classes from './KeybindingHint.module.css'
 import {clsx} from 'clsx'
 
 /** `kbd` element with style resets. */
 const Kbd = ({children, className}: {children: ReactNode; className?: string}) => {
-  const enabled = useFeatureFlag('primer_react_css_modules_ga')
-
   return (
-    <Text
-      as={'kbd' as 'span'}
-      className={clsx(className, enabled && classes.KeybindingHint)}
-      data-testid="keybinding-hint"
-      sx={
-        enabled
-          ? undefined
-          : {
-              color: 'inherit',
-              fontFamily: 'inherit',
-              fontSize: 'inherit',
-              border: 'none',
-              background: 'none',
-              boxShadow: 'none',
-              p: 0,
-              lineHeight: 'unset',
-              position: 'relative',
-              overflow: 'visible',
-              verticalAlign: 'baseline',
-              textWrap: 'nowrap',
-            }
-      }
-    >
+    <Text as={'kbd' as 'span'} className={clsx(className, classes.KeybindingHint)} data-testid="keybinding-hint">
       {children}
     </Text>
   )