From 6464069bfa5e8e7b7f7a5b1398565643ad126507 Mon Sep 17 00:00:00 2001
From: Seongmoon Jeong <tjdans1114@gmail.com>
Date: Mon, 12 Sep 2022 16:56:15 +0900
Subject: [PATCH] fix type declaration of private fields in cvat-canvas which
 are possibly null (#4932)

* fix type declaration of private fields in cvat-canvas which are possibly null

* v2.15.3
---
 cvat-canvas/package.json                   | 2 +-
 cvat-canvas/src/typescript/drawHandler.ts  | 4 ++--
 cvat-canvas/src/typescript/editHandler.ts  | 8 ++++----
 cvat-canvas/src/typescript/groupHandler.ts | 2 +-
 cvat-canvas/src/typescript/mergeHandler.ts | 2 +-
 cvat-canvas/src/typescript/splitHandler.ts | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cvat-canvas/package.json b/cvat-canvas/package.json
index bd865fb1..ee8180b4 100644
--- a/cvat-canvas/package.json
+++ b/cvat-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.15.2",
+  "version": "2.15.3",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {
diff --git a/cvat-canvas/src/typescript/drawHandler.ts b/cvat-canvas/src/typescript/drawHandler.ts
index 1ac7cade..5b2076de 100644
--- a/cvat-canvas/src/typescript/drawHandler.ts
+++ b/cvat-canvas/src/typescript/drawHandler.ts
@@ -86,7 +86,7 @@ export class DrawHandlerImpl implements DrawHandler {
         y: number;
     };
     private crosshair: Crosshair;
-    private drawData: DrawData;
+    private drawData: DrawData | null;
     private geometry: Geometry;
     private autoborderHandler: AutoborderHandler;
     private autobordersEnabled: boolean;
@@ -100,7 +100,7 @@ export class DrawHandlerImpl implements DrawHandler {
     private initialized: boolean;
     private canceled: boolean;
     private pointsGroup: SVG.G | null;
-    private shapeSizeElement: ShapeSizeElement;
+    private shapeSizeElement: ShapeSizeElement | null;
 
     private getFinalEllipseCoordinates(points: number[], fitIntoFrame: boolean): number[] {
         const { offset } = this.geometry;
diff --git a/cvat-canvas/src/typescript/editHandler.ts b/cvat-canvas/src/typescript/editHandler.ts
index 38ce843d..5abb52b5 100644
--- a/cvat-canvas/src/typescript/editHandler.ts
+++ b/cvat-canvas/src/typescript/editHandler.ts
@@ -20,11 +20,11 @@ export interface EditHandler {
 export class EditHandlerImpl implements EditHandler {
     private onEditDone: (state: any, points: number[]) => void;
     private autoborderHandler: AutoborderHandler;
-    private geometry: Geometry;
+    private geometry: Geometry | null;
     private canvas: SVG.Container;
-    private editData: EditData;
-    private editedShape: SVG.Shape;
-    private editLine: SVG.PolyLine;
+    private editData: EditData | null;
+    private editedShape: SVG.Shape | null;
+    private editLine: SVG.PolyLine | null;
     private clones: SVG.Polygon[];
     private controlPointsSize: number;
     private autobordersEnabled: boolean;
diff --git a/cvat-canvas/src/typescript/groupHandler.ts b/cvat-canvas/src/typescript/groupHandler.ts
index 3e56a33a..f4792eb7 100644
--- a/cvat-canvas/src/typescript/groupHandler.ts
+++ b/cvat-canvas/src/typescript/groupHandler.ts
@@ -22,7 +22,7 @@ export class GroupHandlerImpl implements GroupHandler {
     private bindedOnSelectStart: (event: MouseEvent) => void;
     private bindedOnSelectUpdate: (event: MouseEvent) => void;
     private bindedOnSelectStop: (event: MouseEvent) => void;
-    private selectionRect: SVG.Rect;
+    private selectionRect: SVG.Rect | null;
     private startSelectionPoint: {
         x: number;
         y: number;
diff --git a/cvat-canvas/src/typescript/mergeHandler.ts b/cvat-canvas/src/typescript/mergeHandler.ts
index 775bdbdf..b5d0f459 100644
--- a/cvat-canvas/src/typescript/mergeHandler.ts
+++ b/cvat-canvas/src/typescript/mergeHandler.ts
@@ -24,7 +24,7 @@ export class MergeHandlerImpl implements MergeHandler {
     private constraints: {
         labelID: number;
         shapeType: string;
-    };
+    } | null;
 
     private addConstraints(): void {
         const shape = this.statesToBeMerged[0];
diff --git a/cvat-canvas/src/typescript/splitHandler.ts b/cvat-canvas/src/typescript/splitHandler.ts
index 60ba2fc6..e2110ca1 100644
--- a/cvat-canvas/src/typescript/splitHandler.ts
+++ b/cvat-canvas/src/typescript/splitHandler.ts
@@ -16,7 +16,7 @@ export class SplitHandlerImpl implements SplitHandler {
     private onSplitDone: (object: any) => void;
     private onFindObject: (event: MouseEvent) => void;
     private canvas: SVG.Container;
-    private highlightedShape: SVG.Shape;
+    private highlightedShape: SVG.Shape | null;
     private initialized: boolean;
     private splitDone: boolean;