Improve navigation to annotation by id (annotationKey)

zotero · Aug 6, 2021 · 05da34b · 05da34b
1 parent 7108427
commit 05da34b
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/components/annotator.js b/src/components/annotator.js
@@ -188,6 +188,16 @@ const Annotator = React.forwardRef((props, ref) => {
 	}
 
 	let navigate = (location) => {
+
+		let id = location.id || location.annotationKey;
+		let annotation = id && annotationsRef.current.find(x => x.id === id);
+		if (annotation) {
+			// selectAnnotation(id, true, false, true, true);
+			makeBlink(annotation.position);
+			scrollTo({ id, position: annotation.position }, true, true);
+			return;
+		}
+
 		if (Number.isInteger(location.pageIndex)) {
 			window.PDFViewerApplication.pdfViewer.scrollPageIntoView({
 				pageNumber: location.pageIndex + 1
@@ -207,14 +217,6 @@ const Annotator = React.forwardRef((props, ref) => {
 			return;
 		}
 
-		let annotation = location.id && annotationsRef.current.find(x => x.id === location.id);
-		if (annotation) {
-			selectAnnotation(location.id, true, false, true, true);
-			if (!location.position) {
-				location.position = annotation.position;
-			}
-		}
-
 		makeBlink(location.position);
 		scrollTo(location, true, true);
 	};