From c4076041b072b6b6248570b9bc620ceb4f2b86f5 Mon Sep 17 00:00:00 2001 From: tjdans1114 Date: Sun, 11 Sep 2022 10:21:36 +0900 Subject: [PATCH 1/2] fix type declaration of private fields in cvat-canvas which are possibly null --- 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 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cvat-canvas/src/typescript/drawHandler.ts b/cvat-canvas/src/typescript/drawHandler.ts index 1ac7cadecff8..5b2076de39d7 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 38ce843d9597..5abb52b5b506 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 3e56a33a147f..f4792eb7836b 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 775bdbdf6f2a..b5d0f4592297 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 60ba2fc6494e..e2110ca15290 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; From b96189841f22f676b72340375c630b7e5f5fff21 Mon Sep 17 00:00:00 2001 From: tjdans1114 Date: Sun, 11 Sep 2022 10:26:16 +0900 Subject: [PATCH 2/2] v2.15.3 --- cvat-canvas/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat-canvas/package.json b/cvat-canvas/package.json index bd865fb1fae9..ee8180b44cbb 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": {