react-smooth - npm Package Compare versions

Comparing version 0.0.13 to 0.0.14

CHANGELOG.md

@@ -1,2 +0,2 @@
-### 0.0.13 / 2016-03-15
+### 0.0.13/0.0.14 / 2016-03-15
 ===
@@ -3,0 +3,0 @@ - fix: fix update animation judgement

es6/Animate.js

@@ -7,6 +7,2 @@ 'use strict';
 
-var _pick = require('lodash/pick');
-
-var _pick2 = _interopRequireDefault(_pick);
-
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -128,7 +124,7 @@
 
-      if ((0, _util.isEqual)((0, _pick2.default)(this.props, animateProps), (0, _pick2.default)(nextProps, animateProps))) {
+      if ((0, _util.isEqual)(this.props.to, nextProps.to) && this.props.canBegin && this.props.isActive) {
         return;
       }
 
-      var hasToChanged = this.props.to !== nextProps.to;
+      var isTriggered = !this.props.canBegin || !this.props.isActive;
 
@@ -144,3 +140,3 @@ if (this.manager) {
       this.runAnimation(_extends({}, nextProps, {
-        from: hasToChanged ? this.props.to : nextProps.from
+        from: isTriggered ? nextProps.from : this.props.to
       }));
@@ -241,2 +237,3 @@ }
       var attributeName = props.attributeName;
+      var propsFrom = props.from;
       var propsTo = props.to;
@@ -264,5 +261,6 @@ var easing = props.easing;
       var to = attributeName ? _defineProperty({}, attributeName, propsTo) : propsTo;
+      var from = attributeName ? _defineProperty({}, attributeName, propsFrom) : propsFrom;
       var transition = (0, _util.getTransitionVal)(Object.keys(to), duration, easing);
 
-      manager.start([begin, _extends({}, to, { transition: transition }), duration, onAnimationEnd]);
+      manager.start([from, begin, _extends({}, to, { transition: transition }), duration, onAnimationEnd]);
     }
@@ -269,0 +267,0 @@ }, {

lib/Animate.js

@@ -7,6 +7,2 @@ 'use strict';
 
-var _pick = require('lodash/pick');
-
-var _pick2 = _interopRequireDefault(_pick);
-
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -128,7 +124,7 @@
 
-      if ((0, _util.isEqual)((0, _pick2.default)(this.props, animateProps), (0, _pick2.default)(nextProps, animateProps))) {
+      if ((0, _util.isEqual)(this.props.to, nextProps.to) && this.props.canBegin && this.props.isActive) {
         return;
       }
 
-      var hasToChanged = this.props.to !== nextProps.to;
+      var isTriggered = !this.props.canBegin || !this.props.isActive;
 
@@ -144,3 +140,3 @@ if (this.manager) {
       this.runAnimation(_extends({}, nextProps, {
-        from: hasToChanged ? this.props.to : nextProps.from
+        from: isTriggered ? nextProps.from : this.props.to
       }));
@@ -241,2 +237,3 @@ }
       var attributeName = props.attributeName;
+      var propsFrom = props.from;
       var propsTo = props.to;
@@ -264,5 +261,6 @@ var easing = props.easing;
       var to = attributeName ? _defineProperty({}, attributeName, propsTo) : propsTo;
+      var from = attributeName ? _defineProperty({}, attributeName, propsFrom) : propsFrom;
       var transition = (0, _util.getTransitionVal)(Object.keys(to), duration, easing);
 
-      manager.start([begin, _extends({}, to, { transition: transition }), duration, onAnimationEnd]);
+      manager.start([from, begin, _extends({}, to, { transition: transition }), duration, onAnimationEnd]);
     }
@@ -269,0 +267,0 @@ }, {

package.json

 {
   "name": "react-smooth",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "react animation library",
@@ -5,0 +5,0 @@ "main": "lib/index",

src/Animate.js

@@ -106,7 +106,7 @@ import React, { Component, PropTypes, cloneElement, Children } from 'react';
 
-    if (isEqual(_.pick(this.props, animateProps), _.pick(nextProps, animateProps))) {
+    if (isEqual(this.props.to, nextProps.to) && this.props.canBegin && this.props.isActive) {
       return;
     }
 
-    const hasToChanged = this.props.to !== nextProps.to;
+    const isTriggered= !this.props.canBegin || !this.props.isActive;
 
@@ -123,3 +123,3 @@ if (this.manager) {
       ...nextProps,
-      from: hasToChanged ? this.props.to : nextProps.from,
+      from: isTriggered ? nextProps.from : this.props.to,
     });
@@ -214,2 +214,3 @@ }
       attributeName,
+      from: propsFrom,
       to: propsTo,
@@ -237,5 +238,6 @@ easing,
     const to = attributeName ? { [attributeName]: propsTo } : propsTo;
+    const from = attributeName ? { [attributeName]: propsFrom } : propsFrom;
     const transition = getTransitionVal(Object.keys(to), duration, easing);
 
-    manager.start([begin, { ...to, transition }, duration, onAnimationEnd]);
+    manager.start([from, begin, { ...to, transition }, duration, onAnimationEnd]);
   }
@@ -242,0 +244,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

254564

increased by0.09%

Lines of code

6906

increased by0.03%

No dependency changes