Merge branch 'patch' into feat/cli-docs

gluestack · Jun 27, 2024 · 39fa0b7 · 39fa0b7
2 parents ba6caf6 + 5d81777
commit 39fa0b7
Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/example/storybook-nativewind/package.json b/example/storybook-nativewind/package.json
@@ -32,7 +32,7 @@
     "@gluestack-style/animation-resolver": "^1.0.4",
     "@gluestack-style/react": "^1.0.56",
     "@gluestack-ui/config": "^1.1.18",
-    "@gluestack-ui/themed": "^1.1.30",
+    "@gluestack-ui/themed": "^1.1.31",
     "@gluestack/design-system": "^0.5.36",
     "@gorhom/bottom-sheet": "^5.0.0-alpha.10",
     "@legendapp/motion": "^2.2.0",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -66,14 +66,14 @@
     "@gluestack-ui/switch": "0.1.21",
     "@gluestack-ui/tabs": "0.1.16",
     "@gluestack-ui/textarea": "0.1.22",
-    "@gluestack-ui/themed": "1.1.30",
+    "@gluestack-ui/themed": "1.1.31",
     "@gluestack-ui/toast": "1.0.4",
     "@gluestack-ui/tooltip": "0.1.30",
     "@legendapp/motion": "latest"
   },
   "peerDependencies": {
     "@gluestack-style/react": ">=1.0.56",
-    "@gluestack-ui/themed": ">=1.1.30"
+    "@gluestack-ui/themed": ">=1.1.31"
   },
   "release-it": {
     "git": {

diff --git a/packages/nativewind/utils/useBreakpointValue/index.tsx b/packages/nativewind/utils/useBreakpointValue/index.tsx
@@ -1,16 +1,16 @@
 import { Dimensions, useWindowDimensions } from 'react-native';
 import { useEffect, useState } from 'react';
-type BreakPointValue = Partial<{
-  // @ts-ignore
-  [key]: any;
-}>;
 
 import DefaultTheme from 'tailwindcss/defaultConfig';
 import resolveConfig from 'tailwindcss/resolveConfig';
 
 const TailwindTheme = resolveConfig(DefaultTheme);
 const screenSize = TailwindTheme.theme.screens;
 
+type breakpoints = keyof typeof screenSize | 'default';
+
+type BreakPointValue = Partial<Record<breakpoints, any>>;
+
 const resolveScreenWidth: any = {
   default: 0,
 };
@@ -23,7 +23,13 @@ export const getBreakPointValue = (values: any, width: any) => {
   if (typeof values !== 'object') return values;
 
   let finalBreakPointResolvedValue: any;
-  const mediaQueriesBreakpoints: any = [];
+  const mediaQueriesBreakpoints: any = [
+    {
+      key: 'default',
+      breakpoint: 0,
+      isValid: true,
+    },
+  ];
   Object.keys(resolveScreenWidth).forEach((key) => {
     const isValid = isValidBreakpoint(resolveScreenWidth[key], width);
 
@@ -40,15 +46,16 @@ export const getBreakPointValue = (values: any, width: any) => {
     breakpoint.value = values.hasOwnProperty(breakpoint.key)
       ? // @ts-ignore
         values[breakpoint.key]
-      : mediaQueriesBreakpoints[index - 1].value;
+      : mediaQueriesBreakpoints[index - 1]?.value ||
+        mediaQueriesBreakpoints[0]?.value;
   });
 
   const lastValidObject = getLastValidObject(mediaQueriesBreakpoints);
 
   if (!lastValidObject) {
     finalBreakPointResolvedValue = values;
   } else {
-    finalBreakPointResolvedValue = lastValidObject.value;
+    finalBreakPointResolvedValue = lastValidObject?.value;
   }
   return finalBreakPointResolvedValue;
 };

diff --git a/packages/themed/CHANGELOG.md b/packages/themed/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gluestack-ui/themed
 
+## 1.1.31
+
+### Patch Changes
+
+- TextArea Typing Issue
+
 ## 1.1.30
 
 ### Patch Changes

diff --git a/packages/themed/package.json b/packages/themed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gluestack-ui/themed",
-  "version": "1.1.30",
+  "version": "1.1.31",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "module": "build/index",