Introduce React Class as an alias for Composite Component
This is in preparation for the separation of Composite Component internals from the Class abstraction.
Sebastian Markbage committed
Oct 22, 2014 at 02:55 UTC
c7bb936566bce79b35f55b558af5f09b88047a9a
12 files changed
+37
-21
src/browser/ui/React.js
+2
-2
@@ -15,7 +15,7 @@ var DOMPropertyOperations = require('DOMPropertyOperations');
15
var EventPluginUtils = require('EventPluginUtils');
16
var ReactChildren = require('ReactChildren');
17
var ReactComponent = require('ReactComponent');
18
-var ReactCompositeComponent = require('ReactCompositeComponent');
18
+var ReactClass = require('ReactClass');
19
var ReactContext = require('ReactContext');
20
var ReactCurrentOwner = require('ReactCurrentOwner');
21
var ReactElement = require('ReactElement');
@@ -68,7 +68,7 @@ var React = {
68
initializeTouchEvents: function(shouldUseTouch) {
69
EventPluginUtils.useTouchEvents = shouldUseTouch;
70
},
71
- createClass: ReactCompositeComponent.createClass,
71
+ createClass: ReactClass.createClass,
72
createElement: createElement,
73
createFactory: createFactory,
74
constructAndRenderComponent: ReactMount.constructAndRenderComponent,
src/browser/ui/ReactDefaultInjection.js
+1
-1
@@ -89,7 +89,7 @@ function inject() {
89
90
// This needs to happen after createFullPageComponent() otherwise the mixin
91
// gets double injected.
92
- ReactInjection.CompositeComponent.injectMixin(ReactBrowserComponentMixin);
92
+ ReactInjection.Class.injectMixin(ReactBrowserComponentMixin);
93
94
ReactInjection.DOMProperty.injectDOMPropertyConfig(HTMLDOMPropertyConfig);
95
ReactInjection.DOMProperty.injectDOMPropertyConfig(SVGDOMPropertyConfig);
src/browser/ui/ReactInjection.js
+2
-2
@@ -14,7 +14,7 @@
14
var DOMProperty = require('DOMProperty');
15
var EventPluginHub = require('EventPluginHub');
16
var ReactComponent = require('ReactComponent');
17
-var ReactCompositeComponent = require('ReactCompositeComponent');
17
+var ReactClass = require('ReactClass');
18
var ReactEmptyComponent = require('ReactEmptyComponent');
19
var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
20
var ReactNativeComponent = require('ReactNativeComponent');
@@ -24,7 +24,7 @@ var ReactUpdates = require('ReactUpdates');
24
25
var ReactInjection = {
26
Component: ReactComponent.injection,
27
- CompositeComponent: ReactCompositeComponent.injection,
27
+ Class: ReactClass.injection,
28
DOMProperty: DOMProperty.injection,
29
EmptyComponent: ReactEmptyComponent.injection,
30
EventPluginHub: EventPluginHub.injection,
src/browser/ui/dom/components/ReactDOMButton.js
+2
-2
@@ -13,7 +13,7 @@
13
14
var AutoFocusMixin = require('AutoFocusMixin');
15
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
16
-var ReactCompositeComponent = require('ReactCompositeComponent');
16
+var ReactClass = require('ReactClass');
17
var ReactElement = require('ReactElement');
18
var ReactDOM = require('ReactDOM');
19
@@ -39,7 +39,7 @@ var mouseListenerNames = keyMirror({
39
* Implements a <button> native component that does not receive mouse events
40
* when `disabled` is set.
41
*/
42
-var ReactDOMButton = ReactCompositeComponent.createClass({
42
+var ReactDOMButton = ReactClass.createClass({
43
displayName: 'ReactDOMButton',
44
45
mixins: [AutoFocusMixin, ReactBrowserComponentMixin],
src/browser/ui/dom/components/ReactDOMForm.js
+2
-2
@@ -14,7 +14,7 @@
14
var EventConstants = require('EventConstants');
15
var LocalEventTrapMixin = require('LocalEventTrapMixin');
16
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
17
-var ReactCompositeComponent = require('ReactCompositeComponent');
17
+var ReactClass = require('ReactClass');
18
var ReactElement = require('ReactElement');
19
var ReactDOM = require('ReactDOM');
20
@@ -27,7 +27,7 @@ var form = ReactElement.createFactory(ReactDOM.form.type);
27
* do to accomplish this, but the most reliable is to make <form> a
28
* composite component and use `componentDidMount` to attach the event handlers.
29
*/
30
-var ReactDOMForm = ReactCompositeComponent.createClass({
30
+var ReactDOMForm = ReactClass.createClass({
31
displayName: 'ReactDOMForm',
32
33
mixins: [ReactBrowserComponentMixin, LocalEventTrapMixin],
src/browser/ui/dom/components/ReactDOMImg.js
+2
-2
@@ -14,7 +14,7 @@
14
var EventConstants = require('EventConstants');
15
var LocalEventTrapMixin = require('LocalEventTrapMixin');
16
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
17
-var ReactCompositeComponent = require('ReactCompositeComponent');
17
+var ReactClass = require('ReactClass');
18
var ReactElement = require('ReactElement');
19
var ReactDOM = require('ReactDOM');
20
@@ -27,7 +27,7 @@ var img = ReactElement.createFactory(ReactDOM.img.type);
27
* to accomplish this, but the most reliable is to make <img> a composite
28
* component and use `componentDidMount` to attach the event handlers.
29
*/
30
-var ReactDOMImg = ReactCompositeComponent.createClass({
30
+var ReactDOMImg = ReactClass.createClass({
31
displayName: 'ReactDOMImg',
32
tagName: 'IMG',
33
src/browser/ui/dom/components/ReactDOMInput.js
+2
-2
@@ -15,7 +15,7 @@ var AutoFocusMixin = require('AutoFocusMixin');
15
var DOMPropertyOperations = require('DOMPropertyOperations');
16
var LinkedValueUtils = require('LinkedValueUtils');
17
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
18
-var ReactCompositeComponent = require('ReactCompositeComponent');
18
+var ReactClass = require('ReactClass');
19
var ReactElement = require('ReactElement');
20
var ReactDOM = require('ReactDOM');
21
var ReactMount = require('ReactMount');
@@ -52,7 +52,7 @@ function forceUpdateIfMounted() {
52
*
53
* @see http://www.w3.org/TR/2012/WD-html5-20121025/the-input-element.html
54
*/
55
-var ReactDOMInput = ReactCompositeComponent.createClass({
55
+var ReactDOMInput = ReactClass.createClass({
56
displayName: 'ReactDOMInput',
57
58
mixins: [AutoFocusMixin, LinkedValueUtils.Mixin, ReactBrowserComponentMixin],
src/browser/ui/dom/components/ReactDOMOption.js
+2
-2
@@ -12,7 +12,7 @@
12
"use strict";
13
14
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
15
-var ReactCompositeComponent = require('ReactCompositeComponent');
15
+var ReactClass = require('ReactClass');
16
var ReactElement = require('ReactElement');
17
var ReactDOM = require('ReactDOM');
18
@@ -24,7 +24,7 @@ var option = ReactElement.createFactory(ReactDOM.option.type);
24
/**
25
* Implements an <option> native component that warns when `selected` is set.
26
*/
27
-var ReactDOMOption = ReactCompositeComponent.createClass({
27
+var ReactDOMOption = ReactClass.createClass({
28
displayName: 'ReactDOMOption',
29
30
mixins: [ReactBrowserComponentMixin],
src/browser/ui/dom/components/ReactDOMSelect.js
+2
-2
@@ -14,7 +14,7 @@
14
var AutoFocusMixin = require('AutoFocusMixin');
15
var LinkedValueUtils = require('LinkedValueUtils');
16
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
17
-var ReactCompositeComponent = require('ReactCompositeComponent');
17
+var ReactClass = require('ReactClass');
18
var ReactElement = require('ReactElement');
19
var ReactDOM = require('ReactDOM');
20
var ReactUpdates = require('ReactUpdates');
@@ -103,7 +103,7 @@ function updateOptions(component, propValue) {
103
* If `defaultValue` is provided, any options with the supplied values will be
104
* selected.
105
*/
106
-var ReactDOMSelect = ReactCompositeComponent.createClass({
106
+var ReactDOMSelect = ReactClass.createClass({
107
displayName: 'ReactDOMSelect',
108
109
mixins: [AutoFocusMixin, LinkedValueUtils.Mixin, ReactBrowserComponentMixin],
src/browser/ui/dom/components/ReactDOMTextarea.js
+2
-2
@@ -15,7 +15,7 @@ var AutoFocusMixin = require('AutoFocusMixin');
15
var DOMPropertyOperations = require('DOMPropertyOperations');
16
var LinkedValueUtils = require('LinkedValueUtils');
17
var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
18
-var ReactCompositeComponent = require('ReactCompositeComponent');
18
+var ReactClass = require('ReactClass');
19
var ReactElement = require('ReactElement');
20
var ReactDOM = require('ReactDOM');
21
var ReactUpdates = require('ReactUpdates');
@@ -50,7 +50,7 @@ function forceUpdateIfMounted() {
50
* The rendered element will be initialized with an empty value, the prop
51
* `defaultValue` if specified, or the children content (deprecated).
52
*/
53
-var ReactDOMTextarea = ReactCompositeComponent.createClass({
53
+var ReactDOMTextarea = ReactClass.createClass({
54
displayName: 'ReactDOMTextarea',
55
56
mixins: [AutoFocusMixin, LinkedValueUtils.Mixin, ReactBrowserComponentMixin],
src/browser/ui/dom/components/createFullPageComponent.js
+2
-2
@@ -13,7 +13,7 @@
13
"use strict";
14
15
// Defeat circular references by requiring this directly.
16
-var ReactCompositeComponent = require('ReactCompositeComponent');
16
+var ReactClass = require('ReactClass');
17
var ReactElement = require('ReactElement');
18
19
var invariant = require('invariant');
@@ -32,7 +32,7 @@ var invariant = require('invariant');
32
function createFullPageComponent(tag) {
33
var elementFactory = ReactElement.createFactory(tag);
34
35
- var FullPageComponent = ReactCompositeComponent.createClass({
35
+ var FullPageComponent = ReactClass.createClass({
36
displayName: 'ReactFullPageComponent' + tag,
37
38
componentWillUnmount: function() {
src/class/ReactClass.js
new
+16
@@ -0,0 +1,16 @@
1
+/**
2
+ * Copyright 2013-2014, 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 ReactClass
10
+ */
11
+
12
+"use strict";
13
+
14
+var ReactClass = require('ReactCompositeComponent');
15
+
16
+module.exports = ReactClass;