Skip to content

Commit b0723ee

Browse files
authored
Flatten inputs hierarchy (#882)
* move files * change components files to index files * Fix paths * move TextField test file * Fix TextField test
1 parent 16277f2 commit b0723ee

File tree

10 files changed

+19
-22
lines changed

10 files changed

+19
-22
lines changed

src/components/index.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,16 @@ export default {
7272
return require('./KeyboardAwareScrollView').KeyboardAwareListView;
7373
},
7474
get BaseInput() {
75-
return require('./inputs').BaseInput;
75+
return require('./baseInput').default;
7676
},
7777
get TextArea() {
78-
return require('./inputs').TextArea;
78+
return require('./textArea').default;
7979
},
8080
get TextField() {
81-
return require('./inputs').TextField;
82-
},
83-
get TextInput() {
84-
return require('./inputs').TextInput;
81+
return require('./textField').default;
8582
},
8683
get MaskedInput() {
87-
return require('./inputs').MaskedInput;
84+
return require('./maskedInput').default;
8885
},
8986
get Modal() {
9087
return require('./modal').default;

src/components/inputs/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module.exports = {
22
get BaseInput() {
3-
return require('./BaseInput').default;
3+
return require('../baseInput').default;
44
},
55
get TextArea() {
6-
return require('./TextArea').default;
6+
return require('../textArea').default;
77
},
88
get TextField() {
9-
return require('./TextField').default;
9+
return require('../textField').default;
1010
},
1111
get MaskedInput() {
12-
return require('./MaskedInput').default;
12+
return require('../maskedInput').default;
1313
}
1414
};

src/components/inputs/MaskedInput.js renamed to src/components/maskedInput/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import _ from 'lodash';
22
import PropTypes from 'prop-types';
33
import React from 'react';
44
import {StyleSheet, ViewPropTypes, Keyboard} from 'react-native';
5-
import BaseInput from './BaseInput';
6-
import TextField from './TextField';
5+
import BaseInput from '../baseInput';
6+
import TextField from '../textField';
77
import View from '../view';
88
import Text from '../text';
99

src/components/picker/NativePicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import _ from 'lodash';
22
import React from 'react';
33
import {BaseComponent} from '../../commons';
4-
import TextField from '../inputs/TextField';
4+
import TextField from '../textField';
55
import {WheelPicker} from '../../nativeComponents';
66
import PickerDialog from './PickerDialog';
77
import TouchableOpacity from '../touchableOpacity';

src/components/inputs/TextArea.js renamed to src/components/textArea/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import {View, TextInput as RNTextInput, StyleSheet} from 'react-native';
3-
import BaseInput from './BaseInput';
3+
import BaseInput from '../baseInput';
44

55
/**
66
* @description: a wrapper for Text Field component to create enclosed text area

src/components/inputs/__tests__/TextField.spec.js renamed to src/components/textField/__tests__/index.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import TextField from '../TextField';
1+
import TextField from '..';
22
import {Colors} from '../../../style';
33

44
describe('TextField', () => {

src/components/inputs/TextField.js renamed to src/components/textField/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import React from 'react';
1010
import {StyleSheet, Animated, TextInput as RNTextInput, Image as RNImage} from 'react-native';
1111
import {Constants} from '../../helpers';
1212
import {Colors, Typography, Spacings} from '../../style';
13-
import BaseInput from './BaseInput';
13+
import BaseInput from '../baseInput';
1414
import Modal from '../modal';
15-
import TextArea from './TextArea';
15+
import TextArea from '../textArea';
1616
import View from '../view';
1717
import Image from '../image';
1818
import Text from '../text';

src/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ export default {
7979
return require('./components/KeyboardAwareScrollView').KeyboardAwareListView;
8080
},
8181
get BaseInput() {
82-
return require('./components/inputs/BaseInput').default;
82+
return require('./components/baseInput').default;
8383
},
8484
get TextArea() {
85-
return require('./components/inputs/TextArea').default;
85+
return require('./components/textArea').default;
8686
},
8787
get TextField() {
88-
return require('./components/inputs/TextField').default;
88+
return require('./components/textField').default;
8989
},
9090
get MaskedInput() {
91-
return require('./components/inputs/MaskedInput').default;
91+
return require('./components/maskedInput').default;
9292
},
9393
get Modal() {
9494
return require('./components/modal').default;

0 commit comments

Comments
 (0)