Skip to content

Commit 86b6617

Browse files
authored
Revert "Add motion prefix for motion tokens" (Shopify#9053)
Reverts Shopify#9017
1 parent b2f21f4 commit 86b6617

File tree

40 files changed

+96
-204
lines changed

40 files changed

+96
-204
lines changed

.changeset/forty-mangos-judge.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

polaris-react/scripts/build-validate.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ function validateStandardBuild() {
4545
assert.ok(cssContent.includes('.Polaris-Avatar {'));
4646
assert.ok(cssContent.includes('.Polaris-BulkActions__BulkActionButton {'));
4747
assert.ok(cssContent.includes('@keyframes p-keyframes-bounce {'));
48-
assert.ok(
49-
cssContent.includes(
50-
'--p-motion-keyframes-bounce:p-motion-keyframes-bounce;',
51-
),
52-
);
48+
assert.ok(cssContent.includes('--p-keyframes-bounce:p-keyframes-bounce;'));
5349
}
5450

5551
function validateEsNextBuild() {
@@ -73,9 +69,7 @@ function validateEsNextBuild() {
7369
assert.ok(cssContent.includes('.Polaris-Avatar_z763p {'));
7470
assert.ok(cssKeyframesContent.includes('@keyframes p-keyframes-spin {'));
7571
assert.ok(
76-
cssKeyframesContent.includes(
77-
'--p-motion-keyframes-spin:p-motion-keyframes-spin;',
78-
),
72+
cssKeyframesContent.includes('--p-keyframes-spin:p-keyframes-spin;'),
7973
);
8074

8175
const jsContent = fs.readFileSync(

polaris-react/src/components/AlphaFilters/AlphaFilters.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {Button} from '../Button';
1818
import {FilterPill, SearchField} from './components';
1919
import styles from './AlphaFilters.scss';
2020

21-
const TRANSITION_DURATION = 'var(--p-motion-duration-150)';
21+
const TRANSITION_DURATION = 'var(--p-duration-150)';
2222
const TRANSITION_MARGIN = '-36px';
2323

2424
const defaultStyle = {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
display: block;
99
// stylelint-disable-next-line -- generated by polaris-migrator DO NOT COPY
1010
background-color: rgba(0, 0, 0, 0.5);
11-
animation: var(--p-motion-keyframes-fade-in) var(--p-motion-duration-200) 1
12-
forwards;
11+
animation: var(--p-keyframes-fade-in) var(--p-duration-200) 1 forwards;
1312
opacity: 0;
1413
will-change: opacity;
1514
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $bulk-actions-button-stacking-order: (
1414
opacity: 0;
1515
width: 100%;
1616
justify-content: center;
17-
transition: var(--p-motion-duration-100) var(--p-motion-ease);
17+
transition: var(--p-duration-100) var(--p-ease);
1818
transition-property: transform, opacity;
1919
transform: translateY(120px);
2020
padding: 0 var(--p-space-4);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
}
2727

2828
~ .Icon {
29-
transition: opacity var(--p-motion-duration-150) var(--p-motion-ease),
30-
transform var(--p-motion-duration-150) var(--p-motion-ease);
29+
transition: opacity var(--p-duration-150) var(--p-ease),
30+
transform var(--p-duration-150) var(--p-ease);
3131
transform: translate3d(-50%, -50%, 0) scale(1);
3232
opacity: 1;
3333
}
@@ -73,8 +73,8 @@
7373

7474
transform: translate3d(-50%, -50%, 0) scale(0.25);
7575
opacity: 0;
76-
transition: opacity var(--p-motion-duration-100) var(--p-motion-ease),
77-
transform var(--p-motion-duration-100) var(--p-motion-ease);
76+
transition: opacity var(--p-duration-100) var(--p-ease),
77+
transform var(--p-duration-100) var(--p-ease);
7878

7979
svg {
8080
fill: var(--p-color-icon-on-color);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
overflow: hidden;
66
will-change: max-height;
77
transition-property: max-height;
8-
transition-duration: var(--p-motion-duration-100);
9-
transition-timing-function: var(--p-motion-ease-out);
8+
transition-duration: var(--p-duration-100);
9+
transition-timing-function: var(--p-ease-out);
1010
}
1111

1212
// Stop children from being focused when fully closed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export function Default() {
3333
open={open}
3434
id="basic-collapsible"
3535
transition={{
36-
duration: 'var(--p-motion-duration-150)',
37-
timingFunction: 'var(--p-motion-ease-in-out)',
36+
duration: 'var(--p-duration-150)',
37+
timingFunction: 'var(--p-ease-in-out)',
3838
}}
3939
expandOnPrint
4040
>

polaris-react/src/components/Collapsible/Collapsible.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface CollapsibleProps {
1919
/** Toggle whether the collapsible is expanded or not. */
2020
open: boolean;
2121
/** Override transition properties. When set to false, disables transition completely.
22-
* @default transition={{duration: 'var(--p-motion-duration-150)', timingFunction: 'var(--p-motion-ease-in-out)'}}
22+
* @default transition={{duration: 'var(--p-duration-150)', timingFunction: 'var(--p-ease-in-out)'}}
2323
*/
2424
transition?: boolean | Transition;
2525
/** @deprecated Re-measuring is no longer necessary on children update **/

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
padding: var(--p-space-4);
7373
white-space: nowrap;
7474
text-align: left;
75-
transition: background-color var(--p-motion-duration-200)
76-
var(--p-motion-ease-in-out);
75+
transition: background-color var(--p-duration-200) var(--p-ease-in-out);
7776

7877
.IncreasedTableDensity & {
7978
padding: var(--p-space-2) var(--p-space-4);
@@ -183,7 +182,7 @@
183182
display: flex;
184183
align-self: flex-end;
185184
opacity: 0;
186-
transition: opacity var(--p-motion-duration-200) var(--p-motion-ease);
185+
transition: opacity var(--p-duration-200) var(--p-ease);
187186
}
188187

189188
.Heading {
@@ -196,7 +195,7 @@
196195
justify-content: flex-end;
197196
align-items: baseline;
198197
color: var(--p-color-text);
199-
transition: color var(--p-motion-duration-200) var(--p-motion-ease);
198+
transition: color var(--p-duration-200) var(--p-ease);
200199
cursor: pointer;
201200
padding: var(--p-space-2);
202201
margin: var(--p-space-2);

0 commit comments

Comments
 (0)