[#65904] Introduce signals and simplify comments

antmicro · Nov 5, 2024 · 0f64498 · 0f64498
1 parent 6750ecf
commit 0f64498
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 155 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "@codemirror/state": "^6.2.1",
     "@codemirror/view": "^6.16.0",
     "@preact/compat": "^17.1.2",
+    "@preact/signals": "^1.3.0",
     "codemirror": "^6.0.1",
     "dompurify": "^2.3.5",
     "imurmurhash": "^0.1.4",

diff --git a/src/comments/sidebarWidget.js b/src/comments/sidebarWidget.js
@@ -33,7 +33,7 @@ class CommentMarker extends GutterMarker {
 
     if (this.lineNumber) {
       this.gutterMarker.style.width = this.lineNumber.toString().length * 7 + "px";
-      this.gutterMarker.ondrop = () => this.ycomments.moveOrMerge(this.ycomments.draggedComment, this.lineNumber);
+      this.gutterMarker.ondrop = () => this.ycomments.moveOrMerge(this.ycomments.draggedComment.value, this.lineNumber);
       this.gutterMarker.ondragover = (e) => e.preventDefault();
     }
   }
@@ -48,7 +48,7 @@ class CommentMarker extends GutterMarker {
     } else {
       this.icon.onclick = () => this.ycomments.display().switchVisibility(this.commentId);
       this.icon.onmouseenter = () => {
-        this.ycomments.commentWithPopup = this.commentId;
+        this.ycomments.commentWithPopup.value = this.commentId;
         this.ycomments.updateMainCodeMirror();
       };
     }

diff --git a/src/comments/textareaWidget.js b/src/comments/textareaWidget.js
@@ -100,8 +100,7 @@ const commentStateEffect = StateField.define({
 
       moveComments(transaction, ycomments);
 
-      return ycomments
-        .iterComments()
+      return ycomments.comments.value
         .sort(sortByLine)
         .reduce(...buildTextareaWidgets(transaction))
         .finish();