Solve conflicts merging with master

README.md

@@ -165,6 +165,7 @@ The component takes 3 compulsory props - `items`, `uniqueKey` and `onSelectedIte
 | textInputProps | No | (Object) Properties for the Text Input. Pass any property that is required on the text input |
 | uniqueKey      | Yes      | (String) Unique identifier that is part of each item's properties. Used internally as means of identifying each item (Check sample below) |
 |selectedItems | No      | (Array, control prop) List of selected items keys . JavaScript Array of strings, that can be instantiated with the component |
+| removeSelected | No  | (Boolean) Filter selected items from list to be shown in List |
 
 ## Note
 

index.d.ts

@@ -0,0 +1,56 @@
+// Type definitions for react-native-multiple-select 0.5
+
+import * as React from "react";
+import { ViewStyle, TextStyle, TextInputProps, StyleProp, FlatListProps } from 'react-native';
+
+export interface MultiSelectProps {
+    single?: boolean;
+    selectedItems?: any[];
+    items: any[];
+    uniqueKey?: string,
+    tagBorderColor?: string;
+    tagTextColor?: string;
+    fontFamily?: string;
+    tagRemoveIconColor?: string;
+    onSelectedItemsChange: ((items: any[]) => void),
+    selectedItemFontFamily?: string;
+    selectedItemTextColor?: string;
+    itemFontFamily?: string;
+    itemTextColor?: string;
+    itemFontSize?: number;
+    selectedItemIconColor?: string;
+    searchIcon?: React.ReactNode;
+    searchInputPlaceholderText?: string;
+    searchInputStyle?: StyleProp<TextStyle>;
+    selectText?: string;
+    styleDropdownMenu?: StyleProp<ViewStyle>;
+    styleDropdownMenuSubsection?: StyleProp<ViewStyle>;
+    styleInputGroup?: StyleProp<ViewStyle>;
+    styleItemsContainer?: StyleProp<ViewStyle>;
+    styleListContainer?: StyleProp<ViewStyle>;
+    styleMainWrapper?: StyleProp<ViewStyle>;
+    styleRowList?: StyleProp<ViewStyle>;
+    styleSelectorContainer?: StyleProp<ViewStyle>;
+    styleTextDropdown?: StyleProp<TextStyle>;
+    styleTextDropdownSelected?: StyleProp<TextStyle>;
+    altFontFamily?: string;
+    hideSubmitButton?: boolean;
+    hideDropdown?: boolean;
+    submitButtonColor?: string;
+    submitButtonText?: string;
+    textColor?: string;
+    fontSize?: number;
+    fixedHeight?: boolean;
+    hideTags?: boolean,
+    canAddItems?: boolean;
+    onAddItem?: (newItems: any[]) => void;
+    onChangeInput?: (text: string) => void;
+    displayKey?: string;
+    textInputProps?: TextInputProps;
+    flatListProps?: FlatListProps<any>;
+    filterMethod?: string;
+}
+
+export default class MultiSelect extends React.Component<MultiSelectProps> {
+    getSelectedItemsExt: (items: any[]) => React.ReactNode;
+}

lib/react-native-multi-select.js

@@ -80,7 +80,8 @@ export default class MultiSelect extends Component {
     flatListProps: PropTypes.object,
     filterMethod: PropTypes.string,
     onClearSelector: PropTypes.func,
-    onToggleList: PropTypes.func
+    onToggleList: PropTypes.func,
+    removeSelected: PropTypes.bool
   };
 
   static defaultProps = {
@@ -115,7 +116,8 @@ export default class MultiSelect extends Component {
     canAddItems: false,
     onAddItem: () => {},
     onClearSelector: () => {},
-    onToggleList: () => {}
+    onToggleList: () => {},
+    removeSelected: false
   };
 
   constructor(props) {
@@ -473,7 +475,8 @@ export default class MultiSelect extends Component {
       uniqueKey,
       selectedItems,
       flatListProps,
-      styleListContainer
+      styleListContainer,
+      removeSelected
     } = this.props;
     const { searchTerm } = this.state;
     let component = null;
@@ -482,13 +485,20 @@ export default class MultiSelect extends Component {
     let searchTermMatch;
     let itemList;
     let addItemRow;
-    const renderItems = searchTerm ? this._filterItems(searchTerm) : items;
+    let renderItems = searchTerm ? this._filterItems(searchTerm) : items;
+    // Filtering already selected items
+    if (removeSelected) {
+      renderItems = renderItems.filter(
+        item => !selectedItems.includes(item[uniqueKey])
+      );
+    }
     if (renderItems.length) {
       itemList = (
         <FlatList
           data={renderItems}
           extraData={selectedItems}
           keyExtractor={item => item[uniqueKey]}
+          listKey={item => item[uniqueKey]}
           renderItem={rowData => this._getRow(rowData.item)}
           {...flatListProps}
         />