Merge pull request #748 from ANH25/drag-and-drop

fix drag & drop issue when dropping things over existing content

qt/aqt/editor.py

@@ -922,9 +922,7 @@ to a cloze type first, via 'Notes>Change Note Type'"""
                 self.doPaste(html, internal)
 
         p = self.web.mapFromGlobal(QCursor.pos())
-        self.web.evalWithCallback(
-            f"focusIfField(document.elementFromPoint({p.x()}, {p.y()}));", pasteIfField
-        )
+        self.web.evalWithCallback(f"focusIfField({p.x()}, {p.y()});", pasteIfField)
 
     def onPaste(self):
         self.web.onPaste()

qt/ts/src/editor.ts

@@ -216,13 +216,17 @@ function focusPrevious() {
     }
 }
 
-function focusIfField(elem) {
-    if (elem.classList.contains("field")) {
-        elem.focus();
-        // the focus event may not fire if the window is not active, so make sure
-        // the current field is set
-        currentField = elem;
-        return true;
+function focusIfField(x, y) {
+    const elements = document.elementsFromPoint(x, y);
+    for (let i = 0; i < elements.length; i++) {
+        let elem = elements[i] as HTMLElement;
+        if (elem.classList.contains("field")) {
+            elem.focus();
+            // the focus event may not fire if the window is not active, so make sure
+            // the current field is set
+            currentField = elem;
+            return true;
+        }
     }
     return false;
 }