Fix: Ensure dialog is still visible on undo/redo (#302)

box · Nov 30, 2018 · 1c8a7e2 · 1c8a7e2
1 parent 71afd21
commit 1c8a7e2
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/src/AnnotationThread.js b/src/AnnotationThread.js
@@ -138,7 +138,13 @@ class AnnotationThread extends EventEmitter {
      * @return {void}
      */
     reset() {
-        this.state = STATES.inactive;
+        if (this.threadNumber) {
+            // Saved thread
+            this.state = STATES.inactive;
+        } else {
+            // Newly created thread
+            this.state = STATES.pending;
+        }
     }
 
     /**

diff --git a/src/__tests__/AnnotationThread-test.js b/src/__tests__/AnnotationThread-test.js
@@ -127,10 +127,16 @@ describe('AnnotationThread', () => {
     });
 
     describe('reset()', () => {
-        it('should set the thread state to inactive', () => {
+        it('should set the thread state to inactive if saved', () => {
             thread.reset();
             expect(thread.state).toEqual(STATES.inactive);
         });
+
+        it('should set the thread state to pending if not saved', () => {
+            thread.threadNumber = undefined;
+            thread.reset();
+            expect(thread.state).toEqual(STATES.pending);
+        });
     });
 
     describe('save()', () => {

diff --git a/src/drawing/DrawingThread.js b/src/drawing/DrawingThread.js
@@ -255,6 +255,8 @@ class DrawingThread extends AnnotationThread {
 
             if (this.pathContainer.isEmpty()) {
                 this.unmountPopover();
+            } else {
+                this.renderAnnotationPopover();
             }
 
             this.drawBoundary();
@@ -277,6 +279,8 @@ class DrawingThread extends AnnotationThread {
 
             if (this.pathContainer.isEmpty()) {
                 this.unmountPopover();
+            } else {
+                this.renderAnnotationPopover();
             }
 
             this.drawBoundary();
@@ -290,13 +294,7 @@ class DrawingThread extends AnnotationThread {
      * @return {void}
      */
     setup() {
-        if (this.threadNumber) {
-            // Saved thread, load boundary dialog
-            this.state = STATES.inactive;
-        } else {
-            // Newly created thread
-            this.state = STATES.pending;
-        }
+        this.reset();
     }
 
     /**

diff --git a/src/drawing/__tests__/DrawingThread-test.js b/src/drawing/__tests__/DrawingThread-test.js
@@ -195,6 +195,8 @@ describe('drawing/DrawingThread', () => {
             thread.regenerateBoundary = jest.fn();
             thread.drawBoundary = jest.fn();
             thread.emitAvailableActions = jest.fn();
+            thread.unmountPopover = jest.fn();
+            thread.renderAnnotationPopover = jest.fn();
             thread.pathContainer = {
                 isEmpty: jest.fn(),
                 undo: jest.fn().mockReturnValue(false)
@@ -220,13 +222,20 @@ describe('drawing/DrawingThread', () => {
             expect(thread.updateBoundary).toBeCalled();
             expect(thread.regenerateBoundary).toBeCalled();
             expect(thread.drawBoundary).toBeCalled();
+            expect(thread.renderAnnotationPopover).toBeCalled();
+
+            thread.pathContainer.isEmpty = jest.fn().mockReturnValue(true);
+            thread.undo();
+            expect(thread.unmountPopover).toBeCalled();
         });
     });
 
     describe('redo()', () => {
         beforeEach(() => {
             thread.draw = jest.fn();
             thread.emitAvailableActions = jest.fn();
+            thread.unmountPopover = jest.fn();
+            thread.renderAnnotationPopover = jest.fn();
             thread.pathContainer = {
                 isEmpty: jest.fn(),
                 redo: jest.fn().mockReturnValue(false),
@@ -247,6 +256,11 @@ describe('drawing/DrawingThread', () => {
             expect(thread.pathContainer.redo).toBeCalled();
             expect(thread.draw).toBeCalled();
             expect(thread.emitAvailableActions).toBeCalled();
+            expect(thread.renderAnnotationPopover).toBeCalled();
+
+            thread.pathContainer.isEmpty = jest.fn().mockReturnValue(true);
+            thread.redo();
+            expect(thread.unmountPopover).toBeCalled();
         });
     });