Skip to content
This repository was archived by the owner on Sep 30, 2025. It is now read-only.
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
5 changes: 5 additions & 0 deletions .changeset/quick-spies-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': patch
---

Removed wrap children with div from Inline component
58 changes: 23 additions & 35 deletions polaris-react/src/components/Inline/Inline.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
import {Badge, Heading, Icon, Inline} from '@shopify/polaris';
import {CapitalMajor} from '@shopify/polaris-icons';
import {Box, Badge, Heading, Icon, Inline, Thumbnail} from '@shopify/polaris';
import {CapitalMajor, ImageMajor} from '@shopify/polaris-icons';

export default {
component: Inline,
Expand All @@ -13,102 +13,104 @@ export function Default() {
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
<Box>
<Icon source={CapitalMajor} color="primary" />
</Box>
</Inline>
);
}

export function AlignYCenter() {
return (
<Inline alignY="center" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function AlignYTop() {
return (
<Inline alignY="top">
<Inline alignY="top" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function AlignYBottom() {
return (
<Inline alignY="bottom">
<Inline alignY="bottom" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function AlignYBaseline() {
return (
<Inline alignY="baseline">
<Inline alignY="baseline" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function AlignStart() {
return (
<Inline align="start">
<Inline align="start" alignY="center" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function AlignCenter() {
return (
<Inline align="center">
<Inline align="center" alignY="center" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function AlignEnd() {
return (
<Inline align="end">
<Inline align="end" alignY="center" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function AlignCenterAlignYCenter() {
return (
<Inline align="center" alignY="center">
<Inline align="center" alignY="center" spacing="1">
<Thumbnail source={ImageMajor} alt="example" />
<Badge>One</Badge>
<Badge>Two</Badge>
<Badge>Three</Badge>
<Icon source={CapitalMajor} color="primary" />
</Inline>
);
}

export function NonWrapping() {
return (
<Inline wrap={false}>
<Inline wrap={false} spacing="1">
<Badge>Paid</Badge>
<Badge>Processing</Badge>
<Badge>Fulfilled</Badge>
Expand All @@ -121,23 +123,9 @@ export function Spacing() {
return (
<Inline spacing="8">
<Badge>Paid</Badge>
<Badge>Processing</Badge>
<Badge>Fulfilled</Badge>
</Inline>
);
}

export function VerticalCentering() {
return (
<Inline alignY="center">
<Heading>
Order
<br />
#1136
<br />
was paid
</Heading>
<Badge>Paid</Badge>
<Badge>Fulfilled</Badge>
<Badge>Completed</Badge>
</Inline>
);
}
8 changes: 1 addition & 7 deletions polaris-react/src/components/Inline/Inline.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react';
import type {SpacingSpaceScale} from '@shopify/polaris-tokens';

import {elementChildren} from '../../utilities/components';

import styles from './Inline.scss';

const AlignY = {
Expand Down Expand Up @@ -43,13 +41,9 @@ export const Inline = function Inline({
'--pc-inline-spacing': `var(--p-space-${spacing})`,
} as React.CSSProperties;

const itemMarkup = elementChildren(children).map((child, index) => {
return <div key={index}>{child}</div>;
});

return (
<div className={styles.Inline} style={style}>
{itemMarkup}
{children}
</div>
);
};