fix: Add null check for snapping targets

- It can be grid lines that aren't shapes
miyanokomiya · Dec 12, 2024 · b5395c4 · b5395c4
1 parent 0b351e0
commit b5395c4
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 16 deletions.
diff --git a/src/composables/states/appCanvas/droppingNewShapeState.ts b/src/composables/states/appCanvas/droppingNewShapeState.ts
@@ -112,7 +112,8 @@ export function newDroppingNewShapeState(option: Option): AppCanvasState {
           style: ctx.getStyleScheme(),
           scale: ctx.getScale(),
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
     },

diff --git a/src/composables/states/appCanvas/duplicatingShapesState.ts b/src/composables/states/appCanvas/duplicatingShapesState.ts
@@ -116,7 +116,8 @@ export function newDuplicatingShapesState(): AppCanvasState {
           style: ctx.getStyleScheme(),
           scale: ctx.getScale(),
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
     },

diff --git a/src/composables/states/appCanvas/lines/lineDrawingState.ts b/src/composables/states/appCanvas/lines/lineDrawingState.ts
@@ -166,7 +166,8 @@ export function newLineDrawingState(option: Option): AppCanvasState {
           result: connectionResult,
           scale: ctx.getScale(),
           style: ctx.getStyleScheme(),
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
     },

diff --git a/src/composables/states/appCanvas/lines/lineNormalReadyState.ts b/src/composables/states/appCanvas/lines/lineNormalReadyState.ts
@@ -165,7 +165,8 @@ export function newLineNormalReadyState(): AppCanvasState {
           result: connectionResult,
           scale: ctx.getScale(),
           style: ctx.getStyleScheme(),
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
 

diff --git a/src/composables/states/appCanvas/lines/lineReadyState.ts b/src/composables/states/appCanvas/lines/lineReadyState.ts
@@ -131,7 +131,8 @@ export function newLineReadyState(option: Option): AppCanvasState {
           result: connectionResult,
           scale: ctx.getScale(),
           style: ctx.getStyleScheme(),
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
     },

diff --git a/src/composables/states/appCanvas/lines/lineTangentReadyState.ts b/src/composables/states/appCanvas/lines/lineTangentReadyState.ts
@@ -155,7 +155,8 @@ export function newLineTangentReadyState(): AppCanvasState {
           result: connectionResult,
           scale: ctx.getScale(),
           style: ctx.getStyleScheme(),
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
 

diff --git a/src/composables/states/appCanvas/lines/movingElbowSegmentState.ts b/src/composables/states/appCanvas/lines/movingElbowSegmentState.ts
@@ -116,7 +116,7 @@ export function newMovingElbowSegmentState(option: Option): AppCanvasState {
           style,
           scale,
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeMap[id]),
+          getTargetRect: (id) => (shapeMap[id] ? shapeComposite.getWrapperRect(shapeMap[id]) : undefined),
         });
       }
 

diff --git a/src/composables/states/appCanvas/lines/movingLineBezierState.ts b/src/composables/states/appCanvas/lines/movingLineBezierState.ts
@@ -162,7 +162,8 @@ export function newMovingLineBezierState(option: Option): AppCanvasState {
           style,
           scale,
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
 

diff --git a/src/composables/states/appCanvas/lines/movingLineSegmentState.ts b/src/composables/states/appCanvas/lines/movingLineSegmentState.ts
@@ -133,7 +133,8 @@ export function newMovingLineSegmentState(option: Option): AppCanvasState {
           style: ctx.getStyleScheme(),
           scale: ctx.getScale(),
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
 

diff --git a/src/composables/states/appCanvas/lines/movingLineVertexState.ts b/src/composables/states/appCanvas/lines/movingLineVertexState.ts
@@ -141,7 +141,8 @@ export function newMovingLineVertexState(option: Option): AppCanvasState {
           result: connectionResult,
           scale: ctx.getScale(),
           style: ctx.getStyleScheme(),
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
 

diff --git a/src/composables/states/appCanvas/lines/movingNewVertexState.ts b/src/composables/states/appCanvas/lines/movingNewVertexState.ts
@@ -125,7 +125,8 @@ export function newMovingNewVertexState(option: Option): AppCanvasState {
           result: connectionResult,
           scale: ctx.getScale(),
           style: ctx.getStyleScheme(),
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
 

diff --git a/src/composables/states/appCanvas/lines/movingOnLineState.ts b/src/composables/states/appCanvas/lines/movingOnLineState.ts
@@ -276,7 +276,7 @@ export function newMovingOnLineState(option: Option): AppCanvasState {
           style,
           scale,
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeMap[id]),
+          getTargetRect: (id) => (shapeMap[id] ? shapeComposite.getWrapperRect(shapeMap[id]) : undefined),
         });
       }
     },

diff --git a/src/composables/states/appCanvas/movingShapeControlState.ts b/src/composables/states/appCanvas/movingShapeControlState.ts
@@ -105,7 +105,8 @@ export function movingShapeControlState<T extends Shape>(option: Option<T>): App
           style: ctx.getStyleScheme(),
           scale: ctx.getScale(),
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
 

diff --git a/src/composables/states/appCanvas/movingShapeState.ts b/src/composables/states/appCanvas/movingShapeState.ts
@@ -190,7 +190,7 @@ export function newMovingShapeState(option?: Option): AppCanvasState {
           style,
           scale,
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeMap[id]),
+          getTargetRect: (id) => (shapeMap[id] ? shapeComposite.getWrapperRect(shapeMap[id]) : undefined),
         });
       }
 

diff --git a/src/composables/states/appCanvas/resizingState.ts b/src/composables/states/appCanvas/resizingState.ts
@@ -222,7 +222,7 @@ export function newResizingState(option: Option): AppCanvasState {
           style,
           scale,
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeMap[id]),
+          getTargetRect: (id) => (shapeMap[id] ? shapeComposite.getWrapperRect(shapeMap[id]) : undefined),
         });
       }
 

diff --git a/src/composables/states/appCanvas/text/textReadyState.ts b/src/composables/states/appCanvas/text/textReadyState.ts
@@ -99,7 +99,8 @@ export function newTextReadyState(): AppCanvasState {
           style: ctx.getStyleScheme(),
           scale: ctx.getScale(),
           result: snappingResult,
-          getTargetRect: (id) => shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]),
+          getTargetRect: (id) =>
+            shapeComposite.shapeMap[id] ? shapeComposite.getWrapperRect(shapeComposite.shapeMap[id]) : undefined,
         });
       }
     },
-Original file line number
+Diff line change
@@ Expand Up @@
               style,
               scale,
               result: snappingResult,
-              getTargetRect: (id) => shapeComposite.getWrapperRect(shapeMap[id]),
+              getTargetRect: (id) => (shapeMap[id] ? shapeComposite.getWrapperRect(shapeMap[id]) : undefined),
             });
           }
@@ Expand Down @@