[#70333] fix commit popup shift value

antmicro · Dec 19, 2024 · 9a64f08 · 9a64f08
1 parent d3cfe63
commit 9a64f08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/comments/ycomments.js b/src/comments/ycomments.js
@@ -338,8 +338,14 @@ export class YComments {
   }
 
   parentLineHeight(commentId) {
-    let elem = this.mainCodeMirror.dom.querySelector("#" + commentId)?.previousSibling;
-    if (elem) return elem.clientHeight;
+    let elem;
+    if (this.display().isShown(commentId)) {
+      elem = this.mainCodeMirror.dom.querySelector("#" + commentId)?.previousSibling;
+      if (elem) return elem.clientHeight + 5;
+    } else {
+      elem = this.mainCodeMirror.dom.querySelector("#" + commentId)?.parentElement;
+      if (elem) return elem.clientHeight;
+    }
 
     let parentLineNumber = this.positionManager.get(commentId);
     return [...this.mainCodeMirror.dom.querySelectorAll(`.cm-gutterElement`)].find((e) => e.textContent == parentLineNumber)?.clientHeight;

diff --git a/src/components/Comment.jsx b/src/components/Comment.jsx
@@ -82,7 +82,7 @@ const YComment = ({ ycomments, commentId }) => {
     [commentId],
   );
 
-  const parentHeight = ycomments.parentLineHeight(commentId) + 3.8;
+  const parentHeight = ycomments.parentLineHeight(commentId) - 1;
 
   useEffect(() => {
     if (!cmref.current) {