Skip to content

armgit / anime

Public Imported from GitHub
0

JavaScript animation engine

Fix unwanted waapi ease cache on functions #999

Julian Garnier9aad314fe381
diff --git a/lib/anime.esm.js b/lib/anime.esm.js
index 7c58fbaf..020c2cf5 100644
--- a/lib/anime.esm.js
+++ b/lib/anime.esm.js
@@ -3745,13 +3745,14 @@ const parseWAAPIEasing = (ease) => {
const parsed = parseEaseString(ease, WAAPIeases, WAAPIEasesLookups);
if (isFnc(parsed)) parsedEase = parsed === none ? 'linear' : easingToLinear(parsed);
}
+ WAAPIEasesLookups[ease] = parsedEase;
} else if (isFnc(ease)) {
const easing = easingToLinear(ease);
if (easing) parsedEase = easing;
} else if (/** @type {Spring} */(ease).ease) {
parsedEase = easingToLinear(/** @type {Spring} */(ease).ease);
}
- return WAAPIEasesLookups[ease] = parsedEase;
+ return parsedEase;
};
/**
diff --git a/src/waapi.js b/src/waapi.js
index d8c836a9..d50bccfa 100644
--- a/src/waapi.js
+++ b/src/waapi.js
@@ -91,13 +91,14 @@ const parseWAAPIEasing = (ease) => {
const parsed = parseEaseString(ease, WAAPIeases, WAAPIEasesLookups);
if (isFnc(parsed)) parsedEase = parsed === none ? 'linear' : easingToLinear(parsed);
}
+ WAAPIEasesLookups[ease] = parsedEase;
} else if (isFnc(ease)) {
const easing = easingToLinear(ease);
if (easing) parsedEase = easing;
} else if (/** @type {Spring} */(ease).ease) {
parsedEase = easingToLinear(/** @type {Spring} */(ease).ease);
}
- return WAAPIEasesLookups[ease] = parsedEase;
+ return parsedEase;
}
/**
diff --git a/tests/suites/waapi.test.js b/tests/suites/waapi.test.js
index 8862d90b..afcb26a9 100644
--- a/tests/suites/waapi.test.js
+++ b/tests/suites/waapi.test.js
@@ -246,4 +246,42 @@ suite('WAAPI', () => {
utils.remove(targets, null, 'opacity');
});
+ test('WAAPI ease cache should not cache functions', () => {
+ const [ $target1, $target2 ] = utils.$('.target-class');
+ const animation1 = waapi.animate($target1, {
+ opacity: 0,
+ autoplay: false,
+ duration: 10,
+ ease: eases.out(1),
+ });
+ const animation2 = waapi.animate($target2, {
+ opacity: 0,
+ autoplay: false,
+ duration: 10,
+ ease: eases.out(4),
+ });
+ animation1.seek(5);
+ animation2.seek(5);
+ expect(utils.get($target1, 'opacity')).to.not.equal(utils.get($target2, 'opacity'));
+ });
+
+ test('WAAPI ease cache should cache strings', () => {
+ const [ $target1, $target2 ] = utils.$('.target-class');
+ const animation1 = waapi.animate($target1, {
+ opacity: 0,
+ autoplay: false,
+ duration: 10,
+ ease: 'out(1)',
+ });
+ const animation2 = waapi.animate($target2, {
+ opacity: 0,
+ autoplay: false,
+ duration: 10,
+ ease: 'out(4)',
+ });
+ animation1.seek(5);
+ animation2.seek(5);
+ expect(utils.get($target1, 'opacity')).to.not.equal(utils.get($target2, 'opacity'));
+ });
+
});
diff --git a/types/index.js b/types/index.js
index 1a5113bf..316d02a4 100644
--- a/types/index.js
+++ b/types/index.js
@@ -3154,6 +3154,7 @@ const parseWAAPIEasing = (ease) => {
if (isFnc(parsed))
parsedEase = parsed === none ? 'linear' : easingToLinear(parsed);
}
+ WAAPIEasesLookups[ease] = parsedEase;
}
else if (isFnc(ease)) {
const easing = easingToLinear(ease);
@@ -3163,7 +3164,7 @@ const parseWAAPIEasing = (ease) => {
else if ( /** @type {Spring} */(ease).ease) {
parsedEase = easingToLinear(/** @type {Spring} */ (ease).ease);
}
- return WAAPIEasesLookups[ease] = parsedEase;
+ return parsedEase;
};
/**
* @typedef {String|Number|Array<String>|Array<Number>} WAAPITweenValue