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/lovely-moose-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@shopify/polaris': patch
'polaris.shopify.com': patch
---

Refactored `position` properties on `Box` to use logical property names
16 changes: 8 additions & 8 deletions polaris-react/src/components/Box/Box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@
--pc-box-padding-block-start: initial;
--pc-box-width: initial;
--pc-box-border-width: var(--p-border-width-1);
--pc-box-top: initial;
--pc-box-right: initial;
--pc-box-bottom: initial;
--pc-box-left: initial;
top: var(--pc-box-top);
right: var(--pc-box-right);
bottom: var(--pc-box-bottom);
left: var(--pc-box-left);
--pc-box-inset-block-start: initial;
--pc-box-inset-block-end: initial;
--pc-box-inset-inline-start: initial;
--pc-box-inset-inline-end: initial;
inset-block-start: var(--pc-box-inset-block-start);
inset-block-end: var(--pc-box-inset-block-end);
inset-inline-start: var(--pc-box-inset-inline-start);
inset-inline-end: var(--pc-box-inset-inline-end);
background-color: var(--pc-box-background);
box-shadow: var(--pc-box-shadow);
border-radius: var(--pc-box-border-radius);
Expand Down
32 changes: 20 additions & 12 deletions polaris-react/src/components/Box/Box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,13 @@ export interface BoxProps {
/** Position of box */
position?: Position;
/** Top position of box */
top?: Spacing;
insetBlockStart?: Spacing;
/** Bottom position of box */
right?: Spacing;
insetBlockEnd?: Spacing;
/** Left position of box */
bottom?: Spacing;
insetInlineStart?: Spacing;
/** Right position of box */
left?: Spacing;
insetInlineEnd?: Spacing;
/** Opacity of box */
opacity?: string;
/** Visually hide the contents (still announced by screenreader) */
Expand Down Expand Up @@ -210,10 +210,10 @@ export const Box = forwardRef<HTMLElement, BoxProps>(
width,
visuallyHidden,
position,
top,
right,
bottom,
left,
insetBlockStart,
insetBlockEnd,
insetInlineStart,
insetInlineEnd,
zIndex,
opacity,
},
Expand Down Expand Up @@ -298,10 +298,18 @@ export const Box = forwardRef<HTMLElement, BoxProps>(
'--pc-box-shadow': shadow ? `var(--p-shadow-${shadow})` : undefined,
'--pc-box-width': width,
position,
'--pc-box-top': top ? `var(--p-space-${top})` : undefined,
'--pc-box-right': right ? `var(--p-space-${right})` : undefined,
'--pc-box-bottom': bottom ? `var(--p-space-${bottom})` : undefined,
'--pc-box-left': left ? `var(--p-space-${left})` : undefined,
'--pc-box-inset-block-start': insetBlockStart
? `var(--p-space-${insetBlockStart})`
: undefined,
'--pc-box-inset-block-end': insetBlockEnd
? `var(--p-space-${insetBlockEnd})`
: undefined,
'--pc-box-inset-inline-start': insetInlineStart
? `var(--p-space-${insetInlineStart})`
: undefined,
'--pc-box-inset-inline-end': insetInlineEnd
? `var(--p-space-${insetInlineEnd})`
: undefined,
zIndex,
opacity,
} as React.CSSProperties;
Expand Down
Loading