Fix 0.15 compatibility
Sebastian Markbage committed
Mar 24, 2016 at 19:00 UTC
f8335168b6257a8e908c2e9d4529134da5748fee
4 files changed
+22
-15
src/renderers/native/ReactNative/ReactNativeBaseComponent.js
+9
-4
@@ -56,10 +56,6 @@ ReactNativeBaseComponent.Mixin = {
56
return this;
57
},
58
59
- construct: function(element) {
60
- this._currentElement = element;
61
- },
62
-
59
unmountComponent: function() {
60
deleteAllListeners(this._rootNodeID);
61
this.unmountChildren();
@@ -174,6 +170,15 @@ ReactNativeBaseComponent.Mixin = {
170
}
171
},
172
173
+ /**
174
+ * Currently this still uses IDs for reconciliation so this can return null.
175
+ *
176
+ * @return {null} Null.
177
+ */
178
+ getNativeNode: function() {
179
+ return null;
180
+ },
181
+
182
/**
183
* @param {string} rootID Root ID of this subtree.
184
* @param {Transaction} transaction For creating/updating.
src/renderers/native/ReactNative/ReactNativeDefaultInjection.js
+10
-10
@@ -27,13 +27,12 @@ var ReactElement = require('ReactElement');
27
var ReactComponentEnvironment = require('ReactComponentEnvironment');
28
var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
29
var ReactEmptyComponent = require('ReactEmptyComponent');
30
-var ReactInstanceHandles = require('ReactInstanceHandles');
30
var ReactNativeComponentEnvironment = require('ReactNativeComponentEnvironment');
31
var ReactNativeGlobalInteractionHandler = require('ReactNativeGlobalInteractionHandler');
32
var ReactNativeGlobalResponderHandler = require('ReactNativeGlobalResponderHandler');
34
-var ReactNativeMount = require('ReactNativeMount');
33
var ReactNativeTextComponent = require('ReactNativeTextComponent');
34
var ReactNativeComponent = require('ReactNativeComponent');
35
+var ReactSimpleEmptyComponent = require('ReactSimpleEmptyComponent');
36
var ReactUpdates = require('ReactUpdates');
37
var ResponderEventPlugin = require('ResponderEventPlugin');
38
var UniversalWorkerNodeHandle = require('UniversalWorkerNodeHandle');
@@ -50,7 +49,6 @@ function inject() {
49
* Inject module for resolving DOM hierarchy and plugin ordering.
50
*/
51
EventPluginHub.injection.injectEventPluginOrder(IOSDefaultEventPluginOrder);
53
- EventPluginHub.injection.injectInstanceHandle(ReactInstanceHandles);
52
53
ResponderEventPlugin.injection.injectGlobalResponderHandler(
54
ReactNativeGlobalResponderHandler
@@ -81,17 +79,19 @@ function inject() {
79
ReactNativeComponentEnvironment
80
);
81
84
- var EmptyComponent = () => {
82
+ var EmptyComponent = (instantiate) => {
83
// Can't import View at the top because it depends on React to make its composite
84
var View = require('View');
87
- return ReactElement.createElement(View, {
88
- collapsable: true,
89
- style: { position: 'absolute' }
90
- });
85
+ return new ReactSimpleEmptyComponent(
86
+ ReactElement.createElement(View, {
87
+ collapsable: true,
88
+ style: { position: 'absolute' }
89
+ }),
90
+ instantiate
91
+ );
92
};
92
- ReactEmptyComponent.injection.injectEmptyComponent(EmptyComponent);
93
94
- EventPluginUtils.injection.injectMount(ReactNativeMount);
94
+ ReactEmptyComponent.injection.injectEmptyComponentFactory(EmptyComponent);
95
96
ReactNativeComponent.injection.injectTextComponentClass(
97
ReactNativeTextComponent
src/renderers/native/ReactNative/ReactNativeEventEmitter.js
+2
-1
@@ -12,6 +12,7 @@
12
'use strict';
13
14
var EventPluginHub = require('EventPluginHub');
15
+var EventPluginRegistry = require('EventPluginRegistry');
16
var ReactEventEmitterMixin = require('ReactEventEmitterMixin');
17
var ReactNativeTagHandles = require('ReactNativeTagHandles');
18
var NodeHandle = require('NodeHandle');
@@ -91,7 +92,7 @@ var removeTouchesAtIndices = function(
92
*/
93
var ReactNativeEventEmitter = merge(ReactEventEmitterMixin, {
94
94
- registrationNames: EventPluginHub.registrationNameModules,
95
+ registrationNames: EventPluginRegistry.registrationNameModules,
96
97
putListener: EventPluginHub.putListener,
98
src/renderers/native/ReactNative/createReactNativeComponentClass.js
+1
@@ -30,6 +30,7 @@ var createReactNativeComponentClass = function(
30
): ReactClass<any> {
31
var Constructor = function(element) {
32
this._currentElement = element;
33
+ this._topLevelWrapper = null;
34
35
this._rootNodeID = null;
36
this._renderedChildren = null;