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
|
|
|
/* global describe, it, beforeEach, afterEach */
|
|
|
|
|
|
|
|
import {
|
|
|
|
initShortcuts,
|
|
|
|
addShortcutFallback,
|
|
|
|
addToShortcutScope,
|
|
|
|
onKeyDownInShortcutScope,
|
|
|
|
popShortcutScope,
|
|
|
|
pushShortcutScope,
|
|
|
|
removeFromShortcutScope } from '../../src/routes/_utils/shortcuts'
|
|
|
|
import assert from 'assert'
|
|
|
|
|
|
|
|
function KeyDownEvent (key) {
|
|
|
|
this.key = key
|
|
|
|
this.metaKey = false
|
|
|
|
this.ctrlKey = false
|
|
|
|
this.shiftKey = false
|
2019-01-20 00:50:39 +01:00
|
|
|
this.altKey = false
|
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
|
|
|
this.target = null
|
|
|
|
}
|
|
|
|
|
|
|
|
function Component (keyDownFunction) {
|
|
|
|
this.lastEvent = null
|
|
|
|
this.eventCount = 0
|
|
|
|
this.onKeyDown = function (event) {
|
|
|
|
this.lastEvent = event
|
|
|
|
this.eventCount++
|
|
|
|
}
|
|
|
|
this.pressed = function () {
|
|
|
|
return this.eventCount > 0
|
|
|
|
}
|
|
|
|
this.notPressed = function () {
|
|
|
|
return this.eventCount === 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
describe('test-shortcuts.js', function () {
|
|
|
|
let eventListener
|
|
|
|
let originalWindow
|
|
|
|
|
|
|
|
beforeEach(function () {
|
|
|
|
originalWindow = global.window
|
|
|
|
global.window = {
|
|
|
|
addEventListener: function (eventname, listener) {
|
|
|
|
assert.strictEqual(eventname, 'keydown')
|
|
|
|
eventListener = listener
|
|
|
|
},
|
|
|
|
removeEventListener: function (eventname, listener) {
|
|
|
|
assert.strictEqual(eventname, 'keydown')
|
|
|
|
if (listener === eventListener) {
|
|
|
|
eventListener = null
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
initShortcuts()
|
|
|
|
})
|
|
|
|
afterEach(function () {
|
|
|
|
global.window = originalWindow
|
|
|
|
})
|
|
|
|
|
|
|
|
it('sets and unsets event listener', function () {
|
|
|
|
let component = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'k', component)
|
|
|
|
assert(eventListener != null, 'event listener not set')
|
|
|
|
removeFromShortcutScope('global', 'k', component)
|
|
|
|
assert(eventListener == null, 'event listener not reset')
|
|
|
|
})
|
|
|
|
|
|
|
|
it('forwards the right global key event', function () {
|
|
|
|
let component = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'k', component)
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('l'))
|
|
|
|
assert.ok(component.notPressed())
|
|
|
|
|
|
|
|
let kEvent = new KeyDownEvent('k')
|
|
|
|
eventListener(kEvent)
|
|
|
|
assert.ok(component.pressed())
|
|
|
|
assert.strictEqual(component.lastEvent, kEvent)
|
|
|
|
})
|
|
|
|
|
|
|
|
it('register multiple keys', function () {
|
|
|
|
let lmn = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'l|m|n', lmn)
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('x'))
|
|
|
|
assert.strictEqual(lmn.eventCount, 0)
|
|
|
|
eventListener(new KeyDownEvent('m'))
|
|
|
|
assert.strictEqual(lmn.eventCount, 1)
|
|
|
|
eventListener(new KeyDownEvent('l'))
|
|
|
|
assert.strictEqual(lmn.eventCount, 2)
|
|
|
|
eventListener(new KeyDownEvent('n'))
|
|
|
|
assert.strictEqual(lmn.eventCount, 3)
|
|
|
|
})
|
|
|
|
|
|
|
|
it('skips events with modifiers', function () {
|
|
|
|
let component = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'k', component)
|
|
|
|
|
|
|
|
let kEvent = new KeyDownEvent('k')
|
|
|
|
kEvent.shiftKey = true
|
|
|
|
eventListener(kEvent)
|
|
|
|
assert.ok(component.notPressed())
|
|
|
|
|
|
|
|
kEvent = new KeyDownEvent('k')
|
|
|
|
kEvent.ctrlKey = true
|
|
|
|
eventListener(kEvent)
|
|
|
|
assert.ok(component.notPressed())
|
|
|
|
|
|
|
|
kEvent = new KeyDownEvent('k')
|
|
|
|
kEvent.metaKey = true
|
|
|
|
eventListener(kEvent)
|
|
|
|
assert.ok(component.notPressed())
|
|
|
|
})
|
|
|
|
|
2019-01-13 23:02:01 +01:00
|
|
|
it('does not skip events for ?', function () {
|
|
|
|
let component = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', '?', component)
|
|
|
|
|
|
|
|
let qEvent = new KeyDownEvent('?')
|
|
|
|
qEvent.shiftKey = true
|
|
|
|
eventListener(qEvent)
|
|
|
|
assert.ok(component.pressed())
|
|
|
|
})
|
|
|
|
|
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
|
|
|
it('skips events for editable elements', function () {
|
|
|
|
let component = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'k', component)
|
|
|
|
|
|
|
|
let kEvent = new KeyDownEvent('k')
|
|
|
|
kEvent.target = { isContentEditable: true }
|
|
|
|
eventListener(kEvent)
|
|
|
|
assert.ok(component.notPressed())
|
|
|
|
})
|
|
|
|
|
|
|
|
it('handles multi-key events', function () {
|
|
|
|
let a = new Component()
|
|
|
|
let ga = new Component()
|
|
|
|
let gb = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'a', a)
|
|
|
|
addToShortcutScope('global', 'g a', ga)
|
|
|
|
addToShortcutScope('global', 'g b', gb)
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('g'))
|
|
|
|
eventListener(new KeyDownEvent('a'))
|
|
|
|
assert.ok(ga.pressed())
|
|
|
|
assert.ok(gb.notPressed())
|
|
|
|
assert.ok(a.notPressed())
|
|
|
|
})
|
|
|
|
|
|
|
|
it('falls back to single-key events if no sequence matches', function () {
|
|
|
|
let b = new Component()
|
|
|
|
let ga = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'b', b)
|
|
|
|
addToShortcutScope('global', 'g a', ga)
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('g'))
|
|
|
|
eventListener(new KeyDownEvent('b'))
|
|
|
|
assert.ok(b.pressed())
|
|
|
|
assert.ok(ga.notPressed())
|
|
|
|
})
|
|
|
|
|
|
|
|
it('sends unhandled events to fallback', function () {
|
|
|
|
let fallback = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'b', new Component())
|
|
|
|
addShortcutFallback('global', fallback)
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('x'))
|
|
|
|
assert.ok(fallback.pressed())
|
|
|
|
})
|
|
|
|
|
|
|
|
it('directs events to appropriate component in arbitrary scope', function () {
|
|
|
|
let globalB = new Component()
|
|
|
|
let inScopeB = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'b', globalB)
|
|
|
|
addToShortcutScope('inscope', 'b', inScopeB)
|
|
|
|
|
|
|
|
onKeyDownInShortcutScope('inscope', new KeyDownEvent('b'))
|
|
|
|
assert.ok(inScopeB.pressed())
|
|
|
|
assert.ok(globalB.notPressed())
|
|
|
|
})
|
|
|
|
|
|
|
|
it('makes shortcuts modal', function () {
|
|
|
|
let globalA = new Component()
|
|
|
|
let globalB = new Component()
|
|
|
|
let modal1A = new Component()
|
|
|
|
let modal2A = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', 'a', globalA)
|
|
|
|
addToShortcutScope('global', 'b', globalB)
|
|
|
|
addToShortcutScope('modal1', 'a', modal1A)
|
|
|
|
addToShortcutScope('modal2', 'a', modal2A)
|
|
|
|
|
|
|
|
pushShortcutScope('modal1')
|
|
|
|
pushShortcutScope('modal2')
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('b'))
|
|
|
|
assert.ok(globalB.notPressed())
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('a'))
|
|
|
|
assert.ok(globalA.notPressed())
|
|
|
|
assert.ok(modal1A.notPressed())
|
|
|
|
assert.ok(modal2A.pressed())
|
|
|
|
|
|
|
|
popShortcutScope('modal2')
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('a'))
|
|
|
|
assert.ok(globalA.notPressed())
|
|
|
|
assert.ok(modal1A.pressed())
|
|
|
|
|
|
|
|
popShortcutScope('modal1')
|
|
|
|
|
|
|
|
eventListener(new KeyDownEvent('a'))
|
|
|
|
assert.ok(globalA.pressed())
|
|
|
|
})
|
2019-01-20 00:50:39 +01:00
|
|
|
|
|
|
|
it('ignores alt key', function () {
|
|
|
|
let component = new Component()
|
|
|
|
|
|
|
|
addToShortcutScope('global', '1', component)
|
|
|
|
|
|
|
|
let event = new KeyDownEvent('1')
|
|
|
|
event.altKey = true
|
|
|
|
eventListener(event)
|
|
|
|
assert.ok(component.notPressed())
|
|
|
|
})
|
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
|
|
|
})
|