Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Added new selectedText Prop and has changes some ui problems in my ios simulators. #125

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added new selectedText Prop and has changes some ui problems in my ios simulators. #125

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c98024
🆕Added selectedText prop.
monerdx Jan 17, 2020
6ce1d58
🔥Fixed a bug.
monerdx Jan 17, 2020
fcc32e3
Update README.md
muratoner Jan 17, 2020
b73c5f5
🆕 Added selectedText prop in index.d.ts file.
monerdx Jan 17, 2020
8daa8df
Merge branch 'master' of https://github.com/muratoner/react-native-mu…
monerdx Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 14 additions & 12 deletions lib/react-native-multi-select.js
View file
Open in desktop
@@ -1,22 +1,22 @@
import React, { Component } from 'react';
import {
FlatList,
Text,
View,
TextInput,
TouchableWithoutFeedback,
TouchableOpacity,
FlatList,
TouchableWithoutFeedback,
UIManager,
View,
ViewPropTypes
} from 'react-native';
import React, { Component } from 'react';
import styles, { colorPack } from './styles';

import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import PropTypes from 'prop-types';
import reject from 'lodash/reject';
import find from 'lodash/find';
import get from 'lodash/get';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';

import styles, { colorPack } from './styles';
import nodeTypes from './helpers/nodeTypes';
import reject from 'lodash/reject';

// set UIManager LayoutAnimationEnabledExperimental
if (UIManager.setLayoutAnimationEnabledExperimental) {
Expand All @@ -34,6 +34,7 @@ const defaultSearchIcon = (

export default class MultiSelect extends Component {
static propTypes = {
selectedText: PropTypes.string,
single: PropTypes.bool,
selectedItems: PropTypes.array,
items: PropTypes.array.isRequired,
Expand Down Expand Up @@ -117,7 +118,8 @@ export default class MultiSelect extends Component {
onAddItem: () => {},
onClearSelector: () => {},
onToggleList: () => {},
removeSelected: false
removeSelected: false,
selectedText: 'selected'
};

constructor(props) {
Expand Down Expand Up @@ -162,7 +164,7 @@ export default class MultiSelect extends Component {
const foundItem = this._findItem(item);
return get(foundItem, displayKey) || selectText;
}
return `${selectText} (${selectedItems.length} selected)`;
return `${selectText} (${selectedItems.length} ${selectText})`;
};

_findItem = itemKey => {
Expand Down Expand Up @@ -615,7 +617,7 @@ export default class MultiSelect extends Component {
size={20}
onPress={this._clearSelectorCallback}
color={colorPack.placeholderTextColor}
style={{ marginLeft: 5 }}
style={{ marginLeft: 5, marginRight: 10}}
/>
)}
</View>
Expand Down Expand Up @@ -705,7 +707,7 @@ export default class MultiSelect extends Component {
</Text>
<Icon
name={hideSubmitButton ? 'menu-right' : 'menu-down'}
style={styles.indicator}
style={[styles.indicator, { right: -20, height: '100%' }]}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can be bad for other users of the library.
I think better to you create another props

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right but some devices has redundant indicator right margin.

/>
</View>
</TouchableWithoutFeedback>
Expand Down