@popmotion/popcorn - npm Package Compare versions

Comparing version 0.3.6 to 0.3.9

CHANGELOG.md

@@ -5,2 +5,14 @@ # Changelog
 
+## [0.3.9] 2019-04-30
+
+### Fixed
+
+- Improving value compatibility checks in `mixComplex`.
+
+## [0.3.8] 2019-04-30
+
+### Upgrade
+
+- Dependencies.
+
 ## [0.3.6] 2019-04-01
@@ -7,0 +19,0 @@

dist/popcorn.es.js

@@ -175,5 +175,6 @@ import { hsla, rgba, hex, color, complex } from 'style-value-types';
 var mixComplex = function (from, to) {
-    var valueTemplate = complex.createTransformer(from);
-    invariant(valueTemplate(from) === complex.createTransformer(to)(from), "Values '" + from + "' and '" + to + "' are of different format, or a value might have changed value type.");
-    return pipe(mixArray(complex.parse(from), complex.parse(to)), valueTemplate);
+    var template = complex.createTransformer(from);
+    var parsedFrom = complex.parse(from);
+    invariant(from === complex.createTransformer(to)(parsedFrom), "Complex values '" + from + "' and '" + to + "' are of different format.");
+    return pipe(mixArray(parsedFrom, complex.parse(to)), template);
 };
@@ -180,0 +181,0 @@

dist/popcorn.js

@@ -281,2 +281,5 @@ (function (global, factory) {
   var NUMBER_TOKEN = '${n}';
+  var convertNumbersToZero = function (v) {
+      return typeof v === 'number' ? 0 : v;
+  };
   var complex = {
@@ -335,6 +338,10 @@ test: function (v) {
           };
+      },
+      getAnimatableNone: function (target) {
+          var parsedTarget = complex.parse(target);
+          var targetTransformer = complex.createTransformer(target);
+          return targetTransformer(parsedTarget.map(convertNumbersToZero));
       }
   };
 
-  var HEY_LISTEN = 'Hey, listen! ';
   var invariant = function () { };
@@ -344,3 +351,3 @@ if (process.env.NODE_ENV !== 'production') {
           if (!check) {
-              throw new Error(HEY_LISTEN.toUpperCase() + message);
+              throw new Error(message);
           }
@@ -415,5 +422,6 @@ };
   var mixComplex = function (from, to) {
-      var valueTemplate = complex.createTransformer(from);
-      invariant(valueTemplate(from) === complex.createTransformer(to)(from), "Values '" + from + "' and '" + to + "' are of different format, or a value might have changed value type.");
-      return pipe(mixArray(complex.parse(from), complex.parse(to)), valueTemplate);
+      var template = complex.createTransformer(from);
+      var parsedFrom = complex.parse(from);
+      invariant(from === complex.createTransformer(to)(parsedFrom), "Complex values '" + from + "' and '" + to + "' are of different format.");
+      return pipe(mixArray(parsedFrom, complex.parse(to)), template);
   };
@@ -518,2 +526,12 @@
 
+  var HEY_LISTEN = 'Hey, listen! ';
+  var invariant$1 = function () { };
+  if (process.env.NODE_ENV !== 'production') {
+      invariant$1 = function (check, message) {
+          if (!check) {
+              throw new Error(HEY_LISTEN.toUpperCase() + message);
+          }
+      };
+  }
+
   var prevTime = 0;
@@ -570,3 +588,3 @@ var onNextFrame = typeof window !== 'undefined' && window.requestAnimationFrame !== undefined
               if (immediate === void 0) { immediate = false; }
-              invariant(typeof process === 'function', 'Argument must be a function');
+              invariant$1(typeof process === 'function', 'Argument must be a function');
               var addToCurrentBuffer = immediate && isProcessing;
@@ -573,0 +591,0 @@ var buffer = addToCurrentBuffer ? processToRun : processToRunNextFrame;

dist/popcorn.min.js

@@ -1,1 +0,1 @@
-!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t(n.popcorn={})}(this,function(n){"use strict";var t,r={x:0,y:0,z:0},e=function(n){return"number"==typeof n},u=function(n){return 180*n/Math.PI},a=function(n){return function(t,r,e){return void 0!==e?n(t,r,e):function(e){return n(t,r,e)}}},o=a(function(n,t,r){return Math.min(Math.max(r,n),t)}),i=function(n){return n*Math.PI/180},f=function(n){return n.hasOwnProperty("x")&&n.hasOwnProperty("y")},c=function(n){return f(n)&&n.hasOwnProperty("z")},s=function(n,t){return Math.abs(n-t)},p=function(n,t,r){var e=t-n;return 0===e?1:(r-n)/e},h=function(n,t,r){return-r*n+r*t+n},d=function(){return(d=Object.assign||function(n){for(var t,r=1,e=arguments.length;r<e;r++)for(var u in t=arguments[r])Object.prototype.hasOwnProperty.call(t,u)&&(n[u]=t[u]);return n}).apply(this,arguments)},l=function(){return(l=Object.assign||function(n){for(var t,r=1,e=arguments.length;r<e;r++)for(var u in t=arguments[r])Object.prototype.hasOwnProperty.call(t,u)&&(n[u]=t[u]);return n}).apply(this,arguments)},v=function(n,t){return function(r){return Math.max(Math.min(r,t),n)}},m=function(n){return function(t){return"string"==typeof t&&0===t.indexOf(n)}},g=function(n){return n%1?Number(n.toFixed(5)):n},y={test:function(n){return"number"==typeof n},parse:parseFloat,transform:function(n){return n}},b=(l({},y,{transform:v(0,1)}),l({},y,{default:1}),t="%",{test:function(n){return"string"==typeof n&&n.endsWith(t)&&1===n.split(" ").length},parse:parseFloat,transform:function(n){return""+n+t}}),M=(l({},b,{parse:function(n){return b.parse(n)/100},transform:function(n){return b.transform(100*n)}}),v(0,255)),x=/^(#[0-9a-f]{3}|#(?:[0-9a-f]{2}){2,4}|(rgb|hsl)a?\((-?\d+%?[,\s]+){2,3}\s*[\d\.]+%?\))$/i,w=function(n){return void 0!==n.red},O=function(n){return void 0!==n.hue},A=function(n){var t=n.length;return function(r){if("string"!=typeof r)return r;for(var e,u={},a=function(n){return"string"==typeof n?n.split(/,\s*/):[n]}((e=r).substring(e.indexOf("(")+1,e.lastIndexOf(")"))),o=0;o<t;o++)u[n[o]]=void 0!==a[o]?parseFloat(a[o]):1;return u}},F=l({},y,{transform:function(n){return Math.round(M(n))}}),I=m("rgb"),P={test:function(n){return"string"==typeof n?I(n):w(n)},parse:A(["red","green","blue","alpha"]),transform:function(n){var t=n.red,r=n.green,e=n.blue,u=n.alpha;return function(n){var t=n.red,r=n.green,e=n.blue,u=n.alpha;return"rgba("+t+", "+r+", "+e+", "+(void 0===u?1:u)+")"}({red:F.transform(t),green:F.transform(r),blue:F.transform(e),alpha:g(u)})}},R=m("hsl"),E={test:function(n){return"string"==typeof n?R(n):O(n)},parse:A(["hue","saturation","lightness","alpha"]),transform:function(n){var t=n.hue,r=n.saturation,e=n.lightness,u=n.alpha;return function(n){var t=n.hue,r=n.saturation,e=n.lightness,u=n.alpha;return"hsla("+t+", "+r+", "+e+", "+(void 0===u?1:u)+")"}({hue:Math.round(t),saturation:b.transform(g(r)),lightness:b.transform(g(e)),alpha:g(u)})}},S=l({},P,{test:m("#"),parse:function(n){var t="",r="",e="";return n.length>4?(t=n.substr(1,2),r=n.substr(3,2),e=n.substr(5,2)):(t=n.substr(1,1),r=n.substr(2,1),e=n.substr(3,1),t+=t,r+=r,e+=e),{red:parseInt(t,16),green:parseInt(r,16),blue:parseInt(e,16),alpha:1}}}),j={test:function(n){return"string"==typeof n&&x.test(n)||P.test(n)||E.test(n)||S.test(n)},parse:function(n){return P.test(n)?P.parse(n):E.test(n)?E.parse(n):S.test(n)?S.parse(n):n},transform:function(n){return w(n)?P.transform(n):O(n)?E.transform(n):n}},k=/(-)?(\d[\d\.]*)/g,q=/(#[0-9a-f]{6}|#[0-9a-f]{3}|#(?:[0-9a-f]{2}){2,4}|(rgb|hsl)a?\((-?\d+%?[,\s]+){2,3}\s*[\d\.]+%?\))/gi,U=function(n){var t=n,r=[],e=t.match(q);e&&(t=t.replace(q,"${c}"),r.push.apply(r,e.map(j.parse)));var u=t.match(k);return u&&r.push.apply(r,u.map(y.parse)),r},$=function(n){var t=n,r=0,e=n.match(q),u=e?e.length:0;if(e)for(var a=0;a<u;a++)t=t.replace(e[a],"${c}"),r++;var o=t.match(k),i=o?o.length:0;if(o)for(a=0;a<i;a++)t=t.replace(o[a],"${n}"),r++;return function(n){for(var e=t,a=0;a<r;a++)e=e.replace(a<u?"${c}":"${n}",a<u?j.transform(n[a]):g(n[a]));return e}},z=function(){};"production"!==process.env.NODE_ENV&&(z=function(n,t){if(!n)throw new Error("Hey, listen! ".toUpperCase()+t)});var B=function(n,t,r){var e=n*n,u=t*t;return Math.sqrt(Math.max(0,r*(u-e)+e))},D=[S,P,E],C=function(n){return D.find(function(t){return t.test(n)})},N=function(n){return"'"+n+"' is not an animatable color. Use the equivalent color code instead."},T=function(n,t){var r=C(n),e=C(t);z(!!r,N(n)),z(!!e,N(t)),z(r.transform===e.transform,"Both colors must be hex/RGBA, OR both must be HSLA.");var u=r.parse(n),a=e.parse(t),o=d({},u),i=r===E?h:B;return function(n){for(var t in o)"alpha"!==t&&(o[t]=i(u[t],a[t],n));return o.alpha=h(u.alpha,a.alpha,n),r.transform(o)}},V=function(n,t){return function(r){return t(n(r))}},W=function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];return n.reduce(V)},_=function(n,t){var r=n.slice(),u=r.length,a=n.map(function(n,r){var u=t[r];return e(n)?function(t){return h(n,u,t)}:j.test(n)?T(n,u):H(n,u)});return function(n){for(var t=0;t<u;t++)r[t]=a[t](n);return r}},H=function(n,t){var r=$(n);return z(r(n)===$(t)(n),"Values '"+n+"' and '"+t+"' are of different format, or a value might have changed value type."),W(_(U(n),U(t)),r)},L=function(n,t){return function(r){return h(n,t,r)}};function G(n,t,r){for(var e,u=[],a=r||("number"==typeof(e=n[0])?L:j.test(e)?T:H),o=n.length-1,i=0;i<o;i++){var f=a(n[i],n[i+1]);if(t){var c=Array.isArray(t)?t[i]:t;f=W(c,f)}u.push(f)}return u}var J,K=function(n,t){return void 0===t&&(t=2),t=Math.pow(10,t),Math.round(n*t)/t},Q=function(n,t,r,e){return void 0===e&&(e=0),K(n+r*(t-n)/Math.max(e,r))},X=0,Y="undefined"!=typeof window&&void 0!==window.requestAnimationFrame?function(n){return window.requestAnimationFrame(n)}:function(n){var t=Date.now(),r=Math.max(0,16.7-(t-X));X=t+r,setTimeout(function(){return n(X)},r)};!function(n){n.Read="read",n.Update="update",n.Render="render",n.PostRender="postRender",n.FixedUpdate="fixedUpdate"}(J||(J={}));var Z=1/60*1e3,nn=!0,tn=!1,rn=!1,en={delta:0,timestamp:0},un=[J.Read,J.Update,J.Render,J.PostRender],an=function(n){return tn=n},on=un.reduce(function(n,t){var r,e,u,a,o,i,f,c,s,p=(r=an,e=[],u=[],a=0,o=!1,i=0,f=new WeakSet,c=new WeakSet,s={cancel:function(n){var t=u.indexOf(n);f.add(n),-1!==t&&u.splice(t,1)},process:function(n){var t,p;if(o=!0,e=(t=[u,e])[0],(u=t[1]).length=0,a=e.length)for(i=0;i<a;i++)(p=e[i])(n),!0!==c.has(p)||f.has(p)||(s.schedule(p),r(!0));o=!1},schedule:function(n,t,r){void 0===t&&(t=!1),void 0===r&&(r=!1),z("function"==typeof n,"Argument must be a function");var i=r&&o,s=i?e:u;f.delete(n),t&&c.add(n),-1===s.indexOf(n)&&(s.push(n),i&&(a=e.length))}});return n.sync[t]=function(n,t,r){return void 0===t&&(t=!1),void 0===r&&(r=!1),tn||pn(),p.schedule(n,t,r),n},n.cancelSync[t]=function(n){return p.cancel(n)},n.steps[t]=p,n},{steps:{},sync:{},cancelSync:{}}),fn=on.steps,cn=(on.sync,on.cancelSync,function(n){return fn[n].process(en)}),sn=function(n){tn=!1,en.delta=nn?Z:Math.max(Math.min(n-en.timestamp,40),1),nn||(Z=en.delta),en.timestamp=n,rn=!0,un.forEach(cn),rn=!1,tn&&(nn=!1,Y(sn))},pn=function(){tn=!0,nn=!0,rn||Y(sn)},hn=function(n){return n},dn=function(n){return void 0===n&&(n=hn),a(function(t,r,e){var u=r-e,a=-(0-t+1)*(0-n(Math.abs(u)));return u<=0?r+a:r-a})},ln=dn(),vn=dn(Math.sqrt),mn=a(function(n,t,r){var e=t-n;return((r-n)%e+e)%e+n}),gn=o(0,1),yn=function(n){return function(t){return 1-n(1-t)}},bn=function(n){return function(t){return t<=.5?n(2*t)/2:(2-n(2*(1-t)))/2}},Mn=function(n){return function(t){return Math.pow(t,n)}},xn=function(n){return function(t){return t*t*((n+1)*t-n)}},wn=function(n){var t=xn(n);return function(n){return(n*=2)<1?.5*t(n):.5*(2-Math.pow(2,-10*(n-1)))}},On=Mn(2),An=yn(On),Fn=bn(On),In=function(n){return 1-Math.sin(Math.acos(n))},Pn=yn(In),Rn=bn(Pn),En=xn(1.525),Sn=yn(En),jn=bn(En),kn=wn(1.525),qn=8,Un=.001,$n=1e-7,zn=10,Bn=11,Dn=1/(Bn-1),Cn="undefined"!=typeof Float32Array,Nn=function(n,t){return 1-3*t+3*n},Tn=function(n,t){return 3*t-6*n},Vn=function(n){return 3*n},Wn=function(n,t,r){return 3*Nn(t,r)*n*n+2*Tn(t,r)*n+Vn(t)},_n=function(n,t,r){return((Nn(t,r)*n+Tn(t,r))*n+Vn(t))*n};n.angle=function(n,t){return void 0===t&&(t=r),u(Math.atan2(t.y-n.y,t.x-n.x))},n.applyOffset=function(n,t){var r=!0;return void 0===t&&(t=n,r=!1),function(e){return r?e-n+t:(n=e,r=!0,t)}},n.clamp=o,n.conditional=function(n,t){return function(r){return n(r)?t(r):r}},n.degreesToRadians=i,n.distance=function(n,t){if(void 0===t&&(t=r),e(n)&&e(t))return s(n,t);if(f(n)&&f(t)){var u=s(n.x,t.x),a=s(n.y,t.y),o=c(n)&&c(t)?s(n.z,t.z):0;return Math.sqrt(Math.pow(u,2)+Math.pow(a,2)+Math.pow(o,2))}return 0},n.interpolate=function(n,t,r){var e=void 0===r?{}:r,u=e.clamp,a=void 0===u||u,i=e.ease,f=e.mixer,c=n.length;z(c===t.length,"Both input and output ranges must be the same length"),z(!i||!Array.isArray(i)||i.length===c-1,"Array of easing functions must be of length `input.length - 1`, as it applies to the transitions **between** the defined values."),n[0]>n[c-1]&&(n=[].concat(n),t=[].concat(t),n.reverse(),t.reverse());var s=G(t,i,f),h=2===c?function(n,t){var r=n[0],e=n[1],u=t[0];return function(n){return u(p(r,e,n))}}(n,s):function(n,t){var r=n.length,e=r-1;return function(u){var a=0,o=!1;if(u<=n[0]?o=!0:u>=n[e]&&(a=e-1,o=!0),!o){for(var i=1;i<r&&!(n[i]>u||i===e);i++);a=i-1}var f=p(n[a],n[a+1],u);return t[a](f)}}(n,s);return a?W(o(n[0],n[c-1]),h):h},n.isPoint=f,n.isPoint3D=c,n.mix=h,n.mixArray=_,n.mixColor=T,n.mixComplex=H,n.pipe=W,n.pointFromVector=function(n,t,r){return t=i(t),{x:r*Math.cos(t)+n.x,y:r*Math.sin(t)+n.y}},n.progress=p,n.radiansToDegrees=u,n.smooth=function(n){void 0===n&&(n=50);var t=0,r=0;return function(e){var u=en.timestamp,a=u!==r?u-r:0,o=a?Q(t,e,a,n):t;return r=u,t=o,o}},n.smoothFrame=Q,n.snap=function(n){if("number"==typeof n)return function(t){return Math.round(t/n)*n};var t=0,r=n.length;return function(e){var u=Math.abs(n[0]-e);for(t=1;t<r;t++){var a=n[t],o=Math.abs(a-e);if(0===o)return a;if(o>u)return n[t-1];if(t===r-1)return a;u=o}}},n.springForce=dn,n.springForceExpo=vn,n.springForceLinear=ln,n.steps=function(n,t){return void 0===t&&(t="end"),function(r){var e=(r="end"===t?Math.min(r,.999):Math.max(r,.001))*n,u="end"===t?Math.floor(e):Math.ceil(e);return gn(u/n)}},n.toDecimal=K,n.velocityPerFrame=function(n,t){return e(n)?n/(1e3/t):0},n.velocityPerSecond=function(n,t){return t?n*(1e3/t):0},n.wrap=mn,n.createAnticipateEasing=wn,n.createBackIn=xn,n.createExpoIn=Mn,n.cubicBezier=function(n,t,r,e){var u=Cn?new Float32Array(Bn):new Array(Bn),a=function(t){for(var e,a,o,i=0,f=1,c=Bn-1;f!==c&&u[f]<=t;++f)i+=Dn;return e=(t-u[--f])/(u[f+1]-u[f]),(o=Wn(a=i+e*Dn,n,r))>=Un?function(t,e){for(var u=0,a=0;u<qn;++u){if(0===(a=Wn(e,n,r)))return e;e-=(_n(e,n,r)-t)/a}return e}(t,a):0===o?a:function(t,e,u){var a,o,i=0;do{(a=_n(o=e+(u-e)/2,n,r)-t)>0?u=o:e=o}while(Math.abs(a)>$n&&++i<zn);return o}(t,i,i+Dn)};return function(){for(var t=0;t<Bn;++t)u[t]=_n(t*Dn,n,r)}(),function(u){return n===t&&r===e?u:0===u?0:1===u?1:_n(a(u),t,e)}},n.linear=function(n){return n},n.easeIn=On,n.easeOut=An,n.easeInOut=Fn,n.circIn=In,n.circOut=Pn,n.circInOut=Rn,n.backIn=En,n.backOut=Sn,n.backInOut=jn,n.anticipate=kn,n.reversed=yn,n.mirrored=bn,Object.defineProperty(n,"__esModule",{value:!0})});
+!function(n,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports):"function"==typeof define&&define.amd?define(["exports"],r):r(n.popcorn={})}(this,function(n){"use strict";var r,t={x:0,y:0,z:0},e=function(n){return"number"==typeof n},a=function(n){return 180*n/Math.PI},u=function(n){return function(r,t,e){return void 0!==e?n(r,t,e):function(e){return n(r,t,e)}}},o=u(function(n,r,t){return Math.min(Math.max(t,n),r)}),i=function(n){return n*Math.PI/180},f=function(n){return n.hasOwnProperty("x")&&n.hasOwnProperty("y")},c=function(n){return f(n)&&n.hasOwnProperty("z")},s=function(n,r){return Math.abs(n-r)},p=function(n,r,t){var e=r-n;return 0===e?1:(t-n)/e},h=function(n,r,t){return-t*n+t*r+n},l=function(){return(l=Object.assign||function(n){for(var r,t=1,e=arguments.length;t<e;t++)for(var a in r=arguments[t])Object.prototype.hasOwnProperty.call(r,a)&&(n[a]=r[a]);return n}).apply(this,arguments)},d=function(){return(d=Object.assign||function(n){for(var r,t=1,e=arguments.length;t<e;t++)for(var a in r=arguments[t])Object.prototype.hasOwnProperty.call(r,a)&&(n[a]=r[a]);return n}).apply(this,arguments)},v=function(n,r){return function(t){return Math.max(Math.min(t,r),n)}},m=function(n){return function(r){return"string"==typeof r&&0===r.indexOf(n)}},g=function(n){return n%1?Number(n.toFixed(5)):n},y={test:function(n){return"number"==typeof n},parse:parseFloat,transform:function(n){return n}},b=(d({},y,{transform:v(0,1)}),d({},y,{default:1}),r="%",{test:function(n){return"string"==typeof n&&n.endsWith(r)&&1===n.split(" ").length},parse:parseFloat,transform:function(n){return""+n+r}}),M=(d({},b,{parse:function(n){return b.parse(n)/100},transform:function(n){return b.transform(100*n)}}),v(0,255)),x=/^(#[0-9a-f]{3}|#(?:[0-9a-f]{2}){2,4}|(rgb|hsl)a?\((-?\d+%?[,\s]+){2,3}\s*[\d\.]+%?\))$/i,w=function(n){return void 0!==n.red},O=function(n){return void 0!==n.hue},A=function(n){var r=n.length;return function(t){if("string"!=typeof t)return t;for(var e,a={},u=function(n){return"string"==typeof n?n.split(/,\s*/):[n]}((e=t).substring(e.indexOf("(")+1,e.lastIndexOf(")"))),o=0;o<r;o++)a[n[o]]=void 0!==u[o]?parseFloat(u[o]):1;return a}},F=d({},y,{transform:function(n){return Math.round(M(n))}}),I=m("rgb"),P={test:function(n){return"string"==typeof n?I(n):w(n)},parse:A(["red","green","blue","alpha"]),transform:function(n){var r=n.red,t=n.green,e=n.blue,a=n.alpha;return function(n){var r=n.red,t=n.green,e=n.blue,a=n.alpha;return"rgba("+r+", "+t+", "+e+", "+(void 0===a?1:a)+")"}({red:F.transform(r),green:F.transform(t),blue:F.transform(e),alpha:g(a)})}},E=m("hsl"),R={test:function(n){return"string"==typeof n?E(n):O(n)},parse:A(["hue","saturation","lightness","alpha"]),transform:function(n){var r=n.hue,t=n.saturation,e=n.lightness,a=n.alpha;return function(n){var r=n.hue,t=n.saturation,e=n.lightness,a=n.alpha;return"hsla("+r+", "+t+", "+e+", "+(void 0===a?1:a)+")"}({hue:Math.round(r),saturation:b.transform(g(t)),lightness:b.transform(g(e)),alpha:g(a)})}},N=d({},P,{test:m("#"),parse:function(n){var r="",t="",e="";return n.length>4?(r=n.substr(1,2),t=n.substr(3,2),e=n.substr(5,2)):(r=n.substr(1,1),t=n.substr(2,1),e=n.substr(3,1),r+=r,t+=t,e+=e),{red:parseInt(r,16),green:parseInt(t,16),blue:parseInt(e,16),alpha:1}}}),S={test:function(n){return"string"==typeof n&&x.test(n)||P.test(n)||R.test(n)||N.test(n)},parse:function(n){return P.test(n)?P.parse(n):R.test(n)?R.parse(n):N.test(n)?N.parse(n):n},transform:function(n){return w(n)?P.transform(n):O(n)?R.transform(n):n}},T=/(-)?(\d[\d\.]*)/g,j=/(#[0-9a-f]{6}|#[0-9a-f]{3}|#(?:[0-9a-f]{2}){2,4}|(rgb|hsl)a?\((-?\d+%?[,\s]+){2,3}\s*[\d\.]+%?\))/gi,k=function(n){return"number"==typeof n?0:n},q={test:function(n){if("string"!=typeof n||!isNaN(n))return!1;var r=0,t=n.match(T),e=n.match(j);return t&&(r+=t.length),e&&(r+=e.length),r>0},parse:function(n){var r=n,t=[],e=r.match(j);e&&(r=r.replace(j,"${c}"),t.push.apply(t,e.map(S.parse)));var a=r.match(T);return a&&t.push.apply(t,a.map(y.parse)),t},createTransformer:function(n){var r=n,t=0,e=n.match(j),a=e?e.length:0;if(e)for(var u=0;u<a;u++)r=r.replace(e[u],"${c}"),t++;var o=r.match(T),i=o?o.length:0;if(o)for(u=0;u<i;u++)r=r.replace(o[u],"${n}"),t++;return function(n){for(var e=r,u=0;u<t;u++)e=e.replace(u<a?"${c}":"${n}",u<a?S.transform(n[u]):g(n[u]));return e}},getAnimatableNone:function(n){var r=q.parse(n);return q.createTransformer(n)(r.map(k))}},D=function(){};"production"!==process.env.NODE_ENV&&(D=function(n,r){if(!n)throw new Error(r)});var U=function(n,r,t){var e=n*n,a=r*r;return Math.sqrt(Math.max(0,t*(a-e)+e))},$=[N,P,R],z=function(n){return $.find(function(r){return r.test(n)})},B=function(n){return"'"+n+"' is not an animatable color. Use the equivalent color code instead."},C=function(n,r){var t=z(n),e=z(r);D(!!t,B(n)),D(!!e,B(r)),D(t.transform===e.transform,"Both colors must be hex/RGBA, OR both must be HSLA.");var a=t.parse(n),u=e.parse(r),o=l({},a),i=t===R?h:U;return function(n){for(var r in o)"alpha"!==r&&(o[r]=i(a[r],u[r],n));return o.alpha=h(a.alpha,u.alpha,n),t.transform(o)}},_=function(n,r){return function(t){return r(n(t))}},V=function(){for(var n=[],r=0;r<arguments.length;r++)n[r]=arguments[r];return n.reduce(_)},W=function(n,r){var t=n.slice(),a=t.length,u=n.map(function(n,t){var a=r[t];return e(n)?function(r){return h(n,a,r)}:S.test(n)?C(n,a):H(n,a)});return function(n){for(var r=0;r<a;r++)t[r]=u[r](n);return t}},H=function(n,r){var t=q.createTransformer(n),e=q.parse(n);return D(n===q.createTransformer(r)(e),"Complex values '"+n+"' and '"+r+"' are of different format."),V(W(e,q.parse(r)),t)},L=function(n,r){return function(t){return h(n,r,t)}};function G(n,r,t){for(var e,a=[],u=t||("number"==typeof(e=n[0])?L:S.test(e)?C:H),o=n.length-1,i=0;i<o;i++){var f=u(n[i],n[i+1]);if(r){var c=Array.isArray(r)?r[i]:r;f=V(c,f)}a.push(f)}return a}var J=function(n,r){return void 0===r&&(r=2),r=Math.pow(10,r),Math.round(n*r)/r},K=function(n,r,t,e){return void 0===e&&(e=0),J(n+t*(r-n)/Math.max(e,t))},Q=function(){};"production"!==process.env.NODE_ENV&&(Q=function(n,r){if(!n)throw new Error("Hey, listen! ".toUpperCase()+r)});var X,Y=0,Z="undefined"!=typeof window&&void 0!==window.requestAnimationFrame?function(n){return window.requestAnimationFrame(n)}:function(n){var r=Date.now(),t=Math.max(0,16.7-(r-Y));Y=r+t,setTimeout(function(){return n(Y)},t)};!function(n){n.Read="read",n.Update="update",n.Render="render",n.PostRender="postRender",n.FixedUpdate="fixedUpdate"}(X||(X={}));var nn=1/60*1e3,rn=!0,tn=!1,en=!1,an={delta:0,timestamp:0},un=[X.Read,X.Update,X.Render,X.PostRender],on=function(n){return tn=n},fn=un.reduce(function(n,r){var t,e,a,u,o,i,f,c,s,p=(t=on,e=[],a=[],u=0,o=!1,i=0,f=new WeakSet,c=new WeakSet,s={cancel:function(n){var r=a.indexOf(n);f.add(n),-1!==r&&a.splice(r,1)},process:function(n){var r,p;if(o=!0,e=(r=[a,e])[0],(a=r[1]).length=0,u=e.length)for(i=0;i<u;i++)(p=e[i])(n),!0!==c.has(p)||f.has(p)||(s.schedule(p),t(!0));o=!1},schedule:function(n,r,t){void 0===r&&(r=!1),void 0===t&&(t=!1),Q("function"==typeof n,"Argument must be a function");var i=t&&o,s=i?e:a;f.delete(n),r&&c.add(n),-1===s.indexOf(n)&&(s.push(n),i&&(u=e.length))}});return n.sync[r]=function(n,r,t){return void 0===r&&(r=!1),void 0===t&&(t=!1),tn||hn(),p.schedule(n,r,t),n},n.cancelSync[r]=function(n){return p.cancel(n)},n.steps[r]=p,n},{steps:{},sync:{},cancelSync:{}}),cn=fn.steps,sn=(fn.sync,fn.cancelSync,function(n){return cn[n].process(an)}),pn=function(n){tn=!1,an.delta=rn?nn:Math.max(Math.min(n-an.timestamp,40),1),rn||(nn=an.delta),an.timestamp=n,en=!0,un.forEach(sn),en=!1,tn&&(rn=!1,Z(pn))},hn=function(){tn=!0,rn=!0,en||Z(pn)},ln=function(n){return n},dn=function(n){return void 0===n&&(n=ln),u(function(r,t,e){var a=t-e,u=-(0-r+1)*(0-n(Math.abs(a)));return a<=0?t+u:t-u})},vn=dn(),mn=dn(Math.sqrt),gn=u(function(n,r,t){var e=r-n;return((t-n)%e+e)%e+n}),yn=o(0,1),bn=function(n){return function(r){return 1-n(1-r)}},Mn=function(n){return function(r){return r<=.5?n(2*r)/2:(2-n(2*(1-r)))/2}},xn=function(n){return function(r){return Math.pow(r,n)}},wn=function(n){return function(r){return r*r*((n+1)*r-n)}},On=function(n){var r=wn(n);return function(n){return(n*=2)<1?.5*r(n):.5*(2-Math.pow(2,-10*(n-1)))}},An=xn(2),Fn=bn(An),In=Mn(An),Pn=function(n){return 1-Math.sin(Math.acos(n))},En=bn(Pn),Rn=Mn(En),Nn=wn(1.525),Sn=bn(Nn),Tn=Mn(Nn),jn=On(1.525),kn=8,qn=.001,Dn=1e-7,Un=10,$n=11,zn=1/($n-1),Bn="undefined"!=typeof Float32Array,Cn=function(n,r){return 1-3*r+3*n},_n=function(n,r){return 3*r-6*n},Vn=function(n){return 3*n},Wn=function(n,r,t){return 3*Cn(r,t)*n*n+2*_n(r,t)*n+Vn(r)},Hn=function(n,r,t){return((Cn(r,t)*n+_n(r,t))*n+Vn(r))*n};n.angle=function(n,r){return void 0===r&&(r=t),a(Math.atan2(r.y-n.y,r.x-n.x))},n.applyOffset=function(n,r){var t=!0;return void 0===r&&(r=n,t=!1),function(e){return t?e-n+r:(n=e,t=!0,r)}},n.clamp=o,n.conditional=function(n,r){return function(t){return n(t)?r(t):t}},n.degreesToRadians=i,n.distance=function(n,r){if(void 0===r&&(r=t),e(n)&&e(r))return s(n,r);if(f(n)&&f(r)){var a=s(n.x,r.x),u=s(n.y,r.y),o=c(n)&&c(r)?s(n.z,r.z):0;return Math.sqrt(Math.pow(a,2)+Math.pow(u,2)+Math.pow(o,2))}return 0},n.interpolate=function(n,r,t){var e=void 0===t?{}:t,a=e.clamp,u=void 0===a||a,i=e.ease,f=e.mixer,c=n.length;D(c===r.length,"Both input and output ranges must be the same length"),D(!i||!Array.isArray(i)||i.length===c-1,"Array of easing functions must be of length `input.length - 1`, as it applies to the transitions **between** the defined values."),n[0]>n[c-1]&&(n=[].concat(n),r=[].concat(r),n.reverse(),r.reverse());var s=G(r,i,f),h=2===c?function(n,r){var t=n[0],e=n[1],a=r[0];return function(n){return a(p(t,e,n))}}(n,s):function(n,r){var t=n.length,e=t-1;return function(a){var u=0,o=!1;if(a<=n[0]?o=!0:a>=n[e]&&(u=e-1,o=!0),!o){for(var i=1;i<t&&!(n[i]>a||i===e);i++);u=i-1}var f=p(n[u],n[u+1],a);return r[u](f)}}(n,s);return u?V(o(n[0],n[c-1]),h):h},n.isPoint=f,n.isPoint3D=c,n.mix=h,n.mixArray=W,n.mixColor=C,n.mixComplex=H,n.pipe=V,n.pointFromVector=function(n,r,t){return r=i(r),{x:t*Math.cos(r)+n.x,y:t*Math.sin(r)+n.y}},n.progress=p,n.radiansToDegrees=a,n.smooth=function(n){void 0===n&&(n=50);var r=0,t=0;return function(e){var a=an.timestamp,u=a!==t?a-t:0,o=u?K(r,e,u,n):r;return t=a,r=o,o}},n.smoothFrame=K,n.snap=function(n){if("number"==typeof n)return function(r){return Math.round(r/n)*n};var r=0,t=n.length;return function(e){var a=Math.abs(n[0]-e);for(r=1;r<t;r++){var u=n[r],o=Math.abs(u-e);if(0===o)return u;if(o>a)return n[r-1];if(r===t-1)return u;a=o}}},n.springForce=dn,n.springForceExpo=mn,n.springForceLinear=vn,n.steps=function(n,r){return void 0===r&&(r="end"),function(t){var e=(t="end"===r?Math.min(t,.999):Math.max(t,.001))*n,a="end"===r?Math.floor(e):Math.ceil(e);return yn(a/n)}},n.toDecimal=J,n.velocityPerFrame=function(n,r){return e(n)?n/(1e3/r):0},n.velocityPerSecond=function(n,r){return r?n*(1e3/r):0},n.wrap=gn,n.createAnticipateEasing=On,n.createBackIn=wn,n.createExpoIn=xn,n.cubicBezier=function(n,r,t,e){var a=Bn?new Float32Array($n):new Array($n),u=function(r){for(var e,u,o,i=0,f=1,c=$n-1;f!==c&&a[f]<=r;++f)i+=zn;return e=(r-a[--f])/(a[f+1]-a[f]),(o=Wn(u=i+e*zn,n,t))>=qn?function(r,e){for(var a=0,u=0;a<kn;++a){if(0===(u=Wn(e,n,t)))return e;e-=(Hn(e,n,t)-r)/u}return e}(r,u):0===o?u:function(r,e,a){var u,o,i=0;do{(u=Hn(o=e+(a-e)/2,n,t)-r)>0?a=o:e=o}while(Math.abs(u)>Dn&&++i<Un);return o}(r,i,i+zn)};return function(){for(var r=0;r<$n;++r)a[r]=Hn(r*zn,n,t)}(),function(a){return n===r&&t===e?a:0===a?0:1===a?1:Hn(u(a),r,e)}},n.linear=function(n){return n},n.easeIn=An,n.easeOut=Fn,n.easeInOut=In,n.circIn=Pn,n.circOut=En,n.circInOut=Rn,n.backIn=Nn,n.backOut=Sn,n.backInOut=Tn,n.anticipate=jn,n.reversed=bn,n.mirrored=Mn,Object.defineProperty(n,"__esModule",{value:!0})});

lib/index.js

@@ -178,5 +178,6 @@ 'use strict';
 var mixComplex = function (from, to) {
-    var valueTemplate = styleValueTypes.complex.createTransformer(from);
-    heyListen.invariant(valueTemplate(from) === styleValueTypes.complex.createTransformer(to)(from), "Values '" + from + "' and '" + to + "' are of different format, or a value might have changed value type.");
-    return pipe(mixArray(styleValueTypes.complex.parse(from), styleValueTypes.complex.parse(to)), valueTemplate);
+    var template = styleValueTypes.complex.createTransformer(from);
+    var parsedFrom = styleValueTypes.complex.parse(from);
+    heyListen.invariant(from === styleValueTypes.complex.createTransformer(to)(parsedFrom), "Complex values '" + from + "' and '" + to + "' are of different format.");
+    return pipe(mixArray(parsedFrom, styleValueTypes.complex.parse(to)), template);
 };
@@ -183,0 +184,0 @@

package.json

 {
   "name": "@popmotion/popcorn",
-  "version": "0.3.6",
+  "version": "0.3.9",
   "description": "Utility functions for animation and interactions.",
@@ -13,5 +13,5 @@ "main": "lib/index.js",
     "lint": "tslint 'src/**/*.{ts,tsx}' -e '**/_tests/**'",
-    "testsThatHangCircleCi": "jest",
+    "test": "jest --maxWorkers=2",
     "measure": "gzip -c dist/popcorn.min.js | wc -c",
-    "prepublishOnly": "yarn lint && yarn testsThatHangCircleCi && yarn build"
+    "prepublishOnly": "yarn lint && yarn test && yarn build"
   },
@@ -59,4 +59,4 @@ "files": [
     "framesync": "^4.0.1",
-    "hey-listen": "^1.0.5",
-    "style-value-types": "^3.1.0"
+    "hey-listen": "^1.0.8",
+    "style-value-types": "^3.1.3"
   },
@@ -63,0 +63,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

85358

increased by1.26%

Lines of code

1748

increased by1.16%

Dependency changes

• Updatedhey-listen@^1.0.8

• Updatedstyle-value-types@^3.1.3