Merge pull request #36 from szymon-rd/iteration-fixes

Iteration fixes

Author: kamilszewczyk0

scaladoc/resources/dotty_res/scripts/ux.js

@@ -19,28 +19,28 @@ const attrsToCopy = [
  * @returns {SavedPageState}
  */
 function savePageState(doc) {
-  const attrs = {}
+  const attrs = {};
   for (const attr of attrsToCopy) {
-    attrs[attr] = doc.documentElement.getAttribute(attr)
+    attrs[attr] = doc.documentElement.getAttribute(attr);
   }
   return {
-    mainDiv: doc.querySelector("#main").innerHTML,
+    mainDiv: doc.querySelector("#main")?.innerHTML,
     leftColumn: doc.querySelector("#leftColumn").innerHTML,
     title: doc.title,
     attrs,
-  }
+  };
 }
 
 /**
  * @param {Document} doc
  * @param {SavedPageState} saved
  */
 function loadPageState(doc, saved) {
-  doc.title = saved.title
-  doc.querySelector("#main").innerHTML = saved.mainDiv
-  doc.querySelector("#leftColumn").innerHTML = saved.leftColumn
+  doc.title = saved.title;
+  doc.querySelector("#main").innerHTML = saved.mainDiv;
+  doc.querySelector("#leftColumn").innerHTML = saved.leftColumn;
   for (const attr of attrsToCopy) {
-    doc.documentElement.setAttribute(attr, saved.attrs[attr])
+    doc.documentElement.setAttribute(attr, saved.attrs[attr]);
   }
 }
 
@@ -328,15 +328,23 @@ window.addEventListener(DYNAMIC_PAGE_LOAD, () => {
 });
 
 window.addEventListener("dynamicPageLoad", () => {
-  const leftColumn = document.querySelector(".show");
-  if (leftColumn) leftColumn.classList.remove("show");
+  const sideMenuOpen = sessionStorage.getItem("sideMenuOpen");
+  if (sideMenuOpen) {
+    if (document.querySelector("#leftColumn").classList.contains("show")) {
+      document.querySelector("#content").classList.add("sidebar-shown");
+    }
+    sessionStorage.removeItem("sideMenuOpen");
+  } else {
+    const leftColumn = document.querySelector(".show");
+    if (leftColumn) leftColumn.classList.remove("show");
 
-  const mobileSidebarToggleButton = document.querySelector(".menu-shown");
-  if (mobileSidebarToggleButton)
-    mobileSidebarToggleButton.classList.remove("menu-shown");
+    const mobileSidebarToggleButton = document.querySelector(".menu-shown");
+    if (mobileSidebarToggleButton)
+      mobileSidebarToggleButton.classList.remove("menu-shown");
 
-  const content = document.querySelector(".sidebar-shown");
-  if (content) content.classList.remove("sidebar-shown");
+    const content = document.querySelector(".sidebar-shown");
+    if (content) content.classList.remove("sidebar-shown");
+  }
 });
 
 window.addEventListener("DOMContentLoaded", () => {
@@ -514,7 +522,7 @@ members.forEach((member) => {
     const navbarHeight = document.querySelector("#header").clientHeight;
     const filtersHeight = document.querySelector(
       ".documentableFilter",
-    ).clientHeight;
+    )?.clientHeight;
     if (navbarHeight && filtersHeight) {
       member.style.scrollMarginTop = `${navbarHeight + filtersHeight}px`;
     }
@@ -526,9 +534,22 @@ members.forEach((member) => {
     const navbarHeight = document.querySelector("#header").clientHeight;
     const filtersHeight = document.querySelector(
       ".documentableFilter",
-    ).clientHeight;
+    )?.clientHeight;
     if (navbarHeight && filtersHeight) {
       member.style.scrollMarginTop = `${navbarHeight + filtersHeight}px`;
     }
   });
+});
+
+window.addEventListener(DYNAMIC_PAGE_LOAD, () => {
+  const docsLink = document.querySelector("#docs-nav-button");
+  const apiLink = document.querySelector("#api-nav-button");
+
+  docsLink &&
+    apiLink &&
+    [docsLink, apiLink].forEach((button) => {
+      button.addEventListener("click", () => {
+        sessionStorage.setItem("sideMenuOpen", true);
+      });
+    });
 });

scaladoc/resources/dotty_res/styles/theme/components/table-of-content.css

@@ -11,6 +11,13 @@
   padding: var(--base-spacing);
 }
 
+@media (max-height: 600px) and (orientation: landscape){
+  #toc-container {
+   position: fixed;
+   top: 90px;
+  }
+}
+
 .toc-list {
   margin-block-start: calc(2 * var(--base-spacing));
   margin-block-end: 0;
@@ -35,13 +42,20 @@
     left: calc(102 * var(--base-spacing));
   }
 }*/
+@media (max-height: 820px) and (orientation: landscape){
+  .toc-nav {
+    max-height: calc(100vh - 200px);
+    overflow: auto;
+  }
+}
 
 @media (max-width: 768px) {
   #toc {
     display: none;
   }
 }
 
+
 .toc-title {
   color: var(--text-primary);
   margin-bottom: calc(2 * var(--base-spacing));

scaladoc/resources/dotty_res/styles/theme/layout/mobileMenu.css

@@ -6,7 +6,7 @@
   left: 0;
   height: 100%;
   width: 100%;
-  z-index: 3;
+  z-index: 103;
 }
 
 #mobile-menu.show {