From 6e443ff1797ae3ec477db22143e38dcce6bcbbbd Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 24 Nov 2021 10:44:56 -0800 Subject: [PATCH 1/3] Remove unnecessary import from Tokens --- src/components/Collapsible/tests/Collapsible.test.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/Collapsible/tests/Collapsible.test.tsx b/src/components/Collapsible/tests/Collapsible.test.tsx index d3dd099e04d..2f7832228fd 100644 --- a/src/components/Collapsible/tests/Collapsible.test.tsx +++ b/src/components/Collapsible/tests/Collapsible.test.tsx @@ -1,7 +1,6 @@ import React, {useState, useCallback} from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Tokens} from '../../../utilities/theme'; import {Collapsible, CollapsibleProps} from '../Collapsible'; describe('', () => { @@ -69,7 +68,7 @@ describe('', () => { describe('Transition', () => { it('passes a duration property', () => { - const duration = Tokens.duration150; + const duration = '150ms'; const collapsible = mountWithApp( , ); @@ -78,7 +77,7 @@ describe('', () => { }); it('passes a timingFunction property', () => { - const timingFunction = Tokens.ease; + const timingFunction = 'cubic-bezier(0.25, 0.1, 0.25, 1)'; const collapsible = mountWithApp( Date: Wed, 24 Nov 2021 10:53:29 -0800 Subject: [PATCH 2/3] Update UNRELEASED.md --- UNRELEASED.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index bc3b5cdb86f..beb4f50306f 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -42,6 +42,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Remove all color() invocations ([#4636](https://github.com/Shopify/polaris-react/pull/4636)) - Cleaned up Button styling and $button-filled mixin([#4635](https://github.com/Shopify/polaris-react/pull/4635)) - Removed `rem()` function from `tokens.ts` ([#4695](https://github.com/Shopify/polaris-react/pull/4695)) +- Remove unnecessary import of tokens in `Collapsible` test ([#4722](https://github.com/Shopify/polaris-react/pull/4722)) ### Deprecations From 19bd3f3087a5c4b16caf43ad31599e7fc9686f68 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 24 Nov 2021 11:05:55 -0800 Subject: [PATCH 3/3] Update UNRELEASED.md --- UNRELEASED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index beb4f50306f..a39883164e5 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -42,7 +42,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Remove all color() invocations ([#4636](https://github.com/Shopify/polaris-react/pull/4636)) - Cleaned up Button styling and $button-filled mixin([#4635](https://github.com/Shopify/polaris-react/pull/4635)) - Removed `rem()` function from `tokens.ts` ([#4695](https://github.com/Shopify/polaris-react/pull/4695)) -- Remove unnecessary import of tokens in `Collapsible` test ([#4722](https://github.com/Shopify/polaris-react/pull/4722)) +- Remove unnecessary import of `Tokens` in `Collapsible` test ([#4722](https://github.com/Shopify/polaris-react/pull/4722)) ### Deprecations