Skip to content

Commit 4cbc8b7

Browse files
committed
Merge branch 'main' into v11-major
2 parents e994a78 + 74f0bc4 commit 4cbc8b7

File tree

14 files changed

+950
-126
lines changed

14 files changed

+950
-126
lines changed

.changeset/beige-seas-cough.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+
Added a forward `ref` to permit programmatic scrolling for `Scrollable` (example: `scrollRef.current?.scrollTo(0)`)

.changeset/mean-tables-compete.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'polaris.shopify.com': minor
3+
---
4+
5+
Added search event that sets the default google parameters in addition to custom

.changeset/sharp-bulldogs-repair.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'polaris.shopify.com': minor
3+
---
4+
5+
Added 'engagement' category to search event

.changeset/smart-candles-dress.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+
Fixed list reset class from not applying to ordered lists

.changeset/strong-cats-fry.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'polaris.shopify.com': patch
3+
---
4+
5+
Fixed icon page layout

.changeset/swift-cycles-happen.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'polaris.shopify.com': patch
3+
---
4+
5+
Added search tracking using google analytics

polaris-react/src/components/ResourceList/tests/ResourceList.test.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ describe('<ResourceList />', () => {
939939
});
940940

941941
describe('BulkActions', () => {
942-
it('renders on initial load when items are selected', () => {
942+
it('renders on initial load when items are selected and bulkActions are present', () => {
943943
const resourceList = mountWithApp(
944944
<ResourceList
945945
items={singleItemWithID}
@@ -951,6 +951,18 @@ describe('<ResourceList />', () => {
951951
expect(resourceList).toContainReactComponentTimes(BulkActions, 1);
952952
});
953953

954+
it('renders on initial load when items are selected and promotedBulkActions are present', () => {
955+
const resourceList = mountWithApp(
956+
<ResourceList
957+
items={singleItemWithID}
958+
renderItem={renderItem}
959+
promotedBulkActions={promotedBulkActions}
960+
selectedItems={['1']}
961+
/>,
962+
);
963+
expect(resourceList).toContainReactComponentTimes(BulkActions, 1);
964+
});
965+
954966
it('enables select mode when items are programmatically selected', () => {
955967
const resourceList = mountWithApp(
956968
<ResourceList

0 commit comments

Comments
 (0)