From 389c3859c68667d0a756afd9443163f74a3af385 Mon Sep 17 00:00:00 2001
From: Boris Bondarenko <borisbondarenko@gmail.com>
Date: Mon, 22 Oct 2018 20:16:08 +0200
Subject: [PATCH] Added shortcuts Action+Opt+Up/Down to navigate menu

---
 app/scripts/comp/key-handler.js       |  3 ++
 app/scripts/models/menu/menu-model.js | 61 +++++++++++++++++++++++++++
 app/scripts/views/menu/menu-view.js   | 12 ++++++
 3 files changed, 76 insertions(+)

diff --git a/app/scripts/comp/key-handler.js b/app/scripts/comp/key-handler.js
index 011a4efa..d1039fc3 100644
--- a/app/scripts/comp/key-handler.js
+++ b/app/scripts/comp/key-handler.js
@@ -56,6 +56,9 @@ const KeyHandler = {
                     case this.SHORTCUT_OPT:
                         if (!e.altKey) { continue; }
                         break;
+                    case this.SHORTCUT_ACTION + this.SHORTCUT_OPT:
+                        if (!e.altKey || !isActionKey) { continue; }
+                        break;
                     default:
                         if (e.metaKey || e.ctrlKey || e.altKey) { continue; }
                         break;
diff --git a/app/scripts/models/menu/menu-model.js b/app/scripts/models/menu/menu-model.js
index 9053345e..24f91309 100644
--- a/app/scripts/models/menu/menu-model.js
+++ b/app/scripts/models/menu/menu-model.js
@@ -59,6 +59,8 @@ const MenuModel = Backbone.Model.extend({
         this.set('sections', this.menus.app);
 
         this.listenTo(Backbone, 'set-locale', this._setLocale);
+        this.listenTo(Backbone, 'select-next-menu-item', this._selectNext);
+        this.listenTo(Backbone, 'select-previous-menu-item', this._selectPrevious);
         this._setLocale();
     },
 
@@ -79,6 +81,65 @@ const MenuModel = Backbone.Model.extend({
         }
     },
 
+    _selectPrevious: function() {
+        const _this = this;
+        let previousItem = null;
+
+        function processSection(section){
+            if(section.has('visible') && !section.get('visible')) {
+                return true;
+            }
+            if(section.has('active')) {
+                previousItem = section;
+            }
+            const items = section.get('items');
+            if (items) {
+                items.forEach(function(it) {
+                    if (it.get('active') && previousItem) {
+                        _this.select({item: previousItem});
+                        return false;
+                    }
+                    return processSection(it);
+                }, this);
+            }
+        }
+
+        const sections = this.get('sections');
+        sections.forEach(function(section) { 
+            return processSection(section);
+        }, this);
+    },
+
+    _selectNext: function() {
+        const _this = this;
+        let activeItem = null;
+
+        function processSection(section){
+            if(section.has('visible') && !section.get('visible')) {
+                return true;
+            }
+            if(section.has('active') && activeItem && (section !== activeItem)) {
+                _this.select({item: section});
+                activeItem = null;
+                return false;
+            }
+            const items = section.get('items');
+            if (items) {
+                items.forEach(function(it) {
+                    if (it.get('active')) {
+                        activeItem = it;
+                    }
+                    return processSection(it);
+                }, this);
+            }
+        }
+
+        const sections = this.get('sections');
+        sections.forEach(function(section) { 
+            return processSection(section);
+        }, this);
+    },
+
     _select: function(item, selectedItem) {
         const items = item.get('items');
         if (items) {
diff --git a/app/scripts/views/menu/menu-view.js b/app/scripts/views/menu/menu-view.js
index 4163e7bc..a5d2e950 100644
--- a/app/scripts/views/menu/menu-view.js
+++ b/app/scripts/views/menu/menu-view.js
@@ -1,4 +1,6 @@
 const Backbone = require('backbone');
+const Keys = require('../../const/keys');
+const KeyHandler = require('../../comp/key-handler');
 const Resizable = require('../../mixins/resizable');
 const MenuSectionView = require('./menu-section-view');
 const DragView = require('../drag-view');
@@ -17,6 +19,8 @@ const MenuView = Backbone.View.extend({
     initialize: function () {
         this.listenTo(this.model, 'change:sections', this.menuChanged);
         this.listenTo(this, 'view-resize', this.viewResized);
+        KeyHandler.onKey(Keys.DOM_VK_UP, this.selectPreviousSection, this, KeyHandler.SHORTCUT_ACTION + KeyHandler.SHORTCUT_OPT);
+        KeyHandler.onKey(Keys.DOM_VK_DOWN, this.selectNextSection, this, KeyHandler.SHORTCUT_ACTION + KeyHandler.SHORTCUT_OPT);
     },
 
     remove: function() {
@@ -56,6 +60,14 @@ const MenuView = Backbone.View.extend({
 
     switchVisibility: function(visible) {
         this.$el.toggleClass('menu-visible', visible);
+    },
+
+    selectPreviousSection: function() {
+        Backbone.trigger('select-previous-menu-item');
+    },
+
+    selectNextSection: function() {
+        Backbone.trigger('select-next-menu-item');
     }
 });