Daniel Zlotin 6 년 전
부모
커밋
636b27e000

+ 2
- 2
integration/redux/MyContainer.js 파일 보기

@@ -5,7 +5,7 @@ const { Text } = require('react-native');
5 5
 const { connect } = require('react-redux');
6 6
 const store = require('./MyStore');
7 7
 
8
-class MyContainer extends Component {
8
+class MyComponent extends Component {
9 9
   render() {
10 10
     if (this.props.renderCountIncrement) {
11 11
       this.props.renderCountIncrement();
@@ -28,4 +28,4 @@ function mapStateToProps(state) {
28 28
   };
29 29
 }
30 30
 
31
-module.exports = connect(mapStateToProps)(MyContainer);
31
+module.exports = connect(mapStateToProps)(MyComponent);

+ 5
- 5
integration/redux/Redux.test.js 파일 보기

@@ -4,18 +4,18 @@ const renderer = require('react-test-renderer');
4 4
 const { Provider } = require('react-redux');
5 5
 
6 6
 describe('redux support', () => {
7
-  let MyConnectedContainer;
7
+  let MyConnectedComponent;
8 8
   let store;
9 9
 
10 10
   beforeEach(() => {
11
-    MyConnectedContainer = require('./MyContainer');
11
+    MyConnectedComponent = require('./MyComponent');
12 12
     store = require('./MyStore');
13 13
   });
14 14
 
15 15
   it('renders normally', () => {
16 16
     const tree = renderer.create(
17 17
       <Provider store={store.reduxStore}>
18
-        <MyConnectedContainer />
18
+        <MyConnectedComponent />
19 19
       </Provider>
20 20
     );
21 21
     expect(tree.toJSON().children).toEqual(['no name']);
@@ -25,7 +25,7 @@ describe('redux support', () => {
25 25
     const renderCountIncrement = jest.fn();
26 26
     const tree = renderer.create(
27 27
       <Provider store={store.reduxStore}>
28
-        <MyConnectedContainer renderCountIncrement={renderCountIncrement} />
28
+        <MyConnectedComponent renderCountIncrement={renderCountIncrement} />
29 29
       </Provider>
30 30
     );
31 31
 
@@ -43,7 +43,7 @@ describe('redux support', () => {
43 43
     const renderCountIncrement = jest.fn();
44 44
     const tree = renderer.create(
45 45
       <Provider store={store.reduxStore}>
46
-        <MyConnectedContainer printAge={true} renderCountIncrement={renderCountIncrement} />
46
+        <MyConnectedComponent printAge={true} renderCountIncrement={renderCountIncrement} />
47 47
       </Provider>
48 48
     );
49 49
 

+ 2
- 2
integration/remx/MyContainer.js 파일 보기

@@ -5,7 +5,7 @@ const { Text } = require('react-native');
5 5
 const { connect } = require('remx');
6 6
 const store = require('./MyStore');
7 7
 
8
-class MyContainer extends Component {
8
+class MyComponent extends Component {
9 9
   render() {
10 10
     if (this.props.renderCountIncrement) {
11 11
       this.props.renderCountIncrement();
@@ -28,4 +28,4 @@ function mapStateToProps() {
28 28
   };
29 29
 }
30 30
 
31
-module.exports = connect(mapStateToProps)(MyContainer);
31
+module.exports = connect(mapStateToProps)(MyComponent);

+ 5
- 5
integration/remx/remx.test.js 파일 보기

@@ -3,22 +3,22 @@ require('react-native');
3 3
 const renderer = require('react-test-renderer');
4 4
 
5 5
 describe('remx support', () => {
6
-  let MyConnectedContainer;
6
+  let MyConnectedComponent;
7 7
   let store;
8 8
 
9 9
   beforeEach(() => {
10
-    MyConnectedContainer = require('./MyContainer');
10
+    MyConnectedComponent = require('./MyComponent');
11 11
     store = require('./MyStore');
12 12
   });
13 13
 
14 14
   it('renders normally', () => {
15
-    const tree = renderer.create(<MyConnectedContainer />);
15
+    const tree = renderer.create(<MyConnectedComponent />);
16 16
     expect(tree.toJSON().children).toEqual(['no name']);
17 17
   });
18 18
 
19 19
   it('rerenders as a result of an underlying state change (by selector)', () => {
20 20
     const renderCountIncrement = jest.fn();
21
-    const tree = renderer.create(<MyConnectedContainer renderCountIncrement={renderCountIncrement} />);
21
+    const tree = renderer.create(<MyConnectedComponent renderCountIncrement={renderCountIncrement} />);
22 22
 
23 23
     expect(tree.toJSON().children).toEqual(['no name']);
24 24
     expect(renderCountIncrement).toHaveBeenCalledTimes(1);
@@ -32,7 +32,7 @@ describe('remx support', () => {
32 32
 
33 33
   it('rerenders as a result of an underlying state change with a new key', () => {
34 34
     const renderCountIncrement = jest.fn();
35
-    const tree = renderer.create(<MyConnectedContainer printAge={true} renderCountIncrement={renderCountIncrement} />);
35
+    const tree = renderer.create(<MyConnectedComponent printAge={true} renderCountIncrement={renderCountIncrement} />);
36 36
 
37 37
     expect(tree.toJSON().children).toEqual(null);
38 38
     expect(renderCountIncrement).toHaveBeenCalledTimes(1);

+ 2
- 2
playground/src/app.js 파일 보기

@@ -1,8 +1,8 @@
1 1
 const Navigation = require('react-native-navigation');
2
-const { registerContainers } = require('./containers');
2
+const { registerComponents } = require('./components');
3 3
 
4 4
 function start() {
5
-  registerContainers();
5
+  registerComponents();
6 6
   Navigation.events().onAppLaunched(() => {
7 7
     Navigation.setRoot({
8 8
       stack: {

+ 2
- 2
playground/src/containers/CustomTransitionDestination.js 파일 보기

@@ -21,14 +21,14 @@ class CustomTransitionDestination extends Component {
21 21
     };
22 22
   }
23 23
   push() {
24
-    Navigation.push(this.props.containerId, {
24
+    Navigation.push(this.props.componentId, {
25 25
       component: {
26 26
         name: 'navigation.playground.OptionsScreen'
27 27
       }
28 28
     });
29 29
   }
30 30
   pop() {
31
-    Navigation.pop(this.props.containerId, {
31
+    Navigation.pop(this.props.componentId, {
32 32
       customTransition: {
33 33
         animations: [{ type: 'sharedElement', fromId: 'title2', toId: 'title1', startDelay: 0, springVelocity: 0.2, duration: 0.5 },
34 34
         { type: 'sharedElement', toId: 'image1', fromId: 'customDestinationImage', startDelay: 0, springVelocity: 0.2, duration: 0.5 },

+ 2
- 2
playground/src/containers/LifecycleScreen.js 파일 보기

@@ -55,13 +55,13 @@ class LifecycleScreen extends Component {
55 55
         <Text style={styles.h1}>{`Lifecycle Screen`}</Text>
56 56
         <Text style={styles.h1}>{this.state.text}</Text>
57 57
         <Button title="Push to test didDisappear" testID={testIDs.PUSH_TO_TEST_DID_DISAPPEAR_BUTTON} onPress={this.onClickPush} />
58
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
58
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
59 59
       </View>
60 60
     );
61 61
   }
62 62
 
63 63
   onClickPush() {
64
-    Navigation.push(this.props.containerId, { component: { name: 'navigation.playground.TextScreen' } });
64
+    Navigation.push(this.props.componentId, { component: { name: 'navigation.playground.TextScreen' } });
65 65
   }
66 66
 }
67 67
 module.exports = LifecycleScreen;

+ 11
- 11
playground/src/containers/OptionsScreen.js 파일 보기

@@ -63,14 +63,14 @@ class OptionsScreen extends Component {
63 63
         <Button title="Custom Transition" onPress={this.onClickCustomTranstition} />
64 64
         <Button title="Show custom alert" testID={testIDs.SHOW_CUSTOM_ALERT_BUTTON} onPress={this.onClickAlert} />
65 65
         <Button title="Show snackbar" testID={testIDs.SHOW_SNACKBAR_BUTTON} onPress={this.onClickSnackbar} />
66
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
66
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
67 67
       </View>
68 68
     );
69 69
   }
70 70
 
71 71
   onNavigationButtonPressed(id) {
72 72
     if (id === BUTTON_ONE) {
73
-      Navigation.setOptions(this.props.containerId, {
73
+      Navigation.setOptions(this.props.componentId, {
74 74
         topBar: {
75 75
           rightButtons: [{
76 76
             id: BUTTON_TWO,
@@ -88,7 +88,7 @@ class OptionsScreen extends Component {
88 88
         }
89 89
       });
90 90
     } else if (id === BUTTON_TWO) {
91
-      Navigation.setOptions(this.props.containerId, {
91
+      Navigation.setOptions(this.props.componentId, {
92 92
         topBar: {
93 93
           rightButtons: [{
94 94
             id: BUTTON_ONE,
@@ -106,12 +106,12 @@ class OptionsScreen extends Component {
106 106
         }
107 107
       });
108 108
     } else if (id === BUTTON_LEFT) {
109
-      Navigation.pop(this.props.containerId);
109
+      Navigation.pop(this.props.componentId);
110 110
     }
111 111
   }
112 112
 
113 113
   onClickDynamicOptions() {
114
-    Navigation.setOptions(this.props.containerId, {
114
+    Navigation.setOptions(this.props.componentId, {
115 115
       topBar: {
116 116
         title: 'Dynamic Title',
117 117
         textColor: '#00FFFF',
@@ -124,7 +124,7 @@ class OptionsScreen extends Component {
124 124
   }
125 125
 
126 126
   onClickScrollViewScreen() {
127
-    Navigation.push(this.props.containerId, {
127
+    Navigation.push(this.props.componentId, {
128 128
       component: {
129 129
         name: 'navigation.playground.ScrollViewScreen'
130 130
       }
@@ -132,7 +132,7 @@ class OptionsScreen extends Component {
132 132
   }
133 133
 
134 134
   onClickCustomTranstition() {
135
-    Navigation.push(this.props.containerId, {
135
+    Navigation.push(this.props.componentId, {
136 136
       component: {
137 137
         name: 'navigation.playground.CustomTransitionOrigin'
138 138
       }
@@ -140,21 +140,21 @@ class OptionsScreen extends Component {
140 140
   }
141 141
 
142 142
   onClickTopBarTransparent() {
143
-    Navigation.setOptions(this.props.containerId, {
143
+    Navigation.setOptions(this.props.componentId, {
144 144
       topBar: {
145 145
         transparent: true
146 146
       }
147 147
     });
148 148
   }
149 149
   onClickTopBarOpaque() {
150
-    Navigation.setOptions(this.props.containerId, {
150
+    Navigation.setOptions(this.props.componentId, {
151 151
       topBar: {
152 152
         transparent: false
153 153
       }
154 154
     });
155 155
   }
156 156
   onClickShowTopBar() {
157
-    Navigation.setOptions(this.props.containerId, {
157
+    Navigation.setOptions(this.props.componentId, {
158 158
       topBar: {
159 159
         hidden: false,
160 160
         animateHide: true
@@ -163,7 +163,7 @@ class OptionsScreen extends Component {
163 163
   }
164 164
 
165 165
   onClickHideTopBar() {
166
-    Navigation.setOptions(this.props.containerId, {
166
+    Navigation.setOptions(this.props.componentId, {
167 167
       topBar: {
168 168
         hidden: true,
169 169
         animateHide: true

+ 3
- 3
playground/src/containers/OrientationDetectScreen.js 파일 보기

@@ -12,7 +12,7 @@ class OrientationDetectScreen extends Component {
12 12
 
13 13
     this.detectHorizontal = this.detectHorizontal.bind(this);
14 14
     this.state = { horizontal: false };
15
-    Navigation.setOptions(this.props.containerId, {
15
+    Navigation.setOptions(this.props.componentId, {
16 16
       orientation: props.orientation
17 17
     });
18 18
   }
@@ -21,8 +21,8 @@ class OrientationDetectScreen extends Component {
21 21
     return (
22 22
       <View style={styles.root} onLayout={this.detectHorizontal}>
23 23
         <Text style={styles.h1}>{`Orientation Screen`}</Text>
24
-        <Button title="Dismiss" testID={testIDs.DISMISS_BUTTON} onPress={() => Navigation.dismissModal(this.props.containerId)} />
25
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
24
+        <Button title="Dismiss" testID={testIDs.DISMISS_BUTTON} onPress={() => Navigation.dismissModal(this.props.componentId)} />
25
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
26 26
         <Text style={styles.footer} testID="currentOrientation">{this.state.horizontal ? 'Landscape' : 'Portrait'}</Text>
27 27
       </View>
28 28
     );

+ 5
- 5
playground/src/containers/PushedScreen.js 파일 보기

@@ -29,23 +29,23 @@ class PushedScreen extends Component {
29 29
         <Button title="Pop Previous" testID={testIDs.POP_PREVIOUS_BUTTON} onPress={this.onClickPopPrevious} />
30 30
         <Button title="Pop To Root" testID={testIDs.POP_TO_ROOT} onPress={this.onClickPopToRoot} />
31 31
         {stackPosition > 2 && <Button title="Pop To Stack Position 1" testID={testIDs.POP_STACK_POSITION_ONE_BUTTON} onPress={this.onClickPopToFirstPosition} />}
32
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
32
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
33 33
       </View>
34 34
     );
35 35
   }
36 36
 
37 37
   async onClickPush() {
38
-    await Navigation.push(this.props.containerId, {
38
+    await Navigation.push(this.props.componentId, {
39 39
       name: 'navigation.playground.PushedScreen',
40 40
       passProps: {
41 41
         stackPosition: this.getStackPosition() + 1,
42
-        previousScreenIds: _.concat([], this.props.previousScreenIds || [], this.props.containerId)
42
+        previousScreenIds: _.concat([], this.props.previousScreenIds || [], this.props.componentId)
43 43
       }
44 44
     });
45 45
   }
46 46
 
47 47
   async onClickPop() {
48
-    await Navigation.pop(this.props.containerId);
48
+    await Navigation.pop(this.props.componentId);
49 49
   }
50 50
 
51 51
   async onClickPopPrevious() {
@@ -57,7 +57,7 @@ class PushedScreen extends Component {
57 57
   }
58 58
 
59 59
   async onClickPopToRoot() {
60
-    await Navigation.popToRoot(this.props.containerId);
60
+    await Navigation.popToRoot(this.props.componentId);
61 61
   }
62 62
 
63 63
   getStackPosition() {

+ 1
- 1
playground/src/containers/ScrollViewScreen.js 파일 보기

@@ -36,7 +36,7 @@ class ScrollViewScreen extends Component {
36 36
   }
37 37
 
38 38
   onClickToggleTopBarHideOnScroll() {
39
-    Navigation.setOptions(this.props.containerId, {
39
+    Navigation.setOptions(this.props.componentId, {
40 40
       topBar: {
41 41
         hideOnScroll: !this.state.topBarHideOnScroll
42 42
       }

+ 1
- 1
playground/src/containers/SideMenuScreen.js 파일 보기

@@ -20,7 +20,7 @@ class SideMenuScreen extends Component {
20 20
   }
21 21
 
22 22
   hideSideMenu() {
23
-    Navigation.setOptions(this.props.containerId, {
23
+    Navigation.setOptions(this.props.componentId, {
24 24
       sideMenu: {
25 25
         [this.props.side]: {
26 26
           visible: false

+ 11
- 11
playground/src/containers/TextScreen.js 파일 보기

@@ -6,7 +6,7 @@ const { View, Text, Button } = require('react-native');
6 6
 const Navigation = require('react-native-navigation');
7 7
 const testIDs = require('../testIDs');
8 8
 
9
-let globalFirstContainerID;
9
+let globalFirstComponentID;
10 10
 
11 11
 class TextScreen extends Component {
12 12
   static get options() {
@@ -19,7 +19,7 @@ class TextScreen extends Component {
19 19
 
20 20
   constructor(props) {
21 21
     super(props);
22
-    globalFirstContainerID = (props.text === 'This is tab 1') ? props.containerId : globalFirstContainerID;
22
+    globalFirstComponentID = (props.text === 'This is tab 1') ? props.componentId : globalFirstComponentID;
23 23
   }
24 24
 
25 25
   render() {
@@ -27,10 +27,10 @@ class TextScreen extends Component {
27 27
       <View style={styles.root}>
28 28
         <Text style={styles.h1} testID={testIDs.CENTERED_TEXT_HEADER}>{this.props.text || 'Text Screen'}</Text>
29 29
         {this.renderTextFromFunctionInProps()}
30
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
30
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
31 31
         <Button title={'Set Tab Badge'} testID={testIDs.SET_TAB_BADGE_BUTTON} onPress={() => this.onButtonPress()} />
32 32
         <Button title={'Switch To Tab 2'} testID={testIDs.SWITCH_SECOND_TAB_BUTTON} onPress={() => this.onClickSwitchToTab()} />
33
-        <Button title={'Switch To Tab 1 by containerID'} testID={testIDs.SWITCH_FIRST_TAB_BUTTON} onPress={() => this.onClickSwitchToTabByContainerID()} />
33
+        <Button title={'Switch To Tab 1 by componentID'} testID={testIDs.SWITCH_FIRST_TAB_BUTTON} onPress={() => this.onClickSwitchToTabByComponentID()} />
34 34
         <Button title="Hide Tab Bar" testID={testIDs.HIDE_BOTTOM_TABS_BUTTON} onPress={() => this.hideTabBar(true)} />
35 35
         <Button title="Show Tab Bar" testID={testIDs.SHOW_BOTTOM_TABS_BUTTON} onPress={() => this.hideTabBar(false)} />
36 36
         <Button title="Show Left Side Menu" testID={testIDs.SHOW_LEFT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('left')} />
@@ -49,7 +49,7 @@ class TextScreen extends Component {
49 49
   }
50 50
 
51 51
   onButtonPress() {
52
-    Navigation.setOptions(this.props.containerId, {
52
+    Navigation.setOptions(this.props.componentId, {
53 53
       bottomTab: {
54 54
         badge: `TeSt`
55 55
       }
@@ -57,7 +57,7 @@ class TextScreen extends Component {
57 57
   }
58 58
 
59 59
   onClickSwitchToTab() {
60
-    Navigation.setOptions(this.props.containerId, {
60
+    Navigation.setOptions(this.props.componentId, {
61 61
       bottomTabs: {
62 62
         currentTabIndex: 1,
63 63
         hidden: true,
@@ -66,16 +66,16 @@ class TextScreen extends Component {
66 66
     });
67 67
   }
68 68
 
69
-  onClickSwitchToTabByContainerID() {
70
-    Navigation.setOptions(this.props.containerId, {
69
+  onClickSwitchToTabByComponentID() {
70
+    Navigation.setOptions(this.props.componentId, {
71 71
       bottomTabs: {
72
-        currentTabId: globalFirstContainerID
72
+        currentTabId: globalFirstComponentID
73 73
       }
74 74
     });
75 75
   }
76 76
 
77 77
   hideTabBar(hidden) {
78
-    Navigation.setOptions(this.props.containerId, {
78
+    Navigation.setOptions(this.props.componentId, {
79 79
       bottomTabs: {
80 80
         hidden
81 81
       }
@@ -83,7 +83,7 @@ class TextScreen extends Component {
83 83
   }
84 84
 
85 85
   showSideMenu(side) {
86
-    Navigation.setOptions(this.props.containerId, {
86
+    Navigation.setOptions(this.props.componentId, {
87 87
       sideMenu: {
88 88
         [side]: {
89 89
           visible: true

+ 2
- 2
playground/src/containers/TopTabOptionsScreen.js 파일 보기

@@ -25,14 +25,14 @@ class TopTabOptionsScreen extends PureComponent {
25 25
     return (
26 26
       <View style={styles.root}>
27 27
         <Text style={styles.h1}>{this.props.text || 'Top Tab Screen'}</Text>
28
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
28
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
29 29
         <Button title="Dynamic Options" testID={testIDs.DYNAMIC_OPTIONS_BUTTON} onPress={this.onClickDynamicOptions} />
30 30
       </View>
31 31
     );
32 32
   }
33 33
 
34 34
   onClickDynamicOptions() {
35
-    Navigation.setOptions(this.props.containerId, {
35
+    Navigation.setOptions(this.props.componentId, {
36 36
       topBar: {
37 37
         title: 'Dynamic Title',
38 38
         textColor: '#00FFFF',

+ 2
- 2
playground/src/containers/TopTabScreen.js 파일 보기

@@ -16,7 +16,7 @@ class TopTabScreen extends PureComponent {
16 16
 
17 17
   constructor(props) {
18 18
     super(props);
19
-    Navigation.setOptions(this.props.containerId, {
19
+    Navigation.setOptions(this.props.componentId, {
20 20
       topBar: {
21 21
         title: this.props.title
22 22
       }
@@ -27,7 +27,7 @@ class TopTabScreen extends PureComponent {
27 27
     return (
28 28
       <View style={styles.root}>
29 29
         <Text style={styles.h1}>{this.props.text || 'Top Tab Screen'}</Text>
30
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
30
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
31 31
       </View>
32 32
     );
33 33
   }

+ 7
- 7
playground/src/containers/WelcomeScreen.js 파일 보기

@@ -39,7 +39,7 @@ class WelcomeScreen extends Component {
39 39
         <Button title="Show Modal" testID={testIDs.SHOW_MODAL_BUTTON} onPress={this.onClickShowModal} />
40 40
         <Button title="Show Redbox" testID={testIDs.SHOW_REDBOX_BUTTON} onPress={this.onClickShowRedbox} />
41 41
         <Button title="Orientation" testID={testIDs.ORIENTATION_BUTTON} onPress={this.onClickPushOrientationMenuScreen} />
42
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
42
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
43 43
       </View>
44 44
     );
45 45
   }
@@ -164,7 +164,7 @@ class WelcomeScreen extends Component {
164 164
   }
165 165
 
166 166
   async onClickPush() {
167
-    await Navigation.push(this.props.containerId, {
167
+    await Navigation.push(this.props.componentId, {
168 168
       component: {
169 169
         name: 'navigation.playground.PushedScreen'
170 170
       }
@@ -172,7 +172,7 @@ class WelcomeScreen extends Component {
172 172
   }
173 173
 
174 174
   onClickLifecycleScreen() {
175
-    Navigation.push(this.props.containerId, {
175
+    Navigation.push(this.props.componentId, {
176 176
       component: {
177 177
         name: 'navigation.playground.LifecycleScreen'
178 178
       }
@@ -192,7 +192,7 @@ class WelcomeScreen extends Component {
192 192
   }
193 193
 
194 194
   onClickPushOptionsScreen() {
195
-    Navigation.push(this.props.containerId, {
195
+    Navigation.push(this.props.componentId, {
196 196
       component: {
197 197
         name: 'navigation.playground.OptionsScreen'
198 198
       }
@@ -200,7 +200,7 @@ class WelcomeScreen extends Component {
200 200
   }
201 201
 
202 202
   onClickPushTopTabsScreen() {
203
-    Navigation.push(this.props.containerId, {
203
+    Navigation.push(this.props.componentId, {
204 204
       topTabs: [
205 205
         {
206 206
           name: 'navigation.playground.TopTabOptionsScreen',
@@ -251,7 +251,7 @@ class WelcomeScreen extends Component {
251 251
   }
252 252
 
253 253
   onClickBackHandler() {
254
-    Navigation.push(this.props.containerId, {
254
+    Navigation.push(this.props.componentId, {
255 255
       component: {
256 256
         name: 'navigation.playground.BackHandlerScreen'
257 257
       }
@@ -259,7 +259,7 @@ class WelcomeScreen extends Component {
259 259
   }
260 260
 
261 261
   onClickPushOrientationMenuScreen() {
262
-    Navigation.push(this.props.containerId, {
262
+    Navigation.push(this.props.componentId, {
263 263
       component: {
264 264
         name: 'navigation.playground.OrientationSelectScreen'
265 265
       }

+ 18
- 18
playground/src/containers/index.js 파일 보기

@@ -16,25 +16,25 @@ const SideMenuScreen = require('./SideMenuScreen');
16 16
 const TopTabScreen = require('./TopTabScreen');
17 17
 const TopTabOptionsScreen = require('./TopTabOptionsScreen');
18 18
 
19
-function registerContainers() {
20
-  Navigation.registerContainer(`navigation.playground.CustomTransitionDestination`, () => CustomTransitionDestination);
21
-  Navigation.registerContainer(`navigation.playground.CustomTransitionOrigin`, () => CustomTransitionOrigin);
22
-  Navigation.registerContainer(`navigation.playground.ScrollViewScreen`, () => ScrollViewScreen);
23
-  Navigation.registerContainer(`navigation.playground.WelcomeScreen`, () => WelcomeScreen);
24
-  Navigation.registerContainer(`navigation.playground.ModalScreen`, () => ModalScreen);
25
-  Navigation.registerContainer(`navigation.playground.LifecycleScreen`, () => LifecycleScreen);
26
-  Navigation.registerContainer(`navigation.playground.TextScreen`, () => TextScreen);
27
-  Navigation.registerContainer(`navigation.playground.PushedScreen`, () => PushedScreen);
28
-  Navigation.registerContainer(`navigation.playground.OptionsScreen`, () => OptionsScreen);
29
-  Navigation.registerContainer(`navigation.playground.OrientationSelectScreen`, () => OrientationSelectScreen);
30
-  Navigation.registerContainer(`navigation.playground.OrientationDetectScreen`, () => OrientationDetectScreen);
31
-  Navigation.registerContainer('navigation.playground.CustomDialog', () => CustomDialog);
32
-  Navigation.registerContainer('navigation.playground.BackHandlerScreen', () => BandHandlerScreen);
33
-  Navigation.registerContainer('navigation.playground.SideMenuScreen', () => SideMenuScreen);
34
-  Navigation.registerContainer('navigation.playground.TopTabScreen', () => TopTabScreen);
35
-  Navigation.registerContainer('navigation.playground.TopTabOptionsScreen', () => TopTabOptionsScreen);
19
+function registerComponents() {
20
+  Navigation.registerComponent(`navigation.playground.CustomTransitionDestination`, () => CustomTransitionDestination);
21
+  Navigation.registerComponent(`navigation.playground.CustomTransitionOrigin`, () => CustomTransitionOrigin);
22
+  Navigation.registerComponent(`navigation.playground.ScrollViewScreen`, () => ScrollViewScreen);
23
+  Navigation.registerComponent(`navigation.playground.WelcomeScreen`, () => WelcomeScreen);
24
+  Navigation.registerComponent(`navigation.playground.ModalScreen`, () => ModalScreen);
25
+  Navigation.registerComponent(`navigation.playground.LifecycleScreen`, () => LifecycleScreen);
26
+  Navigation.registerComponent(`navigation.playground.TextScreen`, () => TextScreen);
27
+  Navigation.registerComponent(`navigation.playground.PushedScreen`, () => PushedScreen);
28
+  Navigation.registerComponent(`navigation.playground.OptionsScreen`, () => OptionsScreen);
29
+  Navigation.registerComponent(`navigation.playground.OrientationSelectScreen`, () => OrientationSelectScreen);
30
+  Navigation.registerComponent(`navigation.playground.OrientationDetectScreen`, () => OrientationDetectScreen);
31
+  Navigation.registerComponent('navigation.playground.CustomDialog', () => CustomDialog);
32
+  Navigation.registerComponent('navigation.playground.BackHandlerScreen', () => BandHandlerScreen);
33
+  Navigation.registerComponent('navigation.playground.SideMenuScreen', () => SideMenuScreen);
34
+  Navigation.registerComponent('navigation.playground.TopTabScreen', () => TopTabScreen);
35
+  Navigation.registerComponent('navigation.playground.TopTabOptionsScreen', () => TopTabOptionsScreen);
36 36
 }
37 37
 
38 38
 module.exports = {
39
-  registerContainers
39
+  registerComponents
40 40
 };

+ 1
- 1
scripts/generate-js-doc.js 파일 보기

@@ -4,7 +4,7 @@ const path = require('path');
4 4
 
5 5
 const BASE_DIR = './lib/src/params/';
6 6
 const OPTIONS_DIR = BASE_DIR + 'options/';
7
-const CONTAINERS_DIR = BASE_DIR + 'containers/';
7
+const CONTAINERS_DIR = BASE_DIR + 'components/';
8 8
 const OUTPUT_DIR = './docs/docs/';
9 9
 const PARAMS_PARTIALS = ['./docs/templates/header.hbs', './docs/templates/sig-name.hbs'];
10 10
 const PARTIALS = [