Use spread instead of deprecated merge utility (#6634)
Sebastian Markbåge committed
Apr 27, 2016 at 19:54 UTC
72ba5971ae76b8889ceed84c70aa107fc7cfce3b
3 files changed
+5
-23
src/renderers/native/ReactIOS/IOSNativeBridgeEventPlugin.js
+1
-2
@@ -15,7 +15,6 @@ var EventPropagators = require('EventPropagators');
15
var SyntheticEvent = require('SyntheticEvent');
16
var UIManager = require('UIManager');
17
18
-var merge = require('merge');
18
var warning = require('warning');
19
20
var customBubblingEventTypes = UIManager.customBubblingEventTypes;
@@ -38,7 +37,7 @@ for (var directTypeName in customDirectEventTypes) {
37
38
var IOSNativeBridgeEventPlugin = {
39
41
- eventTypes: merge(customBubblingEventTypes, customDirectEventTypes),
40
+ eventTypes: { ...customBubblingEventTypes, ...customDirectEventTypes },
41
42
/**
43
* @see {EventPluginHub.extractEvents}
src/renderers/native/ReactNative/ReactNativeEventEmitter.js
+4
-3
@@ -19,7 +19,6 @@ var ReactNativeTagHandles = require('ReactNativeTagHandles');
19
var ReactUpdates = require('ReactUpdates');
20
var EventConstants = require('EventConstants');
21
22
-var merge = require('merge');
22
var warning = require('warning');
23
24
var topLevelTypes = EventConstants.topLevelTypes;
@@ -91,7 +90,9 @@ var removeTouchesAtIndices = function(
90
*
91
* @internal
92
*/
94
-var ReactNativeEventEmitter = merge(ReactEventEmitterMixin, {
93
+var ReactNativeEventEmitter = {
94
+
95
+ ...ReactEventEmitterMixin,
96
97
registrationNames: EventPluginRegistry.registrationNameModules,
98
@@ -218,6 +219,6 @@ var ReactNativeEventEmitter = merge(ReactEventEmitterMixin, {
219
);
220
}
221
},
221
-});
222
+};
223
224
module.exports = ReactNativeEventEmitter;
src/renderers/native/ReactNative/__mocks__/merge.js
deleted
-18
@@ -1,18 +0,0 @@
1
-/**
2
- * Copyright 2013-2015, Facebook, Inc.
3
- * All rights reserved.
4
- *
5
- * This source code is licensed under the BSD-style license found in the
6
- * LICENSE file in the root directory of this source tree. An additional grant
7
- * of patent rights can be found in the PATENTS file in the same directory.
8
- */
9
-
10
-'use strict';
11
-
12
-// TODO: Replace all callers with spread
13
-
14
-var merge = function(a, b) {
15
- return {...a, ...b};
16
-};
17
-
18
-module.exports = merge;