Merge pull request #2621 from gluestack/main

Backmerge Main -> Patch
gluestack · Dec 3, 2024 · 829c14f · 829c14f
2 parents 43d217d + 0edd098
commit 829c14f
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 37 deletions.
diff --git a/example/storybook-nativewind/src/core-components/nativewind/accordion/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/accordion/index.tsx
@@ -76,7 +76,7 @@ const accordionHeaderStyle = tva({
   base: 'mx-0 my-0',
 });
 const accordionContentStyle = tva({
-  base: 'mt-4',
+  base: 'pt-1 pb-3 px-4',
 });
 const accordionTriggerStyle = tva({
   base: 'w-full flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50 py-3 px-4',
@@ -113,6 +113,12 @@ cssInterop(PrimitiveIcon, {
   },
 });
 
+cssInterop(H3, {
+  className: {
+    target: 'style',
+  },
+});
+
 type IAccordionProps = React.ComponentPropsWithoutRef<typeof UIAccordion> &
   VariantProps<typeof accordionStyle>;
 
@@ -134,6 +140,8 @@ type IAccordionContentTextProps = React.ComponentPropsWithoutRef<
 type IAccordionIconProps = VariantProps<typeof accordionIconStyle> &
   React.ComponentPropsWithoutRef<typeof UIAccordion.Icon> & {
     as?: React.ElementType;
+    height?: number;
+    width?: number;
   };
 
 type IAccordionHeaderProps = React.ComponentPropsWithoutRef<

diff --git a/example/storybook-nativewind/src/core-components/nativewind/actionsheet/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/actionsheet/index.tsx
@@ -272,6 +272,8 @@ type IActionsheetIconProps = VariantProps<typeof actionsheetIconStyle> &
   React.ComponentPropsWithoutRef<typeof UIActionsheet.Icon> & {
     className?: string;
     as?: React.ElementType;
+    height?: number;
+    width?: number;
   };
 
 const Actionsheet = React.forwardRef<

diff --git a/example/storybook-nativewind/src/core-components/nativewind/alert/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/alert/index.tsx
@@ -190,7 +190,10 @@ const AlertText = React.forwardRef<
 );
 
 type IAlertIconProps = React.ComponentPropsWithoutRef<typeof UIAlert.Icon> &
-  VariantProps<typeof alertIconStyle>;
+  VariantProps<typeof alertIconStyle> & {
+    height?: number;
+    width?: number;
+  };
 
 const AlertIcon = React.forwardRef<
   React.ElementRef<typeof UIAlert.Icon>,

diff --git a/example/storybook-nativewind/src/core-components/nativewind/badge/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/badge/index.tsx
@@ -101,7 +101,6 @@ cssInterop(PrimitiveIcon, {
     nativeStyleToProp: {
       height: true,
       width: true,
-      //@ts-expect-error
       fill: true,
       color: 'classNameColor',
       stroke: true,

diff --git a/example/storybook-nativewind/src/core-components/nativewind/button/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/button/index.tsx
@@ -341,6 +341,8 @@ type IButtonIcon = React.ComponentPropsWithoutRef<typeof UIButton.Icon> &
   VariantProps<typeof buttonIconStyle> & {
     className?: string | undefined;
     as?: React.ElementType;
+    height?: number;
+    width?: number;
   };
 
 const ButtonIcon = React.forwardRef<

diff --git a/example/storybook-nativewind/src/core-components/nativewind/fab/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/fab/index.tsx
@@ -169,7 +169,10 @@ const FabLabel = React.forwardRef<
 );
 
 type IFabIconProps = React.ComponentPropsWithoutRef<typeof UIFab.Icon> &
-  VariantProps<typeof fabIconStyle>;
+  VariantProps<typeof fabIconStyle> & {
+    height?: number;
+    width?: number;
+  };
 
 const FabIcon = React.forwardRef<
   React.ElementRef<typeof UIFab.Icon>,

diff --git a/example/storybook-nativewind/src/core-components/nativewind/form-control/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/form-control/index.tsx
@@ -317,7 +317,11 @@ const FormControlErrorText = React.forwardRef<
 type IFormControlErrorIconProps = React.ComponentProps<
   typeof UIFormControl.Error.Icon
 > &
-  VariantProps<typeof formControlErrorIconStyle>;
+  VariantProps<typeof formControlErrorIconStyle> & {
+    height?: number;
+    width?: number;
+  };
+
 const FormControlErrorIcon = React.forwardRef<
   React.ElementRef<typeof UIFormControl.Error.Icon>,
   IFormControlErrorIconProps

diff --git a/example/storybook-nativewind/src/core-components/nativewind/input/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/input/index.tsx
@@ -116,9 +116,12 @@ const Input = React.forwardRef<React.ElementRef<typeof UIInput>, IInputProps>(
   }
 );
 
-type IInputIconProps = React.ComponentProps<typeof UIInput.Icon> & {
-  className?: string;
-};
+type IInputIconProps = React.ComponentProps<typeof UIInput.Icon> &
+  VariantProps<typeof inputIconStyle> & {
+    className?: string;
+    height?: number;
+    width?: number;
+  };
 
 const InputIcon = React.forwardRef<
   React.ElementRef<typeof UIInput.Icon>,

diff --git a/example/storybook-nativewind/src/core-components/nativewind/radio/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/radio/index.tsx
@@ -164,7 +164,10 @@ const RadioLabel = React.forwardRef<
 });
 
 type IRadioIconProps = React.ComponentProps<typeof UIRadio.Icon> &
-  VariantProps<typeof radioIconStyle>;
+  VariantProps<typeof radioIconStyle> & {
+    height?: number;
+    width?: number;
+  };
 const RadioIcon = React.forwardRef<
   React.ElementRef<typeof UIRadio.Icon>,
   IRadioIconProps

diff --git a/yarn.lock b/yarn.lock
@@ -2612,22 +2612,6 @@
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "^0.2.11"
 
-"@gluestack-ui/[email protected]":
-  version "0.1.24-alpha.0"
-  dependencies:
-    "@gluestack-ui/provider" "^0.1.13"
-    "@gluestack-ui/utils" "^0.1.14"
-    "@react-native-aria/focus" "^0.2.9"
-
-"@gluestack-ui/icon@^0.1.3":
-  version "0.1.23"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/icon/-/icon-0.1.23.tgz#68ce538ef2e485d103e8d4192a54105a726e0e98"
-  integrity sha512-au4WIwtAQRsvXV9rSZEvLvv4w8O2ikaTQjaCmF1poZyZabeEIXjun7qFIRTKmJsxoRmWK7ziM22i4OER/BlTCQ==
-  dependencies:
-    "@gluestack-ui/provider" "^0.1.13"
-    "@gluestack-ui/utils" "^0.1.14"
-    "@react-native-aria/focus" "^0.2.9"
-
 "@gluestack-ui/[email protected]":
   version "0.1.14"
   resolved "https://registry.yarnpkg.com/@gluestack-ui/tabs/-/tabs-0.1.14.tgz#5bcb5cc659927cde08f8e32497830257ed5cba4f"
@@ -2648,18 +2632,6 @@
     "@gluestack-ui/utils" "^0.1.12"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/[email protected]", "@gluestack-ui/tooltip@^0.1.30", "@gluestack-ui/tooltip@^0.1.6":
-  version "0.1.35"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/tooltip/-/tooltip-0.1.35.tgz#6b337eb889f87f21acb21898ed240a23a6e96eff"
-  integrity sha512-hS+xv4wOm8vuDvzeRMt+wuGNGTCk7WSABR2wNCgMj8NEhJiaKAwLSBYwkzA01SRJxjGP64uMk8scPUdrnaw8MQ==
-  dependencies:
-    "@gluestack-ui/hooks" "0.1.12"
-    "@gluestack-ui/overlay" "^0.1.16"
-    "@gluestack-ui/utils" "^0.1.14"
-    "@react-native-aria/focus" "^0.2.9"
-    "@react-native-aria/interactions" "0.2.13"
-    "@react-native-aria/overlays" "^0.3.12"
-
 "@gluestack-ui/[email protected]":
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/@gluestack-ui/utils/-/utils-0.1.12.tgz#0bb3400c9315fb6c0fd1bc697b20d80f82cd3899"