github/motion-canvas
1
1
Fork 0
mirror of https://github.com/motion-canvas/motion-canvas.git synced 2026-01-11 14:57:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): keep falsy values with deepTween (#45)

Browse Source 
This PR fixes a bug with `deepTween` that was removing all falsy properties.
I.e. tweening between `{x: 0, y: 10}` and `{x: 0, y: 20}` would result in the `x` property missing.
This commit is contained in:
Jacob
2022-08-16 15:16:29 +02:00
committed by GitHub
parent 831334ca32
commit 93c934f9b5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/tweening/tweenFunctions.test.ts
View File

@@ -77,6 +77,10 @@ describe('deepTween', () => {
expect(deepTween({foo: 5}, {}, 0)).toEqual({foo: 5});
});
test('retains properties with falsy values', () => {
expect(deepTween({x: 0, y: 10}, {x: 0, y: 20}, 0.5)).toEqual({x: 0, y: 15});
});
test('waits to add new values to a map until a value of 1', () => {
expect(deepTween({}, {foo: 5}, 3 / 5)).toEqual({});
expect(deepTween({}, {foo: 5}, 0)).toEqual({});

2
packages/core/src/tweening/tweenFunctions.ts
View File

@@ -108,7 +108,7 @@ export function deepTween(from: any, to: any, value: number): any {
const result = new Map();
for (const key of new Set([...from.keys(), ...to.keys()])) {
const inter = deepTween(from.get(key), to.get(key), value);
if (inter) result.set(key, inter);
if (inter !== undefined) result.set(key, inter);
}
return toObject ? Object.fromEntries(result) : result;
}