Skip to content

Build your personal knowledge base with Trilium Notes

fix(share): close mobile panels from the backdrop and after a ToC jump

perfectra1n095d7766b5c0
diff --git a/packages/share-theme/src/scripts/modules/mobile.ts b/packages/share-theme/src/scripts/modules/mobile.ts
index 36f600e8cd..8a76fddfec 100644
--- a/packages/share-theme/src/scripts/modules/mobile.ts
+++ b/packages/share-theme/src/scripts/modules/mobile.ts
@@ -1,25 +1,10 @@
-
export default function setupMobileMenu() {
- function closeMobileMenus() {
- document.body.classList.remove("menu-open");
- document.body.classList.remove("toc-open");
- }
-
- window.addEventListener("click", e => {
- const isMenuOpen = document.body.classList.contains("menu-open");
- const isTocOpen = document.body.classList.contains("toc-open");
- if (!isMenuOpen && !isTocOpen) return;
-
- const target = e.target as HTMLElement;
-
- // If the click was anywhere in the mobile nav or TOC, don't close
- if (target.closest("#left-pane")) return;
- if (target.closest("#toc-pane")) return;
-
- // If the click was on one of the toggle buttons, the button's own listener will handle it
- if (target.closest(".header-button")) return;
-
- return closeMobileMenus();
- });
+ // A listener on the backdrop itself, not on `window`: iOS Safari dispatches no `click` for a
+ // tap on an element it does not consider clickable, and `window` listeners do not count.
+ document.getElementById("mobile-backdrop")?.addEventListener("click", closeMobileMenus);
+}
+export function closeMobileMenus() {
+ document.body.classList.remove("menu-open");
+ document.body.classList.remove("toc-open");
}
diff --git a/packages/share-theme/src/scripts/modules/toc.ts b/packages/share-theme/src/scripts/modules/toc.ts
index 6d7ca2cfde..e83ea0bbab 100644
--- a/packages/share-theme/src/scripts/modules/toc.ts
+++ b/packages/share-theme/src/scripts/modules/toc.ts
@@ -1,3 +1,5 @@
+import { closeMobileMenus } from "./mobile.js";
+
/**
* The ToC is now generated in the page template so
* it even exists for users without client-side js
@@ -26,6 +28,7 @@ export default function setupToC() {
e.stopPropagation();
target.scrollIntoView({behavior: "smooth"});
+ closeMobileMenus();
});
}
diff --git a/packages/share-theme/src/styles/mobile.css b/packages/share-theme/src/styles/mobile.css
index 09bba1ba64..161903bb85 100644
--- a/packages/share-theme/src/styles/mobile.css
+++ b/packages/share-theme/src/styles/mobile.css
@@ -40,6 +40,10 @@
width: 32px;
}
+#mobile-backdrop {
+ display: none;
+}
+
@media (max-width: 48em) {
html,
@@ -99,22 +103,18 @@
transform: translateX(0);
}
- body::before {
- content: "";
+ #mobile-backdrop {
display: block;
position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
+ inset: 0;
background: rgba(0,0,0,0);
pointer-events: none;
transition: background-color 200ms ease;
z-index: 1;
}
- body.menu-open::before,
- body.toc-open::before {
+ body.menu-open #mobile-backdrop,
+ body.toc-open #mobile-backdrop {
background: rgba(0,0,0, 0.6);
pointer-events: auto;
}
diff --git a/packages/share-theme/src/templates/page.ejs b/packages/share-theme/src/templates/page.ejs
index d940f69e04..4469834aaf 100644
--- a/packages/share-theme/src/templates/page.ejs
+++ b/packages/share-theme/src/templates/page.ejs
@@ -249,6 +249,7 @@ content = content.replaceAll(headingRe, (...match) => {
<% } %>
</div>
</div>
+<div id="mobile-backdrop"></div>
<%- renderSnippets("body:end") %>
</body>
</html>