Merge pull request #2276 from gluestack/main

Backmerge Main -> Patch

Author: Viraj-10

example/storybook-nativewind/package.json

@@ -31,8 +31,8 @@
     "@geometricpanda/storybook-addon-iframe": "^0.2.2",
     "@gluestack-style/animation-resolver": "^1.0.4",
     "@gluestack-style/react": "^1.0.56",
-    "@gluestack-ui/config": "^1.1.18",
-    "@gluestack-ui/themed": "^1.1.32",
+    "@gluestack-ui/config": "^1.1.19",
+    "@gluestack-ui/themed": "^1.1.33",
     "@gluestack/design-system": "^0.5.36",
     "@gorhom/bottom-sheet": "^5.0.0-alpha.10",
     "@legendapp/motion": "^2.2.0",

example/storybook/tsconfig.json

@@ -4,6 +4,7 @@
     "baseUrl": ".",
     "paths": {
       "@gluestack-ui/themed": ["../../packages/themed/src"],
+      "@gluestack-ui/button": ["../../packages/unstyled/button/src"],
       "@gluestack-ui/config": ["../../packages/config/src/gluestack-ui.config"],
       "react-native": ["./node_modules/react-native-web"],
       "@gluestack-style/react": ["../../packages/styled/react/src"],

packages/config/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @gluestack-ui/config
 
+## 1.1.19
+
+### Patch Changes
+
+- fix: ref typing for all the components
+- Updated dependencies
+  - @gluestack-ui/themed@1.1.33
+
 ## 1.1.18
 
 ### Patch Changes

packages/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gluestack-ui/config",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "main": "build/gluestack-ui.config.js",
   "types": "build/gluestack-ui.config.d.ts",
   "module": "build/gluestack-ui.config",
@@ -38,42 +38,42 @@
     "@gluestack-style/animation-resolver": "1.0.4",
     "@gluestack-style/legend-motion-animation-driver": "1.0.3",
     "@gluestack-style/react": "1.0.56",
-    "@gluestack-ui/accordion": "1.0.4",
-    "@gluestack-ui/actionsheet": "0.2.42",
-    "@gluestack-ui/alert": "0.1.14",
-    "@gluestack-ui/alert-dialog": "0.1.29",
-    "@gluestack-ui/avatar": "0.1.16",
-    "@gluestack-ui/button": "1.0.5",
-    "@gluestack-ui/checkbox": "0.1.29",
-    "@gluestack-ui/divider": "0.1.8",
-    "@gluestack-ui/fab": "0.1.20",
-    "@gluestack-ui/form-control": "0.1.17",
+    "@gluestack-ui/accordion": "1.0.5",
+    "@gluestack-ui/actionsheet": "0.2.43",
+    "@gluestack-ui/alert": "0.1.15",
+    "@gluestack-ui/alert-dialog": "0.1.30",
+    "@gluestack-ui/avatar": "0.1.17",
+    "@gluestack-ui/button": "1.0.6",
+    "@gluestack-ui/checkbox": "0.1.30",
+    "@gluestack-ui/divider": "0.1.9",
+    "@gluestack-ui/fab": "0.1.21",
+    "@gluestack-ui/form-control": "0.1.18",
     "@gluestack-ui/icon": "0.1.22",
-    "@gluestack-ui/image": "0.1.9",
-    "@gluestack-ui/input": "0.1.30",
-    "@gluestack-ui/link": "0.1.20",
-    "@gluestack-ui/menu": "0.2.33",
-    "@gluestack-ui/modal": "0.1.33",
+    "@gluestack-ui/image": "0.1.10",
+    "@gluestack-ui/input": "0.1.31",
+    "@gluestack-ui/link": "0.1.21",
+    "@gluestack-ui/menu": "0.2.34",
+    "@gluestack-ui/modal": "0.1.34",
     "@gluestack-ui/overlay": "0.1.14",
-    "@gluestack-ui/popover": "0.1.34",
+    "@gluestack-ui/popover": "0.1.35",
     "@gluestack-ui/pressable": "0.1.16",
-    "@gluestack-ui/progress": "0.1.14",
+    "@gluestack-ui/progress": "0.1.15",
     "@gluestack-ui/provider": "0.1.12",
-    "@gluestack-ui/radio": "0.1.30",
-    "@gluestack-ui/select": "0.1.26",
-    "@gluestack-ui/slider": "0.1.24",
+    "@gluestack-ui/radio": "0.1.31",
+    "@gluestack-ui/select": "0.1.27",
+    "@gluestack-ui/slider": "0.1.25",
     "@gluestack-ui/spinner": "0.1.14",
-    "@gluestack-ui/switch": "0.1.21",
+    "@gluestack-ui/switch": "0.1.22",
     "@gluestack-ui/tabs": "0.1.16",
-    "@gluestack-ui/textarea": "0.1.22",
-    "@gluestack-ui/themed": "1.1.32",
-    "@gluestack-ui/toast": "1.0.4",
-    "@gluestack-ui/tooltip": "0.1.30",
+    "@gluestack-ui/textarea": "0.1.23",
+    "@gluestack-ui/themed": "1.1.33",
+    "@gluestack-ui/toast": "1.0.5",
+    "@gluestack-ui/tooltip": "0.1.31",
     "@legendapp/motion": "latest"
   },
   "peerDependencies": {
     "@gluestack-style/react": ">=1.0.56",
-    "@gluestack-ui/themed": ">=1.1.32"
+    "@gluestack-ui/themed": ">=1.1.33"
   },
   "release-it": {
     "git": {

packages/themed/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @gluestack-ui/themed
 
+## 1.1.33
+
+### Patch Changes
+
+- fix: ref typing for all the components
+- Updated dependencies
+  - @gluestack-ui/alert-dialog@0.1.30
+  - @gluestack-ui/form-control@0.1.18
+  - @gluestack-ui/actionsheet@0.2.43
+  - @gluestack-ui/accordion@1.0.5
+  - @gluestack-ui/checkbox@0.1.30
+  - @gluestack-ui/progress@0.1.15
+  - @gluestack-ui/textarea@0.1.23
+  - @gluestack-ui/divider@0.1.9
+  - @gluestack-ui/popover@0.1.35
+  - @gluestack-ui/tooltip@0.1.31
+  - @gluestack-ui/avatar@0.1.17
+  - @gluestack-ui/button@1.0.6
+  - @gluestack-ui/select@0.1.27
+  - @gluestack-ui/switch@0.1.22
+  - @gluestack-ui/alert@0.1.15
+  - @gluestack-ui/image@0.1.10
+  - @gluestack-ui/input@0.1.31
+  - @gluestack-ui/modal@0.1.34
+  - @gluestack-ui/radio@0.1.31
+  - @gluestack-ui/toast@1.0.5
+  - @gluestack-ui/link@0.1.21
+  - @gluestack-ui/menu@0.2.34
+  - @gluestack-ui/fab@0.1.21
+  - @gluestack-ui/slider@0.1.25
+
 ## 1.1.32
 
 ### Patch Changes

packages/themed/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gluestack-ui/themed",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "module": "build/index",
@@ -37,36 +37,36 @@
     "@expo/html-elements": "latest",
     "@gluestack-style/animation-resolver": "1.0.4",
     "@gluestack-style/legend-motion-animation-driver": "1.0.3",
-    "@gluestack-ui/accordion": "1.0.4",
-    "@gluestack-ui/actionsheet": "0.2.42",
-    "@gluestack-ui/alert": "0.1.14",
-    "@gluestack-ui/alert-dialog": "0.1.29",
-    "@gluestack-ui/avatar": "0.1.16",
-    "@gluestack-ui/button": "1.0.5",
-    "@gluestack-ui/checkbox": "0.1.29",
-    "@gluestack-ui/divider": "0.1.8",
-    "@gluestack-ui/fab": "0.1.20",
-    "@gluestack-ui/form-control": "0.1.17",
+    "@gluestack-ui/accordion": "1.0.5",
+    "@gluestack-ui/actionsheet": "0.2.43",
+    "@gluestack-ui/alert": "0.1.15",
+    "@gluestack-ui/alert-dialog": "0.1.30",
+    "@gluestack-ui/avatar": "0.1.17",
+    "@gluestack-ui/button": "1.0.6",
+    "@gluestack-ui/checkbox": "0.1.30",
+    "@gluestack-ui/divider": "0.1.9",
+    "@gluestack-ui/fab": "0.1.21",
+    "@gluestack-ui/form-control": "0.1.18",
     "@gluestack-ui/icon": "0.1.22",
-    "@gluestack-ui/image": "0.1.9",
-    "@gluestack-ui/input": "0.1.30",
-    "@gluestack-ui/link": "0.1.20",
-    "@gluestack-ui/menu": "0.2.33",
-    "@gluestack-ui/modal": "0.1.33",
+    "@gluestack-ui/image": "0.1.10",
+    "@gluestack-ui/input": "0.1.31",
+    "@gluestack-ui/link": "0.1.21",
+    "@gluestack-ui/menu": "0.2.34",
+    "@gluestack-ui/modal": "0.1.34",
     "@gluestack-ui/overlay": "0.1.14",
-    "@gluestack-ui/popover": "0.1.34",
+    "@gluestack-ui/popover": "0.1.35",
     "@gluestack-ui/pressable": "0.1.16",
-    "@gluestack-ui/progress": "0.1.14",
+    "@gluestack-ui/progress": "0.1.15",
     "@gluestack-ui/provider": "0.1.12",
-    "@gluestack-ui/radio": "0.1.30",
-    "@gluestack-ui/select": "0.1.26",
-    "@gluestack-ui/slider": "0.1.24",
+    "@gluestack-ui/radio": "0.1.31",
+    "@gluestack-ui/select": "0.1.27",
+    "@gluestack-ui/slider": "0.1.25",
     "@gluestack-ui/spinner": "0.1.14",
-    "@gluestack-ui/switch": "0.1.21",
+    "@gluestack-ui/switch": "0.1.22",
     "@gluestack-ui/tabs": "0.1.16",
-    "@gluestack-ui/textarea": "0.1.22",
-    "@gluestack-ui/toast": "1.0.4",
-    "@gluestack-ui/tooltip": "0.1.30",
+    "@gluestack-ui/textarea": "0.1.23",
+    "@gluestack-ui/toast": "1.0.5",
+    "@gluestack-ui/tooltip": "0.1.31",
     "@legendapp/motion": "latest"
   },
   "devDependencies": {

packages/unstyled/accordion/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @gluestack-ui/accordion
 
+## 1.0.5
+
+### Patch Changes
+
+- fix: ref typing for all the components
+
 ## 1.0.4
 
 ### Patch Changes

packages/unstyled/accordion/package.json

@@ -15,7 +15,7 @@
     "ios",
     "nextjs"
   ],
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",

packages/unstyled/accordion/src/types.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { ViewProps } from 'react-native';
 
 export interface IAccordionProps extends ViewProps {
@@ -91,27 +92,33 @@ export type IAccordionComponentType<
   TitleTextProps,
   ContentTextProps
 > = React.ForwardRefExoticComponent<
-  AccordionProps & React.RefAttributes<AccordionProps> & IAccordionProps
+  React.PropsWithoutRef<AccordionProps & IAccordionProps> &
+    React.RefAttributes<AccordionProps>
 > & {
   Item: React.ForwardRefExoticComponent<
-    ItemProps & React.RefAttributes<ItemProps> & IAccordionItemProps
+    React.PropsWithoutRef<ItemProps & IAccordionItemProps> &
+      React.RefAttributes<ItemProps>
   >;
   Header: React.ForwardRefExoticComponent<
-    HeaderProps & React.RefAttributes<HeaderProps>
+    React.PropsWithoutRef<HeaderProps> & React.RefAttributes<HeaderProps>
   >;
   Trigger: React.ForwardRefExoticComponent<
-    Omit<TriggerProps, 'children'> & IAccordionTriggerProps
+    React.PropsWithoutRef<
+      Omit<TriggerProps, 'children'> & IAccordionTriggerProps
+    > &
+      React.RefAttributes<TriggerProps>
   >;
   Content: React.ForwardRefExoticComponent<
-    ContentProps & React.RefAttributes<ContentProps>
+    React.PropsWithoutRef<ContentProps> & React.RefAttributes<ContentProps>
   >;
   TitleText: React.ForwardRefExoticComponent<
-    TitleTextProps & React.RefAttributes<TitleTextProps>
+    React.PropsWithoutRef<TitleTextProps> & React.RefAttributes<TitleTextProps>
   >;
   ContentText: React.ForwardRefExoticComponent<
-    ContentTextProps & React.RefAttributes<ContentTextProps>
+    React.PropsWithoutRef<ContentTextProps> &
+      React.RefAttributes<ContentTextProps>
   >;
   Icon: React.ForwardRefExoticComponent<
-    IconProps & React.RefAttributes<IconProps>
+    React.PropsWithoutRef<IconProps> & React.RefAttributes<IconProps>
   >;
 };

packages/unstyled/actionsheet/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @gluestack-ui/actionsheet
 
+## 0.2.43
+
+### Patch Changes
+
+- fix: ref typing for all the components
+
 ## 0.2.42
 
 ### Patch Changes