diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts index 491c77747..1556d0660 100644 --- a/src/client/app/common/scripts/note-mixin.ts +++ b/src/client/app/common/scripts/note-mixin.ts @@ -29,14 +29,18 @@ export default (opts: Opts = {}) => ({ computed: { keymap(): any { return { - 'r|left': () => this.reply(true), + 'r': () => this.reply(true), 'e|a|plus': () => this.react(true), - 'q|right': () => this.renote(true), + 'q': () => this.renote(true), 'f|b': this.favorite, 'delete|ctrl+d': this.del, - 'ctrl+q|ctrl+right': this.renoteDirectly, + 'ctrl+q': this.renoteDirectly, 'up|k|shift+tab': this.focusBefore, 'down|j|tab': this.focusAfter, + 'shift+up': () => this.$emit('parentFocus', 'up'), + 'shift+down': () => this.$emit('parentFocus', 'down'), + 'shift+left': () => this.$emit('parentFocus', 'left'), + 'shift+right': () => this.$emit('parentFocus', 'right'), 'esc': this.blur, 'm|o': () => this.menu(true), 's': this.toggleShowContent, diff --git a/src/client/app/desktop/views/pages/deck/deck.column-core.vue b/src/client/app/desktop/views/pages/deck/deck.column-core.vue index 0f64406a7..dd2483c5c 100644 --- a/src/client/app/desktop/views/pages/deck/deck.column-core.vue +++ b/src/client/app/desktop/views/pages/deck/deck.column-core.vue @@ -1,14 +1,14 @@ diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/pages/deck/deck.notes.vue index 98cc1e13a..ec1298369 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notes.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue @@ -17,7 +17,13 @@
@@ -97,7 +100,11 @@ export default Vue.extend({ focus() { this.$refs.tl.focus(); - } + }, + + parentFocus(direction) { + this.$emit('parentFocus', direction); + }, } }); diff --git a/src/client/app/desktop/views/pages/deck/deck.tl.vue b/src/client/app/desktop/views/pages/deck/deck.tl.vue index e9507cdf2..318e661b7 100644 --- a/src/client/app/desktop/views/pages/deck/deck.tl.vue +++ b/src/client/app/desktop/views/pages/deck/deck.tl.vue @@ -1,5 +1,5 @@ diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue index 232ffee23..46b4fde7e 100644 --- a/src/client/app/desktop/views/pages/deck/deck.vue +++ b/src/client/app/desktop/views/pages/deck/deck.vue @@ -4,10 +4,10 @@