feat: Add support for keyboard shortcuts (#870)
* Add support for keyboard shortcuts.
This change introduces a Shortcut component for defining global
keyboard shortcuts from whichever component makes more sense.
This change also adds an initial set of navigation shortcuts:
- Backspace to leave a modal dialog or to go back
- g t to go to the federated timeline
- g f to go to the favorite page
- g h to go to the home page
- g n to go to the notification page
- g c to go to the community page
- s to go to the search page
These shortcuts are loaded asynchronously from _layout.html
In modal dialogs, shortcuts are also modal, to avoid strange or
overly complex behavior. This is implemented by grouping
shortcuts into scopes, and activating a separate 'modal' scope
when entering a modal dialog, so a separate set of shortcuts can
be enabled in modal dialog. Modal dialogs can be exited by
pressing 'Backspace'.
* Navigate up/down lists using keyboard shortcuts.
This change introduces keyboard shortcuts for navigating in lists and
virtual lists. j or arrow up selects the next element, k or arrow down,
the previous element. Selecting an element scrolls the list up and down,
as necessary.
This change also allows directing keyboard shortcuts to the active
element and defines the following shortcuts, for the active status:
- f to favorite or unfavorite it
- b to boost or unboost it
- r to reply to it
- o to open its thread
- x to toggle the display of a CW
- y to toggle the display of sensitive medias
This works by defining a keyboard shortcut scope for each list element.
A new component, ScrollListShortcuts, keeps track of the active element,
based on list or virtual list elements and redirects shortcuts to the
active element's scope. ScrollListShortcuts keeps the active element in
the current realm of the store, so the active element is restored when
going back to the list.
* Typing h or ? displays the list of available keyboard shortcuts.
This change introduces a new modal dialog that documents the list of
available shortcuts.
2019-01-13 19:03:29 +01:00
|
|
|
import { Selector as $ } from 'testcafe'
|
|
|
|
import {
|
2019-01-20 01:40:31 +01:00
|
|
|
closeDialogButton,
|
|
|
|
composeModalInput,
|
feat: Add support for keyboard shortcuts (#870)
* Add support for keyboard shortcuts.
This change introduces a Shortcut component for defining global
keyboard shortcuts from whichever component makes more sense.
This change also adds an initial set of navigation shortcuts:
- Backspace to leave a modal dialog or to go back
- g t to go to the federated timeline
- g f to go to the favorite page
- g h to go to the home page
- g n to go to the notification page
- g c to go to the community page
- s to go to the search page
These shortcuts are loaded asynchronously from _layout.html
In modal dialogs, shortcuts are also modal, to avoid strange or
overly complex behavior. This is implemented by grouping
shortcuts into scopes, and activating a separate 'modal' scope
when entering a modal dialog, so a separate set of shortcuts can
be enabled in modal dialog. Modal dialogs can be exited by
pressing 'Backspace'.
* Navigate up/down lists using keyboard shortcuts.
This change introduces keyboard shortcuts for navigating in lists and
virtual lists. j or arrow up selects the next element, k or arrow down,
the previous element. Selecting an element scrolls the list up and down,
as necessary.
This change also allows directing keyboard shortcuts to the active
element and defines the following shortcuts, for the active status:
- f to favorite or unfavorite it
- b to boost or unboost it
- r to reply to it
- o to open its thread
- x to toggle the display of a CW
- y to toggle the display of sensitive medias
This works by defining a keyboard shortcut scope for each list element.
A new component, ScrollListShortcuts, keeps track of the active element,
based on list or virtual list elements and redirects shortcuts to the
active element's scope. ScrollListShortcuts keeps the active element in
the current realm of the store, so the active element is restored when
going back to the list.
* Typing h or ? displays the list of available keyboard shortcuts.
This change introduces a new modal dialog that documents the list of
available shortcuts.
2019-01-13 19:03:29 +01:00
|
|
|
getNthFavorited,
|
|
|
|
getNthStatus,
|
|
|
|
getNthStatusContent,
|
|
|
|
getNthStatusMedia,
|
|
|
|
getNthStatusSensitiveMediaButton,
|
|
|
|
getNthStatusSpoiler,
|
2019-01-20 01:40:31 +01:00
|
|
|
getUrl, modalDialog,
|
2019-01-20 01:04:06 +01:00
|
|
|
scrollToStatus
|
|
|
|
} from '../utils'
|
feat: Add support for keyboard shortcuts (#870)
* Add support for keyboard shortcuts.
This change introduces a Shortcut component for defining global
keyboard shortcuts from whichever component makes more sense.
This change also adds an initial set of navigation shortcuts:
- Backspace to leave a modal dialog or to go back
- g t to go to the federated timeline
- g f to go to the favorite page
- g h to go to the home page
- g n to go to the notification page
- g c to go to the community page
- s to go to the search page
These shortcuts are loaded asynchronously from _layout.html
In modal dialogs, shortcuts are also modal, to avoid strange or
overly complex behavior. This is implemented by grouping
shortcuts into scopes, and activating a separate 'modal' scope
when entering a modal dialog, so a separate set of shortcuts can
be enabled in modal dialog. Modal dialogs can be exited by
pressing 'Backspace'.
* Navigate up/down lists using keyboard shortcuts.
This change introduces keyboard shortcuts for navigating in lists and
virtual lists. j or arrow up selects the next element, k or arrow down,
the previous element. Selecting an element scrolls the list up and down,
as necessary.
This change also allows directing keyboard shortcuts to the active
element and defines the following shortcuts, for the active status:
- f to favorite or unfavorite it
- b to boost or unboost it
- r to reply to it
- o to open its thread
- x to toggle the display of a CW
- y to toggle the display of sensitive medias
This works by defining a keyboard shortcut scope for each list element.
A new component, ScrollListShortcuts, keeps track of the active element,
based on list or virtual list elements and redirects shortcuts to the
active element's scope. ScrollListShortcuts keeps the active element in
the current realm of the store, so the active element is restored when
going back to the list.
* Typing h or ? displays the list of available keyboard shortcuts.
This change introduces a new modal dialog that documents the list of
available shortcuts.
2019-01-13 19:03:29 +01:00
|
|
|
import { homeTimeline } from '../fixtures'
|
|
|
|
import { loginAsFoobar } from '../roles'
|
|
|
|
import { indexWhere } from '../../src/routes/_utils/arrays'
|
|
|
|
|
|
|
|
fixture`025-shortcuts-status.js`
|
|
|
|
.page`http://localhost:4002`
|
|
|
|
|
|
|
|
function isNthStatusActive (idx) {
|
|
|
|
return getNthStatus(idx).hasClass('status-active')
|
|
|
|
}
|
|
|
|
|
|
|
|
async function activateStatus (t, idx) {
|
|
|
|
let timeout = 20000
|
|
|
|
for (let i = 0; i <= idx; i++) {
|
|
|
|
await t.expect(getNthStatus(i).exists).ok({ timeout })
|
|
|
|
.pressKey('j')
|
|
|
|
.expect(getNthStatus(i).hasClass('status-active')).ok()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
test('Shortcut j/k change the active status', async t => {
|
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
.expect(getNthStatus(0).exists).ok({ timeout: 30000 })
|
|
|
|
.expect(isNthStatusActive(0)).notOk()
|
|
|
|
.pressKey('j')
|
|
|
|
.expect(isNthStatusActive(0)).ok()
|
|
|
|
.pressKey('j')
|
|
|
|
.expect(isNthStatusActive(1)).ok()
|
|
|
|
.pressKey('j')
|
|
|
|
.expect(isNthStatusActive(2)).ok()
|
|
|
|
.pressKey('j')
|
|
|
|
.expect(isNthStatusActive(3)).ok()
|
|
|
|
.pressKey('k')
|
|
|
|
.expect(isNthStatusActive(2)).ok()
|
|
|
|
.pressKey('k')
|
|
|
|
.expect(isNthStatusActive(1)).ok()
|
|
|
|
.pressKey('k')
|
|
|
|
.expect(isNthStatusActive(0)).ok()
|
|
|
|
.expect(isNthStatusActive(1)).notOk()
|
|
|
|
.expect(isNthStatusActive(2)).notOk()
|
|
|
|
.expect(isNthStatusActive(3)).notOk()
|
|
|
|
})
|
|
|
|
|
|
|
|
test('Shortcut j goes to the first visible status', async t => {
|
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
await scrollToStatus(t, 10)
|
|
|
|
await t
|
|
|
|
.expect(getNthStatus(10).exists).ok({ timeout: 30000 })
|
|
|
|
.pressKey('j')
|
|
|
|
.expect($('.status-active').exists).ok()
|
|
|
|
.expect($('.status-active').getBoundingClientRectProperty('top')).gte(0)
|
|
|
|
})
|
|
|
|
|
|
|
|
test('Shortcut o opens active status, backspace goes back', async t => {
|
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
.expect(getNthStatus(2).exists).ok({ timeout: 30000 })
|
|
|
|
.pressKey('j') // activates status 0
|
|
|
|
.pressKey('j') // activates status 1
|
|
|
|
.pressKey('j') // activates status 2
|
|
|
|
.expect(isNthStatusActive(2)).ok()
|
|
|
|
.pressKey('o')
|
|
|
|
.expect(getUrl()).contains('/statuses/')
|
|
|
|
.pressKey('Backspace')
|
|
|
|
.expect(isNthStatusActive(2)).ok()
|
|
|
|
})
|
|
|
|
|
|
|
|
test('Shortcut x shows/hides spoilers', async t => {
|
|
|
|
let idx = indexWhere(homeTimeline, _ => _.spoiler === 'kitten CW')
|
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
await activateStatus(t, idx)
|
|
|
|
await t
|
|
|
|
.expect(getNthStatus(idx).hasClass('status-active')).ok()
|
|
|
|
.expect(getNthStatusSpoiler(idx).innerText).contains('kitten CW')
|
|
|
|
.expect(getNthStatusContent(idx).hasClass('shown')).notOk()
|
|
|
|
.pressKey('x')
|
|
|
|
.expect(getNthStatusContent(idx).hasClass('shown')).ok()
|
|
|
|
.pressKey('x')
|
|
|
|
.expect(getNthStatusContent(idx).hasClass('shown')).notOk()
|
|
|
|
})
|
|
|
|
|
|
|
|
test('Shortcut y shows/hides sensitive image', async t => {
|
|
|
|
let idx = indexWhere(homeTimeline, _ => _.content === "here's a secret kitten")
|
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
await activateStatus(t, idx)
|
|
|
|
await t
|
|
|
|
.expect(getNthStatus(idx).hasClass('status-active')).ok()
|
|
|
|
.expect(getNthStatusSensitiveMediaButton(idx).exists).ok()
|
|
|
|
.expect(getNthStatusMedia(idx).exists).notOk()
|
|
|
|
.pressKey('y')
|
|
|
|
.expect(getNthStatusMedia(idx).exists).ok()
|
|
|
|
.pressKey('y')
|
|
|
|
.expect(getNthStatusMedia(idx).exists).notOk()
|
|
|
|
})
|
|
|
|
|
|
|
|
test('Shortcut f toggles favorite status', async t => {
|
|
|
|
let idx = indexWhere(homeTimeline, _ => _.content === 'this is unlisted')
|
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
.expect(getNthStatus(idx).exists).ok({ timeout: 30000 })
|
|
|
|
.expect(getNthFavorited(idx)).eql('false')
|
|
|
|
.pressKey('j '.repeat(idx + 1))
|
|
|
|
.expect(getNthStatus(idx).hasClass('status-active')).ok()
|
|
|
|
.pressKey('f')
|
|
|
|
.expect(getNthFavorited(idx)).eql('true')
|
|
|
|
.pressKey('f')
|
|
|
|
.expect(getNthFavorited(idx)).eql('false')
|
|
|
|
})
|
2019-01-20 01:04:06 +01:00
|
|
|
|
2019-01-20 01:40:31 +01:00
|
|
|
test('Shortcut p toggles profile', async t => {
|
|
|
|
let idx = indexWhere(homeTimeline, _ => _.content === 'pinned toot 1')
|
2019-01-20 01:04:06 +01:00
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
.expect(getNthStatus(idx).exists).ok({ timeout: 30000 })
|
|
|
|
.pressKey('j '.repeat(idx + 1))
|
|
|
|
.expect(getNthStatus(idx).hasClass('status-active')).ok()
|
2019-01-20 01:40:31 +01:00
|
|
|
.pressKey('p')
|
|
|
|
.expect(getUrl()).contains('/accounts/3')
|
|
|
|
})
|
|
|
|
|
|
|
|
test('Shortcut m toggles mention', async t => {
|
|
|
|
let idx = indexWhere(homeTimeline, _ => _.content === 'pinned toot 1')
|
|
|
|
await loginAsFoobar(t)
|
|
|
|
await t
|
|
|
|
.expect(getUrl()).eql('http://localhost:4002/')
|
|
|
|
.expect(getNthStatus(idx).exists).ok({ timeout: 30000 })
|
|
|
|
.pressKey('j '.repeat(idx + 1))
|
|
|
|
.expect(getNthStatus(idx).hasClass('status-active')).ok()
|
|
|
|
.pressKey('m')
|
|
|
|
.expect(composeModalInput.value).eql('@quux ')
|
|
|
|
.click(closeDialogButton)
|
|
|
|
.expect(modalDialog.exists).notOk()
|
2019-01-20 01:04:06 +01:00
|
|
|
})
|