From f01de3d1ff936dfeee0fb6ad442c7104515e3a3f Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sat, 10 Dec 2022 16:30:34 -0800
Subject: [PATCH] Add customizable side queue

---
 .../settings/components/general-tab.tsx       | 55 ++++++++++++++
 .../renderer/src/layouts/default-layout.tsx   | 71 +++++++++++++------
 packages/renderer/src/store/settings.store.ts |  6 ++
 3 files changed, 109 insertions(+), 23 deletions(-)

diff --git a/packages/renderer/src/features/settings/components/general-tab.tsx b/packages/renderer/src/features/settings/components/general-tab.tsx
index 5e2e431d5..006f3468a 100644
--- a/packages/renderer/src/features/settings/components/general-tab.tsx
+++ b/packages/renderer/src/features/settings/components/general-tab.tsx
@@ -3,6 +3,7 @@ import isElectron from 'is-electron';
 import { Switch, Select } from '/@/components';
 import { SettingsOptions } from '/@/features/settings/components/settings-option';
 import { THEME_DATA } from '/@/hooks';
+import type { SideQueueType } from '/@/store/settings.store';
 import { useGeneralSettings, useSettingsStoreActions } from '/@/store/settings.store';
 import type { AppTheme } from '/@/themes/types';
 
@@ -28,6 +29,11 @@ const FONT_OPTIONS = [
   { label: 'Work Sans', value: 'Work Sans' },
 ];
 
+const SIDE_QUEUE_OPTIONS = [
+  { label: 'Fixed', value: 'sideQueue' },
+  { label: 'Floating', value: 'sideDrawerQueue' },
+];
+
 export const GeneralTab = () => {
   const settings = useGeneralSettings();
   const { setSettings } = useSettingsStoreActions();
@@ -176,6 +182,46 @@ export const GeneralTab = () => {
     },
   ];
 
+  const layoutOptions = [
+    {
+      control: (
+        <Select
+          data={SIDE_QUEUE_OPTIONS}
+          defaultValue={settings.sideQueueType}
+          onChange={(e) => {
+            setSettings({
+              general: {
+                ...settings,
+                sideQueueType: e as SideQueueType,
+              },
+            });
+          }}
+        />
+      ),
+      description: 'The style of the sidebar play queue',
+      isHidden: false,
+      title: 'Side play queue style',
+    },
+    {
+      control: (
+        <Switch
+          defaultChecked={settings.showQueueDrawerButton}
+          onChange={(e) => {
+            setSettings({
+              general: {
+                ...settings,
+                showQueueDrawerButton: e.currentTarget.checked,
+              },
+            });
+          }}
+        />
+      ),
+      description: 'Display a hover icon on the right side of the application view the play queue',
+      isHidden: false,
+      title: 'Show floating queue hover area',
+    },
+  ];
+
   return (
     <Stack spacing="xl">
       {options
@@ -195,6 +241,15 @@ export const GeneralTab = () => {
             {...option}
           />
         ))}
+      <Divider />
+      {layoutOptions
+        .filter((o) => !o.isHidden)
+        .map((option) => (
+          <SettingsOptions
+            key={`general-${option.title}`}
+            {...option}
+          />
+        ))}
     </Stack>
   );
 };
diff --git a/packages/renderer/src/layouts/default-layout.tsx b/packages/renderer/src/layouts/default-layout.tsx
index 810dadf35..d09ddb425 100644
--- a/packages/renderer/src/layouts/default-layout.tsx
+++ b/packages/renderer/src/layouts/default-layout.tsx
@@ -9,7 +9,7 @@ import { Outlet, useLocation } from 'react-router';
 import styled from 'styled-components';
 import { AppRoute } from '/@/router/routes';
 import { useAppStore } from '/@/store';
-import { useSettingsStore } from '/@/store/settings.store';
+import { useGeneralSettings, useSettingsStore } from '/@/store/settings.store';
 import { PlaybackType } from '/@/types';
 import { constrainRightSidebarWidth, constrainSidebarWidth } from '/@/utils';
 import { Playerbar } from '/@/features/player';
@@ -120,6 +120,7 @@ export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
   const { setSidebar } = useAppStoreActions();
   const [drawer, drawerHandler] = useDisclosure(false);
   const location = useLocation();
+  const { sideQueueType, showQueueDrawerButton } = useGeneralSettings();
 
   const sidebarRef = useRef<HTMLDivElement | null>(null);
   const rightSidebarRef = useRef<HTMLDivElement | null>(null);
@@ -136,8 +137,11 @@ export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
     drawerTimeout.clear();
   }, [drawerTimeout]);
 
-  const showQueueDrawerButton =
-    !sidebar.rightExpanded && !drawer && location.pathname !== AppRoute.NOW_PLAYING;
+  const isQueueDrawerButtonVisible =
+    showQueueDrawerButton &&
+    !sidebar.rightExpanded &&
+    !drawer &&
+    location.pathname !== AppRoute.NOW_PLAYING;
 
   const showSideQueue = sidebar.rightExpanded && location.pathname !== AppRoute.NOW_PLAYING;
 
@@ -249,7 +253,7 @@ export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
       <Layout>
         <MainContainer
           leftSidebarWidth={sidebar.leftWidth}
-          rightExpanded={showSideQueue}
+          rightExpanded={showSideQueue && sideQueueType === 'sideQueue'}
           rightSidebarWidth={sidebar.rightWidth}
         >
           {!shell && (
@@ -270,7 +274,7 @@ export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
                 initial={false}
                 mode="wait"
               >
-                {showQueueDrawerButton && (
+                {isQueueDrawerButtonVisible && (
                   <QueueDrawerArea
                     key="queue-drawer-button"
                     animate="visible"
@@ -311,24 +315,45 @@ export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
                 mode="wait"
               >
                 {showSideQueue && (
-                  <RightSidebarContainer
-                    key="queue-sidebar"
-                    animate="open"
-                    exit="closed"
-                    initial="closed"
-                    variants={queueSidebarVariants}
-                  >
-                    <ResizeHandle
-                      ref={rightSidebarRef}
-                      isResizing={isResizingRight}
-                      placement="left"
-                      onMouseDown={(e) => {
-                        e.preventDefault();
-                        startResizing('right');
-                      }}
-                    />
-                    <SidebarPlayQueue />
-                  </RightSidebarContainer>
+                  <>
+                    {sideQueueType === 'sideQueue' ? (
+                      <RightSidebarContainer
+                        key="queue-sidebar"
+                        animate="open"
+                        exit="closed"
+                        initial="closed"
+                        variants={queueSidebarVariants}
+                      >
+                        <ResizeHandle
+                          ref={rightSidebarRef}
+                          isResizing={isResizingRight}
+                          placement="left"
+                          onMouseDown={(e) => {
+                            e.preventDefault();
+                            startResizing('right');
+                          }}
+                        />
+                        <SidebarPlayQueue />
+                      </RightSidebarContainer>
+                    ) : (
+                      <QueueDrawer
+                        key="queue-drawer"
+                        animate="open"
+                        exit="closed"
+                        initial="closed"
+                        variants={queueDrawerVariants}
+                        onMouseLeave={() => {
+                          // The drawer will close due to the delay when setting isReorderingQueue
+                          setTimeout(() => {
+                            if (useAppStore.getState().isReorderingQueue) return;
+                            drawerHandler.close();
+                          }, 50);
+                        }}
+                      >
+                        <DrawerPlayQueue />
+                      </QueueDrawer>
+                    )}
+                  </>
                 )}
               </AnimatePresence>
             </>
diff --git a/packages/renderer/src/store/settings.store.ts b/packages/renderer/src/store/settings.store.ts
index 4b36daf1f..f9c71e38a 100644
--- a/packages/renderer/src/store/settings.store.ts
+++ b/packages/renderer/src/store/settings.store.ts
@@ -20,11 +20,15 @@ export type DataTableProps = {
   rowHeight: number;
 };
 
+type SideQueue = 'sideQueue' | 'sideDrawerQueue';
+
 export interface SettingsState {
   general: {
     followSystemTheme: boolean;
     fontContent: string;
     fontHeader: string;
+    showQueueDrawerButton: boolean;
+    sideQueueType: SideQueue;
     theme: AppTheme;
     themeDark: AppTheme;
     themeLight: AppTheme;
@@ -75,6 +79,8 @@ export const useSettingsStore = create<SettingsSlice>()(
           followSystemTheme: false,
           fontContent: 'Circular STD',
           fontHeader: 'Gotham',
+          showQueueDrawerButton: true,
+          sideQueueType: 'sideQueue',
           theme: AppTheme.DEFAULT_DARK,
           themeDark: AppTheme.DEFAULT_DARK,
           themeLight: AppTheme.DEFAULT_LIGHT,