From eacc06c9af6bac946b5fc072093c77c50bdd46f0 Mon Sep 17 00:00:00 2001
From: slorber <lorber.sebastien@gmail.com>
Date: Mon, 7 Sep 2020 15:05:17 +0200
Subject: [PATCH] Reset sidebar state on sidebar changes

---
 .../docusaurus-theme-bootstrap/src/theme/DocPage/index.js   | 6 +++++-
 .../docusaurus-theme-classic/src/theme/DocPage/index.tsx    | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/docusaurus-theme-bootstrap/src/theme/DocPage/index.js b/packages/docusaurus-theme-bootstrap/src/theme/DocPage/index.js
index 6f2922b8e31e..d63a812e8d20 100644
--- a/packages/docusaurus-theme-bootstrap/src/theme/DocPage/index.js
+++ b/packages/docusaurus-theme-bootstrap/src/theme/DocPage/index.js
@@ -23,7 +23,11 @@ function DocPageContent({currentDocRoute, versionMetadata, children}) {
       <div className="d-flex vh-100 overflow-hidden">
         {sidebar && (
           <div className="vh-100" role="complementary">
-            <DocSidebar path={currentDocRoute.path} sidebar={sidebar} />
+            <DocSidebar
+              key={sidebarName}
+              path={currentDocRoute.path}
+              sidebar={sidebar}
+            />
           </div>
         )}
         <main className="vh-100 w-100 d-flex flex-column align-items-center overflow-auto p-5">
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
index 218189d968c9..bc2a44f64ddf 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
@@ -69,6 +69,11 @@ function DocPageContent({
           {sidebar && (
             <div className={styles.docSidebarContainer} role="complementary">
               <DocSidebar
+                key={
+                  // Reset sidebar state on sidebar changes
+                  // See https://github.com/facebook/docusaurus/issues/3414
+                  sidebarName
+                }
                 sidebar={sidebar}
                 path={currentDocRoute.path}
                 sidebarCollapsible={