Skip to content

[feat] Add options w/ direction to transitions #8068

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

Merged
merged 5 commits into from
Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion site/content/docs/03-template-syntax.md
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ transition:fn|local={params}


```js
transition = (node: HTMLElement, params: any) => {
transition = (node: HTMLElement, params: any, options: { direction: 'in' | 'out' | 'both' }) => {
delay?: number,
duration?: number,
easing?: (t: number) => number,
Expand Down Expand Up @@ -1014,6 +1014,16 @@ Like actions, transitions can have parameters.
{/if}
```

##### Transition options

---

Transitions also get passed an options object which provides data about the type of transition.

Possible values in the options object are:

* `direction` - one of `in`, `out`, or `both` depending on the type of transition

##### Custom transition functions

---
Expand Down
18 changes: 11 additions & 7 deletions src/runtime/internal/transitions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ export function transition_out(block: Fragment, local: 0 | 1, detach?: 0 | 1, ca

const null_transition: TransitionConfig = { duration: 0 };

type TransitionFn = (node: Element, params: any) => TransitionConfig;
type TransitionOptions = { direction: 'in' | 'out' | 'both' };
type TransitionFn = (node: Element, params: any, options: TransitionOptions) => TransitionConfig;

export function create_in_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any) {
let config = fn(node, params);
const options: TransitionOptions = { direction: 'in' };
let config = fn(node, params, options);
let running = false;
let animation_name;
let task;
Expand Down Expand Up @@ -150,7 +152,7 @@ export function create_in_transition(node: Element & ElementCSSInlineStyle, fn:
delete_rule(node);

if (is_function(config)) {
config = config();
config = config(options);
wait().then(go);
} else {
go();
Expand All @@ -171,7 +173,8 @@ export function create_in_transition(node: Element & ElementCSSInlineStyle, fn:
}

export function create_out_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any) {
let config = fn(node, params);
const options: TransitionOptions = { direction: 'out' };
let config = fn(node, params, options);
let running = true;
let animation_name;

Expand Down Expand Up @@ -224,7 +227,7 @@ export function create_out_transition(node: Element & ElementCSSInlineStyle, fn:
if (is_function(config)) {
wait().then(() => {
// @ts-ignore
config = config();
config = config(options);
go();
});
} else {
Expand Down Expand Up @@ -264,7 +267,8 @@ interface Program {
}

export function create_bidirectional_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any, intro: boolean) {
let config = fn(node, params);
const options: TransitionOptions = { direction: 'both' };
let config = fn(node, params, options);

let t = intro ? 0 : 1;

Expand Down Expand Up @@ -373,7 +377,7 @@ export function create_bidirectional_transition(node: Element & ElementCSSInline
if (is_function(config)) {
wait().then(() => {
// @ts-ignore
config = config();
config = config(options);
go(b);
});
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export default {
test({ assert, component, target }) {
component.visible = true;

const div_in = target.querySelector('#in');
const div_out = target.querySelector('#out');
const div_both = target.querySelector('#both');

assert.equal(div_in.initial, 'in');
assert.equal(div_out.initial, 'out');
assert.equal(div_both.initial, 'both');

return Promise.resolve().then(() => {
assert.equal(div_in.later, 'in');
assert.equal(div_out.later, 'out');
assert.equal(div_both.later, 'both');
});
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<script>
export let visible;

function foo(node, _params, options) {
node.initial = options.direction;

return (opts) => {
node.later = opts.direction;

return {
duration: 10
};
};
}
</script>

{#if visible}
<div id="both" transition:foo></div>
<div id="in" in:foo></div>
{/if}

{#if !visible}
<div id="out" out:foo></div>
{/if}
13 changes: 13 additions & 0 deletions test/runtime/samples/transition-js-option-direction/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export default {
test({ assert, component, target }) {
component.visible = true;

const div_in = target.querySelector('#in');
const div_out = target.querySelector('#out');
const div_both = target.querySelector('#both');

assert.equal(div_in.direction, 'in');
assert.equal(div_out.direction, 'out');
assert.equal(div_both.direction, 'both');
}
};
20 changes: 20 additions & 0 deletions test/runtime/samples/transition-js-option-direction/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<script>
export let visible = false;

function foo(node, _params, options) {
node.direction = options.direction;

return {
duration: 10
};
}
</script>

{#if visible}
<div id="both" transition:foo></div>
<div id="in" in:foo></div>
{/if}

{#if !visible}
<div id="out" out:foo></div>
{/if}