fix: dont stop all animations if one animation errors

sifrr · May 14, 2019 · 5b3d6ee · 5b3d6ee
1 parent c6304cb
commit 5b3d6ee
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 30 deletions.
diff --git a/dist/sifrr.animate.js b/dist/sifrr.animate.js
diff --git a/dist/sifrr.animate.js.map b/dist/sifrr.animate.js.map
diff --git a/dist/sifrr.animate.min.js b/dist/sifrr.animate.min.js
diff --git a/dist/sifrr.animate.module.js b/dist/sifrr.animate.module.js
diff --git a/dist/sifrr.animate.module.js.map b/dist/sifrr.animate.module.js.map
diff --git a/showcase/showcases.json b/showcase/showcases.json
diff --git a/src/animateone.js b/src/animateone.js
@@ -35,7 +35,7 @@ function animateOne({
   type = typeof type === 'function' ? type : new Bezier(types[type] || type);
   const rawObj = { raw };
 
-  return wait(delay).then(() => new Promise(resolve => {
+  return wait(delay).then(() => new Promise((resolve, reject) => {
     let startTime = performance.now();
     const frame = function(currentTime) {
       const percent = (currentTime - startTime) / time, bper = type(percent >= 1 ? 1 : percent);
@@ -44,9 +44,14 @@ function animateOne({
         return round ? Math.round(n) : n;
       });
       const val = String.raw(rawObj, ...next);
-      target[prop] = Number(val) || val;
-      if (onUp) onUpdate(target, prop, target[prop]);
-      if (percent >= 1) resolve(frames.delete(frame));
+      try {
+        target[prop] = Number(val) || val;
+        if (onUp) onUpdate(target, prop, target[prop]);
+        if (percent >= 1) resolve(frames.delete(frame));
+      } catch(e) {
+        frames.delete(frame);
+        reject(e);
+      }
     };
     frames.add(frame);
   }));

diff --git a/test/browser/animate.test.js b/test/browser/animate.test.js
@@ -24,6 +24,31 @@ describe('animate', () => {
     expect(target).to.deep.equal({ a: 100 });
   });
 
+  it('works even if one animation errors', async () => {
+    const { i, target, error} = await page.evaluate(async () => {
+      let target = { a: 0 }, i = 0, onUpdate = () => i++, error;
+      await animate({
+        target: 'ok',
+        to: {
+          data: 100
+        }
+      }).catch(e => error = e);
+      await animate({
+        target,
+        to: {
+          a: 100
+        },
+        onUpdate
+      });
+
+      return { i, target, error };
+    });
+
+    expect(i).to.be.at.least(300/FRAME_TIME);
+    expect(target).to.deep.equal({ a: 100 });
+    expect(error).to.exist;
+  });
+
   it('works with single digit', async () => {
     const { i, target } = await page.evaluate(async () => {
       let i = 0, onUpdate = () => i++;