diff --git a/Video.ios.js b/Video.ios.js index b43bc8c5..4e716931 100644 --- a/Video.ios.js +++ b/Video.ios.js @@ -2,7 +2,7 @@ var React = require('react-native'); var { StyleSheet, requireNativeComponent, PropTypes, NativeModules, } = React; var VideoResizeMode = require('./VideoResizeMode'); -var merge = require('merge'); +var { extend } = require('lodash'); var VIDEO_REF = 'video'; @@ -80,7 +80,7 @@ var Video = React.createClass({ resizeMode = NativeModules.VideoManager.ScaleNone; } - var nativeProps = merge({},this.props, { + var nativeProps = extend({}, this.props, { style, resizeMode: resizeMode, src: { diff --git a/package.json b/package.json index 17308fd3..071b69ee 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,6 @@ }, "dependencies": { "keymirror": "^0.1.1", - "merge": "^1.2.0" + "lodash": "^3.10.1" } }