From 62abd9cbe086e3a0221bbb23e2b3cffe0e8c7e66 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Thu, 28 Sep 2023 15:40:38 +0200 Subject: [PATCH] fix: don't double load iframe content Signed-off-by: Tilman Vatteroth --- ...se-force-render-page-url-on-iframe-load-callback.ts | 10 ++-------- .../common/renderer-iframe/renderer-iframe.tsx | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/common/renderer-iframe/hooks/use-force-render-page-url-on-iframe-load-callback.ts b/frontend/src/components/common/renderer-iframe/hooks/use-force-render-page-url-on-iframe-load-callback.ts index 69a5fadcd..07c587eb0 100644 --- a/frontend/src/components/common/renderer-iframe/hooks/use-force-render-page-url-on-iframe-load-callback.ts +++ b/frontend/src/components/common/renderer-iframe/hooks/use-force-render-page-url-on-iframe-load-callback.ts @@ -7,7 +7,7 @@ import { ORIGIN, useBaseUrl } from '../../../../hooks/common/use-base-url' import { Logger } from '../../../../utils/logger' import { useEditorToRendererCommunicator } from '../../../editor-page/render-context/editor-to-renderer-communicator-context-provider' import type { RefObject } from 'react' -import { useCallback, useEffect, useMemo, useRef } from 'react' +import { useCallback, useMemo, useRef } from 'react' const log = new Logger('IframeLoader') @@ -31,7 +31,7 @@ export const useForceRenderPageUrlOnIframeLoadCallback = ( }, [iframeCommunicator, rendererBaseUrl]) const redirectionInProgress = useRef(false) - const loadCallback = useCallback(() => { + return useCallback(() => { const frame = iFrameReference.current if (!frame) { @@ -50,10 +50,4 @@ export const useForceRenderPageUrlOnIframeLoadCallback = ( frame.src = forcedUrl } }, [iFrameReference, onNavigateAway, forcedUrl]) - - useEffect(() => { - loadCallback() - }, [loadCallback]) - - return loadCallback } diff --git a/frontend/src/components/common/renderer-iframe/renderer-iframe.tsx b/frontend/src/components/common/renderer-iframe/renderer-iframe.tsx index 3b401773b..a7fa837e3 100644 --- a/frontend/src/components/common/renderer-iframe/renderer-iframe.tsx +++ b/frontend/src/components/common/renderer-iframe/renderer-iframe.tsx @@ -78,9 +78,9 @@ export const RendererIframe: React.FC = ({ useEffect(() => { if (rendererReady) { - log.info('Renderer Ready!') + log.debug('Renderer Ready!') } else { - log.info('Renderer not ready') + log.debug('Renderer not ready') } }, [log, rendererReady])