From 09fda3f11b941ac135ca68d24b8762bbbf73f64b Mon Sep 17 00:00:00 2001
From: Pranay Kothapalli <pranaykothapalli@gmail.com>
Date: Tue, 23 Jun 2026 18:54:59 +0530
Subject: [PATCH] fix(combobox): merge consumer props through getFloatingProps

Pass listbox content props into getFloatingProps for correct handler merge.

Fixes #806
---
 .../contexts/ComboboxPrimitiveContext.tsx     |  2 +-
 .../fragments/ComboboxPrimitiveContent.tsx    | 39 ++++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/core/primitives/Combobox/contexts/ComboboxPrimitiveContext.tsx b/src/core/primitives/Combobox/contexts/ComboboxPrimitiveContext.tsx
index ba196babe..5af7d53ea 100644
--- a/src/core/primitives/Combobox/contexts/ComboboxPrimitiveContext.tsx
+++ b/src/core/primitives/Combobox/contexts/ComboboxPrimitiveContext.tsx
@@ -17,7 +17,7 @@ export type ComboboxPrimitiveContextType = {
     floatingStyles: React.CSSProperties;
     floatingContext: any;
     getReferenceProps: () => any;
-    getFloatingProps: () => any;
+    getFloatingProps: (userProps?: any) => any;
     getItemProps: (userProps?: any) => any;
     activeIndex: number | null;
     setActiveIndex: React.Dispatch<React.SetStateAction<number | null>>;
diff --git a/src/core/primitives/Combobox/fragments/ComboboxPrimitiveContent.tsx b/src/core/primitives/Combobox/fragments/ComboboxPrimitiveContent.tsx
index 0d5ed55a2..46fc28515 100644
--- a/src/core/primitives/Combobox/fragments/ComboboxPrimitiveContent.tsx
+++ b/src/core/primitives/Combobox/fragments/ComboboxPrimitiveContent.tsx
@@ -56,26 +56,27 @@ const ComboboxPrimitiveContent = React.forwardRef<
                     <Floater.FloatingList elementsRef={elementsRef} labelsRef={labelsRef} >
                         <div
                             ref={mergedRef}
-                            style={{
-                                ...floatingStyles,
-                                ...style,
-                                '--rad-ui-floating-transform-origin': placementState.transformOrigin,
-                                visibility: !isPositioned && shouldHideUntilPositioned
-                                    ? 'hidden'
-                                    : middlewareData.hide?.referenceHidden
+                            {...getFloatingProps({
+                                ...props,
+                                className,
+                                'data-state': isOpen ? 'open' : 'closed',
+                                'data-side': placementState.side,
+                                'data-align': placementState.align,
+                                'data-positioned': isPositioned ? '' : undefined,
+                                style: {
+                                    ...floatingStyles,
+                                    ...style,
+                                    '--rad-ui-floating-transform-origin': placementState.transformOrigin,
+                                    visibility: !isPositioned && shouldHideUntilPositioned
                                         ? 'hidden'
-                                        : (style?.visibility || floatingStyles.visibility),
-                                pointerEvents: middlewareData.hide?.referenceHidden
-                                    ? 'none'
-                                    : style?.pointerEvents
-                            }}
-                            className={className}
-                            data-state={isOpen ? 'open' : 'closed'}
-                            data-side={placementState.side}
-                            data-align={placementState.align}
-                            data-positioned={isPositioned ? '' : undefined}
-                            {...getFloatingProps()}
-                            {...props}
+                                        : middlewareData.hide?.referenceHidden
+                                            ? 'hidden'
+                                            : (style?.visibility || floatingStyles.visibility),
+                                    pointerEvents: middlewareData.hide?.referenceHidden
+                                        ? 'none'
+                                        : style?.pointerEvents
+                                }
+                            })}
                         >
 
                             {children}