Drop zone with error
@@ -575,7 +575,7 @@ export function Error() {
{uploadedFiles}
{fileUpload}
-
+
);
}
diff --git a/polaris-react/src/components/DropZone/DropZone.tsx b/polaris-react/src/components/DropZone/DropZone.tsx
index 0e1aa8ff671..4c2ec5ece75 100755
--- a/polaris-react/src/components/DropZone/DropZone.tsx
+++ b/polaris-react/src/components/DropZone/DropZone.tsx
@@ -21,7 +21,7 @@ import {useI18n} from '../../utilities/i18n';
import {isServer} from '../../utilities/target';
import {useComponentDidMount} from '../../utilities/use-component-did-mount';
import {useToggle} from '../../utilities/use-toggle';
-import {VerticalStack} from '../VerticalStack';
+import {BlockStack} from '../BlockStack';
import {useEventListener} from '../../utilities/use-event-listener';
import {FileUpload} from './components';
@@ -388,14 +388,14 @@ export const DropZone: React.FunctionComponent & {
}
return (
-
+
{size === 'small' && }
{(size === 'medium' || size === 'large') && (
{text}
)}
-
+
);
}
diff --git a/polaris-react/src/components/DropZone/components/FileUpload/FileUpload.tsx b/polaris-react/src/components/DropZone/components/FileUpload/FileUpload.tsx
index 0c29f5bad70..43febe9eca0 100755
--- a/polaris-react/src/components/DropZone/components/FileUpload/FileUpload.tsx
+++ b/polaris-react/src/components/DropZone/components/FileUpload/FileUpload.tsx
@@ -10,7 +10,7 @@ import {uploadArrow} from '../../images';
import {DropZoneContext} from '../../context';
import {useI18n} from '../../../../utilities/i18n';
import {createAllowMultipleKey} from '../../utils';
-import {VerticalStack} from '../../../VerticalStack';
+import {BlockStack} from '../../../BlockStack';
import styles from './FileUpload.scss';
@@ -59,18 +59,18 @@ export function FileUpload(props: FileUploadProps) {
switch (size) {
case 'large':
viewMarkup = (
-
+
{actionMarkup}
{actionHintMarkup}
-
+
);
break;
case 'medium':
viewMarkup = (
-
+
{actionMarkup}
{actionHintMarkup}
-
+
);
break;
case 'small':
diff --git a/polaris-react/src/components/EmptyState/EmptyState.tsx b/polaris-react/src/components/EmptyState/EmptyState.tsx
index ef19e2f81c6..0489e14dcd6 100644
--- a/polaris-react/src/components/EmptyState/EmptyState.tsx
+++ b/polaris-react/src/components/EmptyState/EmptyState.tsx
@@ -6,7 +6,7 @@ import {Box} from '../Box';
import {buttonFrom} from '../Button';
import {Image} from '../Image';
import {Text} from '../Text';
-import {VerticalStack} from '../VerticalStack';
+import {BlockStack} from '../VerticalStack';
import {InlineStack} from '../InlineStack';
import styles from './EmptyState.scss';
@@ -120,11 +120,11 @@ export function EmptyState({
const detailsMarkup =
textContentMarkup || actionsMarkup || footerContentMarkup ? (
-
+
{textContentMarkup}
{actionsMarkup}
{footerContentMarkup}
-
+
) : null;
@@ -135,10 +135,10 @@ export function EmptyState({
paddingBlockStart="5"
paddingBlockEnd="16"
>
-
+
{imageMarkup}
{detailsMarkup}
-
+
);
}
diff --git a/polaris-react/src/components/Filters/Filters.stories.tsx b/polaris-react/src/components/Filters/Filters.stories.tsx
index 75c6e097e3d..a53a27c80ec 100644
--- a/polaris-react/src/components/Filters/Filters.stories.tsx
+++ b/polaris-react/src/components/Filters/Filters.stories.tsx
@@ -12,7 +12,7 @@ import {
ResourceList,
TextField,
Text,
- VerticalStack,
+ BlockStack,
} from '@shopify/polaris';
export default {
diff --git a/polaris-react/src/components/Filters/components/FilterPill/FilterPill.tsx b/polaris-react/src/components/Filters/components/FilterPill/FilterPill.tsx
index 365e1f71e29..e7ebbd21d4f 100644
--- a/polaris-react/src/components/Filters/components/FilterPill/FilterPill.tsx
+++ b/polaris-react/src/components/Filters/components/FilterPill/FilterPill.tsx
@@ -9,7 +9,7 @@ import {useI18n} from '../../../../utilities/i18n';
import {useToggle} from '../../../../utilities/use-toggle';
import {Popover} from '../../../Popover';
import {Button} from '../../../Button';
-import {VerticalStack} from '../../../VerticalStack';
+import {BlockStack} from '../../../BlockStack';
import {Icon} from '../../../Icon';
import {Text} from '../../../Text';
import {InlineStack} from '../../../InlineStack';
@@ -201,10 +201,10 @@ export function FilterPill({
>
-
+
{filter}
{clearButtonMarkup}
-
+
diff --git a/polaris-react/src/components/FormLayout/FormLayout.stories.tsx b/polaris-react/src/components/FormLayout/FormLayout.stories.tsx
index f280633af69..04a3df61aba 100644
--- a/polaris-react/src/components/FormLayout/FormLayout.stories.tsx
+++ b/polaris-react/src/components/FormLayout/FormLayout.stories.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {Card, FormLayout, TextField, VerticalStack} from '@shopify/polaris';
+import {Card, FormLayout, TextField, BlockStack} from '@shopify/polaris';
export default {
component: FormLayout,
@@ -56,7 +56,7 @@ export function CondensedFieldGroup() {
export function All() {
return (
-
+
-
+
);
}
diff --git a/polaris-react/src/components/FullscreenBar/FullscreenBar.stories.tsx b/polaris-react/src/components/FullscreenBar/FullscreenBar.stories.tsx
index 8cc867a012f..8a885fea2e1 100644
--- a/polaris-react/src/components/FullscreenBar/FullscreenBar.stories.tsx
+++ b/polaris-react/src/components/FullscreenBar/FullscreenBar.stories.tsx
@@ -6,7 +6,7 @@ import {
ButtonGroup,
FullscreenBar,
Text,
- VerticalStack,
+ BlockStack,
} from '@shopify/polaris';
import {useBreakpoints} from '../../utilities/breakpoints';
@@ -20,19 +20,19 @@ export default {
export function All() {
return (
<>
-
+
With children
-
+
-
+
No children
-
+
>
);
}
diff --git a/polaris-react/src/components/Icon/Icon.stories.tsx b/polaris-react/src/components/Icon/Icon.stories.tsx
index c82f2380d94..52b6ad1f8f2 100644
--- a/polaris-react/src/components/Icon/Icon.stories.tsx
+++ b/polaris-react/src/components/Icon/Icon.stories.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {VerticalStack, Box, Icon} from '@shopify/polaris';
+import {BlockStack, Box, Icon} from '@shopify/polaris';
import type {BoxProps, IconProps} from '@shopify/polaris';
import {CirclePlusMinor} from '@shopify/polaris-icons';
@@ -45,13 +45,13 @@ export function WithBackdrop() {
);
return (
-
+
-
+
);
}
diff --git a/polaris-react/src/components/KeyboardKey/KeyboardKey.stories.tsx b/polaris-react/src/components/KeyboardKey/KeyboardKey.stories.tsx
index d04c6c310c4..d63a7d1ca28 100644
--- a/polaris-react/src/components/KeyboardKey/KeyboardKey.stories.tsx
+++ b/polaris-react/src/components/KeyboardKey/KeyboardKey.stories.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {KeyboardKey, Card, Text, VerticalStack} from '@shopify/polaris';
+import {KeyboardKey, Card, Text, BlockStack} from '@shopify/polaris';
export default {
component: KeyboardKey,
@@ -75,7 +75,7 @@ export function Small() {
export function All() {
return (
-
+
Default
@@ -92,6 +92,6 @@ export function All() {
⌘
h
-
+
);
}
diff --git a/polaris-react/src/components/LegacyCard/LegacyCard.stories.tsx b/polaris-react/src/components/LegacyCard/LegacyCard.stories.tsx
index 150e9763e37..d4c4bf9988f 100644
--- a/polaris-react/src/components/LegacyCard/LegacyCard.stories.tsx
+++ b/polaris-react/src/components/LegacyCard/LegacyCard.stories.tsx
@@ -14,7 +14,7 @@ import {
LegacyStack,
Text,
TextContainer,
- VerticalStack,
+ BlockStack,
Box,
} from '@shopify/polaris';
import {ProductsMajor, CancelMajor} from '@shopify/polaris-icons';
@@ -405,7 +405,7 @@ export function WithFlushedSections() {
export function All() {
return (
-
+
Section 1 content
@@ -508,7 +508,7 @@ export function All() {
-
+
First nested section
@@ -519,10 +519,10 @@ export function All() {
Second nested section
-
+
-
+
First nested section
@@ -533,7 +533,7 @@ export function All() {
Second nested section
-
+
@@ -547,7 +547,7 @@ export function All() {
-
+
);
}
diff --git a/polaris-react/src/components/LegacyTabs/LegacyTabs.stories.tsx b/polaris-react/src/components/LegacyTabs/LegacyTabs.stories.tsx
index 5834348818a..705b55a50ae 100644
--- a/polaris-react/src/components/LegacyTabs/LegacyTabs.stories.tsx
+++ b/polaris-react/src/components/LegacyTabs/LegacyTabs.stories.tsx
@@ -5,7 +5,7 @@ import {
LegacyCard,
LegacyTabs,
Text,
- VerticalStack,
+ BlockStack,
} from '@shopify/polaris';
export default {
@@ -14,42 +14,42 @@ export default {
export function All() {
return (
-
-
+
+
Default
-
+
-
+
With URL tabs
-
+
-
+
Fitted
-
+
-
+
With badge content
-
+
-
+
With custom disclosure
-
-
+
+
);
}
diff --git a/polaris-react/src/components/Listbox/Listbox.stories.tsx b/polaris-react/src/components/Listbox/Listbox.stories.tsx
index c99959cde84..b5e1e8d7433 100644
--- a/polaris-react/src/components/Listbox/Listbox.stories.tsx
+++ b/polaris-react/src/components/Listbox/Listbox.stories.tsx
@@ -9,7 +9,7 @@ import {
Listbox,
LegacyStack,
AutoSelection,
- VerticalStack,
+ BlockStack,
InlineStack,
Text,
Box,
@@ -24,55 +24,55 @@ export default {
export function All() {
return (
-
-
+
+
Default
-
+
-
+
With loading
-
+
-
+
With action
-
+
-
+
With custom element
-
+
-
+
With search
-
+
-
+
With disabled text option
-
+
-
+
);
}
diff --git a/polaris-react/src/components/MediaCard/MediaCard.stories.tsx b/polaris-react/src/components/MediaCard/MediaCard.stories.tsx
index bb4e63871d2..05a9d4b3138 100644
--- a/polaris-react/src/components/MediaCard/MediaCard.stories.tsx
+++ b/polaris-react/src/components/MediaCard/MediaCard.stories.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {MediaCard, VerticalStack, VideoThumbnail} from '@shopify/polaris';
+import {MediaCard, BlockStack, VideoThumbnail} from '@shopify/polaris';
export default {
component: MediaCard,
@@ -225,11 +225,11 @@ export function All() {
);
return (
-
+
-
+
);
}
diff --git a/polaris-react/src/components/MediaCard/MediaCard.tsx b/polaris-react/src/components/MediaCard/MediaCard.tsx
index b43cafa6fa0..77364336efa 100644
--- a/polaris-react/src/components/MediaCard/MediaCard.tsx
+++ b/polaris-react/src/components/MediaCard/MediaCard.tsx
@@ -15,7 +15,7 @@ import {LegacyStack} from '../LegacyStack';
import {Box} from '../Box';
import {InlineStack} from '../InlineStack';
import {useFeatures} from '../../utilities/features';
-import {VerticalStack} from '../VerticalStack';
+import {BlockStack} from '../BlockStack';
import styles from './MediaCard.scss';
@@ -183,14 +183,14 @@ export function MediaCard({
{polarisSummerEditions2023 ? (
-
+
{headerMarkup}
{popoverOrDismissMarkup}
{description}
{actionMarkup}
-
+
) : (
diff --git a/polaris-react/src/components/OptionList/OptionList.stories.tsx b/polaris-react/src/components/OptionList/OptionList.stories.tsx
index a7652c3c73f..bbb84e0f4f8 100644
--- a/polaris-react/src/components/OptionList/OptionList.stories.tsx
+++ b/polaris-react/src/components/OptionList/OptionList.stories.tsx
@@ -10,7 +10,7 @@ import {
OptionList,
Popover,
Thumbnail,
- VerticalStack,
+ BlockStack,
} from '@shopify/polaris';
import {DiscountsMajor, DiscountsMinor} from '@shopify/polaris-icons';
@@ -203,7 +203,7 @@ export function WithDisabledOption() {
export function All() {
return (
-
+
-
+
);
}
diff --git a/polaris-react/src/components/OptionList/OptionList.tsx b/polaris-react/src/components/OptionList/OptionList.tsx
index 8b2a7fec58a..fb7faa51c28 100644
--- a/polaris-react/src/components/OptionList/OptionList.tsx
+++ b/polaris-react/src/components/OptionList/OptionList.tsx
@@ -13,7 +13,7 @@ import type {BoxProps} from '../Box';
import {Text} from '../Text';
import {Bleed} from '../Bleed';
import {useFeatures} from '../../utilities/features';
-import {VerticalStack} from '../VerticalStack';
+import {BlockStack} from '../BlockStack';
import {Option} from './components';
@@ -222,10 +222,10 @@ export function OptionList({
paddingBlockStart={blockStartPadding}
>
{polarisSummerEditions2023 ? (
-
+
{titleMarkup}
{option}
-
+
) : (
<>
{titleMarkup}
diff --git a/polaris-react/src/components/Popover/Popover.stories.tsx b/polaris-react/src/components/Popover/Popover.stories.tsx
index 8c51e39ab47..f6c65e37188 100644
--- a/polaris-react/src/components/Popover/Popover.stories.tsx
+++ b/polaris-react/src/components/Popover/Popover.stories.tsx
@@ -18,7 +18,7 @@ import {
Scrollable,
EmptySearchResult,
Text,
- VerticalStack,
+ BlockStack,
} from '@shopify/polaris';
import {SearchMinor} from '@shopify/polaris-icons';
@@ -30,56 +30,56 @@ export default {
export function All() {
return (
-
-
+
+
With action list
-
+
-
+
With content and actions
-
+
-
+
With form components
-
+
-
+
With lazy loaded list
-
+
-
+
With scrollable lazy loaded list
-
+
-
+
With searchable listbox
-
+
-
+
With loading smaller content
-
-
+
+
);
}
@@ -112,7 +112,7 @@ export function WithActionList() {
return (
);
}
diff --git a/polaris-react/src/components/RadioButton/RadioButton.stories.tsx b/polaris-react/src/components/RadioButton/RadioButton.stories.tsx
index bc56bd9a160..71d7efa3763 100644
--- a/polaris-react/src/components/RadioButton/RadioButton.stories.tsx
+++ b/polaris-react/src/components/RadioButton/RadioButton.stories.tsx
@@ -4,7 +4,7 @@ import {
RadioButton,
LegacyStack,
Card,
- VerticalStack,
+ BlockStack,
Text,
Box,
Divider,
@@ -83,11 +83,11 @@ export function WithBleed() {
);
return (
-
-
+
+
No Bleed
-
+
-
+
-
-
+
+
Bleed
-
-
+
+
);
}
diff --git a/polaris-react/src/components/Scrollable/Scrollable.stories.tsx b/polaris-react/src/components/Scrollable/Scrollable.stories.tsx
index ad795b0b8c7..022aa19cddd 100644
--- a/polaris-react/src/components/Scrollable/Scrollable.stories.tsx
+++ b/polaris-react/src/components/Scrollable/Scrollable.stories.tsx
@@ -7,7 +7,7 @@ import {
Banner,
Box,
Text,
- VerticalStack,
+ BlockStack,
FormLayout,
TextField,
} from '@shopify/polaris';
@@ -1170,7 +1170,7 @@ export function UsingInstantScrollToFromRef() {
export function WithShadowOverComplexChildren() {
return (
-
+
NOTE: Red shadow is for demo/debug purposes only.
@@ -1293,6 +1293,6 @@ export function WithShadowOverComplexChildren() {
-
+
);
}
diff --git a/polaris-react/src/components/SettingToggle/SettingToggle.stories.tsx b/polaris-react/src/components/SettingToggle/SettingToggle.stories.tsx
index 1aa989c2802..d4321988984 100644
--- a/polaris-react/src/components/SettingToggle/SettingToggle.stories.tsx
+++ b/polaris-react/src/components/SettingToggle/SettingToggle.stories.tsx
@@ -8,7 +8,7 @@ import {
Card,
Button,
Badge,
- VerticalStack,
+ BlockStack,
useBreakpoints,
} from '@shopify/polaris';
import {CircleInformationMajor} from '@shopify/polaris-icons';
@@ -124,7 +124,7 @@ export function WithPrimitiveComponents() {
);
const descriptionMarkup = (
-
+
{description}
@@ -133,22 +133,22 @@ export function WithPrimitiveComponents() {
{actionMarkup}
) : null}
-
+
);
return (
-
+
-
+
{headerMarkup}
{descriptionMarkup}
-
+
Your checkout is only accepting test payments.
-
+
);
}
@@ -238,7 +238,7 @@ export function WithPrimitiveComponentsAndLongTitle() {
);
const descriptionMarkup = (
-
+
{description}
@@ -247,22 +247,22 @@ export function WithPrimitiveComponentsAndLongTitle() {
{actionMarkup}
) : null}
-
+
);
return (
-
+
-
+
{headerMarkup}
{descriptionMarkup}
-
+
Your checkout is only accepting test payments.
-
+
);
}
diff --git a/polaris-react/src/components/ShadowBevel/ShadowBevel.stories.tsx b/polaris-react/src/components/ShadowBevel/ShadowBevel.stories.tsx
index bbec571a8ec..c3e5be675eb 100644
--- a/polaris-react/src/components/ShadowBevel/ShadowBevel.stories.tsx
+++ b/polaris-react/src/components/ShadowBevel/ShadowBevel.stories.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
import type {BoxProps} from '@shopify/polaris';
-import {Box, VerticalStack, InlineCode} from '@shopify/polaris';
+import {Box, BlockStack, InlineCode} from '@shopify/polaris';
import {useFeatures} from '../../utilities/features';
@@ -34,7 +34,7 @@ export function Default() {
];
return (
-
+
Default
@@ -88,6 +88,6 @@ export function Default() {
))}
-
+
);
}
diff --git a/polaris-react/src/components/SkeletonPage/SkeletonPage.tsx b/polaris-react/src/components/SkeletonPage/SkeletonPage.tsx
index 85dac8ae1fc..0fa27e86aff 100644
--- a/polaris-react/src/components/SkeletonPage/SkeletonPage.tsx
+++ b/polaris-react/src/components/SkeletonPage/SkeletonPage.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import {useI18n} from '../../utilities/i18n';
import {Box} from '../Box';
-import {VerticalStack} from '../VerticalStack';
+import {BlockStack} from '../VerticalStack';
import {InlineStack} from '../InlineStack';
import styles from './SkeletonPage.scss';
@@ -66,7 +66,7 @@ export function SkeletonPage({
) : null;
return (
-
+
-
+
{children}
-
+
-
+
);
}
diff --git a/polaris-react/src/components/SkeletonThumbnail/SkeletonThumbnail.stories.tsx b/polaris-react/src/components/SkeletonThumbnail/SkeletonThumbnail.stories.tsx
index c782eeedd3c..7475cc56026 100644
--- a/polaris-react/src/components/SkeletonThumbnail/SkeletonThumbnail.stories.tsx
+++ b/polaris-react/src/components/SkeletonThumbnail/SkeletonThumbnail.stories.tsx
@@ -1,15 +1,15 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {SkeletonThumbnail, VerticalStack} from '@shopify/polaris';
+import {SkeletonThumbnail, BlockStack} from '@shopify/polaris';
export function All() {
return (
-
+
-
+
);
}
diff --git a/polaris-react/src/components/Tabs/Tabs.stories.tsx b/polaris-react/src/components/Tabs/Tabs.stories.tsx
index aaaba0ce5fa..48ff30dafc3 100644
--- a/polaris-react/src/components/Tabs/Tabs.stories.tsx
+++ b/polaris-react/src/components/Tabs/Tabs.stories.tsx
@@ -1,6 +1,6 @@
import React, {useCallback, useState} from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {Tabs, VerticalStack, LegacyCard} from '@shopify/polaris';
+import {Tabs, BlockStack, LegacyCard} from '@shopify/polaris';
export default {
component: Tabs,
@@ -8,14 +8,14 @@ export default {
export function All() {
return (
-
+
-
+
);
}
export function Default() {
diff --git a/polaris-react/src/components/TextContainer/TextContainer.tsx b/polaris-react/src/components/TextContainer/TextContainer.tsx
index 9ef6b4e0555..62d2395ca14 100644
--- a/polaris-react/src/components/TextContainer/TextContainer.tsx
+++ b/polaris-react/src/components/TextContainer/TextContainer.tsx
@@ -13,7 +13,7 @@ export interface TextContainerProps {
children?: React.ReactNode;
}
-/** @deprecated Use VerticalStack instead */
+/** @deprecated Use BlockStack instead */
export function TextContainer({spacing, children}: TextContainerProps) {
const className = classNames(
styles.TextContainer,
diff --git a/polaris-react/src/components/Thumbnail/Thumbnail.stories.tsx b/polaris-react/src/components/Thumbnail/Thumbnail.stories.tsx
index 50bdc3c79b8..f1e43cbd201 100644
--- a/polaris-react/src/components/Thumbnail/Thumbnail.stories.tsx
+++ b/polaris-react/src/components/Thumbnail/Thumbnail.stories.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {InlineStack, Thumbnail, VerticalStack} from '@shopify/polaris';
+import {InlineStack, Thumbnail, BlockStack} from '@shopify/polaris';
import {NoteMinor} from '@shopify/polaris-icons';
export default {
@@ -9,7 +9,7 @@ export default {
export function All() {
return (
-
+
@@ -17,7 +17,7 @@ export function All() {
-
+
);
}
diff --git a/polaris-react/src/components/Tooltip/Tooltip.stories.tsx b/polaris-react/src/components/Tooltip/Tooltip.stories.tsx
index 43c4c5f825f..9f01b4be3f0 100644
--- a/polaris-react/src/components/Tooltip/Tooltip.stories.tsx
+++ b/polaris-react/src/components/Tooltip/Tooltip.stories.tsx
@@ -10,7 +10,7 @@ import {
Tooltip,
Box,
InlineStack,
- VerticalStack,
+ BlockStack,
Popover,
} from '@shopify/polaris';
import type {TooltipProps} from '@shopify/polaris';
@@ -21,7 +21,7 @@ export default {
export function All() {
return (
-
+
@@ -35,7 +35,7 @@ export function All() {
-
+
);
}
@@ -256,8 +256,8 @@ export function VisibleOnlyWithChildInteraction() {
export function WithHoverDelay() {
return (
-
-
+
+
TEXT EXAMPLE
@@ -278,9 +278,9 @@ export function WithHoverDelay() {
-
+
-
+
BUTTON EXAMPLE
@@ -297,8 +297,8 @@ export function WithHoverDelay() {
-
-
+
+
);
}
@@ -538,14 +538,14 @@ export function ActiveStates() {
}}
>
-
+
popoverActive: {popoverActive.toString()}
tooltipActive: {tooltipActive?.toString()}
-
+
diff --git a/polaris-react/src/components/VerticalStack/index.ts b/polaris-react/src/components/VerticalStack/index.ts
deleted file mode 100644
index 70179f40186..00000000000
--- a/polaris-react/src/components/VerticalStack/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './VerticalStack';
diff --git a/polaris-react/src/components/VerticalStack/tests/VerticalStack.test.tsx b/polaris-react/src/components/VerticalStack/tests/VerticalStack.test.tsx
deleted file mode 100644
index 06ce83610d8..00000000000
--- a/polaris-react/src/components/VerticalStack/tests/VerticalStack.test.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import {mountWithApp} from 'tests/utilities';
-
-import {VerticalStack} from '../VerticalStack';
-
-const text = 'This is a stack';
-const children =
{text}
;
-
-describe('
', () => {
- it('renders children', () => {
- const verticalStack = mountWithApp(
-
{children},
- );
-
- expect(verticalStack).toContainReactComponent('p', {children: text});
- });
-
- it('renders custom properties by default', () => {
- const verticalStack = mountWithApp(
-
{children},
- );
-
- expect(verticalStack).toContainReactComponent('div', {
- style: expect.objectContaining({
- '--pc-vertical-stack-order': 'column',
- }) as React.CSSProperties,
- });
- });
-
- it('overrides custom properties if they are passed in', () => {
- const verticalStack = mountWithApp(
-
- {children}
- ,
- );
-
- expect(verticalStack).toContainReactComponent('div', {
- style: expect.objectContaining({
- '--pc-vertical-stack-inline-align': 'center',
- '--pc-vertical-stack-gap-xs': 'var(--p-space-10)',
- }) as React.CSSProperties,
- });
- });
-
- it('accepts gap based on breakpoints', () => {
- const verticalStack = mountWithApp(
-
{children},
- );
-
- expect(verticalStack).toContainReactComponent('div', {
- style: expect.objectContaining({
- '--pc-vertical-stack-gap-md': 'var(--p-space-8)',
- '--pc-vertical-stack-gap-xs': 'var(--p-space-2)',
- }) as React.CSSProperties,
- });
- });
-});
diff --git a/polaris-react/src/components/VideoThumbnail/VideoThumbnail.stories.tsx b/polaris-react/src/components/VideoThumbnail/VideoThumbnail.stories.tsx
index 13608a25cbb..8a8ebd55555 100644
--- a/polaris-react/src/components/VideoThumbnail/VideoThumbnail.stories.tsx
+++ b/polaris-react/src/components/VideoThumbnail/VideoThumbnail.stories.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
-import {MediaCard, Text, VerticalStack, VideoThumbnail} from '@shopify/polaris';
+import {MediaCard, Text, BlockStack, VideoThumbnail} from '@shopify/polaris';
export default {
component: VideoThumbnail,
@@ -8,28 +8,28 @@ export default {
export function All() {
return (
-
-
+
+
Default
-
+
-
+
With progress
-
+
-
+
Outside media card
-
-
+
+
);
}
diff --git a/polaris-react/src/index.ts b/polaris-react/src/index.ts
index e0b6db19657..e6eba3225ae 100644
--- a/polaris-react/src/index.ts
+++ b/polaris-react/src/index.ts
@@ -394,8 +394,8 @@ export type {UnstyledButtonProps} from './components/UnstyledButton';
export {UnstyledLink} from './components/UnstyledLink';
export type {UnstyledLinkProps} from './components/UnstyledLink';
-export {VerticalStack} from './components/VerticalStack';
-export type {VerticalStackProps} from './components/VerticalStack';
+export {BlockStack} from './components/BlockStack';
+export type {BlockStackProps} from './components/BlockStack';
export {VideoThumbnail} from './components/VideoThumbnail';
diff --git a/polaris.shopify.com/content/components/layout-and-structure/vertical-stack.md b/polaris.shopify.com/content/components/layout-and-structure/block-stack.md
similarity index 90%
rename from polaris.shopify.com/content/components/layout-and-structure/vertical-stack.md
rename to polaris.shopify.com/content/components/layout-and-structure/block-stack.md
index e7b60d92134..bd1cd4db87a 100644
--- a/polaris.shopify.com/content/components/layout-and-structure/vertical-stack.md
+++ b/polaris.shopify.com/content/components/layout-and-structure/block-stack.md
@@ -1,5 +1,5 @@
---
-title: Vertical stack
+title: Block stack
description: Use to display children vertically and horizontally with full width by default. Based on CSS Flexbox.
category: Layout and structure
keywords:
@@ -15,15 +15,15 @@ status:
value: Alpha
message: This component is a work in progress and ready for exploratory usage, with breaking changes expected in minor version updates. Please use with caution. Learn more about our [component lifecycles](/getting-started/components-lifecycle).
examples:
- - fileName: vertical-stack-with-gap.tsx
+ - fileName: block-stack-with-gap.tsx
title: Gap
description: >-
Control the vertical space between children using the `gap` prop.
- - fileName: vertical-stack-with-align.tsx
+ - fileName: block-stack-with-align.tsx
title: Align
description: >-
Control the vertical alignment of children using the `align` prop.
- - fileName: vertical-stack-with-inline-align.tsx
+ - fileName: block-stack-with-inline-align.tsx
title: Inline align
description: >-
Control the horizontal alignment of children using the `inlineAlign` prop.
diff --git a/polaris.shopify.com/content/patterns/variant.md.template b/polaris.shopify.com/content/patterns/variant.md.template
index 39f94544a7a..4635862d45e 100644
--- a/polaris.shopify.com/content/patterns/variant.md.template
+++ b/polaris.shopify.com/content/patterns/variant.md.template
@@ -55,7 +55,7 @@ This pattern uses the components.
```javascript {"type":"livePreview","id":"example"}
- Coming Soon
+ Coming Soon
```
diff --git a/polaris.shopify.com/pages/examples/bleed-specific-direction.tsx b/polaris.shopify.com/pages/examples/bleed-specific-direction.tsx
index 142af46a514..4ebc3d5345b 100644
--- a/polaris.shopify.com/pages/examples/bleed-specific-direction.tsx
+++ b/polaris.shopify.com/pages/examples/bleed-specific-direction.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import {VerticalStack, Bleed, Box, Text, InlineStack} from '@shopify/polaris';
+import {BlockStack, Bleed, Box, Text, InlineStack} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
function BleedSpecificDirectionExample() {
return (
-
+
-
+
);
}
diff --git a/polaris.shopify.com/pages/examples/vertical-stack-with-align.tsx b/polaris.shopify.com/pages/examples/block-stack-with-align.tsx
similarity index 82%
rename from polaris.shopify.com/pages/examples/vertical-stack-with-align.tsx
rename to polaris.shopify.com/pages/examples/block-stack-with-align.tsx
index 6f32899e7a8..66d1692e19d 100644
--- a/polaris.shopify.com/pages/examples/vertical-stack-with-align.tsx
+++ b/polaris.shopify.com/pages/examples/block-stack-with-align.tsx
@@ -1,34 +1,34 @@
import React from 'react';
-import {VerticalStack, InlineStack, Text, Divider} from '@shopify/polaris';
+import {BlockStack, InlineStack, Text, Divider} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
-function VerticalStackWithAlignExample() {
+function BlockStackWithAlignExample() {
return (
<>
>
@@ -68,4 +68,4 @@ const Placeholder = ({
);
};
-export default withPolarisExample(VerticalStackWithAlignExample);
+export default withPolarisExample(BlockStackWithAlignExample);
diff --git a/polaris.shopify.com/pages/examples/vertical-stack-with-gap.tsx b/polaris.shopify.com/pages/examples/block-stack-with-gap.tsx
similarity index 78%
rename from polaris.shopify.com/pages/examples/vertical-stack-with-gap.tsx
rename to polaris.shopify.com/pages/examples/block-stack-with-gap.tsx
index 27a94f96731..ebd25f4e1a5 100644
--- a/polaris.shopify.com/pages/examples/vertical-stack-with-gap.tsx
+++ b/polaris.shopify.com/pages/examples/block-stack-with-gap.tsx
@@ -1,16 +1,16 @@
import React from 'react';
-import {VerticalStack} from '@shopify/polaris';
+import {BlockStack} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
-function VerticalStackWithGapExample() {
+function BlockStackWithGapExample() {
return (
-
+
-
+
);
}
@@ -40,4 +40,4 @@ const Placeholder = ({height = 'auto'}) => {
);
};
-export default withPolarisExample(VerticalStackWithGapExample);
+export default withPolarisExample(BlockStackWithGapExample);
diff --git a/polaris.shopify.com/pages/examples/vertical-stack-with-inline-align.tsx b/polaris.shopify.com/pages/examples/block-stack-with-inline-align.tsx
similarity index 80%
rename from polaris.shopify.com/pages/examples/vertical-stack-with-inline-align.tsx
rename to polaris.shopify.com/pages/examples/block-stack-with-inline-align.tsx
index 39d73128710..50b7028e79c 100644
--- a/polaris.shopify.com/pages/examples/vertical-stack-with-inline-align.tsx
+++ b/polaris.shopify.com/pages/examples/block-stack-with-inline-align.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import {
- VerticalStack,
+ BlockStack,
Page,
InlineStack,
Text,
@@ -9,28 +9,28 @@ import {
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
-function VerticalStackWithInlineAlignExample() {
+function BlockStackWithInlineAlignExample() {
return (
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
);
}
@@ -68,4 +68,4 @@ const Placeholder = ({
);
};
-export default withPolarisExample(VerticalStackWithInlineAlignExample);
+export default withPolarisExample(BlockStackWithInlineAlignExample);
diff --git a/polaris.shopify.com/pages/examples/box-with-padding.tsx b/polaris.shopify.com/pages/examples/box-with-padding.tsx
index 57c8cbece52..58f66a147dc 100644
--- a/polaris.shopify.com/pages/examples/box-with-padding.tsx
+++ b/polaris.shopify.com/pages/examples/box-with-padding.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import {VerticalStack, Box, Text, InlineStack} from '@shopify/polaris';
+import {BlockStack, Box, Text, InlineStack} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
function BoxWithPaddingExample() {
return (
-
+
-
+
);
}
diff --git a/polaris.shopify.com/pages/examples/card-with-varying-padding.tsx b/polaris.shopify.com/pages/examples/card-with-varying-padding.tsx
index 1db08eebc9a..eb7aa1bda1a 100644
--- a/polaris.shopify.com/pages/examples/card-with-varying-padding.tsx
+++ b/polaris.shopify.com/pages/examples/card-with-varying-padding.tsx
@@ -1,10 +1,10 @@
-import {Card, Text, VerticalStack} from '@shopify/polaris';
+import {Card, Text, BlockStack} from '@shopify/polaris';
import React from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
function CardExample() {
return (
-
+
@@ -17,7 +17,7 @@ function CardExample() {
-
+
);
}
diff --git a/polaris.shopify.com/pages/examples/divider-with-border-color.tsx b/polaris.shopify.com/pages/examples/divider-with-border-color.tsx
index dfa662c37e1..f6a427bdccb 100644
--- a/polaris.shopify.com/pages/examples/divider-with-border-color.tsx
+++ b/polaris.shopify.com/pages/examples/divider-with-border-color.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import {Divider, Text, VerticalStack} from '@shopify/polaris';
+import {Divider, Text, BlockStack} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
function DividerWithBorderColorExample() {
return (
-
+
Default
@@ -22,7 +22,7 @@ function DividerWithBorderColorExample() {
Transparent
-
+
);
}
diff --git a/polaris.shopify.com/pages/examples/index-table-condensed-with-views-search-filter-sorting.tsx b/polaris.shopify.com/pages/examples/index-table-condensed-with-views-search-filter-sorting.tsx
index 9f1a8ba62f4..b4f62b78354 100644
--- a/polaris.shopify.com/pages/examples/index-table-condensed-with-views-search-filter-sorting.tsx
+++ b/polaris.shopify.com/pages/examples/index-table-condensed-with-views-search-filter-sorting.tsx
@@ -9,7 +9,7 @@ import {
ChoiceList,
RangeSlider,
Badge,
- VerticalStack,
+ BlockStack,
InlineStack,
} from '@shopify/polaris';
import type {IndexFiltersProps, TabProps} from '@shopify/polaris';
@@ -303,7 +303,7 @@ function IndexTableWithViewsSearchFilterSorting() {
position={index}
>
-
+
{order} • {date}
@@ -319,7 +319,7 @@ function IndexTableWithViewsSearchFilterSorting() {
{paymentStatus}
{fulfillmentStatus}
-
+
),
diff --git a/polaris.shopify.com/pages/examples/index-table-small-screen.tsx b/polaris.shopify.com/pages/examples/index-table-small-screen.tsx
index 83550471681..7ef38257177 100644
--- a/polaris.shopify.com/pages/examples/index-table-small-screen.tsx
+++ b/polaris.shopify.com/pages/examples/index-table-small-screen.tsx
@@ -5,7 +5,7 @@ import {
Text,
InlineStack,
Badge,
- VerticalStack,
+ BlockStack,
} from '@shopify/polaris';
import React from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
@@ -60,7 +60,7 @@ function SimpleSmallScreenIndexTableExample() {
position={index}
>
-
+
{order} • {date}
@@ -76,7 +76,7 @@ function SimpleSmallScreenIndexTableExample() {
{paymentStatus}
{fulfillmentStatus}
-
+
),
diff --git a/polaris.shopify.com/pages/examples/inline-stack-with-align.tsx b/polaris.shopify.com/pages/examples/inline-stack-with-align.tsx
index 62f8244e157..3d10e690466 100644
--- a/polaris.shopify.com/pages/examples/inline-stack-with-align.tsx
+++ b/polaris.shopify.com/pages/examples/inline-stack-with-align.tsx
@@ -1,18 +1,12 @@
import React from 'react';
-import {
- VerticalStack,
- InlineStack,
- Text,
- Page,
- Divider,
-} from '@shopify/polaris';
+import {BlockStack, InlineStack, Text, Page, Divider} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
function InlineWithAlignExample() {
return (
-
+
@@ -42,7 +36,7 @@ function InlineWithAlignExample() {
-
+
);
}
diff --git a/polaris.shopify.com/pages/examples/inline-stack-with-block-align.tsx b/polaris.shopify.com/pages/examples/inline-stack-with-block-align.tsx
index cd966bb675b..85d2feb21a6 100644
--- a/polaris.shopify.com/pages/examples/inline-stack-with-block-align.tsx
+++ b/polaris.shopify.com/pages/examples/inline-stack-with-block-align.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import {InlineStack, Text, VerticalStack, Divider} from '@shopify/polaris';
+import {InlineStack, Text, BlockStack, Divider} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
function InlineWithBlockAlignExample() {
return (
-
+
@@ -50,7 +50,7 @@ function InlineWithBlockAlignExample() {
-
+
);
}
diff --git a/polaris.shopify.com/pages/examples/inline-stack-with-gap.tsx b/polaris.shopify.com/pages/examples/inline-stack-with-gap.tsx
index b2466068f81..dbd177656d2 100644
--- a/polaris.shopify.com/pages/examples/inline-stack-with-gap.tsx
+++ b/polaris.shopify.com/pages/examples/inline-stack-with-gap.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import {InlineStack, VerticalStack} from '@shopify/polaris';
+import {InlineStack, BlockStack} from '@shopify/polaris';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
function InlineWithGapExample() {
return (
-
+
@@ -22,7 +22,7 @@ function InlineWithGapExample() {
-
+
);
}
diff --git a/polaris.shopify.com/pages/examples/setting-toggle-with-primitive-components.tsx b/polaris.shopify.com/pages/examples/setting-toggle-with-primitive-components.tsx
index 4f6b5776dd9..33515d2953f 100644
--- a/polaris.shopify.com/pages/examples/setting-toggle-with-primitive-components.tsx
+++ b/polaris.shopify.com/pages/examples/setting-toggle-with-primitive-components.tsx
@@ -5,7 +5,7 @@ import {
Card,
Button,
Badge,
- VerticalStack,
+ BlockStack,
useBreakpoints,
} from '@shopify/polaris';
import {CircleInformationMajor} from '@shopify/polaris-icons';
@@ -96,7 +96,7 @@ export function WithPrimitiveComponents() {
);
const descriptionMarkup = (
-
+
{description}
@@ -105,22 +105,22 @@ export function WithPrimitiveComponents() {
{actionMarkup}
) : null}
-
+
);
return (
-
+
-
+
{headerMarkup}
{descriptionMarkup}
-
+
Your checkout is only accepting test payments.
-
+
);
}
diff --git a/polaris.shopify.com/public/images/components/layout-and-structure/vertical-stack.png b/polaris.shopify.com/public/images/components/layout-and-structure/block-stack.png
similarity index 100%
rename from polaris.shopify.com/public/images/components/layout-and-structure/vertical-stack.png
rename to polaris.shopify.com/public/images/components/layout-and-structure/block-stack.png
diff --git a/polaris.shopify.com/src/components/TipBanner/TipBanner.tsx b/polaris.shopify.com/src/components/TipBanner/TipBanner.tsx
index e15502bb7ff..b83ac8b1308 100644
--- a/polaris.shopify.com/src/components/TipBanner/TipBanner.tsx
+++ b/polaris.shopify.com/src/components/TipBanner/TipBanner.tsx
@@ -1,4 +1,4 @@
-import {VerticalStack, Icon, InlineStack, Text} from '@shopify/polaris';
+import {BlockStack, Icon, InlineStack, Text} from '@shopify/polaris';
import {InfoMinor} from '@shopify/polaris-icons';
import styles from './TipBanner.module.scss';
@@ -10,7 +10,7 @@ interface Props {
function TipBanner({title, children}: Props) {
return (
-
+
@@ -20,7 +20,7 @@ function TipBanner({title, children}: Props) {
{children}
-
+
);
}