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.

Sign up for GitHub

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

Add direction parameter to transitions #4019

Closed
wants to merge 1 commit into from
Closed

Add direction parameter to transitions #4019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 18 additions & 12 deletions src/runtime/internal/transitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,15 @@ export function transition_out(block, local: 0 | 1, detach: 0 | 1, callback) {

const null_transition: TransitionConfig = { duration: 0 };

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

export function create_in_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any) {
let config = fn(node, params);
let config = fn(node, params, { direction: 'in' }) as TransitionConfig;
const generator = is_function(config) ? config : null;

let running = false;
let animation_name;
let task;
Expand Down Expand Up @@ -129,8 +134,8 @@ export function create_in_transition(node: Element & ElementCSSInlineStyle, fn:

delete_rule(node);

if (is_function(config)) {
config = config();
if (generator) {
config = generator({ direction: 'in' });
wait().then(go);
} else {
go();
Expand All @@ -151,7 +156,9 @@ 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);
let config = fn(node, params, { direction: 'out' }) as TransitionConfig;
const generator = is_function(config) ? config : null;

let running = true;
let animation_name;

Expand Down Expand Up @@ -201,10 +208,9 @@ export function create_out_transition(node: Element & ElementCSSInlineStyle, fn:
});
}

if (is_function(config)) {
if (generator) {
wait().then(() => {
// @ts-ignore
config = config();
config = generator({ direction: 'out' });
go();
});
} else {
Expand All @@ -226,7 +232,8 @@ export function create_out_transition(node: Element & ElementCSSInlineStyle, fn:
}

export function create_bidirectional_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any, intro: boolean) {
let config = fn(node, params);
let config = fn(node, params, { direction: 'both' }) as TransitionConfig;
const generator = is_function(config) ? config : null;

let t = intro ? 0 : 1;

Expand Down Expand Up @@ -334,10 +341,9 @@ export function create_bidirectional_transition(node: Element & ElementCSSInline

return {
run(b) {
if (is_function(config)) {
if (generator) {
wait().then(() => {
// @ts-ignore
config = config();
config = generator({ direction: b ? 'in' : 'out' });
go(b);
});
} else {
Expand Down