Merge branch 'patch' of github.com:gluestack/gluestack-ui into patch

gluestack · Jul 16, 2024 · 5c70f37 · 5c70f37
2 parents 9737729 + ede5a3e
commit 5c70f37
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 47 deletions.
diff --git a/example/storybook-nativewind/src/components/Text/Text.stories.tsx b/example/storybook-nativewind/src/components/Text/Text.stories.tsx
@@ -27,30 +27,37 @@ const TextMeta: ComponentMeta<typeof Text> = {
         '6xl',
       ],
     },
-    fontWeight: {
-      control: 'select',
-      options: [
-        'hairline',
-        'thin',
-        'light',
-        'normal',
-        'medium',
-        'semibold',
-        'bold',
-        'extrabold',
-        'black',
-        'extrablack',
-      ],
+    bold: {
+      control: 'boolean',
+    },
+    italic: {
+      control: 'boolean',
+    },
+    underline: {
+      control: 'boolean',
+    },
+    strikeThrough: {
+      control: 'boolean',
+    },
+    highlight: {
+      control: 'boolean',
+    },
+    sub: {
+      control: 'boolean',
     },
   },
   args: {
     text: 'Hello world',
     size: 'md',
-    fontWeight: 'medium',
+    bold: false,
+    italic: false,
+    underline: false,
+    strikeThrough: false,
+    highlight: false,
+    sub: false,
   },
 };
 
 export default TextMeta;
 
 export { Text };
-// export { TextSizes };
diff --git a/example/storybook-nativewind/src/components/Text/Text.tsx b/example/storybook-nativewind/src/components/Text/Text.tsx
@@ -1,31 +1,9 @@
 import React from 'react';
 import { Text } from '@/components/ui/text';
 
-const TextBasic = ({
-  size = 'md',
-  text = 'Hello world',
-  fontWeight = 'bold',
-  ...props
-}: any) => {
-  const fontWeights = {
-    hairline: 'font-hairline',
-    thin: 'font-thin',
-    light: 'font-light',
-    normal: 'font-normal',
-    medium: 'font-medium',
-    semibold: 'font-semibold',
-    bold: 'font-bold',
-    extrabold: 'font-extrabold',
-    black: 'font-black',
-    extrablack: 'font-extrablack',
-  };
-
+const TextBasic = ({ size = 'md', text = 'Hello world', ...props }: any) => {
   return (
-    <Text
-      size={size}
-      {...props}
-      className={`${fontWeights[fontWeight as keyof typeof fontWeights]}`}
-    >
+    <Text size={size} {...props}>
       {text}
     </Text>
   );

diff --git a/example/storybook-nativewind/src/core-components/nativewind/menu/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/menu/index.tsx
@@ -119,21 +119,19 @@ const Menu = React.forwardRef(
         ref={ref}
         initial={{
           opacity: 0,
+          scale: 0.8,
         }}
         animate={{
           opacity: 1,
+          scale: 1,
         }}
         exit={{
           opacity: 0,
+          scale: 0.8,
         }}
         transition={{
-          type: 'spring',
-          damping: 18,
-          stiffness: 250,
-          opacity: {
-            type: 'timing',
-            duration: 200,
-          },
+          type: 'timing',
+          duration: 100,
         }}
         className={menuStyle({
           class: className,