@brillout/docpress 0.6.21-commit-e35fa3b → 0.6.21-commit-d3557c8

package/navigation/initMobileNavigation.ts

@@ -1,6 +1,5 @@
 export { initMobileNavigation }
-
-hideNavigationOnLinkClick()
+export { hideMobileNavigation }
 
 function initMobileNavigation() {
   activateMobileShowNavigationToggle()
@@ -16,27 +15,9 @@ function activateMobileNavigationMask() {
   navigationMask.onclick = toggleNavigation
 }
 
-function hideNavigationOnLinkClick() {
-  document.addEventListener('click', (ev) => {
-    const linkTag = findLinkTag(ev.target as HTMLElement)
-    if (!linkTag) return
-    hideNavigation()
-  })
-}
-function findLinkTag(target: HTMLElement): null | HTMLElement {
-  while (target.tagName !== 'A') {
-    const { parentNode } = target
-    if (!parentNode) {
-      return null
-    }
-    target = parentNode as HTMLElement
-  }
-  return target
-}
-
 function toggleNavigation() {
   document.body.classList.toggle('mobile-show-navigation')
 }
-function hideNavigation() {
+function hideMobileNavigation() {
   document.body.classList.remove('mobile-show-navigation')
 }

package/navigation/navigation-fullscreen/initNavigationFullscreen.ts

@@ -1,14 +1,12 @@
 export { initNavigationFullscreen }
+export { hideNavigationFullScreen }
 
 import { assert } from '../../utils/client'
-
 let scrollPositionBeforeToggle: number = 0
+initOnce()
 
-function initNavigationFullscreen() {
-  updateColumnWidth()
+function initOnce() {
   window.addEventListener('resize', updateColumnWidth, { passive: true })
-  document.getElementById('navigation-fullscreen-button')!.onclick = toggleNavExpend
-  document.getElementById('navigation-fullscreen-close')!.onclick = toggleNavExpend
   document.addEventListener(
     // We don't use keydown to not interfere with user pressing `<Esc>` for closing the browser's `<Ctrl-F>` search diablog, see https://stackoverflow.com/questions/66595035/how-to-detect-escape-key-if-search-bar-of-browser-is-open
     'keydown',
@@ -19,6 +17,11 @@ function initNavigationFullscreen() {
     false,
   )
 }
+function initNavigationFullscreen() {
+  updateColumnWidth()
+  document.getElementById('navigation-fullscreen-button')!.onclick = toggleNavExpend
+  document.getElementById('navigation-fullscreen-close')!.onclick = toggleNavExpend
+}
 
 function toggleNavExpend() {
   const navContainer = document.getElementById('navigation-container')!
@@ -29,6 +32,10 @@ function toggleNavExpend() {
   }
   scrollPositionBeforeToggle = scrollPos
 }
+function hideNavigationFullScreen() {
+  if (!document.documentElement.classList.contains('navigation-fullscreen')) return
+  toggleNavExpend()
+}
 
 function updateColumnWidth() {
   const navMinWidth = 299

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.6.21-commit-e35fa3b",
+  "version": "0.6.21-commit-d3557c8",
   "type": "module",
   "scripts": {
     "// Build vite.config.ts and +config.ts": "",

package/renderer/onRenderClient.tsx

@@ -5,14 +5,19 @@ import type { PageContextClient } from 'vike/types'
 import ReactDOM from 'react-dom/client'
 import { PageContextResolved } from '../config/resolvePageContext'
 import { getPageElement } from './getPageElement'
-import { initNavigationFullscreen } from '../navigation/navigation-fullscreen/initNavigationFullscreen'
-import { initMobileNavigation } from '../navigation/initMobileNavigation'
+import {
+  hideNavigationFullScreen,
+  initNavigationFullscreen,
+} from '../navigation/navigation-fullscreen/initNavigationFullscreen'
+import { hideMobileNavigation, initMobileNavigation } from '../navigation/initMobileNavigation'
 import { initPressKit } from '../navigation/initPressKit'
 import '../css/index.css'
 import { autoScrollNav } from '../autoScrollNav'
 import { installSectionUrlHashs } from '../installSectionUrlHashs'
 import { addFeatureClickHandlers, addTwitterWidgets } from '../components/FeatureList/FeatureList.client'
 
+initOnLinkClick()
+
 let root: ReactDOM.Root
 function onRenderClient(pageContext: PageContextClient) {
   const pageContextResolved: PageContextResolved = (pageContext as any).pageContextResolved
@@ -45,6 +50,26 @@ function OnRenderDoneHook({ children }: { children: React.ReactNode }) {
   return children
 }
 
+function initOnLinkClick() {
+  document.addEventListener('click', (ev) => {
+    const linkTag = findLinkTag(ev.target as HTMLElement)
+    if (!linkTag) return
+    hideMobileNavigation()
+    hideNavigationFullScreen()
+  })
+}
+
+function findLinkTag(target: HTMLElement): null | HTMLElement {
+  while (target.tagName !== 'A') {
+    const { parentNode } = target
+    if (!parentNode) {
+      return null
+    }
+    target = parentNode as HTMLElement
+  }
+  return target
+}
+
 function setHydrationIsFinished() {
   // Used by:
   // - https://github.com/vikejs/vike/blob/9d67f3dd4bdfb38c835186b8147251e0e3b06657/docs/.testRun.ts#L22