@supernova-studio/client 0.51.2 → 0.52.1

package/package.json

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

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

@@ -4,6 +4,7 @@ import {
   PageBlockItemMultiRichTextValue,
   PageBlockItemRichTextValue,
   PageBlockItemTableValue,
+  PageBlockText,
   mapPageBlockItemValuesV2,
   removeCommentSpans,
 } from "@supernova-studio/model";
@@ -18,7 +19,7 @@ export function generatePageContentHash(
   let sanitizedContent = structuredClone(content);
 
   // Remove comment spans
-  sanitizedContent = removeCommentSpansFromPage(sanitizedContent, definitions);
+  sanitizedContent = sanitizePageContents(sanitizedContent, definitions);
 
   // Make sure hashes of empty pages always match
   if (isPageContentEmpty(sanitizedContent)) {
@@ -51,7 +52,7 @@ function isPageContentEmpty(content: DocumentationPageEditorModel): boolean {
   return !textValue.value.spans.length;
 }
 
-function removeCommentSpansFromPage(
+function sanitizePageContents(
   content: DocumentationPageEditorModel,
   definitions: PageBlockDefinition[]
 ): DocumentationPageEditorModel {
@@ -62,7 +63,7 @@ function removeCommentSpansFromPage(
       const richTextValue = value as PageBlockItemRichTextValue;
       return {
         ...richTextValue,
-        value: removeCommentSpans(richTextValue.value),
+        value: sanitizeRichText(richTextValue.value),
       };
     }
 
@@ -70,7 +71,7 @@ function removeCommentSpansFromPage(
       const multiRichTextValue = value as PageBlockItemMultiRichTextValue;
       return {
         ...multiRichTextValue,
-        value: multiRichTextValue.value.map(removeCommentSpans),
+        value: multiRichTextValue.value.map(sanitizeRichText),
       };
     }
 
@@ -80,7 +81,7 @@ function removeCommentSpansFromPage(
         r.cells.forEach(c => {
           c.nodes.forEach(n => {
             if (n.type === "RichText") {
-              n.value = removeCommentSpans(n.value);
+              n.value = sanitizeRichText(n.value);
             }
           });
         });
@@ -94,3 +95,15 @@ function removeCommentSpansFromPage(
 
   return content;
 }
+
+function sanitizeRichText(richText: PageBlockText): PageBlockText {
+  return sortSpanAttributes(removeCommentSpans(richText));
+}
+
+function sortSpanAttributes(richText: PageBlockText) {
+  richText.spans.forEach(s => {
+    s.attributes.sort((lhs, rhs) => lhs.type.localeCompare(rhs.type));
+  });
+
+  return richText;
+}