@supernova-studio/client 0.39.0 → 0.42.0

package/src/yjs/design-system-content/item-configuration.ts

@@ -1,6 +1,7 @@
-import { DocumentationItemConfigurationV2, DocumentationItemHeaderV2 } from "@supernova-studio/model";
+import { DocumentationItemHeaderV2 } from "@supernova-studio/model";
 import * as Y from "yjs";
 import { z } from "zod";
+import { DTODocumentationItemConfigurationV2 } from "../../api/dto/elements/documentation/item-configuration-v2";
 
 //
 // Types
@@ -8,12 +9,12 @@ import { z } from "zod";
 
 export const DTODocumentationPageRoomHeaderData = z.object({
   title: z.string(),
-  configuration: DocumentationItemConfigurationV2,
+  configuration: DTODocumentationItemConfigurationV2,
 });
 
 export const DTODocumentationPageRoomHeaderDataUpdate = z.object({
   title: z.string().optional(),
-  configuration: DocumentationItemConfigurationV2.omit({ header: true })
+  configuration: DTODocumentationItemConfigurationV2.omit({ header: true })
     .extend({ header: DocumentationItemHeaderV2.partial() })
     .optional(),
 });
@@ -52,10 +53,11 @@ export function itemConfigurationToYjs(yDoc: Y.Doc, item: DTODocumentationPageRo
       header.minHeight !== undefined && headerYMap.set("minHeight", header.minHeight);
     }
 
-    if (configuration?.showSidebar !== undefined) {
-      const configYMap = trx.doc.getMap("itemConfiguration");
-      configYMap.set("showSidebar", configuration.showSidebar);
-    }
+    const configYMap = trx.doc.getMap("itemConfiguration");
+
+    configuration?.showSidebar !== undefined && configYMap.set("showSidebar", configuration.showSidebar);
+    configuration?.isHidden !== undefined && configYMap.set("isHidden", configuration.isHidden);
+    configuration?.isPrivate !== undefined && configYMap.set("isPrivate", configuration.isPrivate);
   });
 }
 
@@ -76,13 +78,16 @@ export function yjsToItemConfiguration(yDoc: Y.Doc): DTODocumentationPageRoomHea
   };
 
   const configYMap = yDoc.getMap("itemConfiguration");
+
   const rawConfig = {
     showSidebar: configYMap.get("showSidebar"),
+    isHidden: configYMap.get("isHidden") ?? false,
+    isPrivate: configYMap.get("isPrivate") ?? false,
     header: rawHeader,
-  };
+  } satisfies Record<keyof DTODocumentationItemConfigurationV2, unknown>;
 
   return {
     title: z.string().parse(title),
-    configuration: DocumentationItemConfigurationV2.parse(rawConfig),
+    configuration: DTODocumentationItemConfigurationV2.parse(rawConfig),
   };
 }

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

@@ -1,31 +1,31 @@
-import * as Y from "yjs";
 import {
+  PageBlockCalloutType,
   PageBlockDefinition,
   PageBlockDefinitionProperty,
-  PageBlockText,
-  PageBlockTextSpan,
-  PageBlockTextSpanAttribute,
+  PageBlockDefinitionRichTextOptions,
+  PageBlockItemImageValue,
   PageBlockItemRichTextValue,
-  PageBlockCalloutType,
-  PageBlockTableCellAlignment,
-  PageBlockItemTableNode,
   PageBlockItemTableCell,
-  PageBlockItemTableValue,
+  PageBlockItemTableNode,
   PageBlockItemTableRow,
-  PageBlockDefinitionRichTextOptions,
-  PageBlockItemImageValue,
-  SupernovaException,
-  PageSectionItemV2,
+  PageBlockItemTableValue,
+  PageBlockTableCellAlignment,
+  PageBlockText,
+  PageBlockTextSpan,
+  PageBlockTextSpanAttribute,
   PageSectionColumnV2,
+  PageSectionItemV2,
+  SupernovaException,
   mapByUnique,
 } from "@supernova-studio/model";
-import { PageBlockEditorModel, PageSectionEditorModel } from "./model/block";
-import { ProsemirrorNode, ProsemirrorMark } from "./prosemirror/types";
-import { BlockDefinitionUtils, BlockParsingUtils } from "./utils";
-import { DocumentationPageEditorModel } from "./model";
 import { prosemirrorJSONToYXmlFragment } from "y-prosemirror";
-import { pmSchema } from "./prosemirror";
+import * as Y from "yjs";
 import { ListNode, ListTreeBuilder } from "./list-tree-builder";
+import { DocumentationPageEditorModel } from "./model";
+import { PageBlockEditorModel, PageSectionEditorModel } from "./model/block";
+import { pmSchema } from "./prosemirror";
+import { ProsemirrorMark, ProsemirrorNode } from "./prosemirror/types";
+import { BlockDefinitionUtils, BlockParsingUtils } from "./utils";
 
 //
 // Types
@@ -94,7 +94,9 @@ export function blockToProsemirrorNode(
   block: PageBlockEditorModel,
   definition: PageBlockDefinition
 ): ProsemirrorNode | null {
-  return internalBlockToProsemirrorNode(block, definition);
+  const definitionsMap = new Map<string, PageBlockDefinition>([[definition.id, definition]]);
+  const nodes = internalBlocksToProsemirrorNodes([block], definitionsMap);
+  return nodes[0] ?? null;
 }
 
 //
@@ -623,21 +625,27 @@ function serializeTextSpanAttribute(spanAttribute: PageBlockTextSpanAttribute):
       return { type: "code", attrs: {} };
     case "Link":
       if (spanAttribute.link) {
-        return serializeLinkMark(spanAttribute.link, spanAttribute.openInNewWindow ?? false);
+        return serializeLinkMark(
+          spanAttribute.link,
+          spanAttribute.openInNewTab ?? spanAttribute.openInNewWindow ?? false
+        );
       } else if (spanAttribute.documentationItemId) {
-        return serializeLinkMark(`@page:${spanAttribute.documentationItemId}`, spanAttribute.openInNewWindow ?? false);
+        return serializeLinkMark(
+          `@page:${spanAttribute.documentationItemId}`,
+          spanAttribute.openInNewTab ?? spanAttribute.openInNewWindow ?? false
+        );
       } else {
-        return serializeLinkMark("about:blank", spanAttribute.openInNewWindow ?? false);
+        return serializeLinkMark("about:blank", spanAttribute.openInNewTab ?? spanAttribute.openInNewWindow ?? false);
       }
   }
 }
 
-function serializeLinkMark(href: string, openInNewWindow: boolean): ProsemirrorMark {
+function serializeLinkMark(href: string, openInNewTab: boolean): ProsemirrorMark {
   return {
     type: "link",
     attrs: {
       href: href,
-      target: openInNewWindow ? "_blank" : "_self",
+      target: openInNewTab ? "_blank" : "_self",
       rel: "noopener noreferrer nofollow",
       class: "tiptap-link",
     },

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

@@ -396,6 +396,10 @@ function parseRichText(spans: ProsemirrorNode[]): PageBlockText {
 }
 
 function parseRichTextSpan(span: ProsemirrorNode): PageBlockTextSpan | null {
+  if (span.type === "hardBreak") {
+    return { text: "\n", attributes: [] };
+  }
+
   if (span.type !== "text" || !span.text) return null;
 
   const marks = span.marks ?? [];
@@ -428,18 +432,20 @@ function parseProsemirrorLink(mark: ProsemirrorMark): PageBlockTextSpanAttribute
   if (!href) return null;
 
   const target = getProsemirrorAttribute(mark, "target", z.string().optional());
-  const openInNewWindow = target === "_blank";
+  const openInNewTab = target === "_blank";
 
   if (href.startsWith("@")) {
     return {
       type: "Link",
-      openInNewWindow: openInNewWindow,
+      openInNewWindow: openInNewTab,
+      openInNewTab: openInNewTab,
       documentationItemId: href.split(":")[1],
     };
   } else {
     return {
       type: "Link",
-      openInNewWindow: openInNewWindow,
+      openInNewWindow: openInNewTab,
+      openInNewTab: openInNewTab,
       link: href,
     };
   }