feat(highlightlistener): Avoid get selection race (#566)

box · Aug 28, 2020 · 4f3a718 · 4f3a718
1 parent a5fcff9
commit 4f3a718
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/highlight/HighlightListener.ts b/src/highlight/HighlightListener.ts
@@ -75,9 +75,10 @@ export default class HighlightListener {
             return;
         }
 
-        this.isMouseSelecting = false;
-
-        this.selectionChangeTimer = window.setTimeout(this.setSelection, this.selectionChangeDelay);
+        this.selectionChangeTimer = window.setTimeout(() => {
+            this.setSelection();
+            this.isMouseSelecting = false;
+        }, this.selectionChangeDelay);
     };
 
     handleSelectionChange = (): void => {

diff --git a/src/highlight/__tests__/HighlightListener-test.ts b/src/highlight/__tests__/HighlightListener-test.ts
@@ -105,7 +105,7 @@ describe('HighlightListener', () => {
         });
     });
 
-    describe('handleMouseDown', () => {
+    describe('handleMouseDown()', () => {
         test('should clear timeout and selection', () => {
             highlightListener.selectionChangeTimer = 1;
 
@@ -130,11 +130,12 @@ describe('HighlightListener', () => {
 
             highlightListener.handleMouseUp();
 
-            expect(highlightListener.isMouseSelecting).toBe(false);
+            expect(highlightListener.isMouseSelecting).toBe(true);
 
             jest.runAllTimers();
 
             expect(highlightListener.setSelection).toHaveBeenCalled();
+            expect(highlightListener.isMouseSelecting).toBe(false);
         });
 
         test('should do nothing if select not using mouse', () => {