From db4bf3475b2d1f73bd2b34ad28ab410490c73a14 Mon Sep 17 00:00:00 2001
From: Andrey Yamanov <tenphi@gmail.com>
Date: Mon, 20 Oct 2025 13:03:29 +0200
Subject: [PATCH 1/3] fix(ComboBox): qa prop

---
 .changeset/great-eggs-tell.md               |  5 +++++
 src/components/fields/ComboBox/ComboBox.tsx | 12 ++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/great-eggs-tell.md

diff --git a/.changeset/great-eggs-tell.md b/.changeset/great-eggs-tell.md
new file mode 100644
index 000000000..166e11c75
--- /dev/null
+++ b/.changeset/great-eggs-tell.md
@@ -0,0 +1,5 @@
+---
+"@cube-dev/ui-kit": patch
+---
+
+Fix qa prop binding in ComboBox.
diff --git a/src/components/fields/ComboBox/ComboBox.tsx b/src/components/fields/ComboBox/ComboBox.tsx
index 59fa5a271..28b3a0ad6 100644
--- a/src/components/fields/ComboBox/ComboBox.tsx
+++ b/src/components/fields/ComboBox/ComboBox.tsx
@@ -62,6 +62,7 @@ type FilterFn = (textValue: string, inputValue: string) => boolean;
 export type PopoverTriggerAction = 'focus' | 'input' | 'manual';
 
 const ComboBoxWrapperElement = tasty({
+  qa: 'ComboBoxWrapper',
   styles: INPUT_WRAPPER_STYLES,
 });
 
@@ -695,6 +696,7 @@ function useComboBoxKeyboard({
 // Component: ComboBoxInput
 // ============================================================================
 interface ComboBoxInputProps {
+  qa?: string;
   inputRef: RefObject<HTMLInputElement>;
   id?: string;
   value: string;
@@ -713,13 +715,12 @@ interface ComboBoxInputProps {
   hasResults: boolean;
   comboBoxId: string;
   listStateRef: RefObject<any>;
-  isLoading?: boolean;
-  allowsCustomValue?: boolean;
 }
 
 const ComboBoxInput = forwardRef<HTMLInputElement, ComboBoxInputProps>(
   function ComboBoxInput(
     {
+      qa,
       inputRef,
       id,
       value,
@@ -738,8 +739,6 @@ const ComboBoxInput = forwardRef<HTMLInputElement, ComboBoxInputProps>(
       hasResults,
       comboBoxId,
       listStateRef,
-      isLoading,
-      allowsCustomValue,
     },
     ref,
   ) {
@@ -748,7 +747,6 @@ const ComboBoxInput = forwardRef<HTMLInputElement, ComboBoxInputProps>(
     return (
       <InputElement
         ref={combinedRef}
-        qa="Input"
         id={id}
         type="text"
         value={value}
@@ -1565,7 +1563,6 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
   const comboBoxField = (
     <ComboBoxWrapperElement
       ref={wrapperRef}
-      qa={qa || 'ComboBox'}
       mods={mods}
       styles={styles}
       style={{
@@ -1576,6 +1573,7 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
     >
       {prefix ? <div data-element="Prefix">{prefix}</div> : null}
       <ComboBoxInput
+        qa={qa}
         inputRef={inputRef}
         id={id}
         value={effectiveInputValue}
@@ -1592,8 +1590,6 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
         hasResults={hasResults}
         comboBoxId={comboBoxId}
         listStateRef={listStateRef}
-        isLoading={isLoading}
-        allowsCustomValue={allowsCustomValue}
         onChange={handleInputChange}
         onFocus={handleInputFocus}
       />

From 6960a122388ff461c40e40f747454aa476d50fa9 Mon Sep 17 00:00:00 2001
From: Andrey Yamanov <tenphi@gmail.com>
Date: Mon, 20 Oct 2025 13:06:06 +0200
Subject: [PATCH 2/3] fix(ComboBox): qa prop * 2

---
 src/components/fields/ComboBox/ComboBox.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/fields/ComboBox/ComboBox.tsx b/src/components/fields/ComboBox/ComboBox.tsx
index 28b3a0ad6..34d97d72a 100644
--- a/src/components/fields/ComboBox/ComboBox.tsx
+++ b/src/components/fields/ComboBox/ComboBox.tsx
@@ -747,6 +747,7 @@ const ComboBoxInput = forwardRef<HTMLInputElement, ComboBoxInputProps>(
     return (
       <InputElement
         ref={combinedRef}
+        qa={qa}
         id={id}
         type="text"
         value={value}

From 9d9ec23dad5069005363b01e073ee625ecd1b410 Mon Sep 17 00:00:00 2001
From: Andrey Yamanov <tenphi@gmail.com>
Date: Mon, 20 Oct 2025 13:16:26 +0200
Subject: [PATCH 3/3] fix(ComboBox): qa prop * 3

---
 src/components/fields/ComboBox/ComboBox.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/fields/ComboBox/ComboBox.tsx b/src/components/fields/ComboBox/ComboBox.tsx
index 34d97d72a..8a79b437f 100644
--- a/src/components/fields/ComboBox/ComboBox.tsx
+++ b/src/components/fields/ComboBox/ComboBox.tsx
@@ -1574,7 +1574,7 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
     >
       {prefix ? <div data-element="Prefix">{prefix}</div> : null}
       <ComboBoxInput
-        qa={qa}
+        qa={qa || 'ComboBox'}
         inputRef={inputRef}
         id={id}
         value={effectiveInputValue}