Fixed #2107 extract a common function to locate focus node for modes …

…insert and visual
brookhong · Jul 15, 2024 · 446209d · 446209d
1 parent 5940fb2
commit 446209d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 43 deletions.
diff --git a/src/content_scripts/common/hints.js b/src/content_scripts/common/hints.js
@@ -390,20 +390,16 @@ div.hint-scrollable {
     };
 
     self.genLabels = function(total) {
-        var ch, hint, hints, i, len, offset;
-        hints = [""];
-        offset = 0;
-        while (hints.length - offset < total || hints.length === 1) {
-            hint = hints[offset++];
-            for (i = 0, len = characters.length; i < len; i++) {
-                ch = characters[i];
-                hints.push(ch + hint);
+        let chars = characters.toUpperCase();
+        var hints = [""], offset = 0;
+        while (hints.length - offset < total || offset == 0) {
+            var prefix = hints[offset++];
+            for (var i = 0; i < chars.length; i++) {
+                hints.push(prefix + chars[i]);
             }
         }
         hints = hints.slice(offset, offset + total);
-        return hints.map(function(str) {
-            return str.reverse().toUpperCase();
-        });
+        return hints
     };
 
     self.coordinate = function() {

diff --git a/src/content_scripts/common/insert.js b/src/content_scripts/common/insert.js
@@ -6,6 +6,7 @@ import {
     createElementWithContent,
     getRealEdit,
     isEditable,
+    locateFocusNode,
     scrollIntoViewIfNeeded,
     setSanitizedContent,
 } from './utils.js';
@@ -39,9 +40,6 @@ function createInsert() {
                         document.getSelection().setPosition(node, node.childNodes.length);
                     }
                 }
-                // blink cursor to bring cursor into view
-                Visual.showCursor();
-                Visual.hideCursor();
             }
         }
     }
@@ -74,9 +72,6 @@ function createInsert() {
                 // for contenteditable div
                 var selection = document.getSelection();
                 selection.setPosition(selection.focusNode, 0);
-                // blink cursor to bring cursor into view
-                Visual.showCursor();
-                Visual.hideCursor();
             }
         }
     });
@@ -236,14 +231,7 @@ function createInsert() {
                 document.body.append(_emojiDiv);
                 _emojiDiv.style.display = "";
                 _emojiDiv.querySelector('#sk_emoji>div').classList.add("selected");
-                var br;
-                if (isInput) {
-                    br = getCursorPixelPos(input);
-                } else {
-                    Visual.showCursor();
-                    br = Visual.getCursorPixelPos();
-                    Visual.hideCursor();
-                }
+                var br = isInput ? getCursorPixelPos(input) : locateFocusNode(document.getSelection());
                 var top = br.top + br.height + 4;
                 if (window.innerHeight - top < _emojiDiv.offsetHeight) {
                     top = br.top - _emojiDiv.offsetHeight;

diff --git a/src/content_scripts/common/utils.js b/src/content_scripts/common/utils.js
@@ -446,6 +446,33 @@ function getTextRect() {
     return rects;
 }
 
+function locateFocusNode(selection) {
+    let se = selection.focusNode.parentElement
+    scrollIntoViewIfNeeded(se, true);
+    var r = getTextRect(selection.focusNode, selection.focusOffset)[0];
+    if (!r) {
+        r = selection.focusNode.getBoundingClientRect();
+    }
+    if (r) {
+        r = {
+            left: r.left,
+            top: r.top,
+            width: r.width,
+            height: r.height
+        };
+        if (r.left < 0 || r.left >= window.innerWidth) {
+            se.scrollLeft += r.left - window.innerWidth / 2;
+            r.left = window.innerWidth / 2;
+        }
+        if (r.top < 0 || r.top >= window.innerHeight) {
+            se.scrollTop += r.top - window.innerHeight / 2;
+            r.top = window.innerHeight / 2;
+        }
+        return r;
+    }
+    return null;
+}
+
 function getNearestWord(text, offset) {
     var ret = [0, text.length];
     var nonWord = /\W/;
@@ -912,6 +939,7 @@ export {
     isElementPartiallyInViewport,
     isInUIFrame,
     listElements,
+    locateFocusNode,
     mapInMode,
     parseAnnotation,
     refreshHints,

diff --git a/src/content_scripts/common/visual.js b/src/content_scripts/common/visual.js
@@ -12,6 +12,7 @@ import {
     getTextRect,
     getVisibleElements,
     getWordUnderCursor,
+    locateFocusNode,
     scrollIntoViewIfNeeded,
     setSanitizedContent,
     tabOpenLink,
@@ -463,27 +464,11 @@ function createVisual(clipboard, hints) {
         if (selection.focusNode && (selection.focusNode.offsetHeight > 0 || selection.focusNode.parentNode.offsetHeight > 0)) {
             // https://developer.mozilla.org/en-US/docs/Web/API/Selection
             // If focusNode is a text node, this is the number of characters within focusNode preceding the focus. If focusNode is an element, this is the number of child nodes of the focusNode preceding the focus.
-            scrollIntoViewIfNeeded(selection.focusNode.parentElement, true);
-
-            var r = getTextRect(selection.focusNode, selection.focusOffset)[0];
-            if (!r) {
-                r = selection.focusNode.getBoundingClientRect();
-            }
+            let r = locateFocusNode(selection)
             if (r) {
                 cursor.style.position = "fixed";
                 cursor.style.left = r.left + 'px';
-                if (r.left < 0 || r.left >= window.innerWidth) {
-                    document.scrollingElement.scrollLeft += r.left - window.innerWidth / 2;
-                    cursor.style.left = window.innerWidth / 2 + 'px';
-                } else {
-                    cursor.style.left = r.left + 'px';
-                }
-                if (r.top < 0 || r.top >= window.innerHeight) {
-                    document.scrollingElement.scrollTop += r.top - window.innerHeight / 2;
-                    cursor.style.top = window.innerHeight / 2 + 'px';
-                } else {
-                    cursor.style.top = r.top + 'px';
-                }
+                cursor.style.top = r.top + 'px';
                 cursor.style.height = r.height + 'px';
             }