Merge pull request #2321 from gluestack/fix/tab-panel

fix: tabpanel unstyled and minor alert component changes
gluestack · Jul 18, 2024 · 02dfd65 · 02dfd65
2 parents 3204f8b + 835c54b
commit 02dfd65
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/example/storybook-nativewind/src/components/Alert/Alert.tsx b/example/storybook-nativewind/src/components/Alert/Alert.tsx
@@ -4,7 +4,7 @@ import { InfoIcon } from '@/components/ui/icon';
 
 const AlertBasic = ({ ...props }: any) => {
   return (
-    <Alert {...props} className="gap-3">
+    <Alert {...props}>
       <AlertIcon as={InfoIcon} />
       <AlertText>Selection successfully moved!</AlertText>
     </Alert>

diff --git a/example/storybook-nativewind/src/core-components/nativewind/alert/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/alert/index.tsx
@@ -188,7 +188,7 @@ const Alert = React.forwardRef(
     {
       className,
       variant = 'solid',
-      action = 'info',
+      action = 'muted',
       ...props
     }: { className?: string } & IAlertProps,
     ref?: any

diff --git a/packages/unstyled/tabs/src/TabPanel.tsx b/packages/unstyled/tabs/src/TabPanel.tsx
@@ -19,7 +19,8 @@ export const TabPanel = <StyledTabPanel,>(
               tabIndex={value === currentActiveTab ? 0 : -1}
               role={Platform.OS === 'web' ? 'tabpanel' : undefined}
               {...(props as StyledTabPanel)}
-              style={{ display: isActive ? 'flex' : 'none' }}
+              //@ts-ignore
+              style={[{ display: isActive ? 'flex' : 'none' }, props.style]}
               ref={ref}
             />
           );