fix: Add a branch to avoid null shape range

miyanokomiya · Oct 31, 2023 · c133b63 · c133b63
1 parent 9a2faf9
commit c133b63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/composables/canvas.ts b/src/composables/canvas.ts
@@ -65,6 +65,8 @@ export function useCanvas(
   const { scale, viewOrigin } = viewState.state;
   const setScale = useCallback(
     (val: number) => {
+      // For safety
+      if (isNaN(val)) return;
       viewState.setState((state) => ({ scale: val, viewOrigin: state.viewOrigin }));
     },
     [viewState.setState],

diff --git a/src/composables/states/appCanvas/commons.ts b/src/composables/states/appCanvas/commons.ts
@@ -177,7 +177,9 @@ export function handleCommonShortcut(
     case "!":
     case "Home": {
       const shapeComposite = ctx.getShapeComposite();
-      ctx.setViewport(geometry.getWrapperRect(shapeComposite.shapes.map((s) => shapeComposite.getWrapperRect(s))), 80);
+      const rects = shapeComposite.shapes.map((s) => shapeComposite.getWrapperRect(s));
+      if (rects.length === 0) return;
+      ctx.setViewport(geometry.getWrapperRect(rects), 80);
       return;
     }
   }