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 support for SVG animations #5

Merged
merged 6 commits into from
Oct 30, 2024
Merged

Add support for SVG animations #5

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2649553
add initial version of svg animation crossing
Trombach Oct 27, 2024
1e2bd42
move animation forward for duration of view transition
Trombach Oct 27, 2024
88cc1f8
Merge branch 'main' into feature/svg-animations
martrapp Oct 28, 2024
1551a68
remove `svg-anim` kind and move svg animation logic into `anim` kind
Trombach Oct 29, 2024
af44dea
Merge branch 'main' into feature/svg-animations
martrapp Oct 30, 2024
8676e26
chore: add changeset
Trombach Oct 30, 2024
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
81 changes: 56 additions & 25 deletions src/vanilla.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ElementSpec, Spec } from './types';

const DEBUG = false;
const SVG_ANIM_KEY = '/svg';

const crossing = top!.__vtbag?.elementCrossing;
init();
Expand Down Expand Up @@ -147,18 +148,34 @@ function elementSpec(element: HTMLElement) {
});
break;
case 'anim':
const animations = element
.getAnimations()
.filter((a) => a instanceof CSSAnimation && a.animationName === key);
if (animations.length > 1) {
console.error(
'[crossing]',
`retrieval: animation name ${key} is not unique for`,
element
);
}
if (animations.length > 0) {
specs.push({ kind, key, value: '' + (animations[0].currentTime ?? 0) });
if (key === SVG_ANIM_KEY) {
if (!(element instanceof SVGSVGElement)) {
console.error(
'[crossing]',
`retrieval: element is not an SVG element, but "${key}" was used for its key`,
element
);
break;
}

const currentTime = element.getCurrentTime();
if (currentTime > 0) {
specs.push({ kind, key, value: currentTime.toString() });
}
} else {
const animations = element
.getAnimations()
.filter((a) => a instanceof CSSAnimation && a.animationName === key);
if (animations.length > 1) {
console.error(
'[crossing]',
`retrieval: animation name ${key} is not unique for`,
element
);
}
if (animations.length > 0) {
specs.push({ kind, key, value: '' + (animations[0].currentTime ?? 0) });
}
}
break;
case 'elem':
Expand Down Expand Up @@ -218,21 +235,35 @@ function restore(values: ElementSpec[]) {
(element as any)[s.key] = parseFloat(s.value ?? '0');
break;
case 'anim':
const animations = element!
.getAnimations()
.filter((a) => a instanceof CSSAnimation && a.animationName === s.key);
if (animations.length > 1) {
console.warn(
'[crossing]',
`restore: animation name ${s.key} is not unique for`,
element
if (s.key === SVG_ANIM_KEY) {
if (!(element instanceof SVGSVGElement)) {
console.error(
'[crossing]',
`restore: element for key ${s.key} is not an SVG element`,
element
);
break;
}
element.setCurrentTime(
parseFloat(s.value ?? '0') + (new Date().getTime() - elementSpec.timestamp) / 1000
);
} else {
const animations = element!
.getAnimations()
.filter((a) => a instanceof CSSAnimation && a.animationName === s.key);
if (animations.length > 1) {
console.warn(
'[crossing]',
`restore: animation name ${s.key} is not unique for`,
element
);
}
animations.forEach(
(a) =>
(a.currentTime =
~~(s.value ?? '0') + (new Date().getTime() - elementSpec.timestamp))
);
}
animations.forEach(
(a) =>
(a.currentTime =
~~(s.value ?? '0') + (new Date().getTime() - elementSpec.timestamp))
);
break;
case 'elem':
const crossing = top?.__vtbag?.elementCrossing;
Expand Down