Skip to content

feat(base-window): preload.keyboard-shortcuts.js reusable in all WebViews #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manusa merged 1 commit into from
Nov 6, 2025
Merged

feat(base-window): preload.keyboard-shortcuts.js reusable in all WebViews #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions ...ests__/preload.keyboard-shortcuts.test.js → ...ests__/preload.keyboard-shortcuts.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,51 @@ describe('Browser Keyboard Shortcuts test suite', () => {
});
});
describe('Control modified events', () => {
test('ctrl+R, should send reload app event', () => {
// Given
browserKeyboardShortcuts.initKeyboardShortcuts();
// When
globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: 'R', ctrlKey: true}));
// Then
expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
});
test('ctrl+r (lowercase), should send reload app event', () => {
// Given
browserKeyboardShortcuts.initKeyboardShortcuts();
// When
globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: 'r', ctrlKey: true}));
// Then
expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
});
test('ctrl++ (zoom in), should send zoomIn event', () => {
// Given
browserKeyboardShortcuts.initKeyboardShortcuts();
// When
globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: '+', ctrlKey: true}));
// Then
expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
expect(electron.ipcRenderer.send).toHaveBeenCalledWith('zoomIn');
});
test('ctrl+- (zoom out), should send zoomOut event', () => {
// Given
browserKeyboardShortcuts.initKeyboardShortcuts();
// When
globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: '-', ctrlKey: true}));
// Then
expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
expect(electron.ipcRenderer.send).toHaveBeenCalledWith('zoomOut');
});
test('ctrl+0 (zoom reset), should send zoomReset event', () => {
// Given
browserKeyboardShortcuts.initKeyboardShortcuts();
// When
globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: '0', ctrlKey: true}));
// Then
expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
expect(electron.ipcRenderer.send).toHaveBeenCalledWith('zoomReset');
});
test('ctrl+unrecognized_key, should NOT send any app event', () => {
// Given
browserKeyboardShortcuts.initKeyboardShortcuts();
Expand All @@ -63,6 +108,15 @@ describe('Browser Keyboard Shortcuts test suite', () => {
expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
});
test('cmd+r (lowercase), should send reload app event', () => {
// Given
browserKeyboardShortcuts.initKeyboardShortcuts();
// When
globalThis.dispatchEvent(new KeyboardEvent('keyup', {key: 'r', metaKey: true}));
// Then
expect(electron.ipcRenderer.send).toHaveBeenCalledTimes(1);
expect(electron.ipcRenderer.send).toHaveBeenCalledWith('reload');
});
});
describe('Mouse wheel events', () => {
test('ctrl+scrollUp, should send zoomIn event', () => {
Expand Down
0 ...ice-manager/preload.keyboard-shortcuts.js → ...base-window/preload.keyboard-shortcuts.js
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions src/chrome-extensions/preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
limitations under the License.
*/
require('./preload.webstore-private');
require('../base-window/preload.keyboard-shortcuts').initKeyboardShortcuts();
4 changes: 2 additions & 2 deletions src/service-manager/__tests__/preload.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('Service Manager Module preload test suite', () => {
});
describe('preload', () => {
beforeEach(() => {
jest.spyOn(require('../preload.keyboard-shortcuts'), 'initKeyboardShortcuts');
jest.spyOn(require('../../base-window/preload.keyboard-shortcuts'), 'initKeyboardShortcuts');
jest.spyOn(require('../preload.spell-check'), 'initSpellChecker');
});
test('adds required libraries', async () => {
Expand All @@ -39,7 +39,7 @@ describe('Service Manager Module preload test suite', () => {
// Then
expect(globalThis.Notification).toEqual(expect.any(Function));
expect(globalThis.navigator.mediaDevices.getDisplayMedia).toEqual(expect.any(Function));
expect(require('../preload.keyboard-shortcuts').initKeyboardShortcuts).toHaveBeenCalledTimes(1);
expect(require('../../base-window/preload.keyboard-shortcuts').initKeyboardShortcuts).toHaveBeenCalledTimes(1);
await waitFor(() => expect(mockElectron.webFrame.setSpellCheckProvider).toHaveBeenCalledTimes(1));
expect(require('../preload.spell-check').initSpellChecker).toHaveBeenCalledTimes(1);
});
Expand Down
2 changes: 1 addition & 1 deletion src/service-manager/preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
require('./preload.notification-shim');
require('./preload.mediadevices-shim');
require('./preload.keyboard-shortcuts').initKeyboardShortcuts();
require('../base-window/preload.keyboard-shortcuts').initKeyboardShortcuts();
require('./preload.spell-check').initSpellChecker()
.catch(err => console.error('Error initializing spell check', err));