fix: fix string with decimal numbers

sifrr · May 3, 2019 · 4ee46fb · 4ee46fb
1 parent f39438c
commit 4ee46fb
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 6 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/src/animateone.js b/src/animateone.js
@@ -1,6 +1,6 @@
 const Bezier = require('./bezier');
 const types = require('./types');
-const digitRgx = /(\d+)/;
+const digitRgx = /(\d+\.?\d*)/;
 
 function animateOne({
   target,

diff --git a/test/browser/animate.test.js b/test/browser/animate.test.js
@@ -24,6 +24,26 @@ describe('animate', () => {
     expect(target).to.deep.equal({ a: 100 });
   });
 
+  it('works with single digit', async () => {
+    const { i, target } = await page.evaluate(async () => {
+      let i = 0, onUpdate = () => i++;
+      let target = { a: 0 };
+      await animate({
+        target,
+        to: {
+          a: 9
+        },
+        onUpdate,
+        time: 100
+      });
+
+      return { i, target };
+    });
+
+    expect(i).to.be.at.least(100/FRAME_TIME);
+    expect(target).to.deep.equal({ a: 9 });
+  });
+
   it('works without from', async () => {
     const { i, target } = await page.evaluate(async () => {
       let i = 0, onUpdate = () => i++;
@@ -96,6 +116,36 @@ describe('animate', () => {
     expect(Number(callBreak[3])).to.be.at.least(100);
   });
 
+  it('works with decimal string', async () => {
+    const calls = await page.evaluate(async () => {
+      let calls = [], onUpdate = function(target, prop, val) {
+        calls.push(val);
+      };
+      let target = {
+        a: '0.567px'
+      };
+      await animate({
+        target,
+        to: {
+          a: '145.567px'
+        },
+        time: 100,
+        onUpdate
+      });
+
+      return calls;
+    });
+
+    expect(calls.length).to.be.at.least(100/FRAME_TIME);
+    expect(calls[0]).to.not.equal('145.567px');
+    expect(calls[calls.length - 1]).to.equal('145.567px');
+
+    const callBreak = calls[0].split(/(\d+.?\d+)/);
+    expect(Number(callBreak[1])).to.be.at.least(0);
+    expect(Number(callBreak[1])).to.be.at.most(145);
+    expect(calls[0].match(/\./g).length).to.equal(1);
+  });
+
   it('works with string, no from value', async () => {
     const calls = await page.evaluate(async () => {
       let calls = [], onUpdate = function(target, prop, val) {