Merge pull request #1318 from opencv/bs/batch_of_fixes

React UI: Batch of fixes
cvat-ai · Mar 26, 2020 · 76d0c6b · 76d0c6b
2 parents 6a4ccde + e478637
commit 76d0c6b
Show file tree

Hide file tree

Showing 18 changed files with 194 additions and 167 deletions.
diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts
@@ -1208,11 +1208,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
 
         let shapeSizeElement: ShapeSizeElement | null = null;
         let resized = false;
-        (shape as any).resize().on('resizestart', (e: any): void => {
-            if (e.detail.event.detail.event.button === 2) {
-                e.preventDefault();
-                return;
-            }
+        (shape as any).resize().on('resizestart', (): void => {
             this.mode = Mode.RESIZE;
             if (state.shapeType === 'rectangle') {
                 shapeSizeElement = displayShapeSize(this.adoptedContent, this.adoptedText);

diff --git a/cvat-canvas/src/typescript/svg.patch.ts b/cvat-canvas/src/typescript/svg.patch.ts
@@ -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);

diff --git a/cvat-core/src/annotations-collection.js b/cvat-core/src/annotations-collection.js
@@ -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) {

diff --git a/cvat-core/src/annotations-history.js b/cvat-core/src/annotations-history.js
@@ -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);