From af695510bbcbc61c18d6105b5cc062a794277d2b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 9 Feb 2021 17:03:14 +0100
Subject: [PATCH] Improve comment bubble

---
 www/pad/app-pad.less | 13 +++++++++----
 www/pad/comments.js  | 25 +++++++------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/www/pad/app-pad.less b/www/pad/app-pad.less
index 1818e22be..502d5616c 100644
--- a/www/pad/app-pad.less
+++ b/www/pad/app-pad.less
@@ -177,13 +177,19 @@ body.cp-app-pad {
         }
         div.cp-comment-bubble {
             position: relative;
-            order: 2;
             button {
                 .fa {
                     margin: 0 !important;
                 }
-                left: 10px;
                 position: absolute;
+                padding: 0 4px;
+                background: @cp_toolbar-bg;
+                margin-left: 0px;
+                margin-top: 20px;
+                line-height: unset;
+                &:hover {
+                    background: @toolbar-bg-active;
+                }
             }
         }
         #cp-app-pad-comments {
@@ -204,8 +210,7 @@ body.cp-app-pad {
         &.cke_body_width {
             div.cp-comment-bubble {
                 button {
-                    right: -10px;
-                    left: unset;
+                    margin-left: 30px;
                 }
             }
             iframe {
diff --git a/www/pad/comments.js b/www/pad/comments.js
index 4d752d54d..90ba02471 100644
--- a/www/pad/comments.js
+++ b/www/pad/comments.js
@@ -749,31 +749,19 @@ define([
     };
     var updateBubble = function(Env) {
         if (!Env.bubble) { return; }
-        var pos = Env.bubble.node.getBoundingClientRect();
-        if (pos.y < 0 || pos.y > Env.$inner.outerHeight()) {
-            //removeCommentBubble(Env);
-        }
-        Env.bubble.button.setAttribute('style', 'top:' + pos.y + 'px');
+        var pos = Env.bubble.range.getClientRects()[0];
+        var left = pos.x + pos.width;
+        Env.bubble.button.setAttribute('style', 'top:' + pos.y + 'px; left: '+left+'px');
     };
     var addCommentBubble = function(Env) {
         var ranges = Env.editor.getSelectedRanges();
         if (!ranges.length) { return; }
-        var el = ranges[0].endContainer || ranges[0].startContainer;
-        var node = el && el.$;
-        if (!node) { return; }
-        if (node.nodeType === Node.TEXT_NODE) {
-            node = node.parentNode;
-            if (!node) { return; }
-        }
-        var pos = node.getBoundingClientRect();
-        var y = pos.y;
-        if (y < 0 || y > Env.$inner.outerHeight()) { return; }
+
         var button = h('button.btn.btn-secondary', {
-            style: 'top:' + y + 'px;',
             title: Messages.comments_comment
         }, h('i.fa.fa-commenting'));
         Env.bubble = {
-            node: node,
+            range: ranges[0],
             button: button
         };
         $(button).click(function(e)  {
@@ -781,7 +769,8 @@ define([
             Env.editor.execCommand('comment');
             Env.bubble = undefined;
         });
-        Env.$contentContainer.append(h('div.cp-comment-bubble', button));
+        Env.$contentContainer.find('iframe').before(h('div.cp-comment-bubble', button));
+        updateBubble(Env);
     };
 
     var isEditable = function (document) {