mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Various search UI improvements

Browse source
This commit is contained in:
Evan Hahn 2021-11-01 13:43:02 -05:00 • committed by GitHub
parent 630394d91d
commit a9cb621eb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 835 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/state/smart/LeftPane.tsx
View file

@ -13,6 +13,8 @@ import { missingCaseError } from '../../util/missingCaseError';
import { ComposerStep, OneTimeModalState } from '../ducks/conversations';
import {
getIsSearchingInAConversation,
getQuery,
getSearchConversation,
getSearchResults,
getStartSearchCounter,
isSearching,
@ -91,9 +93,14 @@ const getModeSpecificProps = (
case undefined:
if (getShowArchived(state)) {
const { archivedConversations } = getLeftPaneLists(state);
const searchConversation = getSearchConversation(state);
const searchTerm = getQuery(state);
return {
mode: LeftPaneMode.Archive,
archivedConversations,
searchConversation,
searchTerm,
...(searchConversation && searchTerm ? getSearchResults(state) : {}),
};
}
if (isSearching(state)) {