Use lodash instead of merge, because the latter is ignoring one of the params passed in
This commit is contained in:
parent
1f0ba1347b
commit
3d96525558
@ -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: {
|
||||
|
@ -31,6 +31,6 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"keymirror": "^0.1.1",
|
||||
"merge": "^1.2.0"
|
||||
"lodash": "^3.10.1"
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user