From 3b65f2aefa5959258b0c4ce9d720daf68b8d5562 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Wed, 9 Aug 2023 19:31:30 +0200
Subject: [PATCH] make `InteractiveCanvas` callbacks mandatory and move
 viewMode check inside

---
 src/components/App.tsx                        |  6 +--
 src/components/canvases/InteractiveCanvas.tsx | 39 +++++++++++++++----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/components/App.tsx b/src/components/App.tsx
index 011d9e150..ea4927d76 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1253,11 +1253,7 @@ class App extends React.Component<AppProps, AppState> {
                           onPointerCancel={this.removePointer}
                           onTouchMove={this.handleTouchMove}
                           onPointerDown={this.handleCanvasPointerDown}
-                          onDoubleClick={
-                            this.state.viewModeEnabled
-                              ? undefined
-                              : this.handleCanvasDoubleClick
-                          }
+                          onDoubleClick={this.handleCanvasDoubleClick}
                         />
                         {this.renderFrameNames()}
                       </ExcalidrawActionManagerContext.Provider>
diff --git a/src/components/canvases/InteractiveCanvas.tsx b/src/components/canvases/InteractiveCanvas.tsx
index b81a86654..4099ffc8d 100644
--- a/src/components/canvases/InteractiveCanvas.tsx
+++ b/src/components/canvases/InteractiveCanvas.tsx
@@ -28,13 +28,34 @@ type InteractiveCanvasProps = {
     data: RenderInteractiveSceneCallback,
   ) => void;
   handleCanvasRef: (canvas: HTMLCanvasElement) => void;
-  onContextMenu: DOMAttributes<HTMLCanvasElement>["onContextMenu"];
-  onPointerMove: DOMAttributes<HTMLCanvasElement>["onPointerMove"];
-  onPointerUp: DOMAttributes<HTMLCanvasElement>["onPointerUp"];
-  onPointerCancel: DOMAttributes<HTMLCanvasElement>["onPointerCancel"];
-  onTouchMove: DOMAttributes<HTMLCanvasElement>["onTouchMove"];
-  onPointerDown: DOMAttributes<HTMLCanvasElement>["onPointerDown"];
-  onDoubleClick: DOMAttributes<HTMLCanvasElement>["onDoubleClick"];
+  onContextMenu: Exclude<
+    DOMAttributes<HTMLCanvasElement>["onContextMenu"],
+    undefined
+  >;
+  onPointerMove: Exclude<
+    DOMAttributes<HTMLCanvasElement>["onPointerMove"],
+    undefined
+  >;
+  onPointerUp: Exclude<
+    DOMAttributes<HTMLCanvasElement>["onPointerUp"],
+    undefined
+  >;
+  onPointerCancel: Exclude<
+    DOMAttributes<HTMLCanvasElement>["onPointerCancel"],
+    undefined
+  >;
+  onTouchMove: Exclude<
+    DOMAttributes<HTMLCanvasElement>["onTouchMove"],
+    undefined
+  >;
+  onPointerDown: Exclude<
+    DOMAttributes<HTMLCanvasElement>["onPointerDown"],
+    undefined
+  >;
+  onDoubleClick: Exclude<
+    DOMAttributes<HTMLCanvasElement>["onDoubleClick"],
+    undefined
+  >;
 };
 
 const InteractiveCanvas = (props: InteractiveCanvasProps) => {
@@ -130,7 +151,9 @@ const InteractiveCanvas = (props: InteractiveCanvasProps) => {
       onPointerCancel={props.onPointerCancel}
       onTouchMove={props.onTouchMove}
       onPointerDown={props.onPointerDown}
-      onDoubleClick={props.onDoubleClick}
+      onDoubleClick={
+        props.appState.viewModeEnabled ? undefined : props.onDoubleClick
+      }
     >
       {t("labels.drawingCanvas")}
     </canvas>