TweenOneGroup restore resetStyle

Author: jljsj33

HISTORY.md

@@ -2,7 +2,7 @@
 ----
 
 ## 2.2.0
-1. TweenOne 的 resetStyleBool 改名成 resetStyle;
+1. resetStyleBool 改名成 resetStyle;
 2. TweenOne 删除 updateReStart, 现在默认是。
 3. Group 重构动画逻辑，以队列形式切换，如果在动画时做切换，需将动画完成后再执切换动画。
 4. Group 增加 exclusive, 在队列动画时强行执行切换动画。

README.md

@@ -205,6 +205,7 @@ object: `animation={{ path: { x: path, y: path, rotate: path } }}`, can be contr
 | leave     | object / array / func | `{ x: 30, opacity: 0 }` | leave anim twee-one data. when array is tween-one timeline, func refer to queue-anim  |
 | onEnd     |  func          | -    | one animation end callback |
 | animatingClassName | array | `['tween-one-entering', 'tween-one-leaving']` | className to every element of animating |
+| resetStyle  |  boolean    | TweenOne resetStyle, reset the initial style when changing animation. |
 | exclusive   |  boolean   | false  | Whether to allow a new animate to execute immediately when switching. `enter => leave`: execute immediately leave |
 | component | 	React.Element/String | div  |  component tag  | 
 | componentProps | object  |  -  | component tag props |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-tween-one",
-  "version": "2.2.10",
+  "version": "2.2.11",
   "description": "tween-one anim component for react",
   "keywords": [
     "react",
@@ -34,9 +34,7 @@
     "assets/*.css",
     "dist",
     "es",
-    "typings/index.d.ts",
-    "typings/AnimObject.d.ts",
-    "typings/TweenOneGroup.d.ts"
+    "typings"
   ],
   "licenses": "MIT",
   "main": "./lib/index",

src/TweenOneGroup.jsx

@@ -125,7 +125,7 @@ class TweenOneGroup extends Component {
       key: child.key,
       animation: animate,
       onChange,
-      resetStyle: this.props.exclusive,
+      resetStyle: this.props.resetStyle,
     };
     if (this.keysToEnter.concat(this.keysToLeave).indexOf(child.key) >= 0
       || !this.onEnterBool && animation) {
@@ -220,6 +220,7 @@ class TweenOneGroup extends Component {
       'animatingClassName',
       'onEnd',
       'exclusive',
+      'resetStyle',
     ].forEach(key => delete componentProps[key]);
     return createElement(this.props.component,
       { ...componentProps, ...this.props.componentProps },
@@ -238,6 +239,7 @@ TweenOneGroup.propTypes = {
   leave: PropTypes.any,
   animatingClassName: PropTypes.array,
   onEnd: PropTypes.func,
+  resetStyle: PropTypes.bool,
   exclusive: PropTypes.bool,
 };
 
@@ -249,6 +251,7 @@ TweenOneGroup.defaultProps = {
   enter: { x: 50, opacity: 0, type: 'from' },
   leave: { x: -50, opacity: 0 },
   onEnd: noop,
+  resetStyle: false,
   exclusive: false,
 };
 TweenOneGroup.isTweenOneGroup = true;

typings/TweenOneGroup.d.ts

@@ -10,6 +10,7 @@ export interface IGroupProps<T> extends Omit<React.HTMLAttributes<T>, 'onChange'
   leave?: IAnimObject | IAnimObject[] | ((key: string, index: number) => IAnimObject);
   animatingClassName?: string[] | [string, string];
   exclusive?: boolean;
+  resetStyle?: boolean;
   onEnd?: (e: { key: string, type: string }) => void;
   component?: string | React.ReactNode;
   componentProps?: {};