Skip to content

fix: shortcuts conflict with browser native shortcuts #20375

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
merged 4 commits into from
Mar 15, 2022
Merged

fix: shortcuts conflict with browser native shortcuts #20375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a80f2ba
fix: shortcuts conflict with browser native shortcuts
majidzeno Feb 26, 2022
7448ac0
fix: close the accordion to flush the onMount event
majidzeno Mar 4, 2022
be78566
Add test around shortcut modifier keys
BlueWinds Mar 14, 2022
ba09deb
Merge branch 'develop' into issue-20222
emilyrohrbough Mar 15, 2022
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
1 change: 1 addition & 0 deletions packages/desktop-gui/cypress/integration/settings_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ describe('Settings', () => {
it('loads preferred editor, available editors and shows spinner', () => {
cy.get('.loading-editors').then(function () {
expect(this.ipc.getUserEditor).to.be.called
cy.contains('File Opener Preference').click()
})
})

Expand Down
10 changes: 10 additions & 0 deletions packages/reporter/cypress/integration/shortcuts_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,15 @@ describe('shortcuts', function () {
cy.get('button.stop').trigger('mouseover')
cy.get('.cy-tooltip').should('have.text', 'Stop Running S')
})

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@majidzeno - I went ahead and pushed a test for these changes onto your branch, this is what @jennifer-shehane was asking for.

Looks good to me. 👍

it('does not run shortcut if modifier keys are pressed', () => {
['{ctrl+f}', '{alt+f}', '{shift+f}', '{meta+f}'].forEach((text) => {
cy.get('body').type(text)
})

cy.then(() => {
expect(runner.emit).not.to.have.been.calledWith('focus:tests')
})
})
})
})
7 changes: 5 additions & 2 deletions packages/reporter/src/lib/shortcuts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @ts-ignore
import dom from '@packages/driver/src/dom'
import $dom from '@packages/driver/src/dom'
import events from './events'
import appState from './app-state'
import { action } from 'mobx'
Expand All @@ -16,7 +16,10 @@ class Shortcuts {
_handleKeyDownEvent (event: KeyboardEvent) {
// if typing into an input, textarea, etc, don't trigger any shortcuts
// @ts-ignore
if (dom.isTextLike(event.target)) return
const isTextLike = $dom.isTextLike(event.target)
const isAnyModifierKeyPressed = event.altKey || event.ctrlKey || event.shiftKey || event.metaKey

if (isAnyModifierKeyPressed || isTextLike) return

switch (event.key) {
case 'r': !appState.studioActive && events.emit('restart')
Expand Down