feat(annotations): scroll to annotation on load

* PR Feedback
box · Jun 16, 2020 · fdefff2 · fdefff2
1 parent 6316c70
commit fdefff2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/lib/viewers/BaseViewer.js b/src/lib/viewers/BaseViewer.js
@@ -967,7 +967,7 @@ class BaseViewer extends EventEmitter {
      */
     initAnnotations() {
         // Annotations must be loaded and ready before scrolling can occur on a deep-linked annotation.
-        this.annotator.addListener('annotations_initialized', this.handleAnnotationsOnLoad);
+        this.annotator.addListener('annotations_initialized', this.handleAnnotationsInitialized);
 
         this.annotator.init(this.scale);
 
@@ -1046,17 +1046,12 @@ class BaseViewer extends EventEmitter {
      * @param {Array} event.annotations - annotations array from emitted from box-annotations.
      * @return {void}
      */
-    handleAnnotationsOnLoad = ({ annotations = [] }) => {
+    handleAnnotationsInitialized = ({ annotations = [] }) => {
         const {
             file: { id },
         } = this.options;
 
         const activeAnnotationId = getProp(this.options, `fileOptions.${id}.annotations.activeId`, null);
-
-        if (!activeAnnotationId) {
-            return;
-        }
-
         const annotation = annotations.find(entry => entry.id === activeAnnotationId);
 
         if (!annotation) {

diff --git a/src/lib/viewers/__tests__/BaseViewer-test.js b/src/lib/viewers/__tests__/BaseViewer-test.js
@@ -1193,7 +1193,7 @@ describe('lib/viewers/BaseViewer', () => {
             expect(base.annotator.addListener).to.be.calledWith('annotations_create', base.handleAnnotationCreateEvent);
             expect(base.annotator.addListener).to.be.calledWith(
                 'annotations_initialized',
-                base.handleAnnotationsOnLoad,
+                base.handleAnnotationsInitialized,
             );
             expect(base.emit).to.be.calledWith('annotator', base.annotator);
         });
@@ -1300,7 +1300,7 @@ describe('lib/viewers/BaseViewer', () => {
         });
     });
 
-    describe('handleAnnotationsOnLoad()', () => {
+    describe('handleAnnotationsInitialized()', () => {
         let scrollToAnnotationStub;
 
         beforeEach(() => {
@@ -1319,7 +1319,7 @@ describe('lib/viewers/BaseViewer', () => {
                 },
             };
 
-            base.handleAnnotationsOnLoad({ annotations: [{ id: '123' }] });
+            base.handleAnnotationsInitialized({ annotations: [{ id: '123' }] });
 
             expect(scrollToAnnotationStub).not.to.be.called;
         });
@@ -1332,7 +1332,7 @@ describe('lib/viewers/BaseViewer', () => {
                 },
             };
 
-            base.handleAnnotationsOnLoad({ annotations: [{ id: 'ABC' }] });
+            base.handleAnnotationsInitialized({ annotations: [{ id: 'ABC' }] });
 
             expect(scrollToAnnotationStub).to.be.calledWith('ABC');
         });