File tree Expand file tree Collapse file tree 2 files changed +10
-4
lines changed Expand file tree Collapse file tree 2 files changed +10
-4
lines changed Original file line number Diff line number Diff line change 1212
1313var NativeMethodsMixin = require ( 'NativeMethodsMixin' ) ;
1414var PropTypes = require ( 'ReactPropTypes' ) ;
15- var React = require ( 'React' ) ;
15+ var ReactClass = require ( 'ReactClass' ) ;
16+ var ReactElement = require ( 'ReactElement' ) ;
17+ var ReactIOSComponentMixin = require ( 'ReactIOSComponentMixin' ) ;
1618var ReactIOSViewAttributes = require ( 'ReactIOSViewAttributes' ) ;
1719var StyleSheetPropType = require ( 'StyleSheetPropType' ) ;
1820var ViewStylePropTypes = require ( 'ViewStylePropTypes' ) ;
@@ -42,8 +44,8 @@ var stylePropType = StyleSheetPropType(ViewStylePropTypes);
4244 * `View`s are designed to be used with `StyleSheet`s for clarity and
4345 * performance, although inline styles are also supported.
4446 */
45- var View = React . createClass ( {
46- mixins : [ NativeMethodsMixin ] ,
47+ var View = ReactClass . createClass ( {
48+ mixins : [ NativeMethodsMixin , ReactIOSComponentMixin ] ,
4749
4850 /**
4951 * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
@@ -138,7 +140,7 @@ var View = React.createClass({
138140 } ,
139141
140142 render : function ( ) {
141- return < RCTView { ... this . props } /> ;
143+ return ReactElement . createElement ( RCTView , this . props ) ;
142144 } ,
143145} ) ;
144146
Original file line number Diff line number Diff line change @@ -24,6 +24,7 @@ var NodeHandle = require('NodeHandle');
2424var ReactClass = require ( 'ReactClass' ) ;
2525var ReactComponentEnvironment = require ( 'ReactComponentEnvironment' ) ;
2626var ReactDefaultBatchingStrategy = require ( 'ReactDefaultBatchingStrategy' ) ;
27+ var ReactEmptyComponent = require ( 'ReactEmptyComponent' ) ;
2728var ReactInstanceHandles = require ( 'ReactInstanceHandles' ) ;
2829var ReactIOSComponentEnvironment = require ( 'ReactIOSComponentEnvironment' ) ;
2930var ReactIOSComponentMixin = require ( 'ReactIOSComponentMixin' ) ;
@@ -35,6 +36,7 @@ var ReactNativeComponent = require('ReactNativeComponent');
3536var ReactUpdates = require ( 'ReactUpdates' ) ;
3637var ResponderEventPlugin = require ( 'ResponderEventPlugin' ) ;
3738var UniversalWorkerNodeHandle = require ( 'UniversalWorkerNodeHandle' ) ;
39+ var View = require ( 'View' ) ;
3840
3941// Just to ensure this gets packaged, since its only caller is from Native.
4042require ( 'RCTEventEmitter' ) ;
@@ -77,6 +79,8 @@ function inject() {
7779 ReactIOSComponentEnvironment
7880 ) ;
7981
82+ ReactEmptyComponent . injection . injectEmptyComponent ( View ) ;
83+
8084 EventPluginUtils . injection . injectMount ( ReactIOSMount ) ;
8185
8286 ReactClass . injection . injectMixin ( ReactIOSComponentMixin ) ;
You can’t perform that action at this time.
0 commit comments