Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added --ease-anticipate-* easings #419

Merged
merged 3 commits into from
Sep 29, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docsite/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ pre[class*="language-"] {
&:is(:hover,:focus) {
transform: scale(1.5);
transition-delay: 0s;
transition-timing-function: var(--ease-elastic-3);
transition-timing-function: var(--ease-elastic-out-3);

&::before {
opacity: 1;
Expand Down Expand Up @@ -1436,7 +1436,7 @@ input[type="range"] {
stroke-width: 2px;
transform-origin: center center;
transition:
transform .5s var(--ease-elastic-4),
transform .5s var(--ease-elastic-out-4),
opacity var(--_opacity-dur) var(--ease-3);

@nest :hover > svg > & {
Expand Down
52 changes: 36 additions & 16 deletions docsite/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2252,8 +2252,9 @@ <h5>The Props</h5>
--ease-in-{1-5}
--ease-out-{1-5}
--ease-in-out-{1-5}
--ease-elastic-{1-5}
--ease-squish-{1-5}
--ease-elastic-out-{1-5}
--ease-elastic-in-{1-5}
--ease-elastic-in-out{1-5}
--ease-spring-{1-5}
--ease-step-{1-5}
</code></pre>
Expand Down Expand Up @@ -2352,7 +2353,7 @@ <h5>Ease In Out</h5>

<div class="block-wrap">
<header class="animation-control-header">
<h5>Ease Elastic</h5>
<h5>Ease Elastic Out</h5>
<button class="play-button">
<svg viewBox="0 0 20 20">
<use href="#play-icon"/>
Expand All @@ -2361,17 +2362,17 @@ <h5>Ease Elastic</h5>
</button>
</header>
<div class="ease-demo paused">
<div style="animation-timing-function: var(--ease-elastic-1)">ease-elastic-1</div>
<div style="animation-timing-function: var(--ease-elastic-2)">ease-elastic-2</div>
<div style="animation-timing-function: var(--ease-elastic-3)">ease-elastic-3</div>
<div style="animation-timing-function: var(--ease-elastic-4)">ease-elastic-4</div>
<div style="animation-timing-function: var(--ease-elastic-5)">ease-elastic-5</div>
<div style="animation-timing-function: var(--ease-elastic-out-1)">ease-elastic-out-1</div>
<div style="animation-timing-function: var(--ease-elastic-out-2)">ease-elastic-out-2</div>
<div style="animation-timing-function: var(--ease-elastic-out-3)">ease-elastic-out-3</div>
<div style="animation-timing-function: var(--ease-elastic-out-4)">ease-elastic-out-4</div>
<div style="animation-timing-function: var(--ease-elastic-out-5)">ease-elastic-out-5</div>
</div>
</div>

<div class="block-wrap">
<header class="animation-control-header">
<h5>Ease Squish</h5>
<h5>Ease Elastic In</h5>
<button class="play-button">
<svg viewBox="0 0 20 20">
<use href="#play-icon"/>
Expand All @@ -2380,11 +2381,30 @@ <h5>Ease Squish</h5>
</button>
</header>
<div class="ease-demo paused">
<div style="animation-timing-function: var(--ease-squish-1)">ease-squish-1</div>
<div style="animation-timing-function: var(--ease-squish-2)">ease-squish-2</div>
<div style="animation-timing-function: var(--ease-squish-3)">ease-squish-3</div>
<div style="animation-timing-function: var(--ease-squish-4)">ease-squish-4</div>
<div style="animation-timing-function: var(--ease-squish-5)">ease-squish-5</div>
<div style="animation-timing-function: var(--ease-elastic-in-1)">ease-elastic-in-1</div>
<div style="animation-timing-function: var(--ease-elastic-in-2)">ease-elastic-in-2</div>
<div style="animation-timing-function: var(--ease-elastic-in-3)">ease-elastic-in-3</div>
<div style="animation-timing-function: var(--ease-elastic-in-4)">ease-elastic-in-4</div>
<div style="animation-timing-function: var(--ease-elastic-in-5)">ease-elastic-in-5</div>
</div>
</div>å

<div class="block-wrap">
<header class="animation-control-header">
<h5>Ease Elastic In Out</h5>
<button class="play-button">
<svg viewBox="0 0 20 20">
<use href="#play-icon"/>
<use href="#pause-icon" class="hidden"/>
</svg>
</button>
</header>
<div class="ease-demo paused">
<div style="animation-timing-function: var(--ease-elastic-in-out-1)">ease-elastic-in-out-1</div>
<div style="animation-timing-function: var(--ease-elastic-in-out-2)">ease-elastic-in-out-2</div>
<div style="animation-timing-function: var(--ease-elastic-in-out-3)">ease-elastic-in-out-3</div>
<div style="animation-timing-function: var(--ease-elastic-in-out-4)">ease-elastic-in-out-4</div>
<div style="animation-timing-function: var(--ease-elastic-in-out-5)">ease-elastic-in-out-5</div>
</div>
</div>

Expand Down Expand Up @@ -2745,7 +2765,7 @@ <h6>Slide Fade</h6>
animation:
var(--animation-fade-out) forwards,
var(--animation-slide-out-down);
animation-timing-function: var(--ease-squish-3);
animation-timing-function: var(--ease-elastic-in-out-3);
animation-duration: 1s;
}
</code></pre>
Expand Down Expand Up @@ -2791,7 +2811,7 @@ <h6>Push Out</h6>
animation:
var(--animation-scale-down),
var(--animation-fade-out);
animation-timing-function: var(--ease-squish-4);
animation-timing-function: var(--ease-elastic-in-out-4);
}
</code></pre>
</div>
Expand Down
25 changes: 15 additions & 10 deletions src/props.easing.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,21 @@
--ease-in-out-3: cubic-bezier(.5, 0, .5, 1);
--ease-in-out-4: cubic-bezier(.7, 0, .3, 1);
--ease-in-out-5: cubic-bezier(.9, 0, .1, 1);
--ease-elastic-1: cubic-bezier(.5, .75, .75, 1.25);
--ease-elastic-2: cubic-bezier(.5, 1, .75, 1.25);
--ease-elastic-3: cubic-bezier(.5, 1.25, .75, 1.25);
--ease-elastic-4: cubic-bezier(.5, 1.5, .75, 1.25);
--ease-elastic-5: cubic-bezier(.5, 1.75, .75, 1.25);
--ease-squish-1: cubic-bezier(.5, -.1, .1, 1.5);
--ease-squish-2: cubic-bezier(.5, -.3, .1, 1.5);
--ease-squish-3: cubic-bezier(.5, -.5, .1, 1.5);
--ease-squish-4: cubic-bezier(.5, -.7, .1, 1.5);
--ease-squish-5: cubic-bezier(.5, -.9, .1, 1.5);
--ease-elastic-out-1: cubic-bezier(.5, .75, .75, 1.25);
--ease-elastic-out-2: cubic-bezier(.5, 1, .75, 1.25);
--ease-elastic-out-3: cubic-bezier(.5, 1.25, .75, 1.25);
--ease-elastic-out-4: cubic-bezier(.5, 1.5, .75, 1.25);
--ease-elastic-out-5: cubic-bezier(.5, 1.75, .75, 1.25);
--ease-elastic-in-1: cubic-bezier(.5, -0.25, .75, 1);
--ease-elastic-in-2: cubic-bezier(.5, -0.50, .75, 1);
--ease-elastic-in-3: cubic-bezier(.5, -0.75, .75, 1);
--ease-elastic-in-4: cubic-bezier(.5, -1.00, .75, 1);
--ease-elastic-in-5: cubic-bezier(.5, -1.25, .75, 1);
--ease-elastic-in-out-1: cubic-bezier(.5, -.1, .1, 1.5);
--ease-elastic-in-out-2: cubic-bezier(.5, -.3, .1, 1.5);
--ease-elastic-in-out-3: cubic-bezier(.5, -.5, .1, 1.5);
--ease-elastic-in-out-4: cubic-bezier(.5, -.7, .1, 1.5);
--ease-elastic-in-out-5: cubic-bezier(.5, -.9, .1, 1.5);
--ease-step-1: steps(2);
--ease-step-2: steps(3);
--ease-step-3: steps(4);
Expand Down
26 changes: 16 additions & 10 deletions src/props.easing.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,23 @@ export default {
'--ease-in-out-4': 'cubic-bezier(.7, 0, .3, 1)',
'--ease-in-out-5': 'cubic-bezier(.9, 0, .1, 1)',

'--ease-elastic-1': 'cubic-bezier(.5, .75, .75, 1.25)',
'--ease-elastic-2': 'cubic-bezier(.5, 1, .75, 1.25)',
'--ease-elastic-3': 'cubic-bezier(.5, 1.25, .75, 1.25)',
'--ease-elastic-4': 'cubic-bezier(.5, 1.5, .75, 1.25)',
'--ease-elastic-5': 'cubic-bezier(.5, 1.75, .75, 1.25)',
'--ease-elastic-out-1': 'cubic-bezier(.5, .75, .75, 1.25)',
'--ease-elastic-out-2': 'cubic-bezier(.5, 1, .75, 1.25)',
'--ease-elastic-out-3': 'cubic-bezier(.5, 1.25, .75, 1.25)',
'--ease-elastic-out-4': 'cubic-bezier(.5, 1.5, .75, 1.25)',
'--ease-elastic-out-5': 'cubic-bezier(.5, 1.75, .75, 1.25)',

'--ease-squish-1': 'cubic-bezier(.5, -.1, .1, 1.5)',
'--ease-squish-2': 'cubic-bezier(.5, -.3, .1, 1.5)',
'--ease-squish-3': 'cubic-bezier(.5, -.5, .1, 1.5)',
'--ease-squish-4': 'cubic-bezier(.5, -.7, .1, 1.5)',
'--ease-squish-5': 'cubic-bezier(.5, -.9, .1, 1.5)',
'--ease-elastic-in-1': 'cubic-bezier(.5, -0.25, .75, 1)',
'--ease-elastic-in-2': 'cubic-bezier(.5, -0.50, .75, 1)',
'--ease-elastic-in-3': 'cubic-bezier(.5, -0.75, .75, 1)',
'--ease-elastic-in-4': 'cubic-bezier(.5, -1.00, .75, 1)',
'--ease-elastic-in-5': 'cubic-bezier(.5, -1.25, .75, 1)',

'--ease-elastic-in-out-1': 'cubic-bezier(.5, -.1, .1, 1.5)',
'--ease-elastic-in-out-2': 'cubic-bezier(.5, -.3, .1, 1.5)',
'--ease-elastic-in-out-3': 'cubic-bezier(.5, -.5, .1, 1.5)',
'--ease-elastic-in-out-4': 'cubic-bezier(.5, -.7, .1, 1.5)',
'--ease-elastic-in-out-5': 'cubic-bezier(.5, -.9, .1, 1.5)',

'--ease-step-1': 'steps(2)',
'--ease-step-2': 'steps(3)',
Expand Down
4 changes: 2 additions & 2 deletions test/basic.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const OpenProps = require('../dist/open-props.cjs')
const OPtokens = require('../open-props.tokens.json')

test('Should have an all included import', t => {
t.is(Object.keys(OpenProps).length, 1612)
t.is(Object.keys(OpenProps).length, 1622)
})

test('Import should have animations', async t => {
Expand All @@ -24,7 +24,7 @@ test('Import should have colors', async t => {
})

test('JSON Import should have colors', async t => {
t.is(Object.keys(OPtokens).length, 419)
t.is(Object.keys(OPtokens).length, 424)
t.assert(Object.keys(OPtokens).includes('--orange-0'))
})

Expand Down