From 230549bc8c1a2b59f7e077c5e117be12dc28fb46 Mon Sep 17 00:00:00 2001
From: Marie Lucca <francinelucca@github.com>
Date: Tue, 23 Dec 2025 12:02:04 -0500
Subject: [PATCH 1/2] fix(Autocomplete.Overlay): prevent user-defined className
 from overriding default styles

---
 .../src/Autocomplete/Autocomplete.test.tsx    | 40 ++++++++++++-------
 .../src/Autocomplete/AutocompleteOverlay.tsx  |  4 +-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/packages/react/src/Autocomplete/Autocomplete.test.tsx b/packages/react/src/Autocomplete/Autocomplete.test.tsx
index ea8c2a501df..971b7b83ee8 100644
--- a/packages/react/src/Autocomplete/Autocomplete.test.tsx
+++ b/packages/react/src/Autocomplete/Autocomplete.test.tsx
@@ -8,6 +8,7 @@ import type {AutocompleteMenuInternalProps, AutocompleteMenuItem} from '../Autoc
 import BaseStyles from '../BaseStyles'
 import {implementsClassName} from '../utils/testing'
 import classes from './AutocompleteOverlay.module.css'
+import {AutocompleteContext} from './AutocompleteContext'
 
 const mockItems = [
   {text: 'zero', id: '0'},
@@ -441,21 +442,32 @@ describe('Autocomplete', () => {
       expect(screen.getByText('Three')).toBeInTheDocument()
     })
   })
+  describe('Autocomplete.Overlay', () => {
+    implementsClassName(props => {
+      // Create a context with showMenu set to true
+      const mockContext = {
+        activeDescendantRef: {current: null},
+        autocompleteSuggestion: '',
+        id: 'test-id',
+        inputRef: {current: document.createElement('input')},
+        inputValue: '',
+        isMenuDirectlyActivated: false,
+        scrollContainerRef: {current: null},
+        selectedItemLength: 0,
+        setAutocompleteSuggestion: () => {},
+        setInputValue: () => {},
+        setIsMenuDirectlyActivated: () => {},
+        setSelectedItemLength: () => {},
+        setShowMenu: () => {},
+        showMenu: true, // Force the menu to show
+      }
 
-  // TODO: Enable once className override bug is fixed in Autocomplete.Overlay, also remember to remove from ignore list on script/check-classname-tests.mjs
-  // eslint-disable-next-line vitest/no-disabled-tests
-  describe.skip('Autocomplete.Overlay', () => {
-    implementsClassName(
-      props => (
-        <Autocomplete id="autocompleteId">
-          <Autocomplete.Input />
-          <Autocomplete.Overlay {...props} visibility="visible">
-            hi
-          </Autocomplete.Overlay>
-        </Autocomplete>
-      ),
-      classes.Overlay,
-    )
+      return (
+        <AutocompleteContext.Provider value={mockContext}>
+          <Autocomplete.Overlay {...props}>hi</Autocomplete.Overlay>
+        </AutocompleteContext.Provider>
+      )
+    }, classes.Overlay)
   })
 
   describe('null context', () => {
diff --git a/packages/react/src/Autocomplete/AutocompleteOverlay.tsx b/packages/react/src/Autocomplete/AutocompleteOverlay.tsx
index d72494a7545..caa70236e7a 100644
--- a/packages/react/src/Autocomplete/AutocompleteOverlay.tsx
+++ b/packages/react/src/Autocomplete/AutocompleteOverlay.tsx
@@ -9,6 +9,7 @@ import {useRefObjectAsForwardedRef} from '../hooks/useRefObjectAsForwardedRef'
 import VisuallyHidden from '../_VisuallyHidden'
 
 import classes from './AutocompleteOverlay.module.css'
+import {clsx} from 'clsx'
 
 type AutocompleteOverlayInternalProps = {
   /**
@@ -27,6 +28,7 @@ function AutocompleteOverlay({
   menuAnchorRef,
   overlayProps: oldOverlayProps,
   children,
+  className,
   ...newOverlayProps
 }: AutocompleteOverlayInternalProps) {
   const autocompleteContext = useContext(AutocompleteContext)
@@ -63,7 +65,7 @@ function AutocompleteOverlay({
       ref={floatingElementRef as React.RefObject<HTMLDivElement>}
       top={position?.top}
       left={position?.left}
-      className={classes.Overlay}
+      className={clsx(classes.Overlay, className)}
       {...overlayProps}
     >
       {children}

From fb50342210e221b4a641b03a828b7bcb97291907 Mon Sep 17 00:00:00 2001
From: Marie Lucca <40550942+francinelucca@users.noreply.github.com>
Date: Tue, 23 Dec 2025 12:34:01 -0500
Subject: [PATCH 2/2] Fix className behavior in Autocomplete.Overlay

Prevent user-defined className from overriding default styles in Autocomplete.Overlay.
---
 .changeset/dry-carrots-bathe.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/dry-carrots-bathe.md

diff --git a/.changeset/dry-carrots-bathe.md b/.changeset/dry-carrots-bathe.md
new file mode 100644
index 00000000000..151f7a2a8e3
--- /dev/null
+++ b/.changeset/dry-carrots-bathe.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+fix(Autocomplete.Overlay): prevent user-defined className from overriding default styles