feat(animate): add preffix and suffix

sifrr · Apr 15, 2019 · 28032d1 · 28032d1
1 parent 5ddf6b6
commit 28032d1
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 37 deletions.
diff --git a/dist/sifrrelements.js b/dist/sifrrelements.js
diff --git a/dist/sifrrelements.js.map b/dist/sifrrelements.js.map
diff --git a/dist/sifrrelements.min.js b/dist/sifrrelements.min.js
diff --git a/dist/sifrrelements.module.js b/dist/sifrrelements.module.js
diff --git a/dist/sifrrelements.module.js.map b/dist/sifrrelements.module.js.map
diff --git a/elements/sifrr-stater/dist/sifrrstater.js b/elements/sifrr-stater/dist/sifrrstater.js
diff --git a/elements/sifrr-stater/dist/sifrrstater.js.map b/elements/sifrr-stater/dist/sifrrstater.js.map
diff --git a/elements/sifrr-stater/dist/sifrrstater.min.js b/elements/sifrr-stater/dist/sifrrstater.min.js
diff --git a/elements/sifrr-stater/dist/sifrrstater.module.js b/elements/sifrr-stater/dist/sifrrstater.module.js
diff --git a/elements/sifrr-stater/dist/sifrrstater.module.js.map b/elements/sifrr-stater/dist/sifrrstater.module.js.map
diff --git a/elements/sifrr-tabs/dist/sifrrtabs.js b/elements/sifrr-tabs/dist/sifrrtabs.js
diff --git a/elements/sifrr-tabs/dist/sifrrtabs.js.map b/elements/sifrr-tabs/dist/sifrrtabs.js.map
diff --git a/elements/sifrr-tabs/dist/sifrrtabs.min.js b/elements/sifrr-tabs/dist/sifrrtabs.min.js
diff --git a/elements/sifrr-tabs/dist/sifrrtabs.module.js b/elements/sifrr-tabs/dist/sifrrtabs.module.js
diff --git a/elements/sifrr-tabs/dist/sifrrtabs.module.js.map b/elements/sifrr-tabs/dist/sifrrtabs.module.js.map
diff --git a/helpers/animate.js b/helpers/animate.js
@@ -45,8 +45,10 @@ class Bezier {
 }
 
 function animate(who, what, to, time = 300, { preffix = false, suffix = false, type = 'ease' } = {}) {
-  const f = who[what].toString();
-  const from = Number(f.slice(preffix ? preffix.length : 0, suffix ? -1 * suffix.length : f.length));
+  let from = who[what].toString(), toBefore = to;
+  to = to.toString();
+  from = Number(from.slice(preffix ? preffix.length : 0, suffix ? -1 * suffix.length : from.length));
+  to = Number(to.slice(preffix ? preffix.length : 0, suffix ? -1 * suffix.length : to.length));
   const diff = to - from;
   const animeFxn = new Bezier(animate.types[type] || type);
   let startTime;
@@ -56,10 +58,12 @@ function animate(who, what, to, time = 300, { preffix = false, suffix = false, t
       startTime = startTime || currentTime;
       const percent = (currentTime - startTime) / time;
       if (percent >= 1) {
-        who[what] = to;
+        who[what] = toBefore;
         return res();
       }
-      who[what] = Math.round(animeFxn(percent) * diff + from);
+      let next = animeFxn(percent) * diff + from;
+      if (!suffix && !preffix) who[what] = next;
+      else who[what] = (preffix ? preffix : '') + next + (suffix ? suffix : '');
       window.requestAnimationFrame(frame);
     }
     window.requestAnimationFrame(frame);

diff --git a/src/sifrrelements.js b/src/sifrrelements.js
@@ -9,3 +9,5 @@ export { default as SifrrProgressRound } from '../elements/sifrr-progress-round/
 
 // helpers
 export { default as animate } from '../helpers/animate';
+// import animate from '../helpers/animate';
+// window.animate = animate;