@makeswift/runtime 0.9.8 → 0.9.10

package/dist/react-page.cjs.js

@@ -2058,14 +2058,11 @@ function toNodeDAO(node) {
     case ObjectType.Text:
       return toInlineOrTextDAO(node);
     case ObjectType.Block:
-      if (node.nodes == null || node.nodes && node.nodes.length === 0) {
-        return [];
-      }
       return [
         {
           type: node.type,
           textAlign: (node == null ? void 0 : node.data) && "textAlign" in node.data ? node == null ? void 0 : node.data.textAlign : void 0,
-          children: node.nodes.flatMap(toNodeDAO)
+          children: node.nodes == null || node.nodes && node.nodes.length === 0 ? [{ text: "" }] : node.nodes.flatMap(toNodeDAO)
         }
       ];
     default:
@@ -2146,6 +2143,11 @@ function toNodeDTO(node) {
     case BlockType.Heading1:
     case BlockType.Heading2:
     case BlockType.Heading3:
+    case BlockType.Heading4:
+    case BlockType.Heading5:
+    case BlockType.Heading6:
+    case BlockType.Default:
+    case BlockType.Text:
     case BlockType.BlockQuote:
     case BlockType.Paragraph:
     case BlockType.OrderedList:
@@ -2268,6 +2270,16 @@ class RichTextControl extends PropController {
     this.send({ type: RichTextControlMessageType.CHANGE_BOX_MODEL, payload: { boxModel } });
   }
 }
+function richTextV2DataToDescendents(data) {
+  return data.descendants;
+}
+function richTextV2DescendentsToData(descendants) {
+  return {
+    type: RichTextV2ControlType,
+    version: 2,
+    descendants
+  };
+}
 const RichTextV2ControlType = "makeswift::controls::rich-text-v2";
 const RichTextV2Mode = {
   Inline: "makeswift::controls::rich-text-v2::mode::inline",
@@ -2286,15 +2298,15 @@ function unstable_RichTextV2(config = {}) {
   return { type: RichTextV2ControlType, config };
 }
 const RichTextV2ControlMessageType = {
-  RESET_VALUE: "RESET_VALUE",
-  FOCUS: "FOCUS",
-  RUN_PLUGIN_CONTROL_ACTION: "RUN_PLUGIN_CONTROL_ACTION",
-  SET_DEFAULT_VALUE: "SET_DEFAULT_VALUE",
-  SET_PLUGIN_CONTROL_VALUE: "SET_PLUGIN_CONTROL_VALUE",
-  ON_CHANGE: "ON_CHANGE",
-  SELECT: "SELECT",
-  SWITCH_TO_BUILD_MODE: "SWITCH_TO_BUILD_MODE",
-  CHANGE_BOX_MODEL: "CHANGE_BOX_MODEL"
+  RESET_VALUE: "makeswift::controls::rich-text-v2::control-message::reset-value",
+  FOCUS: "makeswift::controls::rich-text-v2::control-message::focus",
+  RUN_PLUGIN_CONTROL_ACTION: "makeswift::controls::rich-text-v2::control-message::run-plugin-control-action",
+  SET_DEFAULT_VALUE: "makeswift::controls::rich-text-v2::control-message::set-default-value",
+  SET_PLUGIN_CONTROL_VALUE: "makeswift::controls::rich-text-v2::control-message::set-plugin-control-value",
+  ON_CHANGE: "makeswift::controls::rich-text-v2::control-message::on-change",
+  SELECT: "makeswift::controls::rich-text-v2::control-message::select",
+  SWITCH_TO_BUILD_MODE: "makeswift::controls::rich-text-v2::control-message::switch-to-build-mode",
+  CHANGE_BOX_MODEL: "makeswift::controls::rich-text-v2::control-message::change-box-model"
 };
 class RichTextV2Control extends PropController {
   constructor(send, descriptor) {
@@ -2314,7 +2326,7 @@ class RichTextV2Control extends PropController {
         case RichTextV2ControlMessageType.RESET_VALUE: {
           if (this.defaultValue) {
             this.editor.selection = null;
-            this.editor.children = this.defaultValue;
+            this.editor.children = this.defaultValue.descendants;
             this.editor.onChange();
           }
           break;
@@ -2340,8 +2352,11 @@ class RichTextV2Control extends PropController {
     });
   }
   setDefaultValue(defaultValue) {
-    this.defaultValue = defaultValue;
-    this.send({ type: RichTextV2ControlMessageType.SET_DEFAULT_VALUE, value: defaultValue });
+    this.defaultValue = richTextV2DescendentsToData(defaultValue);
+    this.send({
+      type: RichTextV2ControlMessageType.SET_DEFAULT_VALUE,
+      value: richTextV2DescendentsToData(defaultValue)
+    });
   }
   select() {
     this.send({ type: RichTextV2ControlMessageType.SELECT });
@@ -2356,7 +2371,7 @@ class RichTextV2Control extends PropController {
       return;
     this.send({
       type: RichTextV2ControlMessageType.ON_CHANGE,
-      value
+      value: richTextV2DescendentsToData(value)
     });
     this.send({
       type: RichTextV2ControlMessageType.SET_PLUGIN_CONTROL_VALUE,
@@ -2371,7 +2386,7 @@ class RichTextV2Control extends PropController {
   }
 }
 function isRichTextV1Data(value) {
-  return value !== void 0 && typeof value === "object" && !Array.isArray(value);
+  return value !== void 0 && typeof value === "object" && !Array.isArray(value) && "object" in value;
 }
 function isNonNullable(value) {
   return value != null;
@@ -2538,11 +2553,11 @@ function getSwatchIds(descriptor, prop) {
           return ((_a4 = plugin.control) == null ? void 0 : _a4.definition) && plugin.control.getLeafValue ? getSwatchIds(plugin.control.definition, plugin.control.getLeafValue(text)) : [];
         })) != null ? _a3 : [];
       };
-      const descendants = prop;
+      const data = prop;
       const plugins = descriptor.config.plugins;
-      if (isRichTextV1Data(descendants))
+      if (isRichTextV1Data(data))
         return [];
-      return descendants.flatMap((d) => getDescendantSwatchIds(d));
+      return data.descendants.flatMap((d) => getDescendantSwatchIds(d));
     }
     case ShapeControlType: {
       return introspectShapeData(descriptor, prop, getSwatchIds);
@@ -3112,6 +3127,8 @@ exports.reducer$8 = reducer$1;
 exports.richTextDAOToDTO = richTextDAOToDTO;
 exports.richTextDTOtoDAO = richTextDTOtoDAO;
 exports.richTextDTOtoSelection = richTextDTOtoSelection;
+exports.richTextV2DataToDescendents = richTextV2DataToDescendents;
+exports.richTextV2DescendentsToData = richTextV2DescendentsToData;
 exports.toSelectionDTO = toSelectionDTO;
 exports.unstable_RichTextV2 = unstable_RichTextV2;
 exports.unstable_StyleV2 = unstable_StyleV2;