Merge branch 'develop' of github.com:gluestack/gluestack-ui into rele…

…ase/@gluestack-ui/[email protected]
gluestack · Dec 23, 2024 · e902c6c · e902c6c
2 parents 74c5c44 + ed5e152
commit e902c6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 190 deletions.
diff --git a/example/storybook-nativewind/src/core-components/hooks/use-break-point-value.ts b/example/storybook-nativewind/src/core-components/hooks/use-break-point-value.ts
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react';
 import resolveConfig from 'tailwindcss/resolveConfig';
 import tailwindConfig from 'tailwind.config';
 
-const TailwindTheme = resolveConfig(tailwindConfig);
+const TailwindTheme = resolveConfig(tailwindConfig as any);
 const screenSize = TailwindTheme.theme.screens;
 
 type breakpoints = keyof typeof screenSize | 'default';
@@ -16,10 +16,12 @@ const resolveScreenWidth: any = {
 };
 
 Object.entries(screenSize).forEach(([key, value]) => {
-  resolveScreenWidth[key] = parseInt(value.replace('px', ''), 10);
+  if (typeof value === 'string') {
+    resolveScreenWidth[key] = parseInt(value.replace('px', ''), 10);
+  }
 });
 
-export const getBreakPointValue = (values: any, width: any) => {
+export const getBreakPointValue = (values: BreakPointValue, width: number) => {
   if (typeof values !== 'object') return values;
 
   let finalBreakPointResolvedValue: any;

diff --git a/example/storybook-nativewind/src/core-components/nativewind/dependencies.json b/example/storybook-nativewind/src/core-components/nativewind/dependencies.json
@@ -9,7 +9,8 @@
         "react-native-svg": "15.2.0",
         "nativewind": "latest",
         "react-native-css-interop": "latest",
-        "react-native-safe-area-context": "latest"
+        "react-native-safe-area-context": "latest",
+        "@gluestack-ui/icon": "latest"
       },
       "devDependencies": {
         "jscodeshift": "0.15.2"
@@ -226,191 +227,5 @@
       "hooks": ["useBreakpointValue"]
     }
   },
-  "gluestack-ui-provider": {
-    "dependencies": {
-      "tailwindcss": "",
-      "@gluestack-ui/overlay": "latest",
-      "@gluestack-ui/toast": "latest",
-      "@gluestack-ui/nativewind-utils": "latest",
-      "react-native-svg": "13.4.0"
-    },
-    "devDependencies": {
-      "jscodeshift": "0.15.2"
-    }
-  },
-  "accordion": {
-    "dependencies": {
-      "@gluestack-ui/accordion": "latest",
-      "@expo/html-elements": "0.4.2"
-    }
-  },
-  "actionsheet": {
-    "dependencies": {
-      "@legendapp/motion": "latest",
-      "@gluestack-ui/actionsheet": "latest"
-    }
-  },
-  "alert": {
-    "dependencies": {
-      "@gluestack-ui/alert": "latest"
-    }
-  },
-  "alert-dialog": {
-    "dependencies": {
-      "@gluestack-ui/alert-dialog": "latest",
-      "@legendapp/motion": "latest"
-    }
-  },
-  "avatar": {
-    "dependencies": {
-      "@gluestack-ui/avatar": "latest"
-    }
-  },
-  "badge": { "dependencies": {} },
-  "box": { "dependencies": {} },
-  "button": {
-    "dependencies": {
-      "@gluestack-ui/button": "latest"
-    }
-  },
-  "card": { "dependencies": {} },
-  "center": { "dependencies": {} },
-  "checkbox": {
-    "dependencies": {
-      "@gluestack-ui/checkbox": "latest"
-    }
-  },
-  "divider": {
-    "dependencies": {}
-  },
-  "fab": {
-    "dependencies": {
-      "@gluestack-ui/fab": "latest"
-    }
-  },
-  "flat-list": {
-    "dependencies": {}
-  },
-  "form-control": {
-    "dependencies": {
-      "@gluestack-ui/form-control": "latest"
-    }
-  },
-  "heading": {
-    "dependencies": {
-      "@expo/html-elements": "0.4.2"
-    }
-  },
-  "hstack": {
-    "dependencies": {}
-  },
-  "icon": {
-    "dependencies": {
-      "@gluestack-ui/icon": "latest"
-    }
-  },
-  "image": {
-    "dependencies": {
-      "@gluestack-ui/image": "latest"
-    }
-  },
-  "image-background": {
-    "dependencies": {}
-  },
-  "input": {
-    "dependencies": {
-      "@gluestack-ui/input": "latest"
-    }
-  },
-  "input-accessory-view": {
-    "dependencies": {}
-  },
-  "keyboard-avoiding-view": {
-    "dependencies": {}
-  },
-  "link": {
-    "dependencies": {
-      "@gluestack-ui/link": "latest"
-    }
-  },
-  "menu": {
-    "dependencies": {
-      "@gluestack-ui/menu": "latest",
-      "@legendapp/motion": "latest"
-    }
-  },
-  "modal": {
-    "dependencies": {
-      "@gluestack-ui/modal": "latest",
-      "@legendapp/motion": "latest"
-    }
-  },
-  "popover": {
-    "dependencies": {
-      "@gluestack-ui/popover": "latest",
-      "@legendapp/motion": "latest"
-    }
-  },
-  "pressable": {
-    "dependencies": {
-      "@gluestack-ui/pressable": "latest"
-    }
-  },
-  "progress": {
-    "dependencies": {
-      "@gluestack-ui/progress": "latest"
-    }
-  },
-  "radio": {
-    "dependencies": {
-      "@gluestack-ui/radio": "latest"
-    }
-  },
-  "refresh-control": { "dependencies": {} },
-  "safe-area-view": { "dependencies": {} },
-  "scroll-view": { "dependencies": {} },
-  "section-list": {
-    "dependencies": {}
-  },
-  "select": {
-    "dependencies": {
-      "@gluestack-ui/select": "latest",
-      "@gluestack-ui/actionsheet": "latest",
-      "@legendapp/motion": "latest",
-      "@expo/html-elements": "0.4.2"
-    }
-  },
-  "slider": {
-    "dependencies": {
-      "@gluestack-ui/slider": "latest"
-    }
-  },
-  "spinner": {
-    "dependencies": {}
-  },
-  "status-bar": { "dependencies": {} },
-  "switch": {
-    "dependencies": {
-      "@gluestack-ui/switch": "latest"
-    }
-  },
-  "text": { "dependencies": {} },
-  "textarea": {
-    "dependencies": {
-      "@gluestack-ui/textarea": "latest"
-    }
-  },
-  "toast": {
-    "dependencies": {
-      "@gluestack-ui/toast": "latest",
-      "@legendapp/motion": "latest"
-    }
-  },
-  "tooltip": {
-    "dependencies": {
-      "@gluestack-ui/tooltip": "latest",
-      "@legendapp/motion": "latest"
-    }
-  },
   "IgnoredComponents": ["bottomsheet"]
 }