From dc9dc104c9670c3412673bbc150f2ab94d41efd3 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Wed, 8 Dec 2021 20:40:56 +0530
Subject: [PATCH] feat: Always show quick settings menu (#765)

---
 .../QuickSettingsMenu/QuickSettingsMenu.tsx   | 111 +++++++++---------
 .../javascripts/views/footer/footer_view.ts   |  35 +-----
 2 files changed, 58 insertions(+), 88 deletions(-)

diff --git a/app/assets/javascripts/components/QuickSettingsMenu/QuickSettingsMenu.tsx b/app/assets/javascripts/components/QuickSettingsMenu/QuickSettingsMenu.tsx
index 003aa8e1d..c9d0fc86d 100644
--- a/app/assets/javascripts/components/QuickSettingsMenu/QuickSettingsMenu.tsx
+++ b/app/assets/javascripts/components/QuickSettingsMenu/QuickSettingsMenu.tsx
@@ -180,15 +180,16 @@ const QuickSettingsMenu: FunctionComponent<MenuProps> = observer(
       }
     };
 
-    const handleQuickSettingsKeyDown: JSXInternal.KeyboardEventHandler<HTMLDivElement> =
-      (event) => {
-        quickSettingsKeyDownHandler(
-          closeQuickSettingsMenu,
-          event,
-          quickSettingsMenuRef,
-          themesMenuOpen
-        );
-      };
+    const handleQuickSettingsKeyDown: JSXInternal.KeyboardEventHandler<
+      HTMLDivElement
+    > = (event) => {
+      quickSettingsKeyDownHandler(
+        closeQuickSettingsMenu,
+        event,
+        quickSettingsMenuRef,
+        themesMenuOpen
+      );
+    };
 
     const handlePanelKeyDown: React.KeyboardEventHandler<HTMLDivElement> = (
       event
@@ -222,54 +223,56 @@ const QuickSettingsMenu: FunctionComponent<MenuProps> = observer(
           <div className="px-3 mt-1 mb-2 font-semibold color-text uppercase">
             Quick Settings
           </div>
-          <Disclosure open={themesMenuOpen} onChange={toggleThemesMenu}>
-            <DisclosureButton
-              onKeyDown={handleBtnKeyDown}
-              onBlur={closeOnBlur}
-              ref={themesButtonRef}
-              className="sn-dropdown-item justify-between focus:bg-info-backdrop focus:shadow-none"
-            >
-              <div className="flex items-center">
-                <Icon type="themes" className="color-neutral mr-2" />
-                Themes
-              </div>
-              <Icon type="chevron-right" className="color-neutral" />
-            </DisclosureButton>
-            <DisclosurePanel
-              onBlur={closeOnBlur}
-              ref={themesMenuRef}
-              onKeyDown={handlePanelKeyDown}
-              style={{
-                ...themesMenuPosition,
-              }}
-              className={`${MENU_CLASSNAME} fixed sn-dropdown--animated`}
-            >
-              <div className="px-3 my-1 font-semibold color-text uppercase">
-                Themes
-              </div>
-              <button
-                className="sn-dropdown-item focus:bg-info-backdrop focus:shadow-none"
-                onClick={toggleDefaultTheme}
+          {themes && themes.length ? (
+            <Disclosure open={themesMenuOpen} onChange={toggleThemesMenu}>
+              <DisclosureButton
+                onKeyDown={handleBtnKeyDown}
                 onBlur={closeOnBlur}
-                ref={defaultThemeButtonRef}
+                ref={themesButtonRef}
+                className="sn-dropdown-item justify-between focus:bg-info-backdrop focus:shadow-none"
               >
-                <div
-                  className={`pseudo-radio-btn ${
-                    defaultThemeOn ? 'pseudo-radio-btn--checked' : ''
-                  } mr-2`}
-                ></div>
-                Default
-              </button>
-              {themes.map((theme) => (
-                <ThemesMenuButton
-                  theme={theme}
-                  application={application}
-                  key={theme.uuid}
+                <div className="flex items-center">
+                  <Icon type="themes" className="color-neutral mr-2" />
+                  Themes
+                </div>
+                <Icon type="chevron-right" className="color-neutral" />
+              </DisclosureButton>
+              <DisclosurePanel
+                onBlur={closeOnBlur}
+                ref={themesMenuRef}
+                onKeyDown={handlePanelKeyDown}
+                style={{
+                  ...themesMenuPosition,
+                }}
+                className={`${MENU_CLASSNAME} fixed sn-dropdown--animated`}
+              >
+                <div className="px-3 my-1 font-semibold color-text uppercase">
+                  Themes
+                </div>
+                <button
+                  className="sn-dropdown-item focus:bg-info-backdrop focus:shadow-none"
+                  onClick={toggleDefaultTheme}
                   onBlur={closeOnBlur}
-                />
-              ))}
-            </DisclosurePanel>
-          </Disclosure>
+                  ref={defaultThemeButtonRef}
+                >
+                  <div
+                    className={`pseudo-radio-btn ${
+                      defaultThemeOn ? 'pseudo-radio-btn--checked' : ''
+                    } mr-2`}
+                  ></div>
+                  Default
+                </button>
+                {themes.map((theme) => (
+                  <ThemesMenuButton
+                    theme={theme}
+                    application={application}
+                    key={theme.uuid}
+                    onBlur={closeOnBlur}
+                  />
+                ))}
+              </DisclosurePanel>
+            </Disclosure>
+          ) : null}
           {toggleableComponents.map((component) => (
             <Switch
               className="sn-dropdown-item focus:bg-info-backdrop focus:shadow-none"
diff --git a/app/assets/javascripts/views/footer/footer_view.ts b/app/assets/javascripts/views/footer/footer_view.ts
index 1504e6515..e692b7e4a 100644
--- a/app/assets/javascripts/views/footer/footer_view.ts
+++ b/app/assets/javascripts/views/footer/footer_view.ts
@@ -8,7 +8,6 @@ import {
   SNTheme,
   ComponentArea,
   CollectionSort,
-  SNComponent,
 } from '@standardnotes/snjs';
 import template from './footer-view.pug';
 import { AppStateEvent, EventSource } from '@/ui_models/app_state';
@@ -43,8 +42,6 @@ class FooterViewCtrl extends PureViewCtrl<
   }
 > {
   private $rootScope: ng.IRootScopeService;
-  private themes: SNTheme[] = [];
-  private toggleableComponents: SNComponent[] = [];
   private showSyncResolution = false;
   private unregisterComponent: any;
   private rootScopeListener2: any;
@@ -76,8 +73,6 @@ class FooterViewCtrl extends PureViewCtrl<
   deinit() {
     for (const remove of this.observerRemovers) remove();
     this.observerRemovers.length = 0;
-    this.themes.length = 0;
-    this.toggleableComponents.length = 0;
     this.unregisterComponent();
     this.unregisterComponent = undefined;
     this.rootScopeListener2();
@@ -276,30 +271,6 @@ class FooterViewCtrl extends PureViewCtrl<
         return !theme.errorDecrypting;
       }
     );
-
-    this.observerRemovers.push(
-      this.application.streamItems(ContentType.Theme, async () => {
-        const themes = this.application.getDisplayableItems(
-          ContentType.Theme
-        ) as SNTheme[];
-        this.themes = themes;
-      })
-    );
-
-    this.observerRemovers.push(
-      this.application.streamItems(ContentType.Component, async () => {
-        const toggleableComponents = (
-          this.application.getDisplayableItems(
-            ContentType.Component
-          ) as SNComponent[]
-        ).filter((component) =>
-          [ComponentArea.EditorStack, ComponentArea.TagsList].includes(
-            component.area
-          )
-        );
-        this.toggleableComponents = toggleableComponents;
-      })
-    );
   }
 
   registerComponentHandler() {
@@ -400,11 +371,7 @@ class FooterViewCtrl extends PureViewCtrl<
 
   quickSettingsPressed() {
     this.appState.accountMenu.closeAccountMenu();
-    if (this.themes.length > 0 || this.toggleableComponents.length > 0) {
-      this.appState.quickSettingsMenu.toggle();
-    } else {
-      this.appState.preferences.openPreferences();
-    }
+    this.appState.quickSettingsMenu.toggle();
   }
 
   toggleSyncResolutionMenu() {