From 48a8490ebe9e9dd72bb65ffa9c0f6a06b1af806b Mon Sep 17 00:00:00 2001
From: Rajat Chaudhary <rajatchaudhary@Rajats-MacBook-Air.local>
Date: Fri, 19 Jul 2024 12:34:23 +0530
Subject: [PATCH] fix: invalid state for switch and select

---
 .../src/core-components/nativewind/select/index.tsx  | 12 ++++++++----
 .../src/core-components/nativewind/switch/index.tsx  | 10 +++++++---
 yarn.lock                                            |  9 +++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/example/storybook-nativewind/src/core-components/nativewind/select/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/select/index.tsx
index 8d70df726..ba3f5af32 100644
--- a/example/storybook-nativewind/src/core-components/nativewind/select/index.tsx
+++ b/example/storybook-nativewind/src/core-components/nativewind/select/index.tsx
@@ -25,7 +25,11 @@ import {
 } from './select-actionsheet';
 import { Pressable, View, TextInput, Platform } from 'react-native';
 
-/** Select Components */
+const SelectTriggerWrapper = React.forwardRef(
+  ({ ...props }: any, ref?: any) => {
+    return <Pressable {...props} ref={ref} />;
+  }
+);
 
 const selectIconStyle = tva({
   base: 'text-background-500 fill-none',
@@ -137,8 +141,8 @@ const UISelect = createSelect(
     // @ts-ignore
     Trigger:
       Platform.OS === 'web'
-        ? withStyleContext(Pressable)
-        : withStyleContextAndStates(Pressable),
+        ? withStyleContext(SelectTriggerWrapper)
+        : withStyleContextAndStates(SelectTriggerWrapper),
     Input: TextInput,
     Icon: PrimitiveIcon,
   },
@@ -162,7 +166,7 @@ cssInterop(UISelect, { className: 'style' });
 cssInterop(UISelect.Input, {
   className: { target: 'style', nativeStyleToProp: { textAlign: true } },
 });
-cssInterop(UISelect.Trigger, { className: 'style' });
+cssInterop(SelectTriggerWrapper, { className: 'style' });
 // @ts-ignore
 cssInterop(UISelect.Icon, {
   className: {
diff --git a/example/storybook-nativewind/src/core-components/nativewind/switch/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/switch/index.tsx
index 8806d1758..05fc71c5b 100644
--- a/example/storybook-nativewind/src/core-components/nativewind/switch/index.tsx
+++ b/example/storybook-nativewind/src/core-components/nativewind/switch/index.tsx
@@ -8,14 +8,18 @@ import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withSt
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
+const SwitchWrapper = React.forwardRef(({ ...props }: any, ref?: any) => {
+  return <RNSwitch {...props} ref={ref} />;
+});
+
 const UISwitch = createSwitch({
   Root:
     Platform.OS === 'web'
-      ? withStyleContext(RNSwitch)
-      : withStyleContextAndStates(RNSwitch),
+      ? withStyleContext(SwitchWrapper)
+      : withStyleContextAndStates(SwitchWrapper),
 });
 
-cssInterop(UISwitch, { className: 'style' });
+cssInterop(SwitchWrapper, { className: 'style' });
 
 const switchStyle = tva({
   base: 'data-[focus=true]:outline-0 data-[focus=true]:ring-2 data-[focus=true]:ring-indicator-primary web:cursor-pointer disabled:cursor-not-allowed data-[disabled=true]:opacity-40 data-[invalid=true]:border-error-700 data-[invalid=true]:rounded-xl data-[invalid=true]:border-2',
diff --git a/yarn.lock b/yarn.lock
index ae77b004c..5c417f9ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2625,6 +2625,15 @@
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "^0.2.11"
 
+"@gluestack-ui/tabs@0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/tabs/-/tabs-0.1.16.tgz#54739c87d50831ed248faa0ce4015384a8f5d238"
+  integrity sha512-voSV4J+Ec5u9oq0cCDvgrISrVf4ObYZpbyRDJvS3L/StJYk5lM5sEfLuI3w7stlyvit9pkwi4aQKKX0BN5wBuw==
+  dependencies:
+    "@gluestack-ui/utils" "^0.1.12"
+    "@react-native-aria/focus" "^0.2.9"
+    "@react-native-aria/interactions" "0.2.13"
+
 "@gluestack-ui/toast@^0.1.7":
   version "0.1.20"
   resolved "https://registry.yarnpkg.com/@gluestack-ui/toast/-/toast-0.1.20.tgz#863453f75d2e941000204a9524161bfd2500e320"