Skip to content

Flatten inputs hierarchy #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
11 changes: 4 additions & 7 deletions src/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,16 @@ export default {
return require('./KeyboardAwareScrollView').KeyboardAwareListView;
},
get BaseInput() {
return require('./inputs').BaseInput;
return require('./baseInput').default;
},
get TextArea() {
return require('./inputs').TextArea;
return require('./textArea').default;
},
get TextField() {
return require('./inputs').TextField;
},
get TextInput() {
return require('./inputs').TextInput;
return require('./textField').default;
},
get MaskedInput() {
return require('./inputs').MaskedInput;
return require('./maskedInput').default;
},
get Modal() {
return require('./modal').default;
Expand Down
8 changes: 4 additions & 4 deletions src/components/inputs/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = {
get BaseInput() {
return require('./BaseInput').default;
return require('../baseInput').default;
},
get TextArea() {
return require('./TextArea').default;
return require('../textArea').default;
},
get TextField() {
return require('./TextField').default;
return require('../textField').default;
},
get MaskedInput() {
return require('./MaskedInput').default;
return require('../maskedInput').default;
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import _ from 'lodash';
import PropTypes from 'prop-types';
import React from 'react';
import {StyleSheet, ViewPropTypes, Keyboard} from 'react-native';
import BaseInput from './BaseInput';
import TextField from './TextField';
import BaseInput from '../baseInput';
import TextField from '../textField';
import View from '../view';
import Text from '../text';

Expand Down
2 changes: 1 addition & 1 deletion src/components/picker/NativePicker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import _ from 'lodash';
import React from 'react';
import {BaseComponent} from '../../commons';
import TextField from '../inputs/TextField';
import TextField from '../textField';
import {WheelPicker} from '../../nativeComponents';
import PickerDialog from './PickerDialog';
import TouchableOpacity from '../touchableOpacity';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {View, TextInput as RNTextInput, StyleSheet} from 'react-native';
import BaseInput from './BaseInput';
import BaseInput from '../baseInput';

/**
* @description: a wrapper for Text Field component to create enclosed text area
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TextField from '../TextField';
import TextField from '..';
import {Colors} from '../../../style';

describe('TextField', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import React from 'react';
import {StyleSheet, Animated, TextInput as RNTextInput, Image as RNImage} from 'react-native';
import {Constants} from '../../helpers';
import {Colors, Typography, Spacings} from '../../style';
import BaseInput from './BaseInput';
import BaseInput from '../baseInput';
import Modal from '../modal';
import TextArea from './TextArea';
import TextArea from '../textArea';
import View from '../view';
import Image from '../image';
import Text from '../text';
Expand Down
8 changes: 4 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@ export default {
return require('./components/KeyboardAwareScrollView').KeyboardAwareListView;
},
get BaseInput() {
return require('./components/inputs/BaseInput').default;
return require('./components/baseInput').default;
},
get TextArea() {
return require('./components/inputs/TextArea').default;
return require('./components/textArea').default;
},
get TextField() {
return require('./components/inputs/TextField').default;
return require('./components/textField').default;
},
get MaskedInput() {
return require('./components/inputs/MaskedInput').default;
return require('./components/maskedInput').default;
},
get Modal() {
return require('./components/modal').default;
Expand Down