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
6 changes: 6 additions & 0 deletions .changeset/silly-meals-hang.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@shopify/polaris': minor
'polaris.shopify.com': minor
---

Renamed `AlphaStack` to `VerticalStack`
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {AlphaCard} from '../AlphaCard';
import {Box} from '../Box';
import {Inline} from '../Inline';
import {Text} from '../Text';
import {AlphaStack} from '../AlphaStack';
import {VerticalStack} from '../VerticalStack';

export interface AccountConnectionProps {
/** Content to display as title */
Expand Down Expand Up @@ -73,10 +73,10 @@ export function AccountConnection({
<SettingAction action={actionElement}>
<Inline gap="4">
{avatarMarkup}
<AlphaStack gap="2">
<VerticalStack gap="2">
{titleMarkup}
{detailsMarkup}
</AlphaStack>
</VerticalStack>
</Inline>
</SettingAction>
{termsOfServiceMarkup}
Expand Down
26 changes: 13 additions & 13 deletions polaris-react/src/components/AlphaCard/AlphaCard.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import type {ComponentMeta} from '@storybook/react';
import {
AlphaCard,
AlphaStack,
VerticalStack,
Bleed,
Box,
Divider,
Expand All @@ -17,59 +17,59 @@ export default {
export function Default() {
return (
<AlphaCard>
<AlphaStack gap="5">
<VerticalStack gap="5">
<Text as="h3" variant="headingMd">
Online store dashboard
</Text>
<p>View a summary of your online store’s performance.</p>
</AlphaStack>
</VerticalStack>
</AlphaCard>
);
}

export function WithBackgroundSubdued() {
return (
<AlphaCard background="bg-subdued">
<AlphaStack gap="5">
<VerticalStack gap="5">
<Text as="h3" variant="headingMd">
Online store dashboard
</Text>
<p>View a summary of your online store’s performance.</p>
</AlphaStack>
</VerticalStack>
</AlphaCard>
);
}

export function WithBorderRadiusRoundedAbove() {
return (
<AlphaCard roundedAbove="sm">
<AlphaStack gap="5">
<VerticalStack gap="5">
<Text as="h3" variant="headingMd">
Online store dashboard
</Text>
<p>View a summary of your online store’s performance.</p>
</AlphaStack>
</VerticalStack>
</AlphaCard>
);
}

export function WithResponsivePadding() {
return (
<AlphaCard padding={{xs: '5', sm: '6', md: '8'}} roundedAbove="sm">
<AlphaStack gap={{xs: '4', sm: '5'}}>
<VerticalStack gap={{xs: '4', sm: '5'}}>
<Text as="h3" variant="headingMd">
Online store dashboard
</Text>
<p>View a summary of your online store’s performance.</p>
</AlphaStack>
</VerticalStack>
</AlphaCard>
);
}

export function WithSubduedSection() {
return (
<AlphaCard roundedAbove="sm">
<AlphaStack gap="5">
<VerticalStack gap="5">
<Text as="h3" variant="headingMd">
Staff accounts
</Text>
Expand All @@ -79,22 +79,22 @@ export function WithSubduedSection() {
<List.Item>Ezequiel Manno</List.Item>
</List>
</Box>
</AlphaStack>
</VerticalStack>
<Bleed
marginBlockEnd={{xs: '4', sm: '5'}}
marginInline={{xs: '4', sm: '5'}}
>
<Divider />
<Box background="bg-subdued" padding={{xs: '4', sm: '5'}}>
<AlphaStack gap="2">
<VerticalStack gap="2">
<Text variant="headingSm" as="h3">
Deactivated staff accounts
</Text>
<List>
<List.Item>Felix Crafford</List.Item>
<List.Item>Ezequiel Manno</List.Item>
</List>
</AlphaStack>
</VerticalStack>
</Box>
</Bleed>
</AlphaCard>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {useI18n} from '../../../../utilities/i18n';
import {useToggle} from '../../../../utilities/use-toggle';
import {Popover} from '../../../Popover';
import {Button} from '../../../Button';
import {AlphaStack} from '../../../AlphaStack';
import {VerticalStack} from '../../../VerticalStack';
import {Icon} from '../../../Icon';
import {Text} from '../../../Text';
import {Inline} from '../../../Inline';
Expand Down Expand Up @@ -174,10 +174,10 @@ export function FilterPill({
>
<div className={styles.PopoverWrapper}>
<Popover.Section>
<AlphaStack gap="1">
<VerticalStack gap="1">
{filter}
{clearButtonMarkup}
</AlphaStack>
</VerticalStack>
</Popover.Section>
</div>
</Popover>
Expand Down
1 change: 0 additions & 1 deletion polaris-react/src/components/AlphaStack/index.ts

This file was deleted.

6 changes: 3 additions & 3 deletions polaris-react/src/components/Banner/Banner.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useCallback, useEffect, useRef, useState} from 'react';
import type {ComponentMeta} from '@storybook/react';
import {
AlphaStack,
VerticalStack,
Banner,
Button,
LegacyCard,
Expand Down Expand Up @@ -193,7 +193,7 @@ export function InACard() {
export function WithEndJustifiedContent() {
return (
<Banner status="critical">
<AlphaStack gap="1">
<VerticalStack gap="1">
<Inline gap="4" align="space-between">
<Text variant="headingMd" fontWeight="semibold" as="h3">
Deployment failed in 5min
Expand All @@ -203,7 +203,7 @@ export function WithEndJustifiedContent() {
</Link>
</Inline>
<p>This order was archived on March 7, 2017 at 3:12pm EDT.</p>
</AlphaStack>
</VerticalStack>
</Banner>
);
}
6 changes: 3 additions & 3 deletions polaris-react/src/components/Box/Box.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
import {AlphaStack, Box, Icon} from '@shopify/polaris';
import {VerticalStack, Box, Icon} from '@shopify/polaris';
import {PaintBrushMajor} from '@shopify/polaris-icons';

export default {
Expand Down Expand Up @@ -33,7 +33,7 @@ export function WithBorderRadius() {

export function WithResponsivePadding() {
return (
<AlphaStack gap="4">
<VerticalStack gap="4">
<Box background="bg" padding={{xs: '2', sm: '8'}} border="dark">
<Icon source={PaintBrushMajor} color="base" />
</Box>
Expand Down Expand Up @@ -64,6 +64,6 @@ export function WithResponsivePadding() {
<Box background="bg" paddingInlineEnd={{xs: '4', sm: '10'}} border="dark">
<Icon source={PaintBrushMajor} color="base" />
</Box>
</AlphaStack>
</VerticalStack>
);
}
10 changes: 5 additions & 5 deletions polaris-react/src/components/ChoiceList/ChoiceList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {Error} from '../../types';
import {Checkbox} from '../Checkbox';
import {RadioButton} from '../RadioButton';
import {InlineError, errorTextID} from '../InlineError';
import {AlphaStack} from '../AlphaStack';
import {VerticalStack} from '../VerticalStack';
import {Box} from '../Box';
import {Bleed} from '../Bleed';

Expand Down Expand Up @@ -132,18 +132,18 @@ export function ChoiceList({
);

return (
<AlphaStack
<VerticalStack
as="fieldset"
gap={{xs: '4', md: '0'}}
aria-invalid={error != null}
id={finalName}
>
{titleMarkup}
<AlphaStack as="ul" gap={{xs: '4', md: '0'}}>
<VerticalStack as="ul" gap={{xs: '4', md: '0'}}>
{choicesMarkup}
</AlphaStack>
</VerticalStack>
{errorMarkup}
</AlphaStack>
</VerticalStack>
);
}

Expand Down
6 changes: 3 additions & 3 deletions polaris-react/src/components/Divider/Divider.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
import {AlphaStack, Divider, Text} from '@shopify/polaris';
import {VerticalStack, Divider, Text} from '@shopify/polaris';

export default {
component: Divider,
Expand All @@ -12,7 +12,7 @@ export function Default() {

export function WithBorderStyles() {
return (
<AlphaStack gap="5">
<VerticalStack gap="5">
<Text as="h1" variant="headingXs">
Default
</Text>
Expand All @@ -29,6 +29,6 @@ export function WithBorderStyles() {
Transparent
</Text>
<Divider borderColor="transparent" />
</AlphaStack>
</VerticalStack>
);
}
Loading