Fixed exception: State cannot be updated during editing, need to fini…

…sh current editing first (#8019)
cvat-ai · Jun 13, 2024 · 05e7a6a · 05e7a6a
1 parent de95605
commit 05e7a6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/changelog.d/20240612_162647_boris_fixed_issue.md b/changelog.d/20240612_162647_boris_fixed_issue.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- Exception: State cannot be updated during editing, need to finish current editing first
+  (<https://github.com/cvat-ai/cvat/pull/8019>)
diff --git a/cvat-ui/src/components/annotation-page/canvas/views/canvas2d/brush-tools.tsx b/cvat-ui/src/components/annotation-page/canvas/views/canvas2d/brush-tools.tsx
@@ -164,7 +164,7 @@ function BrushTools(): React.ReactPortal | null {
 
         const updateEditableState = (e: Event): void => {
             const evt = e as CustomEvent;
-            if (evt.type === 'canvas.editstart' && evt.detail.state) {
+            if (evt.type === 'canvas.editstart' && evt.detail?.state?.shapeType === ShapeType.MASK) {
                 setEditableState(evt.detail.state);
             } else if (editableState) {
                 setEditableState(null);
@@ -179,7 +179,7 @@ function BrushTools(): React.ReactPortal | null {
             canvasInstance.html().addEventListener('canvas.drawstart', showToolset);
             canvasInstance.html().addEventListener('canvas.editstart', showToolset);
             canvasInstance.html().addEventListener('canvas.editstart', updateEditableState);
-            canvasInstance.html().addEventListener('canvas.editdone', updateEditableState);
+            canvasInstance.html().addEventListener('canvas.edited', updateEditableState);
         }
 
         return () => {
@@ -191,7 +191,7 @@ function BrushTools(): React.ReactPortal | null {
                 canvasInstance.html().removeEventListener('canvas.drawstart', showToolset);
                 canvasInstance.html().removeEventListener('canvas.editstart', showToolset);
                 canvasInstance.html().removeEventListener('canvas.editstart', updateEditableState);
-                canvasInstance.html().removeEventListener('canvas.editdone', updateEditableState);
+                canvasInstance.html().removeEventListener('canvas.edited', updateEditableState);
             }
         };
     }, [visible, editableState, currentTool]);