From 9c37c5cd224540a9c001cf480e6d8a45bb73c9bc Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Tue, 13 Oct 2020 19:20:54 +0800
Subject: [PATCH 1/8] [refactor] hideSidebar.

---
 src/core/config.js       |  1 +
 src/core/fetch/index.js  | 27 ++++++++++++++++++++-------
 src/core/render/index.js | 15 ++-------------
 src/core/render/tpl.js   |  3 ++-
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/core/config.js b/src/core/config.js
index 2d23f5db2..1429b4977 100644
--- a/src/core/config.js
+++ b/src/core/config.js
@@ -11,6 +11,7 @@ export default function(vm) {
       subMaxLevel: 0,
       loadSidebar: null,
       loadNavbar: null,
+      hideSidebar: false,
       homepage: 'README.md',
       coverpage: '',
       basePath: '',
diff --git a/src/core/fetch/index.js b/src/core/fetch/index.js
index 1853a0297..dde21afe9 100644
--- a/src/core/fetch/index.js
+++ b/src/core/fetch/index.js
@@ -85,8 +85,11 @@ export function fetchMixin(proto) {
     return path404;
   };
 
-  proto._loadSideAndNav = function(path, qs, loadSidebar, cb) {
+  proto._loadSideAndNav = function(path, qs, loadSidebar, hideSidebar, cb) {
     return () => {
+      if (hideSidebar) {
+        return;
+      }
       if (!loadSidebar) {
         return cb();
       }
@@ -104,7 +107,12 @@ export function fetchMixin(proto) {
   proto._fetch = function(cb = noop) {
     const { path, query } = this.route;
     const qs = stringifyQuery(query, ['id']);
-    const { loadNavbar, requestHeaders, loadSidebar } = this.config;
+    const {
+      loadNavbar,
+      requestHeaders,
+      loadSidebar,
+      hideSidebar,
+    } = this.config;
     // Abort last request
 
     const file = this.router.getFile(path);
@@ -120,7 +128,7 @@ export function fetchMixin(proto) {
         this._renderMain(
           text,
           opt,
-          this._loadSideAndNav(path, qs, loadSidebar, cb)
+          this._loadSideAndNav(path, qs, loadSidebar, hideSidebar, cb)
         ),
       _ => {
         this._fetchFallbackPage(path, qs, cb) || this._fetch404(file, qs, cb);
@@ -197,7 +205,12 @@ export function fetchMixin(proto) {
   };
 
   proto._fetchFallbackPage = function(path, qs, cb = noop) {
-    const { requestHeaders, fallbackLanguages, loadSidebar } = this.config;
+    const {
+      requestHeaders,
+      fallbackLanguages,
+      loadSidebar,
+      hideSidebar,
+    } = this.config;
 
     if (!fallbackLanguages) {
       return false;
@@ -219,7 +232,7 @@ export function fetchMixin(proto) {
         this._renderMain(
           text,
           opt,
-          this._loadSideAndNav(path, qs, loadSidebar, cb)
+          this._loadSideAndNav(path, qs, loadSidebar, hideSidebar, cb)
         ),
       () => this._fetch404(path, qs, cb)
     );
@@ -255,7 +268,7 @@ export function fetchMixin(proto) {
 }
 
 export function initFetch(vm) {
-  const { loadSidebar } = vm.config;
+  const { loadSidebar, hideSidebar } = vm.config;
 
   // Server-Side Rendering
   if (vm.rendered) {
@@ -264,7 +277,7 @@ export function initFetch(vm) {
       activeEl.parentNode.innerHTML += window.__SUB_SIDEBAR__;
     }
 
-    vm._bindEventOnRendered(activeEl);
+    !hideSidebar && vm._bindEventOnRendered(activeEl);
     vm.$resetEvents();
     callHook(vm, 'doneEach');
     callHook(vm, 'ready');
diff --git a/src/core/render/index.js b/src/core/render/index.js
index 42e62ba96..0984fab58 100644
--- a/src/core/render/index.js
+++ b/src/core/render/index.js
@@ -48,7 +48,7 @@ function renderMain(html) {
   this._renderTo('.markdown-section', html);
 
   // Render sidebar with the TOC
-  !this.config.loadSidebar && this._renderSidebar();
+  !this.config.loadSidebar && !this.config.hideSidebar && this._renderSidebar();
 
   // Execute markdown <script>
   if (
@@ -128,18 +128,7 @@ export function renderMixin(proto) {
   };
 
   proto._renderSidebar = function(text) {
-    const { maxLevel, subMaxLevel, loadSidebar, hideSidebar } = this.config;
-
-    if (hideSidebar) {
-      // FIXME : better styling solution
-      document.querySelector('aside.sidebar').remove();
-      document.querySelector('button.sidebar-toggle').remove();
-      document.querySelector('section.content').style.right = 'unset';
-      document.querySelector('section.content').style.left = 'unset';
-      document.querySelector('section.content').style.position = 'relative';
-      document.querySelector('section.content').style.width = '100%';
-      return null;
-    }
+    const { maxLevel, subMaxLevel, loadSidebar } = this.config;
 
     this._renderTo('.sidebar-nav', this.compiler.sidebar(text, maxLevel));
     const activeEl = getAndActive(this.router, '.sidebar-nav', true, true);
diff --git a/src/core/render/tpl.js b/src/core/render/tpl.js
index 2bad3a311..a450461a3 100644
--- a/src/core/render/tpl.js
+++ b/src/core/render/tpl.js
@@ -51,7 +51,8 @@ export function main(config) {
     '<div class="sidebar-nav"><!--sidebar--></div>' +
     '</aside>';
   return (
-    `<main>${aside}` +
+    '<main>' +
+    (!config.hideSidebar ? `${aside}` : '') +
     '<section class="content">' +
     '<article class="markdown-section" id="main"><!--main--></article>' +
     '</section>' +

From 676f13a40300c2e8b752c2e1a625f4e46e117494 Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Tue, 13 Oct 2020 19:25:45 +0800
Subject: [PATCH 2/8] [update docs] rt.

---
 docs/configuration.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 7a65553a3..a708d69d0 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -108,9 +108,10 @@ window.$docsify = {
 ## hideSidebar
 
 - Type : `Boolean`
-- Default: `true`
+- Default: `false`
 
-This option will completely hide your sidebar and won't render any content on the side.
+This option will completely hide your sidebar and won't render any content on the side.  
+Meanwhile, the search plugin won't work either. 
 
 ```js
 window.$docsify = {

From cfe1fa8ac68361c588c9cab4ee57210505161fbd Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Tue, 13 Oct 2020 19:20:54 +0800
Subject: [PATCH 3/8] [refactor] hideSidebar.

---
 src/core/config.js       |  1 +
 src/core/fetch/index.js  | 27 ++++++++++++++++++++-------
 src/core/render/index.js | 15 ++-------------
 src/core/render/tpl.js   |  3 ++-
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/core/config.js b/src/core/config.js
index 2d23f5db2..1429b4977 100644
--- a/src/core/config.js
+++ b/src/core/config.js
@@ -11,6 +11,7 @@ export default function(vm) {
       subMaxLevel: 0,
       loadSidebar: null,
       loadNavbar: null,
+      hideSidebar: false,
       homepage: 'README.md',
       coverpage: '',
       basePath: '',
diff --git a/src/core/fetch/index.js b/src/core/fetch/index.js
index 1853a0297..dde21afe9 100644
--- a/src/core/fetch/index.js
+++ b/src/core/fetch/index.js
@@ -85,8 +85,11 @@ export function fetchMixin(proto) {
     return path404;
   };
 
-  proto._loadSideAndNav = function(path, qs, loadSidebar, cb) {
+  proto._loadSideAndNav = function(path, qs, loadSidebar, hideSidebar, cb) {
     return () => {
+      if (hideSidebar) {
+        return;
+      }
       if (!loadSidebar) {
         return cb();
       }
@@ -104,7 +107,12 @@ export function fetchMixin(proto) {
   proto._fetch = function(cb = noop) {
     const { path, query } = this.route;
     const qs = stringifyQuery(query, ['id']);
-    const { loadNavbar, requestHeaders, loadSidebar } = this.config;
+    const {
+      loadNavbar,
+      requestHeaders,
+      loadSidebar,
+      hideSidebar,
+    } = this.config;
     // Abort last request
 
     const file = this.router.getFile(path);
@@ -120,7 +128,7 @@ export function fetchMixin(proto) {
         this._renderMain(
           text,
           opt,
-          this._loadSideAndNav(path, qs, loadSidebar, cb)
+          this._loadSideAndNav(path, qs, loadSidebar, hideSidebar, cb)
         ),
       _ => {
         this._fetchFallbackPage(path, qs, cb) || this._fetch404(file, qs, cb);
@@ -197,7 +205,12 @@ export function fetchMixin(proto) {
   };
 
   proto._fetchFallbackPage = function(path, qs, cb = noop) {
-    const { requestHeaders, fallbackLanguages, loadSidebar } = this.config;
+    const {
+      requestHeaders,
+      fallbackLanguages,
+      loadSidebar,
+      hideSidebar,
+    } = this.config;
 
     if (!fallbackLanguages) {
       return false;
@@ -219,7 +232,7 @@ export function fetchMixin(proto) {
         this._renderMain(
           text,
           opt,
-          this._loadSideAndNav(path, qs, loadSidebar, cb)
+          this._loadSideAndNav(path, qs, loadSidebar, hideSidebar, cb)
         ),
       () => this._fetch404(path, qs, cb)
     );
@@ -255,7 +268,7 @@ export function fetchMixin(proto) {
 }
 
 export function initFetch(vm) {
-  const { loadSidebar } = vm.config;
+  const { loadSidebar, hideSidebar } = vm.config;
 
   // Server-Side Rendering
   if (vm.rendered) {
@@ -264,7 +277,7 @@ export function initFetch(vm) {
       activeEl.parentNode.innerHTML += window.__SUB_SIDEBAR__;
     }
 
-    vm._bindEventOnRendered(activeEl);
+    !hideSidebar && vm._bindEventOnRendered(activeEl);
     vm.$resetEvents();
     callHook(vm, 'doneEach');
     callHook(vm, 'ready');
diff --git a/src/core/render/index.js b/src/core/render/index.js
index 42e62ba96..0984fab58 100644
--- a/src/core/render/index.js
+++ b/src/core/render/index.js
@@ -48,7 +48,7 @@ function renderMain(html) {
   this._renderTo('.markdown-section', html);
 
   // Render sidebar with the TOC
-  !this.config.loadSidebar && this._renderSidebar();
+  !this.config.loadSidebar && !this.config.hideSidebar && this._renderSidebar();
 
   // Execute markdown <script>
   if (
@@ -128,18 +128,7 @@ export function renderMixin(proto) {
   };
 
   proto._renderSidebar = function(text) {
-    const { maxLevel, subMaxLevel, loadSidebar, hideSidebar } = this.config;
-
-    if (hideSidebar) {
-      // FIXME : better styling solution
-      document.querySelector('aside.sidebar').remove();
-      document.querySelector('button.sidebar-toggle').remove();
-      document.querySelector('section.content').style.right = 'unset';
-      document.querySelector('section.content').style.left = 'unset';
-      document.querySelector('section.content').style.position = 'relative';
-      document.querySelector('section.content').style.width = '100%';
-      return null;
-    }
+    const { maxLevel, subMaxLevel, loadSidebar } = this.config;
 
     this._renderTo('.sidebar-nav', this.compiler.sidebar(text, maxLevel));
     const activeEl = getAndActive(this.router, '.sidebar-nav', true, true);
diff --git a/src/core/render/tpl.js b/src/core/render/tpl.js
index 2bad3a311..a450461a3 100644
--- a/src/core/render/tpl.js
+++ b/src/core/render/tpl.js
@@ -51,7 +51,8 @@ export function main(config) {
     '<div class="sidebar-nav"><!--sidebar--></div>' +
     '</aside>';
   return (
-    `<main>${aside}` +
+    '<main>' +
+    (!config.hideSidebar ? `${aside}` : '') +
     '<section class="content">' +
     '<article class="markdown-section" id="main"><!--main--></article>' +
     '</section>' +

From 3e7f27d8f98ab0aafd7458d29a96da3b33674e8b Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Tue, 13 Oct 2020 19:25:45 +0800
Subject: [PATCH 4/8] [update docs] rt.

---
 docs/configuration.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 7a65553a3..a708d69d0 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -108,9 +108,10 @@ window.$docsify = {
 ## hideSidebar
 
 - Type : `Boolean`
-- Default: `true`
+- Default: `false`
 
-This option will completely hide your sidebar and won't render any content on the side.
+This option will completely hide your sidebar and won't render any content on the side.  
+Meanwhile, the search plugin won't work either. 
 
 ```js
 window.$docsify = {

From 6368d65ae573d68868df7a34798eedef96276df9 Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Wed, 14 Oct 2020 17:31:15 +0800
Subject: [PATCH 5/8] add test.

---
 test/integration/configuration.test.js | 70 ++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 test/integration/configuration.test.js

diff --git a/test/integration/configuration.test.js b/test/integration/configuration.test.js
new file mode 100644
index 000000000..30cca24a6
--- /dev/null
+++ b/test/integration/configuration.test.js
@@ -0,0 +1,70 @@
+const docsifyInit = require('../helpers/docsify-init');
+
+// Suite
+// -----------------------------------------------------------------------------
+describe('Configuration Tests', function() {
+  // Tests
+  // ---------------------------------------------------------------------------
+  test('Configuration hideSidebar', async () => {
+    // Init docsify basic fully site
+    const docsifyInitConfig = {
+      config: {
+        name: 'Docsify Name',
+        hideSidebar: true,
+      },
+      markdown: {
+        coverpage: `
+          # Docsify Test
+
+          > Testing a magical documentation site generator
+
+          [GitHub](https://github.com/docsifyjs/docsify/)
+        `,
+        homepage: `
+          # Hello World
+
+          This is the homepage.
+        `,
+        navbar: `
+          - [docsify.js.org](https://docsify.js.org/#/)
+        `,
+        sidebar: `
+          - [Test Page](test)
+        `,
+      },
+      routes: {
+        '/test.md': `
+          # Test Page
+
+          This is a custom route.
+        `,
+        '/data-test-scripturls.js': `
+          document.body.setAttribute('data-test-scripturls', 'pass');
+        `,
+      },
+      script: `
+        document.body.setAttribute('data-test-script', 'pass');
+      `,
+      scriptURLs: ['/data-test-scripturls.js', '/lib/plugins/search.min.js'],
+      style: `
+        body {
+          background: red !important;
+        }
+      `,
+      styleURLs: ['/lib/themes/vue.css'],
+    };
+
+    await docsifyInit({
+      ...docsifyInitConfig,
+    });
+
+    // Verify config options
+    expect(typeof window.$docsify).toEqual('object');
+    expect(window.$docsify).toHaveProperty('hideSidebar', true);
+
+    // Verify sidebar not exist
+    // There should use toEqual(null), not toBeNull
+    expect(document.querySelector('aside.sidebar')).toBeNull();
+    expect(document.querySelector('button.sidebar-toggle')).toBeNull();
+  });
+});

From 170f6f76cbf9f6b945342cb9ce9c3dd39f5be432 Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Wed, 14 Oct 2020 17:35:32 +0800
Subject: [PATCH 6/8] snyc.

---
 test/e2e/sidebar.test.js | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 test/e2e/sidebar.test.js

diff --git a/test/e2e/sidebar.test.js b/test/e2e/sidebar.test.js
deleted file mode 100644
index 3b58bdf5a..000000000
--- a/test/e2e/sidebar.test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const docsifyInit = require('../helpers/docsify-init');
-
-// Suite
-// -----------------------------------------------------------------------------
-describe('Sidebar Tests', function() {
-  // Tests
-  // ---------------------------------------------------------------------------
-  test('search readme', async () => {
-    await docsifyInit();
-    await page.goto(DOCS_URL + '/#/quickstart');
-    await page.fill('input[type=search]', 'Please consider donating');
-    expect(
-      await page.innerText('.results-panel > .matching-post > a > h2')
-    ).toEqual('Donate');
-  });
-});

From 64261b2632d177f3fe06dc3c6e712aef18a5e745 Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Wed, 14 Oct 2020 17:38:57 +0800
Subject: [PATCH 7/8] refine.

---
 src/core/render/index.js               | 2 +-
 test/integration/configuration.test.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/render/index.js b/src/core/render/index.js
index 0984fab58..8e40cfc53 100644
--- a/src/core/render/index.js
+++ b/src/core/render/index.js
@@ -48,7 +48,7 @@ function renderMain(html) {
   this._renderTo('.markdown-section', html);
 
   // Render sidebar with the TOC
-  !this.config.loadSidebar && !this.config.hideSidebar && this._renderSidebar();
+  !this.config.hideSidebar && !this.config.loadSidebar && this._renderSidebar();
 
   // Execute markdown <script>
   if (
diff --git a/test/integration/configuration.test.js b/test/integration/configuration.test.js
index 30cca24a6..dc7e290df 100644
--- a/test/integration/configuration.test.js
+++ b/test/integration/configuration.test.js
@@ -63,7 +63,6 @@ describe('Configuration Tests', function() {
     expect(window.$docsify).toHaveProperty('hideSidebar', true);
 
     // Verify sidebar not exist
-    // There should use toEqual(null), not toBeNull
     expect(document.querySelector('aside.sidebar')).toBeNull();
     expect(document.querySelector('button.sidebar-toggle')).toBeNull();
   });

From 45d1a12fa6c24672f5732aa5e5c6c2a16547b76f Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Wed, 14 Oct 2020 17:47:55 +0800
Subject: [PATCH 8/8] snyc.

---
 src/plugins/search/search.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/plugins/search/search.js b/src/plugins/search/search.js
index 5c7f38bca..18fb88ea4 100644
--- a/src/plugins/search/search.js
+++ b/src/plugins/search/search.js
@@ -226,9 +226,6 @@ export function init(config, vm) {
         namespaceSuffix = matches[0];
       }
     }
-    paths.unshift(namespaceSuffix + '/');
-  } else {
-    paths.unshift('/');
   }
 
   const expireKey = resolveExpireKey(config.namespace) + namespaceSuffix;