OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Hide `Clear room list filter field` shortcut if new search enabled (#7798)

pull/21833/head
Michael Telatynski 2022-02-14 23:38:29 +00:00 committed by GitHub
parent 8d3c2eddd6
commit 226eed2a7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/accessibility/KeyboardShortcuts.ts
View File

@ -19,6 +19,7 @@ import { _td } from "../languageHandler";
import { isMac, Key } from "../Keyboard"; import { isMac, Key } from "../Keyboard";
import { ISetting } from "../settings/Settings"; import { ISetting } from "../settings/Settings";
import SettingsStore from "../settings/SettingsStore"; import SettingsStore from "../settings/SettingsStore";
import IncompatibleController from "../settings/controllers/IncompatibleController";
export enum KeyBindingAction { export enum KeyBindingAction {
/** Send a message */ /** Send a message */
@ -396,6 +397,7 @@ const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
key: Key.ESCAPE, key: Key.ESCAPE,
}, },
displayName: _td("Clear room list filter field"), displayName: _td("Clear room list filter field"),
controller: new IncompatibleController("feature_spotlight", { key: null }),
}, },
[KeyBindingAction.NextRoom]: { [KeyBindingAction.NextRoom]: {
default: { default: {
@ -591,7 +593,12 @@ export const getCustomizableShortcuts = (): IKeyboardShortcuts => {
displayName: _td("Redo edit"), displayName: _td("Redo edit"),
}; };
return keyboardShortcuts; return Object.keys(keyboardShortcuts).filter(k => {
return !keyboardShortcuts[k].controller?.settingDisabled;
}).reduce((o, key) => {
o[key] = keyboardShortcuts[key];
return o;
}, {});
}; };
export const getKeyboardShortcuts = (): IKeyboardShortcuts => { export const getKeyboardShortcuts = (): IKeyboardShortcuts => {