matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-07 21:23:00 +03:00
Code Activity

Work towards unifying KeyboardShortcuts and KeyBindingsDefaults #1 (#7651)

Browse Source
This commit is contained in:
Šimon Brandner
2022-01-27 12:37:53 +01:00
committed by GitHub
parent f2249b3e37
commit 57a5647079
6 changed files with 237 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/accessibility/KeyboardShortcuts-test.ts
View File

@@ -17,7 +17,7 @@ limitations under the License.
import {
CATEGORIES,
CategoryName,
KEYBOARD_SHORTCUTS,
getKeyboardShortcuts,
registerShortcut,
} from "../../src/accessibility/KeyboardShortcuts";
import { Key } from "../../src/Keyboard";
@@ -38,7 +38,7 @@ describe("KeyboardShortcuts", () => {
registerShortcut(shortcutName, shortcutCategory, shortcut);
expect(KEYBOARD_SHORTCUTS[shortcutName]).toBe(shortcut);
expect(getKeyboardShortcuts()[shortcutName]).toBe(shortcut);
expect(CATEGORIES[shortcutCategory].settingNames.includes(shortcutName)).toBeTruthy();
});
});

12
test/components/views/settings/tabs/user/KeyboardUserSettingsTab-test.tsx
View File

@@ -60,7 +60,7 @@ describe("KeyboardUserSettingsTab", () => {
it("doesn't render same modifier twice", async () => {
mockKeyboardShortcuts({
"KEYBOARD_SHORTCUTS": {
"getKeyboardShortcuts": () => ({
"keybind1": {
default: {
key: Key.A,
@@ -69,14 +69,14 @@ describe("KeyboardUserSettingsTab", () => {
},
displayName: "Cancel replying to a message",
},
},
}),
});
const body1 = await renderKeyboardUserSettingsTab("KeyboardShortcut", { name: "keybind1" });
expect(body1).toMatchSnapshot();
jest.resetModules();
mockKeyboardShortcuts({
"KEYBOARD_SHORTCUTS": {
"getKeyboardShortcuts": () => ({
"keybind1": {
default: {
key: Key.A,
@@ -85,7 +85,7 @@ describe("KeyboardUserSettingsTab", () => {
},
displayName: "Cancel replying to a message",
},
},
}),
});
const body2 = await renderKeyboardUserSettingsTab("KeyboardShortcut", { name: "keybind1" });
expect(body2).toMatchSnapshot();
@@ -94,7 +94,7 @@ describe("KeyboardUserSettingsTab", () => {
it("renders list of keyboard shortcuts", async () => {
mockKeyboardShortcuts({
"KEYBOARD_SHORTCUTS": {
"getKeyboardShortcuts": () => ({
"keybind1": {
default: {
key: Key.A,
@@ -115,7 +115,7 @@ describe("KeyboardUserSettingsTab", () => {
},
displayName: "Select room from the room list",
},
},
}),
"CATEGORIES": {
"Composer": {
settingNames: ["keybind1", "keybind2"],