Merge branch 'master' into fix/delete-readme-images

packages/app/src/components/Sidebar.tsx

@@ -72,7 +72,7 @@ const SidebarContentsWrapper = () => {
       />
 
       <div id="grw-sidebar-contents-scroll-target" style={{ minHeight: '100%' }}>
-        <div id="grw-sidebar-content-container" onLoad={() => setResetKey(Math.random())}>
+        <div id="grw-sidebar-content-container" className="grw-sidebar-content-container" onLoad={() => setResetKey(Math.random())}>
           <SidebarContents />
         </div>
       </div>

packages/app/src/styles/_sidebar.scss

@@ -44,6 +44,7 @@
       flex-direction: row;
       height: 100%;
       overflow: hidden;
+
       .grw-contextual-navigation {
         position: relative;
         width: 240px;
@@ -77,6 +78,11 @@
           }
         }
       }
+
+      .grw-sidebar-content-container {
+        position: relative;
+        z-index: 110; // greater than the value of .grw-navigation-draggable to fix https://redmine.weseek.co.jp/issues/86678
+      }
     }
     .grw-navigation-draggable {
       position: absolute;