Get rid of ReactInjection
We don't use this indirection. It'll easier to break these apart without it.
Sebastian Markbage committed
Oct 24, 2016 at 19:16 UTC
b0ccf62ea36b7e52f1c3623a870f8c9b19cc8404
2 files changed
+22
-49
src/renderers/dom/shared/ReactDefaultInjection.js
+22
-15
@@ -13,10 +13,15 @@
13
14
var ARIADOMPropertyConfig = require('ARIADOMPropertyConfig');
15
var BeforeInputEventPlugin = require('BeforeInputEventPlugin');
16
+var DOMProperty = require('DOMProperty');
17
var ChangeEventPlugin = require('ChangeEventPlugin');
18
var DefaultEventPluginOrder = require('DefaultEventPluginOrder');
19
var EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');
20
+var EventPluginHub = require('EventPluginHub');
21
+var EventPluginUtils = require('EventPluginUtils');
22
var HTMLDOMPropertyConfig = require('HTMLDOMPropertyConfig');
23
+var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
24
+var ReactComponentEnvironment = require('ReactComponentEnvironment');
25
var ReactComponentBrowserEnvironment =
26
require('ReactComponentBrowserEnvironment');
27
var ReactDOMComponent = require('ReactDOMComponent');
@@ -25,9 +30,11 @@ var ReactDOMEmptyComponent = require('ReactDOMEmptyComponent');
30
var ReactDOMTreeTraversal = require('ReactDOMTreeTraversal');
31
var ReactDOMTextComponent = require('ReactDOMTextComponent');
32
var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
33
+var ReactEmptyComponent = require('ReactEmptyComponent');
34
var ReactEventListener = require('ReactEventListener');
29
-var ReactInjection = require('ReactInjection');
35
+var ReactHostComponent = require('ReactHostComponent');
36
var ReactReconcileTransaction = require('ReactReconcileTransaction');
37
+var ReactUpdates = require('ReactUpdates');
38
var SVGDOMPropertyConfig = require('SVGDOMPropertyConfig');
39
var SelectEventPlugin = require('SelectEventPlugin');
40
var SimpleEventPlugin = require('SimpleEventPlugin');
@@ -43,22 +50,22 @@ function inject() {
50
}
51
alreadyInjected = true;
52
46
- ReactInjection.EventEmitter.injectReactEventListener(
53
+ ReactBrowserEventEmitter.injection.injectReactEventListener(
54
ReactEventListener
55
);
56
57
/**
58
* Inject modules for resolving DOM hierarchy and plugin ordering.
59
*/
53
- ReactInjection.EventPluginHub.injectEventPluginOrder(DefaultEventPluginOrder);
54
- ReactInjection.EventPluginUtils.injectComponentTree(ReactDOMComponentTree);
55
- ReactInjection.EventPluginUtils.injectTreeTraversal(ReactDOMTreeTraversal);
60
+ EventPluginHub.injection.injectEventPluginOrder(DefaultEventPluginOrder);
61
+ EventPluginUtils.injection.injectComponentTree(ReactDOMComponentTree);
62
+ EventPluginUtils.injection.injectTreeTraversal(ReactDOMTreeTraversal);
63
64
/**
65
* Some important event plugins included by default (without having to require
66
* them).
67
*/
61
- ReactInjection.EventPluginHub.injectEventPluginsByName({
68
+ EventPluginHub.injection.injectEventPluginsByName({
69
SimpleEventPlugin: SimpleEventPlugin,
70
EnterLeaveEventPlugin: EnterLeaveEventPlugin,
71
ChangeEventPlugin: ChangeEventPlugin,
@@ -66,32 +73,32 @@ function inject() {
73
BeforeInputEventPlugin: BeforeInputEventPlugin,
74
});
75
69
- ReactInjection.HostComponent.injectGenericComponentClass(
76
+ ReactHostComponent.injection.injectGenericComponentClass(
77
ReactDOMComponent
78
);
79
73
- ReactInjection.HostComponent.injectTextComponentClass(
80
+ ReactHostComponent.injection.injectTextComponentClass(
81
ReactDOMTextComponent
82
);
83
77
- ReactInjection.DOMProperty.injectDOMPropertyConfig(ARIADOMPropertyConfig);
78
- ReactInjection.DOMProperty.injectDOMPropertyConfig(HTMLDOMPropertyConfig);
79
- ReactInjection.DOMProperty.injectDOMPropertyConfig(SVGDOMPropertyConfig);
84
+ DOMProperty.injection.injectDOMPropertyConfig(ARIADOMPropertyConfig);
85
+ DOMProperty.injection.injectDOMPropertyConfig(HTMLDOMPropertyConfig);
86
+ DOMProperty.injection.injectDOMPropertyConfig(SVGDOMPropertyConfig);
87
81
- ReactInjection.EmptyComponent.injectEmptyComponentFactory(
88
+ ReactEmptyComponent.injection.injectEmptyComponentFactory(
89
function(instantiate) {
90
return new ReactDOMEmptyComponent(instantiate);
91
}
92
);
93
87
- ReactInjection.Updates.injectReconcileTransaction(
94
+ ReactUpdates.injection.injectReconcileTransaction(
95
ReactReconcileTransaction
96
);
90
- ReactInjection.Updates.injectBatchingStrategy(
97
+ ReactUpdates.injection.injectBatchingStrategy(
98
ReactDefaultBatchingStrategy
99
);
100
94
- ReactInjection.Component.injectEnvironment(ReactComponentBrowserEnvironment);
101
+ ReactComponentEnvironment.injection.injectEnvironment(ReactComponentBrowserEnvironment);
102
}
103
104
module.exports = {
src/renderers/dom/shared/ReactInjection.js
deleted
-34
@@ -1,34 +0,0 @@
1
-/**
2
- * Copyright 2013-present, 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
- * @providesModule ReactInjection
10
- */
11
-
12
-'use strict';
13
-
14
-var DOMProperty = require('DOMProperty');
15
-var EventPluginHub = require('EventPluginHub');
16
-var EventPluginUtils = require('EventPluginUtils');
17
-var ReactComponentEnvironment = require('ReactComponentEnvironment');
18
-var ReactEmptyComponent = require('ReactEmptyComponent');
19
-var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
20
-var ReactHostComponent = require('ReactHostComponent');
21
-var ReactUpdates = require('ReactUpdates');
22
-
23
-var ReactInjection = {
24
- Component: ReactComponentEnvironment.injection,
25
- DOMProperty: DOMProperty.injection,
26
- EmptyComponent: ReactEmptyComponent.injection,
27
- EventPluginHub: EventPluginHub.injection,
28
- EventPluginUtils: EventPluginUtils.injection,
29
- EventEmitter: ReactBrowserEventEmitter.injection,
30
- HostComponent: ReactHostComponent.injection,
31
- Updates: ReactUpdates.injection,
32
-};
33
-
34
-module.exports = ReactInjection;