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

Remove ghost from crossfade during scroll #4344

Closed
wants to merge 1 commit into from
Closed

Remove ghost from crossfade during scroll #4344

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
19 changes: 9 additions & 10 deletions src/runtime/transition/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,21 +204,22 @@ interface CrossfadeParams {
easing: EasingFunction;
}

type ClientRectMap = Map<any, { rect: ClientRect }>;
type ElementMap = Map<any, { node: Element }>;

export function crossfade({ fallback, ...defaults }: CrossfadeParams & {
fallback: (node: Element, params: CrossfadeParams, intro: boolean) => TransitionConfig;
}) {
const to_receive: ClientRectMap = new Map();
const to_send: ClientRectMap = new Map();
const to_receive: ElementMap = new Map();
const to_send: ElementMap = new Map();

function crossfade(from: ClientRect, node: Element, params: CrossfadeParams): TransitionConfig {
function crossfade(from_node: Element, node: Element, params: CrossfadeParams): TransitionConfig {
const {
delay = 0,
duration = d => Math.sqrt(d) * 30,
easing = cubicOut
} = assign(assign({}, defaults), params);

const from = from_node.getBoundingClientRect();
const to = node.getBoundingClientRect();
const dx = from.left - to.left;
const dy = from.top - to.top;
Expand All @@ -242,18 +243,16 @@ export function crossfade({ fallback, ...defaults }: CrossfadeParams & {
};
}

function transition(items: ClientRectMap, counterparts: ClientRectMap, intro: boolean) {
function transition(items: ElementMap, counterparts: ElementMap, intro: boolean) {
return (node: Element, params: CrossfadeParams & { key: any }) => {
items.set(params.key, {
rect: node.getBoundingClientRect()
});
items.set(params.key, { node });

return () => {
if (counterparts.has(params.key)) {
const { rect } = counterparts.get(params.key);
const from_node = counterparts.get(params.key).node;
counterparts.delete(params.key);

return crossfade(rect, node, params);
return crossfade(from_node, node, params);
}

// if the node is disappearing altogether
Expand Down