From b1d1e82aca6042efa79ddb48465fb16897899d63 Mon Sep 17 00:00:00 2001
From: Andrey Yamanov <tenphi@gmail.com>
Date: Thu, 27 Nov 2025 17:38:11 +0100
Subject: [PATCH 1/2] fix: styles prop leakage

---
 .changeset/fix-styles-extraction.md               | 6 ++++++
 src/components/fields/Switch/Switch.tsx           | 4 +++-
 src/components/fields/TextInput/TextInputBase.tsx | 8 +++++++-
 src/tasty/utils/styles.ts                         | 2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/fix-styles-extraction.md

diff --git a/.changeset/fix-styles-extraction.md b/.changeset/fix-styles-extraction.md
new file mode 100644
index 000000000..589de6eff
--- /dev/null
+++ b/.changeset/fix-styles-extraction.md
@@ -0,0 +1,6 @@
+---
+"@cube-dev/ui-kit": patch
+---
+
+Fixed `styles` prop leaking to inner elements in `TextInput` and `Switch` components
+
diff --git a/src/components/fields/Switch/Switch.tsx b/src/components/fields/Switch/Switch.tsx
index 340adb319..8477da7d7 100644
--- a/src/components/fields/Switch/Switch.tsx
+++ b/src/components/fields/Switch/Switch.tsx
@@ -164,7 +164,9 @@ function Switch(props: WithNullableSelected<CubeSwitchProps>, ref) {
 
   let styles = extractStyles(props, OUTER_STYLES);
 
-  inputStyles = extractStyles(props, BLOCK_STYLES, inputStyles);
+  inputStyles = extractStyles(props, BLOCK_STYLES, inputStyles, undefined, [
+    'styles',
+  ]);
 
   let { isFocused, focusProps } = useFocus({ isDisabled }, true);
   let { hoverProps, isHovered } = useHover({ isDisabled });
diff --git a/src/components/fields/TextInput/TextInputBase.tsx b/src/components/fields/TextInput/TextInputBase.tsx
index 1b776f145..0bd4cc267 100644
--- a/src/components/fields/TextInput/TextInputBase.tsx
+++ b/src/components/fields/TextInput/TextInputBase.tsx
@@ -263,7 +263,13 @@ function _TextInputBase(props: CubeTextInputBaseProps, ref) {
   let styles = extractStyles(otherProps, OUTER_STYLES);
   let type = otherProps.type;
 
-  inputStyles = extractStyles(otherProps, INPUT_STYLE_PROPS_LIST, inputStyles);
+  inputStyles = extractStyles(
+    otherProps,
+    INPUT_STYLE_PROPS_LIST,
+    inputStyles,
+    undefined,
+    ['styles'],
+  );
 
   let ElementType: 'textarea' | 'input' = multiLine ? 'textarea' : 'input';
   let { isFocused, focusProps } = useFocus({ isDisabled });
diff --git a/src/tasty/utils/styles.ts b/src/tasty/utils/styles.ts
index aee216d97..c40254027 100644
--- a/src/tasty/utils/styles.ts
+++ b/src/tasty/utils/styles.ts
@@ -373,7 +373,7 @@ export function extractStyles(
 ): Styles {
   const styles: Styles = {
     ...defaultStyles,
-    ...props.styles,
+    ...(ignoreList.includes('styles') ? undefined : props.styles),
   };
 
   Object.keys(props).forEach((prop) => {

From a484cae5776fb3ffc03bc18ba9b7d3d31ceb8116 Mon Sep 17 00:00:00 2001
From: Andrey Yamanov <tenphi@gmail.com>
Date: Fri, 28 Nov 2025 15:25:43 +0100
Subject: [PATCH 2/2] fix(NumberInput): style application

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

diff --git a/src/components/fields/NumberInput/NumberInput.tsx b/src/components/fields/NumberInput/NumberInput.tsx
index 283f537bd..45e009208 100644
--- a/src/components/fields/NumberInput/NumberInput.tsx
+++ b/src/components/fields/NumberInput/NumberInput.tsx
@@ -22,7 +22,7 @@ export interface CubeNumberInputProps
 }
 
 const StyledTextInputBase = tasty(TextInputBase, {
-  styles: {
+  inputStyles: {
     textAlign: 'right',
   },
 });