@supernova-studio/client 0.48.26 → 0.48.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supernova-studio/client",
-  "version": "0.48.26",
+  "version": "0.48.28",
   "description": "Supernova Data Models",
   "source": "src/index.ts",
   "main": "dist/index.js",

package/src/yjs/docs-editor/blocks-to-prosemirror.ts

@@ -628,6 +628,14 @@ function serializeTextSpanAttribute(spanAttribute: PageBlockTextSpanAttribute):
       return { type: "strike", attrs: {} };
     case "Code":
       return { type: "code", attrs: {} };
+    case "Comment":
+      return {
+        type: "commentHighlight",
+        attrs: {
+          highlightId: spanAttribute.commentHighlightId,
+          resolved: spanAttribute.commentIsResolved,
+        },
+      };
     case "Link":
       if (spanAttribute.link) {
         return serializeLinkMark(

package/src/yjs/docs-editor/prosemirror/schema.ts

@@ -510,7 +510,7 @@ const newSchema = {
       name: "link",
       rank: 0,
       spec: {
-        inclusive: true,
+        inclusive: false,
         attrs: {
           href: {
             default: null,
@@ -522,10 +522,7 @@ const newSchema = {
             default: "noopener noreferrer nofollow",
           },
           class: {
-            default: null,
-          },
-          itemId: {
-            default: null,
+            default: "tiptap-link",
           },
         },
         parseDOM: [
@@ -549,11 +546,7 @@ const newSchema = {
         },
         class: {
           hasDefault: true,
-          default: null,
-        },
-        itemId: {
-          hasDefault: true,
-          default: null,
+          default: "tiptap-link",
         },
       },
       instance: {
@@ -562,47 +555,65 @@ const newSchema = {
           href: null,
           target: "_blank",
           rel: "noopener noreferrer nofollow",
-          class: null,
-          itemId: null,
+          class: "tiptap-link",
         },
       },
     },
-    bold: {
-      name: "bold",
+    commentHighlight: {
+      name: "commentHighlight",
       rank: 1,
       spec: {
-        parseDOM: [
-          {
-            tag: "strong",
+        attrs: {
+          highlightId: {
+            default: null,
           },
-          {
-            tag: "b",
+          resolved: {
+            default: false,
           },
+        },
+        parseDOM: [
           {
-            style: "font-weight",
+            tag: "commenthighlight",
           },
         ],
       },
-      attrs: {},
+      attrs: {
+        highlightId: {
+          hasDefault: true,
+          default: null,
+        },
+        resolved: {
+          hasDefault: true,
+          default: false,
+        },
+      },
       instance: {
-        type: "bold",
+        type: "commentHighlight",
+        attrs: {
+          highlightId: null,
+          resolved: false,
+        },
       },
     },
-    code: {
-      name: "code",
+    bold: {
+      name: "bold",
       rank: 2,
       spec: {
-        excludes: "_",
-        code: true,
         parseDOM: [
           {
-            tag: "code",
+            tag: "strong",
+          },
+          {
+            tag: "b",
+          },
+          {
+            style: "font-weight",
           },
         ],
       },
       attrs: {},
       instance: {
-        type: "code",
+        type: "bold",
       },
     },
     italic: {
@@ -651,6 +662,23 @@ const newSchema = {
         type: "strike",
       },
     },
+    code: {
+      name: "code",
+      rank: 5,
+      spec: {
+        excludes: "bold code italic strike link",
+        code: true,
+        parseDOM: [
+          {
+            tag: "code",
+          },
+        ],
+      },
+      attrs: {},
+      instance: {
+        type: "code",
+      },
+    },
   },
 } as const;
 

package/src/yjs/docs-editor/prosemirror-to-blocks.ts

@@ -421,6 +421,8 @@ function parseRichTextAttribute(mark: ProsemirrorMark): PageBlockTextSpanAttribu
       return { type: "Code" };
     case "link":
       return parseProsemirrorLink(mark);
+    case "commentHighlight":
+      return parseProsemirrorCommentHighlight(mark);
   }
 
   return null;
@@ -450,6 +452,19 @@ function parseProsemirrorLink(mark: ProsemirrorMark): PageBlockTextSpanAttribute
   }
 }
 
+function parseProsemirrorCommentHighlight(mark: ProsemirrorMark): PageBlockTextSpanAttribute | null {
+  const highlightId = getProsemirrorAttribute(mark, "highlightId", z.string().optional());
+  if (!highlightId) return null;
+
+  const isResolved = getProsemirrorAttribute(mark, "resolved", z.boolean().optional()) ?? false;
+
+  return {
+    type: "Comment",
+    commentHighlightId: highlightId,
+    commentIsResolved: isResolved,
+  };
+}
+
 //
 // Embed
 //