inital work

Author: shailpatels

src/UI/page.js

@@ -8,8 +8,8 @@ const PAGE_TEMPLATE = `
     <div class="canvasWrapper">
       <canvas></canvas>
     </div>
-    <div class="` + config.textLayerName + `"></div>
     <svg class="` + config.annotationLayerName + `"></svg>
+    <div class="` + config.textLayerName + `"></div>
   </div>
 `;
 

src/UI/pen.js

@@ -64,9 +64,6 @@ function saveToStorage(x, y) {
  * @param {PointerEvent} e The DOM event to be handled
  */
 function handleDocumentPointermove(e) {
-  if (!e.srcElement.classList.contains('annotationLayer')) {
-    return;
-  }
   if (_candraw) {
     savePoint(e.clientX, e.clientY);
   }

src/UI/text.js

@@ -21,9 +21,7 @@ function handleDocumentMouseup(e) {
   if (input || !findSVGAtPoint(e.clientX, e.clientY)) {
     return;
   }
-  if (!e.srcElement.classList.contains('annotationLayer')) {
-    return;
-  }
+  
   input = document.createElement('input');
   input.setAttribute('id', 'pdf-annotate-text-input');
   input.setAttribute('placeholder', 'Enter text');

src/UI/utils.js

@@ -66,24 +66,25 @@ export function findSVGAtPoint(x, y) {
 /**
  * Find an Element that represents an annotation at a given point.
  *
- * IMPORTANT: Requires the annotation layer to be the top most element so
- *            either use z-ordering or make it the leaf container.
- *
  * @param {Number} x The x coordinate of the point
  * @param {Number} y The y coordinate of the point
- * @return {Element} The annotation element or null if one can't be found
+ * @return {Element|null} The annotation element or null if one can't be found
  */
 export function findAnnotationAtPoint(x, y) {
-  let el = null;
-  let candidate = document.elementFromPoint(x, y);
-  while (!el && candidate && candidate !== document) {
-    let type = candidate.getAttribute('data-pdf-annotate-type');
-    if (type) {
-      el = candidate;
+  let svg = findSVGAtPoint(x, y);
+
+  if (!svg) {
+    return;
+  }
+
+  let elements = svg.querySelectorAll('[data-pdf-annotate-type]');
+  for (let element of elements) {
+    if (pointIntersectsRect(x, y, element.getBoundingClientRect())) {
+      return element;
     }
-    candidate = candidate.parentNode;
   }
-  return el;
+
+  return null;
 }
 
 /**