Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions apps/storybook-react-native/stories/Backgrounds.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,23 @@ export default meta;
type Story = StoryObj;

const ButtonComponents = () => (
<Box flexDirection={BoxFlexDirection.Row} gap={2}>
<Button variant={ButtonVariant.Primary}>Primary Button</Button>
<Button variant={ButtonVariant.Secondary}>Secondary Button</Button>
<Button variant={ButtonVariant.Tertiary}>Tertiary Button</Button>
<TextButton>Text Button</TextButton>
<Box flexDirection={BoxFlexDirection.Column} gap={2}>
<Button isFullWidth variant={ButtonVariant.Primary}>
Primary Button
</Button>
<Button isFullWidth variant={ButtonVariant.Secondary}>
Secondary Button
</Button>
<Button isFullWidth variant={ButtonVariant.Tertiary}>
Tertiary Button
</Button>
</Box>
);

const TextComponents = () => (
<>
<Text variant={TextVariant.HeadingSm}>Text & Icon Colors</Text>
<Box twClassName="space-y-2">
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

space-y-2 doesn't work with twrnc

Image

<Box flexDirection={BoxFlexDirection.Column} gap={2}>
<Box
flexDirection={BoxFlexDirection.Row}
alignItems={BoxAlignItems.Center}
Expand All @@ -65,18 +70,16 @@ const TextComponents = () => (
<Icon name={IconName.Info} color={IconColor.IconMuted} />
<Text color={TextColor.TextMuted}>Text Muted and Icon Muted</Text>
</Box>
<TextButton>Text Button</TextButton>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving TextButton to text where it's likely to be used instead of in a button group

</Box>
</>
);

const Backgrounds: React.FC = () => {
const tw = useTailwind();
return (
<ScrollView style={tw`flex-1 bg-default`}>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

background/default is right up against the edge of text here. Going to move to change storybook background color altogether

<Box
twClassName="w-full"
backgroundColor={BoxBackgroundColor.BackgroundDefault}
>
<ScrollView style={tw`flex-1`}>
<Box twClassName="w-full">
{/* Background Default */}
<Box
flexDirection={BoxFlexDirection.Column}
Expand All @@ -88,7 +91,8 @@ const Backgrounds: React.FC = () => {
<ButtonComponents />
{/* Background Section */}
<Box
twClassName="p-4 rounded-2xl"
twClassName="rounded-2xl"
padding={4}
backgroundColor={BoxBackgroundColor.BackgroundSection}
flexDirection={BoxFlexDirection.Column}
gap={4}
Expand All @@ -99,7 +103,8 @@ const Backgrounds: React.FC = () => {

{/* Background Subsection */}
<Box
twClassName="p-4 rounded-2xl"
twClassName="rounded-2xl"
padding={4}
backgroundColor={BoxBackgroundColor.BackgroundSubsection}
flexDirection={BoxFlexDirection.Column}
gap={4}
Expand Down
2 changes: 1 addition & 1 deletion apps/storybook-react/stories/Backgrounds.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ const ButtonComponents = () => (
<Button variant={ButtonVariant.Primary}>Primary Button</Button>
<Button variant={ButtonVariant.Secondary}>Secondary Button</Button>
<Button variant={ButtonVariant.Tertiary}>Tertiary Button</Button>
<TextButton>Text Button</TextButton>
</Box>
);

Expand Down Expand Up @@ -63,6 +62,7 @@ const TextComponents = () => (
<Icon name={IconName.Info} color={IconColor.IconMuted} />
<Text color={TextColor.TextMuted}>Text Muted and Icon Muted</Text>
</Box>
<TextButton>Text Button</TextButton>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving TextButton to text where it's likely to be used instead of in a button group

</Box>
</>
);
Expand Down
Loading