@supernova-studio/client 0.48.28 → 0.48.30

package/package.json

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

package/src/yjs/version-room/frontend.ts

@@ -4,6 +4,7 @@ import {
   DocumentationPageV2,
   ElementGroup,
   ElementGroupSnapshot,
+  PageBlockDefinition,
   defaultDocumentationItemConfigurationV2,
   mapByUnique,
   pickLatestGroupSnapshots,
@@ -373,8 +374,12 @@ export class FrontendVersionRoomYDoc {
   // Update page content hash
   //
 
-  notifyDocumentationPageContentUpdated(pageId: string, content: DocumentationPageEditorModel) {
-    const pageContentHash = generatePageContentHash(content, this.debug);
+  notifyDocumentationPageContentUpdated(
+    pageId: string,
+    content: DocumentationPageEditorModel,
+    definitions: PageBlockDefinition[]
+  ) {
+    const pageContentHash = generatePageContentHash(content, definitions, this.debug);
     if (this.debug) {
       console.log(`Will set page content hash: '${pageId}' : '${pageContentHash}'`);
     }

package/src/yjs/version-room/utils.ts

@@ -1,12 +1,26 @@
-import { PageBlockItemRichTextValue } from "@supernova-studio/model";
+import {
+  PageBlockDefinition,
+  PageBlockDefinitionsMap,
+  PageBlockItemMultiRichTextValue,
+  PageBlockItemRichTextValue,
+  mapPageBlockItemValuesV2,
+  removeCommentSpans,
+} from "@supernova-studio/model";
 import { generateHash } from "../../utils";
 import { DocumentationPageEditorModel } from "../docs-editor";
 
-export function generatePageContentHash(content: DocumentationPageEditorModel, debug = false) {
+export function generatePageContentHash(
+  content: DocumentationPageEditorModel,
+  definitions: PageBlockDefinition[],
+  debug = false
+) {
   let sanitizedContent = content;
 
+  // Remove comment spans
+  sanitizedContent = removeCommentSpansFromPage(content, definitions);
+
   // Make sure hashes of empty pages always match
-  if (isPageContentEmpty(content)) {
+  if (isPageContentEmpty(sanitizedContent)) {
     sanitizedContent = { blocks: [] };
   }
 
@@ -35,3 +49,32 @@ function isPageContentEmpty(content: DocumentationPageEditorModel): boolean {
   const textValue = singleItem.props["text"] as PageBlockItemRichTextValue;
   return !textValue.value.spans.length;
 }
+
+function removeCommentSpansFromPage(
+  content: DocumentationPageEditorModel,
+  definitions: PageBlockDefinition[]
+): DocumentationPageEditorModel {
+  const defMap = new PageBlockDefinitionsMap(definitions);
+
+  mapPageBlockItemValuesV2(content.blocks, defMap, (block, item, prop, value) => {
+    if (prop.type === "RichText") {
+      const richTextValue = value as PageBlockItemRichTextValue;
+      return {
+        ...richTextValue,
+        value: removeCommentSpans(richTextValue.value),
+      };
+    }
+
+    if (prop.type === "MultiRichText") {
+      const multiRichTextValue = value as PageBlockItemMultiRichTextValue;
+      return {
+        ...multiRichTextValue,
+        value: multiRichTextValue.value.map(removeCommentSpans),
+      };
+    }
+
+    return value;
+  });
+
+  return content;
+}