Home Explore Help
Sign In
wiki
/
weseek__growi
mirror of https://github.com/weseek/growi
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix bug for drawioUri

Yuki Takei 8 months ago
parent
6dc8b8a0e5
commit
847cdf29f9
3 changed files with 15 additions and 9 deletions
Split View Show Diff Stats
  1. 8 3
      apps/app/src/components/Script/DrawioViewerScript/DrawioViewerScript.tsx
  2. 1 1
      apps/app/src/components/Script/DrawioViewerScript/use-viewer-min-js-url.ts
  3. 6 5
      apps/app/src/pages/[[...path]].page.tsx

+ 8 - 3
apps/app/src/components/Script/DrawioViewerScript/DrawioViewerScript.tsx
View File 

@@ -3,7 +3,7 @@ import { useCallback, type JSX } from 'react';
 
 import type { IGraphViewerGlobal } from '@growi/remark-drawio';
 
 import Head from 'next/head';
 
 
-import { useViewerMinJsUrl } from './use-viewer-min-js-url';
 
+import { generateViewerMinJsUrl } from './use-viewer-min-js-url';
 
 
 declare global {
 
   // eslint-disable-next-line vars-on-top, no-var
 
@@ -15,8 +15,6 @@ type Props = {
 
 }
 
 
 export const DrawioViewerScript = ({ drawioUri }: Props): JSX.Element => {
 
-  const viewerMinJsSrc = useViewerMinJsUrl(drawioUri);
 
-
 
   const loadedHandler = useCallback(() => {
 
     // disable useResizeSensor and checkVisibleState
 
     //   for preventing resize event by viewer-static.min.js
 
@@ -36,6 +34,13 @@ export const DrawioViewerScript = ({ drawioUri }: Props): JSX.Element => {
 
     GraphViewer.processElements();
 
   }, []);
 
 
+  // Return empty element if drawioUri is not provided to avoid Invalid URL error
 
+  if (!drawioUri) {
 
+    return <></>;
 
+  }
 
+
 
+  const viewerMinJsSrc = generateViewerMinJsUrl(drawioUri);
 
+
 
   return (
 
     <Head>
 
       <script

+ 1 - 1
apps/app/src/components/Script/DrawioViewerScript/use-viewer-min-js-url.ts
View File 

@@ -1,6 +1,6 @@
 
 import urljoin from 'url-join';
 
 
-export const useViewerMinJsUrl = (drawioUri: string): string => {
 
+export const generateViewerMinJsUrl = (drawioUri: string): string => {
 
   // extract search from URL
 
   const url = new URL(drawioUri);
 
   const pathname = urljoin(url.pathname, '/js/viewer-static.min.js');

+ 6 - 5
apps/app/src/pages/[[...path]].page.tsx
View File 

@@ -238,16 +238,17 @@ const Layout = ({ children, ...props }: LayoutProps): JSX.Element => {
 
   return <BasicLayoutWithEditor>{children}</BasicLayoutWithEditor>;
 
 };
 
 
-let drawioUri = '';
 
 Page.getLayout = function getLayout(page: React.ReactElement<Props>) {
 
-  if (isInitialProps(page.props)) {
 
-    drawioUri = page.props.rendererConfig.drawioUri;
 
-  }
 
+  // Get drawioUri from rendererConfig atom to ensure consistency across navigations
 
+  const DrawioViewerScriptWithAtom = (): JSX.Element => {
 
+    const [rendererConfig] = useRendererConfig();
 
+    return <DrawioViewerScript drawioUri={rendererConfig.drawioUri} />;
 
+  };
 
 
   return (
 
     <>
 
       <GrowiPluginsActivator />
 
-      <DrawioViewerScript drawioUri={drawioUri} />
 
+      <DrawioViewerScriptWithAtom />
 
 
       <Layout {...page.props}>
 
         {page}