From 31c45781a043726bf46538f6bca069ebddd9823e Mon Sep 17 00:00:00 2001
From: EnixCoda <enixcoda@gmail.com>
Date: Sun, 23 May 2021 02:19:01 +0800
Subject: [PATCH] feat: core toggle mode switch

---
 src/components/SideBar.tsx                  | 12 +++++++++---
 src/components/settings/SidebarSettings.tsx | 10 ++++++++++
 src/styles/index.scss                       | 18 ++++++++++++------
 src/utils/configHelper.ts                   |  3 +++
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index 73fb14d..e7ba0da 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -51,14 +51,15 @@ export function SideBar() {
     }
   }, [hasMetaData])
 
+  const sidebarToggleMode = configContext.value.sidebarToggleMode
   const $shouldShow = useStateIO(false)
   const shouldShow = $shouldShow.value
   React.useEffect(() => {
-    DOMHelper.setBodyIndent(shouldShow)
+    DOMHelper.setBodyIndent(shouldShow && sidebarToggleMode === 'persistent')
     if (shouldShow) {
       DOMHelper.focusFileExplorer() // TODO: verify if it works
     }
-  }, [shouldShow])
+  }, [shouldShow, sidebarToggleMode])
 
   const intelligentToggle = configContext.value.intelligentToggle
 
@@ -105,7 +106,12 @@ export function SideBar() {
         <Portal into={$logoContainerElement.value}>
           {!shouldShow && <ToggleShowButton error={error} onClick={toggleShowSideBar} />}
         </Portal>
-        <SideBarBodyWrapper className={cx({ hidden: error || !shouldShow })} baseSize={baseSize}>
+        <SideBarBodyWrapper
+          className={cx(`toggle-mode-${sidebarToggleMode}`, {
+            hidden: error || !shouldShow,
+          })}
+          baseSize={baseSize}
+        >
           <div className={'gitako-side-bar-body'}>
             <div className={'close-side-bar-button-position'}>
               <button className={'close-side-bar-button'} onClick={toggleShowSideBar}>
diff --git a/src/components/settings/SidebarSettings.tsx b/src/components/settings/SidebarSettings.tsx
index 8f805b0..5707319 100644
--- a/src/components/settings/SidebarSettings.tsx
+++ b/src/components/settings/SidebarSettings.tsx
@@ -90,6 +90,16 @@ export function SidebarSettings(props: React.PropsWithChildren<Props>) {
           value={configContext.value.toggleButtonContent}
         ></SelectInput>
       </Field>
+      <SimpleToggleField
+        field={{
+          key: 'sidebarToggleMode',
+          label: 'Dock sidebar on expand',
+          overwrite: {
+            value: enabled => enabled === 'persistent',
+            onChange: checked => (checked ? 'persistent' : 'float'),
+          },
+        }}
+      />
       <SimpleToggleField
         field={{
           key: 'intelligentToggle',
diff --git a/src/styles/index.scss b/src/styles/index.scss
index a452a3b..7e0f1b7 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -272,8 +272,18 @@ $minimal-z-index: max($github-header-z-index, $github-pull-request-float-header-
     z-index: $minimal-z-index;
     display: flex;
 
-    &.hidden {
-      @extend %hidden;
+    &.toggle-mode-persistent {
+      &.hidden {
+        @extend %hidden;
+      }
+    }
+
+    &.toggle-mode-float {
+      left: 0%;
+      transition: all 0.3s ease;
+      &.hidden {
+        left: -100%;
+      }
     }
 
     .gitako-side-bar-body-wrapper-content {
@@ -315,10 +325,6 @@ $minimal-z-index: max($github-header-z-index, $github-pull-request-float-header-
     border-left: 1px solid var(--gitako-border-overlay);
     overflow: hidden;
 
-    &.hidden {
-      @extend %hidden;
-    }
-
     .octicon {
       transition: transform 0.3s ease;
       color: var(--gitako-icon-tertiary);
diff --git a/src/utils/configHelper.ts b/src/utils/configHelper.ts
index 4203d31..f949e85 100644
--- a/src/utils/configHelper.ts
+++ b/src/utils/configHelper.ts
@@ -14,6 +14,7 @@ export type Config = {
   toggleButtonContent: 'logo' | 'octoface'
   recursiveToggleFolder: 'shift' | 'alt'
   searchMode: SearchMode
+  sidebarToggleMode: 'persistent' | 'float'
 }
 
 enum configKeys {
@@ -29,6 +30,7 @@ enum configKeys {
   toggleButtonContent = 'toggleButtonContent',
   recursiveToggleFolder = 'recursiveToggleFolder',
   searchMode = 'searchMode',
+  sidebarToggleMode = 'sidebarToggleMode',
 }
 
 const defaultConfigs: Config = {
@@ -44,6 +46,7 @@ const defaultConfigs: Config = {
   toggleButtonContent: 'logo',
   recursiveToggleFolder: 'shift',
   searchMode: 'fuzzy',
+  sidebarToggleMode: 'float',
 }
 
 const configKeyArray = Object.values(configKeys)