From 61e747c313ab614c8bce272695bacec442146420 Mon Sep 17 00:00:00 2001
From: artemave <artemave@gmail.com>
Date: Fri, 2 Feb 2024 16:49:27 +0100
Subject: [PATCH] Better popup positioning

---
 .gitignore       |  1 +
 contentscript.js | 45 ++++++++++++++++++++++++++++++++++-----------
 lib/popup.html   |  3 ++-
 manifest_v2.json |  2 +-
 manifest_v3.json |  2 +-
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index b186605..d2801e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 dist
 node_modules
 .DS_Store
+.mise.toml
diff --git a/contentscript.js b/contentscript.js
index a4d021c..75b8fa4 100644
--- a/contentscript.js
+++ b/contentscript.js
@@ -75,7 +75,25 @@ function showPopup(e, content) {
   $('body').append($popup)
 
   $popup.on('transover-popup_content_updated', function() {
-    const pos = calculatePosition(e.clientX, e.clientY, $popup)
+    let textRect = {
+      top: e.clientY,
+      bottom: e.clientY,
+      left: e.clientX,
+      right: e.clientX,
+    }
+
+    const selection = window.getSelection()
+    if (selection.toString()) {
+      const selectionRect = selection.getRangeAt(0).getBoundingClientRect()
+      textRect = {
+        top: selectionRect.top,
+        bottom: selectionRect.bottom,
+        left: selectionRect.left,
+        right: selectionRect.right,
+      }
+    }
+    const pos = calculatePopupPosition(textRect, $popup)
+
     $popup
       .each(function() {
         $(this.shadowRoot.querySelector('main')).hide()
@@ -88,23 +106,28 @@ function showPopup(e, content) {
   $popup.attr({content, options: JSON.stringify(options)})
 }
 
-function calculatePosition(x, y, $popup) {
+function calculatePopupPosition(textRect, $popup) {
   const pos = {}
   const margin = 5
   const anchor = 10
   const outerWidth = Number($popup.attr('outer-width'))
   const outerHeight = Number($popup.attr('outer-height'))
+  const windowWidth = $(window).width()
 
   // show popup to the right of the word if it fits into window this way
-  if (x + anchor + outerWidth + margin < $(window).width()) {
-    pos.x = x + anchor
+  if (textRect.right + anchor + outerWidth + margin < windowWidth) {
+    pos.x = textRect.right + anchor
   }
   // show popup to the left of the word if it fits into window this way
-  else if (x - anchor - outerWidth - margin > 0) {
-    pos.x = x - anchor - outerWidth
+  else if (textRect.left - anchor - outerWidth - margin > 0) {
+    pos.x = textRect.left - anchor - outerWidth
+  }
+  // align popup with selection start if it's too wide to be on the either sides
+  else if (textRect.left + anchor + outerWidth + margin < windowWidth) {
+    pos.x = textRect.left
   }
   // show popup at the very left if it is not wider than window
-  else if (outerWidth + margin*2 < $(window).width()) {
+  else if (outerWidth + margin*2 < windowWidth) {
     pos.x = margin
   }
   // resize popup width to fit into window and position it the very left of the window
@@ -118,12 +141,12 @@ function calculatePosition(x, y, $popup) {
   }
 
   // show popup above the word if it fits into window this way
-  if (y - anchor - outerHeight - margin > 0) {
-    pos.y = y - anchor - outerHeight
+  if (textRect.top - anchor - outerHeight - margin > 0) {
+    pos.y = textRect.top - anchor - outerHeight
   }
   // show popup below the word if it fits into window this way
-  else if (y + anchor + outerHeight + margin < $(window).height()) {
-    pos.y = y + anchor
+  else if (textRect.bottom + anchor + outerHeight + margin < $(window).height()) {
+    pos.y = textRect.bottom + anchor
   }
   // show popup at the very top of the window
   else {
diff --git a/lib/popup.html b/lib/popup.html
index 9936458..7030a23 100644
--- a/lib/popup.html
+++ b/lib/popup.html
@@ -14,6 +14,7 @@
 
     main {
       color: #333;
+      max-width: 800px;
       font-family: Arial, sans-serif;
       font-size: 14px;
       font-weight: 300;
@@ -49,7 +50,7 @@
 
     .pos_translation {
       font-size: 1em;
-      line-height: 1.2em;
+      line-height: 1.3em;
     }
 
     .red {
diff --git a/manifest_v2.json b/manifest_v2.json
index 8d55a34..fcd85bd 100644
--- a/manifest_v2.json
+++ b/manifest_v2.json
@@ -1,7 +1,7 @@
 {
   "name": "TransOver",
   "manifest_version": 2,
-  "version": "1.73",
+  "version": "1.74",
   "icons": { "16": "to_16.png", "48": "to_48.png", "128": "to_128.png" },
   "description": "Hover, click or select to translate (with text-to-speech). Translator.",
   "background": {
diff --git a/manifest_v3.json b/manifest_v3.json
index cf8e6a3..e756101 100644
--- a/manifest_v3.json
+++ b/manifest_v3.json
@@ -1,7 +1,7 @@
 {
   "name": "TransOver",
   "manifest_version": 3,
-  "version": "1.73",
+  "version": "1.74",
   "icons": { "16": "to_16.png", "48": "to_48.png", "128": "to_128.png" },
   "description": "Hover, click or select to translate (with text-to-speech). Translator.",
   "background": {