Skip to content

Commit 06b1e29

Browse files
committed
Merge branch 'next' into progress-bar-tone
2 parents 6d5c6c4 + eb30870 commit 06b1e29

File tree

22 files changed

+596
-821
lines changed

22 files changed

+596
-821
lines changed

.changeset/clever-ducks-camp.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris': minor
3+
---
4+
5+
introduce a subdued prop to the popover pane component

.changeset/empty-walls-design.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris': patch
3+
---
4+
5+
Fixed wrapping overflow of strings with no spacing within `Filters` popover

.changeset/lazy-apricots-visit.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris': patch
3+
---
4+
5+
Fixed BannerExperimental no title hidden icon variant

.changeset/young-dragons-switch.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris': patch
3+
---
4+
5+
Fixed primary Button styles for Chrome on Android devices

.github/workflows/ci-a11y-vrt-experimental.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ on:
88
paths:
99
- 'polaris-react/src/**'
1010
- 'polaris-react/playground/**'
11+
- 'polaris-react/.storybook/**'
1112
- 'polaris-tokens/src/**'
1213
pull_request:
1314
paths:
1415
- 'polaris-react/src/**'
1516
- 'polaris-react/playground/**'
17+
- 'polaris-react/.storybook/**'
1618
- 'polaris-tokens/src/**'
1719

1820
jobs:

polaris-react/.storybook/preview-head.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
crossorigin="anonymous"
66
/>
77
<link
8+
rel="preload"
89
href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap"
910
rel="stylesheet"
1011
/>

polaris-react/locales/th.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
"BulkActions": {
199199
"actionsActivatorLabel": "การดำเนินการ",
200200
"moreActionsActivatorLabel": "การดำเนินการเพิ่มเติม",
201-
"warningMessage": "หากต้องการมอบประสบการณ์ใช้งานที่ดียิ่งขึ้นแก่ผู้ใช้ การดำเนินการที่ได้รับการโปรโมทไม่ควรมีมากเกิน {maxPromotedActions} รายการ"
201+
"warningMessage": "หากต้องการมอบประสบการณ์ใช้งานที่ดียิ่งขึ้นแก่ผู้ใช้ การดำเนินการที่ได้รับการโปรโมตไม่ควรมีมากเกิน {maxPromotedActions} รายการ"
202202
},
203203
"showingTotalCount": "แสดง {resource} จำนวน {itemsCount} จาก {totalItemsCount} รายการ",
204204
"allFilteredItemsSelected": "เลือก {resourceNamePlural} ทั้ง {itemsLength}+ รายการในตัวกรองนี้แล้ว",

polaris-react/src/components/Banner/Banner.stories.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,19 @@ export function All() {
295295
</Text>
296296
}
297297
/>
298+
<Text as="h2" variant="headingMd">
299+
No title with hidden icon
300+
</Text>
301+
<AllBanners
302+
title={undefined}
303+
hideIcon
304+
children={
305+
<Text as="p">
306+
Changing the phone number for this customer will unsubscribe them
307+
from SMS marketing text messages until they provide consent.
308+
</Text>
309+
}
310+
/>
298311
<Text as="h2" variant="headingMd">
299312
Only title
300313
</Text>

polaris-react/src/components/Banner/components/BannerExperimental/BannerExperimental.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,13 @@ export function InlineIconBanner({
206206
>
207207
<Box width="100%">
208208
<HorizontalStack gap="2" wrap={false} blockAlign={blockAlign}>
209-
<div ref={iconNode}>
210-
<Box background={backgroundColor} borderRadius="2" padding="1">
211-
{bannerIcon}
212-
</Box>
213-
</div>
209+
{bannerIcon ? (
210+
<div ref={iconNode}>
211+
<Box background={backgroundColor} borderRadius="2" padding="1">
212+
{bannerIcon}
213+
</Box>
214+
</div>
215+
) : null}
214216
<Box ref={contentNode} width="100%">
215217
<VerticalStack gap="2">
216218
<div>{children}</div>

polaris-react/src/components/BulkActions/BulkActions.scss

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ $bulk-actions-button-stacking-order: (
5252
.ButtonGroupWrapper {
5353
width: auto;
5454
justify-content: flex-start;
55-
padding: var(--p-space-4);
55+
padding: var(--p-space-3);
5656
background: var(--p-color-bg);
5757
border-radius: var(--p-border-radius-2);
5858
box-shadow: var(--p-shadow-md), var(--p-shadow-xl);
@@ -61,7 +61,7 @@ $bulk-actions-button-stacking-order: (
6161

6262
@include shadow-bevel(
6363
$boxShadow: var(--p-shadow-md),
64-
$borderRadius: var(--p-border-radius-2)
64+
$borderRadius: var(--p-border-radius-3)
6565
);
6666

6767
@media #{$p-breakpoints-sm-down} {
@@ -89,6 +89,45 @@ $bulk-actions-button-stacking-order: (
8989

9090
button {
9191
display: flex;
92+
93+
#{$se23} & {
94+
background-color: var(--p-color-bg-strong);
95+
box-shadow: none;
96+
/* stylelint-disable-next-line selector-max-combinators -- se23 */
97+
&:hover {
98+
background-color: var(--p-color-bg-strong-hover);
99+
box-shadow: none;
100+
}
101+
/* stylelint-disable-next-line selector-max-combinators -- se23 */
102+
&:focus-visible,
103+
&:active {
104+
background-color: var(--p-color-bg-strong-active);
105+
}
106+
/* stylelint-disable-next-line selector-max-combinators -- se23 */
107+
&:focus-visible:not(:active) {
108+
/* stylelint-disable-next-line polaris/border/polaris/at-rule-disallowed-list -- se23 */
109+
@include no-focus-ring;
110+
outline: var(--p-border-width-2) solid
111+
var(--p-color-border-interactive-focus);
112+
outline-offset: var(--p-space-05);
113+
}
114+
// stylelint-disable-next-line selector-max-combinators -- se23
115+
&[aria-disabled='true'] {
116+
background-color: var(--p-color-bg-transparent-disabled-experimental);
117+
}
118+
}
119+
}
120+
121+
// Extra specificity
122+
// stylelint-disable-next-line selector-max-class, selector-max-specificity -- se23
123+
&.BulkActionButton.BulkActionButton button {
124+
#{$se23} & {
125+
// stylelint-disable-next-line selector-max-class, selector-max-combinators -- se23
126+
&:focus-visible,
127+
&:active {
128+
box-shadow: var(--p-shadow-inset-md);
129+
}
130+
}
92131
}
93132
}
94133

0 commit comments

Comments
 (0)