From 68d3efc7dabb41ac8b7000e80d8ef81db660cbf7 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Wed, 23 Mar 2016 10:54:54 +0800
Subject: [PATCH] deps: remove object-assign

---
 package.json   | 1 -
 src/Slider.jsx | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index dd90834..7ea2174 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
   ],
   "dependencies": {
     "classnames": "^2.2.1",
-    "object-assign": "^4.0.1",
     "rc-tooltip": "3.x",
     "rc-util": "3.x"
   }
diff --git a/src/Slider.jsx b/src/Slider.jsx
index 2c2946f..e2aa6bb 100644
--- a/src/Slider.jsx
+++ b/src/Slider.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import {Dom as DomUtils} from 'rc-util';
 import classNames from 'classnames';
-import objectAssign from 'object-assign';
 import Track from './Track';
 import Handle from './Handle';
 import Steps from './Steps';
@@ -108,7 +107,7 @@ class Slider extends React.Component {
       this.setState({handle: state.handle});
     }
 
-    const data = objectAssign({}, this.state, state);
+    const data = {...this.state, ...state};
     const changedValue = props.range ? [data.lowerBound, data.upperBound] : data.upperBound;
     props.onChange(changedValue);
   }
@@ -257,7 +256,7 @@ class Slider extends React.Component {
   trimAlignValue(v, nextProps) {
     const state = this.state || {};
     const {handle, lowerBound, upperBound} = state;
-    const {marks, step, min, max, allowCross} = objectAssign({}, this.props, nextProps || {});
+    const {marks, step, min, max, allowCross} = {...this.props, ...(nextProps || {})};
 
     let val = v;
     if (val <= min) {