Keyboard shortcuts and accessibility

ts/state/selectors/search.ts

@@ -50,6 +50,11 @@ export const getSearchConversationName = createSelector(
   (state: SearchStateType): string | undefined => state.searchConversationName
 );
 
+export const getStartSearchCounter = createSelector(
+  getSearch,
+  (state: SearchStateType): number => state.startSearchCounter
+);
+
 export const isSearching = createSelector(
   getSearch,
   (state: SearchStateType) => {
@@ -64,12 +69,19 @@ export const getMessageSearchResultLookup = createSelector(
   (state: SearchStateType) => state.messageLookup
 );
 export const getSearchResults = createSelector(
-  [getSearch, getRegionCode, getConversationLookup, getSelectedConversation],
+  [
+    getSearch,
+    getRegionCode,
+    getConversationLookup,
+    getSelectedConversation,
+    getSelectedMessage,
+  ],
   (
     state: SearchStateType,
     regionCode: string,
     lookup: ConversationLookupType,
-    selectedConversation?: string
+    selectedConversationId?: string,
+    selectedMessageId?: string
     // tslint:disable-next-line max-func-body-length
   ): SearchResultsPropsType | undefined => {
     const {
@@ -115,7 +127,7 @@ export const getSearchResults = createSelector(
           type: 'conversation',
           data: {
             ...data,
-            isSelected: Boolean(data && id === selectedConversation),
+            isSelected: Boolean(data && id === selectedConversationId),
           },
         });
       });
@@ -141,7 +153,7 @@ export const getSearchResults = createSelector(
           type: 'contact',
           data: {
             ...data,
-            isSelected: Boolean(data && id === selectedConversation),
+            isSelected: Boolean(data && id === selectedConversationId),
           },
         });
       });
@@ -177,6 +189,8 @@ export const getSearchResults = createSelector(
       regionCode: regionCode,
       searchConversationName,
       searchTerm: state.query,
+      selectedConversationId,
+      selectedMessageId,
     };
   }
 );

ts/state/selectors/user.ts

@@ -32,6 +32,11 @@ export const getStickersPath = createSelector(
   (state: UserStateType): string => state.stickersPath
 );
 
+export const getPlatform = createSelector(
+  getUser,
+  (state: UserStateType): string => state.platform
+);
+
 export const getTempPath = createSelector(
   getUser,
   (state: UserStateType): string => state.tempPath