Skip to content

Commit 02dfd65

Browse files
authored
Merge pull request #2321 from gluestack/fix/tab-panel
fix: tabpanel unstyled and minor alert component changes
2 parents 3204f8b + 835c54b commit 02dfd65

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

example/storybook-nativewind/src/components/Alert/Alert.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { InfoIcon } from '@/components/ui/icon';
44

55
const AlertBasic = ({ ...props }: any) => {
66
return (
7-
<Alert {...props} className="gap-3">
7+
<Alert {...props}>
88
<AlertIcon as={InfoIcon} />
99
<AlertText>Selection successfully moved!</AlertText>
1010
</Alert>

example/storybook-nativewind/src/core-components/nativewind/alert/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ const Alert = React.forwardRef(
188188
{
189189
className,
190190
variant = 'solid',
191-
action = 'info',
191+
action = 'muted',
192192
...props
193193
}: { className?: string } & IAlertProps,
194194
ref?: any

packages/unstyled/tabs/src/TabPanel.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ export const TabPanel = <StyledTabPanel,>(
1919
tabIndex={value === currentActiveTab ? 0 : -1}
2020
role={Platform.OS === 'web' ? 'tabpanel' : undefined}
2121
{...(props as StyledTabPanel)}
22-
style={{ display: isActive ? 'flex' : 'none' }}
22+
//@ts-ignore
23+
style={[{ display: isActive ? 'flex' : 'none' }, props.style]}
2324
ref={ref}
2425
/>
2526
);

0 commit comments

Comments
 (0)