From f36651f5380f1c119577495622365a015b34cdba Mon Sep 17 00:00:00 2001
From: Heiko Carrasco <heiko.carrasco@yahoo.com>
Date: Sat, 26 Sep 2020 23:21:16 +0200
Subject: [PATCH 1/2] Add keyboard shortcut to close current conversations

Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
---
 src/accessibility/KeyboardShortcuts.tsx    |  6 ++++++
 src/components/structures/LoggedInView.tsx | 12 +++++++++++-
 src/i18n/strings/en_EN.json                |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 58d8124122..48d0eb2ab1 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -257,6 +257,12 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.SLASH,
             }],
             description: _td("Toggle this dialog"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL, Modifiers.ALT],
+                key: Key.H,
+            }],
+            description: _td("Go to Home View"),
         },
     ],
 
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 79f2916200..e7256e4cd4 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -21,7 +21,7 @@ import * as PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { DragDropContext } from 'react-beautiful-dnd';
 
-import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
+import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isMac} from '../../Keyboard';
 import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
@@ -400,6 +400,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
         const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
         const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT;
+        const modKey = isMac ? ev.metaKey : ev.ctrlKey;
 
         switch (ev.key) {
             case Key.PAGE_UP:
@@ -444,6 +445,15 @@ class LoggedInView extends React.Component<IProps, IState> {
                 }
                 break;
 
+            case Key.H:
+                if (ev.altKey && modKey) {
+                    dis.dispatch({
+                        action: 'view_home_page',
+                    });
+                    handled = true;
+                }
+                break;
+
             case Key.ARROW_UP:
             case Key.ARROW_DOWN:
                 if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index eb8f9100ec..0bc430d87a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2350,6 +2350,7 @@
     "Activate selected button": "Activate selected button",
     "Toggle right panel": "Toggle right panel",
     "Toggle this dialog": "Toggle this dialog",
+    "Go to Home View": "Go to Home View",
     "Move autocomplete selection up/down": "Move autocomplete selection up/down",
     "Cancel autocomplete": "Cancel autocomplete",
     "Page Up": "Page Up",

From d7f15985f590232a72be980570d98d81b7efd45c Mon Sep 17 00:00:00 2001
From: Heiko Carrasco <heiko.carrasco@yahoo.com>
Date: Tue, 13 Oct 2020 18:26:48 +0200
Subject: [PATCH 2/2] Close all active modals when home shortcut is used

Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
---
 src/Modal.tsx                              | 9 +++++++++
 src/components/structures/LoggedInView.tsx | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/Modal.tsx b/src/Modal.tsx
index b0f6ef988e..b6074e4807 100644
--- a/src/Modal.tsx
+++ b/src/Modal.tsx
@@ -147,6 +147,15 @@ export class ModalManager {
         return this.appendDialogAsync<T>(...rest);
     }
 
+    public closeCurrentModal(reason: string) {
+        const modal = this.getCurrentModal();
+        if (!modal) {
+            return;
+        }
+        modal.closeReason = reason;
+        modal.close();
+    }
+
     private buildModal<T extends any[]>(
         prom: Promise<React.ComponentType>,
         props?: IProps<T>,
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index e7256e4cd4..98921d03a1 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -52,6 +52,7 @@ import RoomListStore from "../../stores/room-list/RoomListStore";
 import NonUrgentToastContainer from "./NonUrgentToastContainer";
 import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload";
 import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
+import Modal from "../../Modal";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -450,6 +451,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                     dis.dispatch({
                         action: 'view_home_page',
                     });
+                    Modal.closeCurrentModal("homeKeyboardShortcut");
                     handled = true;
                 }
                 break;