colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent conversation up/down when showing search results

Browse Source
This commit is contained in:
Scott Nonnenberg
2019-11-14 16:29:39 -08:00
parent 79b9408f1f
commit bb02fa3a7e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/background.js
View File

@@ -651,6 +651,7 @@
const state = store.getState();
const selectedId = state.conversations.selectedConversation;
const conversation = ConversationController.get(selectedId);
const isSearching = Signal.State.Selectors.search.isSearching(state);
// NAVIGATION
@@ -798,7 +799,7 @@
}
// Change currently selected conversation - up/down, to next/previous unread
if (optionOrAlt && !shiftKey && key === 'ArrowUp') {
if (!isSearching && optionOrAlt && !shiftKey && key === 'ArrowUp') {
const unreadOnly = false;
const targetId = findConversation(
conversation ? conversation.id : null,
@@ -813,7 +814,7 @@
return;
}
}
if (optionOrAlt && !shiftKey && key === 'ArrowDown') {
if (!isSearching && optionOrAlt && !shiftKey && key === 'ArrowDown') {
const unreadOnly = false;
const targetId = findConversation(
conversation ? conversation.id : null,
@@ -828,7 +829,7 @@
return;
}
}
if (optionOrAlt && shiftKey && key === 'ArrowUp') {
if (!isSearching && optionOrAlt && shiftKey && key === 'ArrowUp') {
const unreadOnly = true;
const targetId = findConversation(
conversation ? conversation.id : null,
@@ -843,7 +844,7 @@
return;
}
}
if (optionOrAlt && shiftKey && key === 'ArrowDown') {
if (!isSearching && optionOrAlt && shiftKey && key === 'ArrowDown') {
const unreadOnly = true;
const targetId = findConversation(
conversation ? conversation.id : null,

2
js/modules/signal.js
View File

@@ -70,6 +70,7 @@ const stickersDuck = require('../../ts/state/ducks/stickers');
const userDuck = require('../../ts/state/ducks/user');
const conversationsSelectors = require('../../ts/state/selectors/conversations');
const searchSelectors = require('../../ts/state/selectors/search');
// Migrations
const {
@@ -286,6 +287,7 @@ exports.setup = (options = {}) => {
};
const Selectors = {
conversations: conversationsSelectors,
search: searchSelectors,
};
const State = {