Merge pull request #587 from docat-org/fix/docs-blinking-when-changin…

…g-hash Fix: Docs blinking when navigating between hashes or pages
docat-org · Aug 30, 2023 · c14824d · c14824d
2 parents 8f88f84 + 55e3b2e
commit c14824d
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/web/src/pages/Docs.tsx b/web/src/pages/Docs.tsx
@@ -3,7 +3,7 @@
   the iFrameRef is not really compatiple with ts,
 */
 
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useEffect, useRef, useMemo, useState } from 'react'
 import { useLocation, useParams, useSearchParams } from 'react-router-dom'
 import DocumentControlButtons from '../components/DocumentControlButtons'
 import ProjectDetails from '../models/ProjectDetails'
@@ -36,22 +36,34 @@ export default function Docs (): JSX.Element {
   const location = useLocation()
   const iFrameRef = useRef<HTMLIFrameElement>(null)
 
+  const iFrame = useMemo(() => {
+    return (<iframe
+        ref={iFrameRef}
+        key={uniqueId()}
+        src={ProjectRepository.getProjectDocsURL(project, version, page, hash)}
+        title="docs"
+        className={styles['docs-iframe']}
+        onLoad={() => {
+          if (iFrameRef.current == null) {
+            console.error('iFrameRef is null')
+            return
+          }
+
+          // @ts-expect-error ts can't find contentWindow
+          onIFrameLocationChanged(iFrameRef.current.contentWindow.location.href)
+        }}
+      />
+    )
+  }, [project, version])
+
   document.title = `${project} | docat`
 
   if (projectParam === '') {
     setLoadingFailed(true)
   }
 
   const updateURL = (newProject: string, newVersion: string, newPage: string, newHash: string, newHideUi: boolean): void => {
-    let url = `#/${newProject}/${newVersion}/${newPage}`
-
-    if (newHash.length > 0) {
-      url += newHash
-    }
-
-    if (newHideUi) {
-      url += '?hide-ui=true'
-    }
+    const url = `#/${newProject}/${newVersion}/${newPage}${newHash}${newHideUi ? '?hide-ui=true' : ''}`
 
     if (project === newProject && version === newVersion && page === newPage && hash === newHash && hideUi === newHideUi) {
       // no change
@@ -217,18 +229,7 @@ export default function Docs (): JSX.Element {
 
   return (
     <>
-      <iframe
-        ref={iFrameRef}
-        key={uniqueId()}
-        src={ProjectRepository.getProjectDocsURL(project, version, page, hash)}
-        title="docs"
-        className={styles['docs-iframe']}
-        onLoad={() => {
-          // @ts-expect-error ts can't find contentWindow
-          onIFrameLocationChanged(iFrameRef.current?.contentWindow.location.href)
-        }}
-      />
-
+      {iFrame}
       {!hideUi && (
         <DocumentControlButtons
           version={version}