Properly check whether the selection is visible in the current viewport

1 files changed, 5 insertions, 2 deletions

diff --git a/content_scripts/mode_visual_edit.coffee b/content_scripts/mode_visual_edit.coffee
index ce3caafe..9e597cca 100644
--- a/content_scripts/mode_visual_edit.coffee
+++ b/content_scripts/mode_visual_edit.coffee
@@ -484,8 +484,11 @@ class VisualMode extends Movement
         @extendByOneCharacter(forward) or @extendByOneCharacter backward
       else
         if @selection.type in [ "Caret", "Range" ]
-          elementWithFocus = DomUtils.getElementWithFocus @selection, @getDirection() == backward
-          if DomUtils.getVisibleClientRect elementWithFocus
+          selectionRect = @selection.getRangeAt(0).getBoundingClientRect()
+          selectionRect = Rect.intersect selectionRect, (Rect.create 0, 0, window.innerWidth,
+              window.innerHeight)
+          if selectionRect.height >= 0 and selectionRect.width >= 0
+            # The selection is visible in the current viewport.
             if @selection.type == "Caret"
               # The caret is in the viewport. Make make it visible.
               @extendByOneCharacter(forward) or @extendByOneCharacter backward