remove object-assign

Author: jljsj33

package.json

@@ -52,7 +52,6 @@
     "lint"
   ],
   "dependencies": {
-    "object-assign": "4.0.x",
     "raf": "3.1.x",
     "rc-tween-one": "~0.8.0",
     "tween-functions": "1.0.x"

src/ScrollLink.jsx

@@ -3,7 +3,6 @@
  */
 import React, { createElement } from 'react';
 import ReactDOM from 'react-dom';
-import assign from 'object-assign';
 import easingTypes from 'tween-functions';
 import requestAnimationFrame from 'raf';
 import EventListener from './EventDispatcher';
@@ -53,7 +52,7 @@ class ScrollLink extends React.Component {
     this.scrollTop = currentScrollTop();
     const toTop = Math.round(elementRect.top) - Math.round(docRect.top);
     this.toTop = this.props.toShowHeight ?
-      toTop - transformArguments(this.props.showHeightActive)[0] : toTop;
+    toTop - transformArguments(this.props.showHeightActive)[0] : toTop;
     this.initTime = Date.now();
     this.rafID = requestAnimationFrame(this.raf);
   }
@@ -94,12 +93,12 @@ class ScrollLink extends React.Component {
     const top = Math.round(docRect.top - elementRect.top + scrollTop);
     const showHeightActive = transformArguments(this.props.showHeightActive);
     const startShowHeight = showHeightActive[0].toString().indexOf('%') >= 0 ?
-      parseFloat(showHeightActive[0]) / 100 * clientHeight :
+    parseFloat(showHeightActive[0]) / 100 * clientHeight :
       parseFloat(showHeightActive[0]);
     const endShowHeight = showHeightActive[1].toString().indexOf('%') >= 0 ?
-      parseFloat(showHeightActive[1]) / 100 * clientHeight :
+    parseFloat(showHeightActive[1]) / 100 * clientHeight :
       parseFloat(showHeightActive[1]);
-    if (top >= - startShowHeight && top < elementClientHeight - endShowHeight) {
+    if (top >= -startShowHeight && top < elementClientHeight - endShowHeight) {
       if (!this.props.onFocus.only) {
         const obj = {
           target: this.dom,
@@ -129,12 +128,13 @@ class ScrollLink extends React.Component {
   render() {
     const active = this.state.active ? this.props.active : '';
     const onClick = this.props.onClick;
-    const props = assign({}, this.props, {
+    const props = {
+      ...this.props,
       onClick: (e) => {
         onClick(e);
         this.onClick(e);
       },
-    });
+    };
     [
       'component',
       'duration',

src/ScrollParallax.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import ReactDom from 'react-dom';
-import assign from 'object-assign';
 import EventListener from './EventDispatcher';
 import easingTypes from 'tween-functions';
 import Timeline from 'rc-tween-one/lib/TimeLine';
@@ -76,9 +75,9 @@ class ScrollParallax extends React.Component {
     const vars = dataToArray(_vars);
     const varsForIn = (item, i) => {
       const playScale = playScaleToArray(item.playScale).map(data => data * this.clientHeight);
-      const __item = assign({}, item);
+      const __item = { ...item };
       delete __item.playScale;
-      const _item = assign({}, item);
+      const _item = { ...item };
       delete _item.playScale;
       _item.delay = __item.delay = playScale[0];
       _item.duration = __item.duration = playScale[1] - playScale[0];
@@ -153,13 +152,15 @@ class ScrollParallax extends React.Component {
   }
 
   render() {
-    const props = assign({}, this.props);
+    const props = { ...this.props };
     [
       'animation',
       'always',
       'component',
+      'location',
+      'scrollName',
     ].forEach(key => delete props[key]);
-    const style = assign({}, props.style);
+    const style = { ...props.style };
     for (const p in style) {
       if (p.indexOf('filter') >= 0 || p.indexOf('Filter') >= 0) {
         // ['Webkit', 'Moz', 'Ms', 'ms'].forEach(prefix=> style[`${prefix}Filter`] = style[p]);