Skip to content

Commit 273a775

Browse files
Merge pull request RealOrangeOne#121 from bob-carson/tabbarios-picker-issues
Fixes issue with TabBarIOS. Adds Picker.Item
2 parents 1bc5d4e + 663a0ec commit 273a775

File tree

5 files changed

+58
-5
lines changed

5 files changed

+58
-5
lines changed

src/components/Picker.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import React from 'react';
2+
import createMockComponent from './createMockComponent';
3+
4+
const Picker = React.createClass({
5+
propTypes: {
6+
children: React.PropTypes.node
7+
},
8+
statics: {
9+
Item: createMockComponent('Picker.Item')
10+
},
11+
render() {
12+
return null;
13+
}
14+
});
15+
16+
module.exports = Picker;

src/components/TabBarIOS.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import React from 'react';
2+
import createMockComponent from './createMockComponent';
3+
4+
const TabBarIOS = React.createClass({
5+
propTypes: {
6+
children: React.PropTypes.node
7+
},
8+
statics: {
9+
Item: createMockComponent('TabBarIOS.Item')
10+
},
11+
render() {
12+
return null;
13+
}
14+
});
15+
16+
module.exports = TabBarIOS;

src/react-native.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const ReactNative = {
2424
Modal: createMockComponent('Modal'),
2525
Navigator: require('./components/Navigator'),
2626
NavigatorIOS: createMockComponent('NavigatorIOS'),
27-
Picker: createMockComponent('Picker'),
27+
Picker: require('./components/Picker'),
2828
PickerIOS: createMockComponent('PickerIOS'),
2929
ProgressBarAndroid: createMockComponent('ProgressBarAndroid'),
3030
ProgressViewIOS: createMockComponent('ProgressViewIOS'),
@@ -39,10 +39,7 @@ const ReactNative = {
3939
StatusBar: require('./components/StatusBar'),
4040
SwitchAndroid: createMockComponent('SwitchAndroid'),
4141
SwitchIOS: createMockComponent('SwitchIOS'),
42-
TabBarIOS: {
43-
...createMockComponent('TabBarIOS'),
44-
Item: createMockComponent('TabBarIOS.Item')
45-
},
42+
TabBarIOS: require('./components/TabBarIOS'),
4643
Text: require('./components/Text'),
4744
TextInput: require('./components/TextInput'),
4845
ToastAndroid: createMockComponent('ToastAndroid'),

test/components/Picker.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { expect } from 'chai';
2+
import Picker from '../../src/components/Picker.js';
3+
4+
describe('Picker', () => {
5+
it('is renderable', () => {
6+
expect(Picker).to.be.a('function');
7+
});
8+
9+
it('.Item is renderable', () => {
10+
expect(Picker.Item).to.be.a('function');
11+
});
12+
});

test/components/TabBarIOS.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { expect } from 'chai';
2+
import TabBarIOS from '../../src/components/TabBarIOS.js';
3+
4+
describe('TabBarIOS', () => {
5+
it('is renderable', () => {
6+
expect(TabBarIOS).to.be.a('function');
7+
});
8+
9+
it('.Item is renderable', () => {
10+
expect(TabBarIOS.Item).to.be.a('function');
11+
});
12+
});

0 commit comments

Comments
 (0)