Merge pull request #410 from brian-tagg/mentionsKeyboardInteractions

[TMA-841] Fixed up keyboard mentions

1 files changed, 13 insertions, 6 deletions

diff --git a/src/components/common/TaggTypeahead.tsx b/src/components/common/TaggTypeahead.tsx
index 7cd99278..747e0bb5 100644
--- a/src/components/common/TaggTypeahead.tsx
+++ b/src/components/common/TaggTypeahead.tsx
@@ -1,26 +1,32 @@
 import React, {Fragment, useEffect, useState} from 'react';
 import {ScrollView, StyleSheet} from 'react-native';
 import {MentionSuggestionsProps} from 'react-native-controlled-mentions';
+import {useSelector} from 'react-redux';
 import {SEARCH_ENDPOINT_MESSAGES} from '../../constants';
 import {loadSearchResults} from '../../services';
+import {RootState} from '../../store/rootReducer';
 import {ProfilePreviewType} from '../../types';
-import {SCREEN_WIDTH} from '../../utils';
+import {SCREEN_WIDTH, shuffle} from '../../utils';
 import TaggUserRowCell from './TaggUserRowCell';
 
 const TaggTypeahead: React.FC<MentionSuggestionsProps> = ({
   keyword,
   onSuggestionPress,
 }) => {
+  const {friends} = useSelector((state: RootState) => state.friends);
   const [results, setResults] = useState<ProfilePreviewType[]>([]);
   const [height, setHeight] = useState(0);
 
   useEffect(() => {
-    getQuerySuggested();
+    if (keyword === '') {
+      setResults(shuffle(friends));
+    } else {
+      getQuerySuggested();
+    }
   }, [keyword]);
 
   const getQuerySuggested = async () => {
-    if (!keyword || keyword.length < 3) {
-      setResults([]);
+    if (keyword === undefined || keyword === '@') {
       return;
     }
     const searchResults = await loadSearchResults(
@@ -41,15 +47,16 @@ const TaggTypeahead: React.FC<MentionSuggestionsProps> = ({
       showsVerticalScrollIndicator={false}
       onLayout={(event) => {
         setHeight(event.nativeEvent.layout.height);
-      }}>
+      }}
+      keyboardShouldPersistTaps={'always'}>
       {results.map((user) => (
         <TaggUserRowCell
           onPress={() => {
+            setResults([]);
             onSuggestionPress({
               id: user.id,
               name: user.username,
             });
-            setResults([]);
           }}
           user={user}
         />