Merge branch 'master' into Template-Changes

1 files changed, 7 insertions, 8 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 37060d20c..948beec74 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -11,14 +11,13 @@ import { GroupManager } from '../util/GroupManager';
 import { SettingsManager } from '../util/SettingsManager';
 import { SharingManager } from '../util/SharingManager';
 import { SnappingManager } from '../util/SnappingManager';
-import { UndoManager, undoable } from '../util/UndoManager';
+import { UndoManager } from '../util/UndoManager';
 import { ContextMenu } from './ContextMenu';
 import { DocumentDecorations } from './DocumentDecorations';
 import { InkStrokeProperties } from './InkStrokeProperties';
 import { MainView } from './MainView';
 import { CollectionDockingView } from './collections/CollectionDockingView';
 import { CollectionStackedTimeline } from './collections/CollectionStackedTimeline';
-import { CollectionFreeFormView } from './collections/collectionFreeForm';
 import { CollectionFreeFormDocumentView } from './nodes/CollectionFreeFormDocumentView';
 import { DocumentLinksButton } from './nodes/DocumentLinksButton';
 import { DocumentView } from './nodes/DocumentView';
@@ -240,17 +239,17 @@ export class KeyManager {
                 break;
             case 'i':
                 {
-                    const importBtn = DocListCast(Doc.MyLeftSidebarMenu.data).find(d => d.target === Doc.MyImports);
+                    const importBtn = DocListCast(Doc.MyLeftSidebarMenu?.data).find(d => d.target === Doc.MyImports);
                     if (importBtn) {
-                        MainView.Instance.selectMenu(importBtn);
+                        MainView.Instance.selectLeftSidebarButton(importBtn);
                     }
                 }
                 break;
             case 's':
                 {
-                    const trailsBtn = DocListCast(Doc.MyLeftSidebarMenu.data).find(d => d.target === Doc.MyTrails);
+                    const trailsBtn = DocListCast(Doc.MyLeftSidebarMenu?.data).find(d => d.target === Doc.MyTrails);
                     if (trailsBtn) {
-                        MainView.Instance.selectMenu(trailsBtn);
+                        MainView.Instance.selectLeftSidebarButton(trailsBtn);
                     }
                 }
                 break;
@@ -258,9 +257,9 @@ export class KeyManager {
                 if (DocumentView.Selected().length === 1 && DocumentView.Selected()[0].ComponentView?.search) {
                     DocumentView.Selected()[0].ComponentView?.search?.('', false, false);
                 } else {
-                    const searchBtn = DocListCast(Doc.MyLeftSidebarMenu.data).find(d => d.target === Doc.MySearcher);
+                    const searchBtn = DocListCast(Doc.MyLeftSidebarMenu?.data).find(d => d.target === Doc.MySearcher);
                     if (searchBtn) {
-                        MainView.Instance.selectMenu(searchBtn);
+                        MainView.Instance.selectLeftSidebarButton(searchBtn);
                     }
                 }
                 break;