move webview specific callbacks to TopBar

LedgerHQ · Jul 11, 2022 · 62b87e1 · 62b87e1
1 parent 4bb456d
commit 62b87e1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 33 deletions.
diff --git a/apps/ledger-live-desktop/src/renderer/components/WebPlatformPlayer/TopBar.jsx b/apps/ledger-live-desktop/src/renderer/components/WebPlatformPlayer/TopBar.jsx
@@ -115,21 +115,17 @@ export type Props = {
   onReload: Function,
   onClose?: Function,
   onHelp?: Function,
-  onOpenDevTools: Function,
-  onGoBack: Function,
-  onGoForward: Function,
   config?: TopBarConfig,
+  webview: WebviewTag,
 };
 
 const WebPlatformTopBar = ({
   manifest,
   onReload,
   onHelp,
   onClose,
-  onOpenDevTools,
-  onGoBack,
-  onGoForward,
   config = {},
+  webview,
 }: Props) => {
   const { name, icon } = manifest;
 
@@ -146,6 +142,24 @@ const WebPlatformTopBar = ({
     dispatch(openPlatformAppInfoDrawer({ manifest }));
   }, [manifest, dispatch]);
 
+  const onOpenDevTools = useCallback(() => {
+    if (webview) {
+      webview.openDevTools();
+    }
+  }, [webview]);
+
+  const onGoBack = useCallback(() => {
+    if (webview) {
+      webview.goBack();
+    }
+  }, [webview]);
+
+  const onGoForward = useCallback(() => {
+    if (webview) {
+      webview.goForward();
+    }
+  }, [webview]);
+
   return (
     <Container>
       {shouldDisplayName && (

diff --git a/apps/ledger-live-desktop/src/renderer/components/WebPlatformPlayer/index.jsx b/apps/ledger-live-desktop/src/renderer/components/WebPlatformPlayer/index.jsx
@@ -532,40 +532,14 @@ const WebPlatformPlayer = ({ manifest, onClose, inputs, config }: Props) => {
     };
   }, [handleLoad, handleNewWindow]);
 
-  const handleOpenDevTools = useCallback(() => {
-    const webview = targetRef.current;
-
-    if (webview) {
-      webview.openDevTools();
-    }
-  }, []);
-
-  const handleGoBack = useCallback(() => {
-    const webview = targetRef.current;
-
-    if (webview) {
-      webview.goBack();
-    }
-  }, []);
-
-  const handleGoForward = useCallback(() => {
-    const webview = targetRef.current;
-
-    if (webview) {
-      webview.goForward();
-    }
-  }, []);
-
   return (
     <Container>
       <TrackPage category="Platform" name="App" appId={manifest.id} params={inputs} />
       <TopBar
         manifest={manifest}
         onReload={handleReload}
         onClose={onClose}
-        onOpenDevTools={handleOpenDevTools}
-        onGoBack={handleGoBack}
-        onGoForward={handleGoForward}
+        webview={targetRef.current}
         config={config?.topBarConfig}
       />