fix test

Author: jljsj33

examples/scrollAnim.js

@@ -2,28 +2,23 @@ import Tween from 'rc-tween-one';
 import React from 'react';
 import ReactDom from 'react-dom';
 import ScrollOverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import { Row, Col } from 'antd';
 
 function Demo() {
   return (
     <div>
       <div style={{ height: 800 }}>往下滚动</div>
       <ScrollOverPack
         style={{ height: 800 }}
+        component={Row}
+        componentProps={{ gutter: { md: 12, sm: 5 } }}
       >
         <Tween
           key="1"
           animation={{ y: 30, type: 'from', ease: 'easeOutQuart', opacity: 0 }}
           reverseDelay={200}
           style={{ background: '#fff000' }}
-        >
-          执行动画
-        </Tween>
-        <Tween
-          key="2"
-          id="12"
-          animation={{ y: 30, delay: 100, ease: 'easeOutQuart', type: 'from', opacity: 0, id: 12 }}
-          reverseDelay={100}
-          style={{ background: '#000fff' }}
+          component={Col}
         >
           执行动画
         </Tween>

examples/simple.js

@@ -10,8 +10,7 @@ class Demo extends React.Component {
 
   render() {
     return (<Tween
-      animation={{ x: 300 }}
-      onChange={this.bbb}
+      animation={{ x: 300, duration: 100000 }}
       style={{ opacity: 1, height: 100, display: 'inline-block' }}
     >
       <div>执行动效</div>

src/Tween.js

@@ -392,20 +392,25 @@ p.resetAnimData = function () {
   this.start = {};
 };
 
-p.getDefaultStyle = function (domStyle) {
+const getDefaultStyle = function (domStyle, defaultStyle, tweenData) {
   const $data = defaultData({}, 0);
   const getStyleToArray = (styleString) => (
     styleString.split(';').filter(c => c).map(str =>
       str.split(':').map(s => s.trim())
     )
   );
-  const styleToArray = getStyleToArray(this.startDefaultData.style);
+  const styleToArray = getStyleToArray(defaultStyle);
   let domStyleToArray = getStyleToArray(domStyle);
-  this.data.forEach(value => {
+  tweenData.forEach(value => {
     Object.keys(value).forEach(name => {
       if (!(name in $data)) {
         const styleName = toCssLowerCase(isTransform(getGsapType(name)));
-        domStyleToArray = domStyleToArray.filter(item => item[0] !== styleName);
+        domStyleToArray = domStyleToArray.filter(item => {
+          if (item[0].match(/transform|filter/ig) && styleName.match(/transform|filter/ig)) {
+            return false;
+          }
+          return item[0] !== styleName;
+        });
       }
     })
   });
@@ -431,20 +436,23 @@ p.resetDefaultStyle = function () {
   Object.keys(this.startDefaultData).forEach(key => {
     if (!(key in data)) {
       if (key === 'style') {
-        const value = this.getDefaultStyle(this.target.style.cssText);
+        const value = getDefaultStyle(this.target.style.cssText,
+          this.startDefaultData.style,
+          this.data);
         this.target.setAttribute(key, value);
       } else {
         this.target.setAttribute(key, this.startDefaultData[key]);
       }
-      this.target.setAttribute(key, this.startDefaultData[key]);
       this.computedStyle = null;
     }
   });
 };
 
 p.reStart = function (style) {
   this.start = {};
-  this.target.style.cssText = this.getDefaultStyle(this.target.style.cssText);
+  this.target.style.cssText = getDefaultStyle(this.target.style.cssText,
+    this.startDefaultData.style,
+    this.data);
   Object.keys(style || {}).forEach(key => {
     this.target.style[key] = stylesToCss(key, style[key]);
   });

tests/tweenOne.spec.jsx

@@ -109,6 +109,7 @@ describe('rc-tween-one', () => {
         x: '+=100',
         transformOrign: '30% 10%',
         delay: 100,
+        yoyo: true,
       },
       style: { top: 0, left: '10vw', width: '5vh', height: '10%', marginLeft: '10rem' },
     });
@@ -123,6 +124,25 @@ describe('rc-tween-one', () => {
     }, 600);
   });
 
+  it('tween-one repeat -1 and yoyo', (done) => {
+    instance = createTweenInstance({
+      animation: {
+        top: 100,
+        repeat: -1,
+        yoyo: true,
+      },
+      style: { top: 0},
+    });
+    const child = TestUtils.findRenderedDOMComponentWithTag(instance, 'div');
+    console.log('start:', child.style.top);
+    expect(getFloat(child.style.top)).to.be(0);
+    ticker.timeout(() => {
+      console.log('end:', child.style.top);
+      expect(getFloat(child.style.top)).to.above(0);
+      done();
+    }, 200);
+  });
+
   it('single tween-one duration is 0', (done) => {
     let start;
     let update;