feat(annotations): Fix typescript

box · Mar 26, 2020 · dbba2b7 · dbba2b7
1 parent 1b095b2
commit dbba2b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/src/lib/AnnotationControls.ts b/src/lib/AnnotationControls.ts
@@ -17,9 +17,6 @@ export default class AnnotationControls {
     /** @property {bool} - Region comment mode active state */
     private isRegionActive = false;
 
-    /** @property {HTMLElement} - Region comment button element */
-    private regionButtonElement: HTMLElement = new HTMLButtonElement();
-
     /**
      * [constructor]
      *
@@ -42,11 +39,13 @@ export default class AnnotationControls {
      * @return {void}
      */
     private handleRegionClick = (onRegionClick: Function) => (event: MouseEvent): void => {
+        const regionButtonElement = event.target as HTMLButtonElement;
+
         this.isRegionActive = !this.isRegionActive;
         if (this.isRegionActive) {
-            this.regionButtonElement.classList.add(CLASS_BUTTON_ACTIVE);
+            regionButtonElement.classList.add(CLASS_BUTTON_ACTIVE);
         } else {
-            this.regionButtonElement.classList.remove(CLASS_BUTTON_ACTIVE);
+            regionButtonElement.classList.remove(CLASS_BUTTON_ACTIVE);
         }
 
         onRegionClick({ isRegionActive: this.isRegionActive, event });
@@ -60,7 +59,7 @@ export default class AnnotationControls {
      */
     public init({ onRegionClick = noop }: Options = {}): void {
         const groupElement = this.controls.addGroup(CLASS_ANNOTATIONS_GROUP);
-        this.regionButtonElement = this.controls.add(
+        this.controls.add(
             // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
             // @ts-ignore
             __('region_comment'),

diff --git a/src/lib/__tests__/AnnotationControls-test.js b/src/lib/__tests__/AnnotationControls-test.js
@@ -61,20 +61,19 @@ describe('lib/AnnotationControls', () => {
 
     describe('handleRegionClick()', () => {
         beforeEach(() => {
-            stubs.event = sandbox.stub({});
             stubs.classListAdd = sandbox.stub();
             stubs.classListRemove = sandbox.stub();
-            stubs.add = sandbox.stub(annotationControls.controls, 'add').returns({
-                classList: {
-                    add: stubs.classListAdd,
-                    remove: stubs.classListRemove,
+            stubs.event = sandbox.stub({
+                target: {
+                    classList: {
+                        add: stubs.classListAdd,
+                        remove: stubs.classListRemove,
+                    },
                 },
             });
         });
 
         it('should activate region button then deactivate', () => {
-            annotationControls.init({ onRegionClick: stubs.onRegionClick });
-
             expect(annotationControls.isRegionActive).to.be.false;
 
             annotationControls.handleRegionClick(stubs.onRegionClick)(stubs.event);
@@ -87,7 +86,6 @@ describe('lib/AnnotationControls', () => {
         });
 
         it('should call onRegionClick', () => {
-            annotationControls.init({ onRegionClick: stubs.onRegionClick });
             annotationControls.handleRegionClick(stubs.onRegionClick)(stubs.event);
 
             expect(stubs.onRegionClick).to.be.calledWith({