Fix some type errors

ShortestPathLab · Nov 21, 2024 · 5e779a2 · 5e779a2
1 parent aff9cc1
commit 5e779a2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/client/src/components/generic/Modal.tsx b/client/src/components/generic/Modal.tsx
@@ -365,7 +365,11 @@ export function ManagedModal({
                 </Box>
               </Popover>
             ) : (
-              <Modal open={isOpen} onClose={close} {...slotProps?.modal}>
+              <Modal
+                open={isOpen}
+                onClose={close as () => void}
+                {...slotProps?.modal}
+              >
                 <ModalAppBar onClose={close} {...ModalAppBarProps} />
                 {chi2}
               </Modal>

diff --git a/client/src/components/script-editor/templates.tsx b/client/src/components/script-editor/templates.tsx
@@ -1,8 +1,9 @@
 import { TraceEvent } from "protocol/Trace";
 import { FunctionTemplate } from "./FunctionTemplate";
+import { EventTree } from "pages/tree.worker";
 
 export type ShouldBreak = FunctionTemplate<
-  [number, TraceEvent, TraceEvent[], TraceEvent, TraceEvent[]],
+  [number, TraceEvent, TraceEvent[], EventTree | void, EventTree[] | void],
   boolean
 >;
 

diff --git a/client/src/hooks/useBreakpoints.tsx b/client/src/hooks/useBreakpoints.tsx
@@ -106,7 +106,7 @@ export function useBreakpoints(key?: string) {
               event,
               events,
               trees[step]?.parent,
-              trees[step]?.children,
+              trees[step]?.children ?? [],
             ])
           ) {
             return { result: "Script editor" };

diff --git a/client/src/pages/TreePage.tsx b/client/src/pages/TreePage.tsx
@@ -132,7 +132,7 @@ const orientationOptions = {
 };
 
 type R = {
-  event: MouseEvent;
+  event: MouseEvent | TouchEvent;
   node: string;
 };
 
@@ -407,6 +407,19 @@ export function TreePage({ template: Page }: PageContentProps) {
   }, [trace, setTrackedProperty]);
 
   const [selection, setSelection] = useState<R>();
+
+  const { x, y } = selection
+    ? selection.event instanceof MouseEvent
+      ? {
+          x: selection.event.clientX,
+          y: selection.event.clientY,
+        }
+      : {
+          x: selection.event.touches?.[0]?.clientX,
+          y: selection.event.touches?.[0]?.clientY,
+        }
+    : { x: 0, y: 0 };
+
   const [menuOpen, setMenuOpen] = useState(false);
 
   const [mode, setMode] = useState<"tree" | "directed-graph">("tree");
@@ -491,8 +504,8 @@ export function TreePage({ template: Page }: PageContentProps) {
                     onClose={() => setMenuOpen(false)}
                     anchorReference="anchorPosition"
                     anchorPosition={{
-                      left: selection?.event.clientX ?? 0,
-                      top: selection?.event.clientY ?? 0,
+                      left: x,
+                      top: y,
                     }}
                     transformOrigin={{
                       horizontal: "left",