cvat-ai
diff --git a/‎Dockerfile.ui
+2-3 b/‎Dockerfile.ui
+2-3
diff --git a/‎cvat-canvas/src/typescript/canvasView.ts
+24-1 b/‎cvat-canvas/src/typescript/canvasView.ts
+24-1
diff --git a/‎cvat-canvas/src/typescript/editHandler.ts
+8-2 b/‎cvat-canvas/src/typescript/editHandler.ts
+8-2
diff --git a/‎cvat-canvas/src/typescript/svg.patch.ts
+5 b/‎cvat-canvas/src/typescript/svg.patch.ts
+5
diff --git a/‎cvat-core/src/annotations-collection.js
+8-5 b/‎cvat-core/src/annotations-collection.js
+8-5
diff --git a/‎cvat-core/src/annotations-history.js
+4-3 b/‎cvat-core/src/annotations-history.js
+4-3
@@ -9,9 +9,8 @@ ENV TERM=xterm \
     http_proxy=${http_proxy}   \
     https_proxy=${https_proxy} \
     no_proxy=${no_proxy} \
-    socks_proxy=${socks_proxy}
-
-ENV LANG='C.UTF-8'  \
+    socks_proxy=${socks_proxy} \
+    LANG='C.UTF-8'  \
     LC_ALL='C.UTF-8'
 
 # Install dependencies
 
@@ -456,6 +456,27 @@ export class CanvasViewImpl implements CanvasView, Listener {
             e.preventDefault();
         }
 
+        function contextmenuHandler(e: MouseEvent): void {
+            const pointID = Array.prototype.indexOf
+                .call(((e.target as HTMLElement).parentElement as HTMLElement).children, e.target);
+            if (self.activeElement.clientID !== null) {
+                const [state] = self.controller.objects
+                    .filter((_state: any): boolean => (
+                        _state.clientID === self.activeElement.clientID
+                    ));
+                self.canvas.dispatchEvent(new CustomEvent('point.contextmenu', {
+                    bubbles: false,
+                    cancelable: true,
+                    detail: {
+                        mouseEvent: e,
+                        objectState: state,
+                        pointID,
+                    },
+                }));
+            }
+            e.preventDefault();
+        }
+
         if (value) {
             (shape as any).selectize(value, {
                 deepSelect: true,
@@ -478,6 +499,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
                         });
 
                         circle.on('dblclick', dblClickHandler);
+                        circle.on('contextmenu', contextmenuHandler);
                         circle.addClass('cvat_canvas_selected_point');
                     });
 
@@ -487,6 +509,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
                         });
 
                         circle.off('dblclick', dblClickHandler);
+                        circle.off('contextmenu', contextmenuHandler);
                         circle.removeClass('cvat_canvas_selected_point');
                     });
 
@@ -911,7 +934,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
                 this.activate(activeElement);
             }
 
-            if (state.points
+            if (state.points.length !== drawnState.points.length || state.points
                 .some((p: number, id: number): boolean => p !== drawnState.points[id])
             ) {
                 const translatedPoints: number[] = translate(state.points);
 
@@ -96,15 +96,21 @@ export class EditHandlerImpl implements EditHandler {
         let mouseY: number | null = null;
 
         this.canvas.on('mousedown.edit', (e: MouseEvent): void => {
-            if (e.which === 1) {
+            if (e.button === 0) {
                 mouseX = e.clientX;
                 mouseY = e.clientY;
+            } else if (e.button === 2 && this.editLine) {
+                if (this.editData.state.shapeType === 'points'
+                    || this.editLine.attr('points').split(' ').length > 2
+                ) {
+                    (this.editLine as any).draw('undo');
+                }
             }
         });
 
         this.canvas.on('mouseup.edit', (e: MouseEvent): void => {
             const threshold = 10; // px
-            if (e.which === 1) {
+            if (e.button === 0) {
                 if (Math.sqrt( // l2 distance < threshold
                     ((mouseX - e.clientX) ** 2)
                     + ((mouseY - e.clientY) ** 2),
 
@@ -161,6 +161,11 @@ SVG.Element.prototype.resize = function constructor(...args: any): any {
     if (!handler) {
         originalResize.call(this, ...args);
         handler = this.remember('_resizeHandler');
+        handler.resize = function(e: any) {
+            if (e.detail.event.button === 0) {
+                return handler.constructor.prototype.resize.call(this, e);
+            }
+        }
         handler.update = function(e: any) {
             this.m = this.el.node.getScreenCTM().inverse();
             return handler.constructor.prototype.update.call(this, e);
 
@@ -317,7 +317,7 @@
 
                     // Push outside shape after each annotation shape
                     // Any not outside shape rewrites it
-                    if (!((object.frame + 1) in keyframes)) {
+                    if (!((object.frame + 1) in keyframes) && object.frame + 1 <= this.stopFrame) {
                         keyframes[object.frame + 1] = JSON
                             .parse(JSON.stringify(keyframes[object.frame]));
                         keyframes[object.frame + 1].outside = true;
@@ -427,7 +427,10 @@
                 for (const object of objectsForMerge) {
                     object.removed = true;
                 }
-            }, [...objectsForMerge.map((object) => object.clientID), trackModel.clientID]);
+            }, [
+                ...objectsForMerge
+                    .map((object) => object.clientID), trackModel.clientID,
+            ], objectStates[0].frame);
         }
 
         split(objectState, frame) {
@@ -522,7 +525,7 @@
                 object.removed = true;
                 prevTrack.removed = false;
                 nextTrack.removed = false;
-            }, [object.clientID, prevTrack.clientID, nextTrack.clientID]);
+            }, [object.clientID, prevTrack.clientID, nextTrack.clientID], frame);
         }
 
         group(objectStates, reset) {
@@ -554,7 +557,7 @@
                 objectsForGroup.forEach((object, idx) => {
                     object.group = redoGroups[idx];
                 });
-            }, objectsForGroup.map((object) => object.clientID));
+            }, objectsForGroup.map((object) => object.clientID), objectStates[0].frame);
 
             return groupIdx;
         }
@@ -790,7 +793,7 @@
                 importedArray.forEach((object) => {
                     object.removed = false;
                 });
-            }, importedArray.map((object) => object.clientID));
+            }, importedArray.map((object) => object.clientID), objectStates[0].frame);
         }
 
         select(objectStates, x, y) {
 
@@ -12,17 +12,18 @@ class AnnotationHistory {
 
     get() {
         return {
-            undo: this._undo.map((undo) => undo.action),
-            redo: this._redo.map((redo) => redo.action),
+            undo: this._undo.map((undo) => [undo.action, undo.frame]),
+            redo: this._redo.map((redo) => [redo.action, redo.frame]),
         };
     }
 
-    do(action, undo, redo, clientIDs) {
+    do(action, undo, redo, clientIDs, frame) {
         const actionItem = {
             clientIDs,
             action,
             undo,
             redo,
+            frame,
         };
 
         this._undo = this._undo.slice(-MAX_HISTORY_LENGTH + 1);