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

Fix flaky search behaviour with minimized left pane

Browse source
This commit is contained in:
Sylvan Mably 2024-03-08 20:08:30 -05:00
parent 3eed6cb350
commit ee4608ee04
13 changed files with 154 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,12 +19,13 @@ import { LeftPaneMode } from '../../types/leftPane';
import { ComposerStep, OneTimeModalState } from '../ducks/conversationsEnums';
import {
getHasSearchQuery,
getIsSearching,
getIsSearchingGlobally,
getQuery,
getSearchConversation,
getSearchResults,
getStartSearchCounter,
isSearching,
} from '../selectors/search';
import {
getIntl,
@ -146,19 +147,21 @@ const getModeSpecificProps = (
return {
mode: LeftPaneMode.Archive,
archivedConversations,
isSearchingGlobally: getIsSearchingGlobally(state),
searchConversation,
searchTerm,
startSearchCounter: getStartSearchCounter(state),
...(searchConversation && searchTerm ? getSearchResults(state) : {}),
};
}
if (isSearching(state)) {
if (getHasSearchQuery(state)) {
const primarySendsSms = Boolean(
get(state.items, ['primarySendsSms'], false)
);
return {
mode: LeftPaneMode.Search,
isSearchingGlobally: getIsSearchingGlobally(state),
primarySendsSms,
searchConversation: getSearchConversation(state),
searchDisabled: state.network.challengeStatus !== 'idle',
@ -169,6 +172,7 @@ const getModeSpecificProps = (
return {
mode: LeftPaneMode.Inbox,
isAboutToSearch: getIsSearching(state),
isSearchingGlobally: getIsSearchingGlobally(state),
searchConversation: getSearchConversation(state),
searchDisabled: state.network.challengeStatus !== 'idle',
searchTerm: getQuery(state),
@ -263,7 +267,7 @@ const mapStateToProps = (state: StateType) => {
const composerStep = getComposerStep(state);
const showArchived = getShowArchived(state);
const hasSearchQuery = isSearching(state);
const hasSearchQuery = getHasSearchQuery(state);
return {
hasNetworkDialog: hasNetworkDialog(state),