@makeswift/runtime 0.11.9 → 0.11.10

package/dist/react-page.cjs.js

@@ -38,7 +38,7 @@ var _c;
 var redux = require("redux");
 var thunk = require("redux-thunk");
 var actions = require("./actions.cjs.js");
-var state_breakpoints = require("./state/breakpoints.cjs.js");
+var state_breakpoints = require("./breakpoints.cjs.js");
 var tsPattern = require("ts-pattern");
 var ipsum = require("corporate-ipsum");
 var slate = require("slate");
@@ -3615,6 +3615,168 @@ function getValue(editor) {
   })).map(([node]) => node["typography"]);
   return matchingValues;
 }
+function shallowMergeTypographies(commonTypography, typography) {
+  var _a, _b;
+  const devices = [
+    ...new Set(commonTypography == null ? void 0 : commonTypography.style.map((node) => node.deviceId).concat((_a = typography == null ? void 0 : typography.style.map((node) => node.deviceId)) != null ? _a : []))
+  ];
+  return {
+    id: (_b = commonTypography == null ? void 0 : commonTypography.id) != null ? _b : typography == null ? void 0 : typography.id,
+    style: devices.map((deviceId) => {
+      var _a2, _b2;
+      const commonDevice = commonTypography == null ? void 0 : commonTypography.style.find((s) => s.deviceId === deviceId);
+      const existingDeviceStyle = typography == null ? void 0 : typography.style.find((s) => s.deviceId === deviceId);
+      return {
+        deviceId,
+        value: state_breakpoints.shallowMerge((_a2 = existingDeviceStyle == null ? void 0 : existingDeviceStyle.value) != null ? _a2 : {}, (_b2 = commonDevice == null ? void 0 : commonDevice.value) != null ? _b2 : {})
+      };
+    })
+  };
+}
+function normalizeTypographyDown(editor, entry) {
+  const [normalizationNode, normalizationPath] = entry;
+  if (slate.Element.isElement(normalizationNode) && normalizationNode.typography != null && normalizationNode.children.length) {
+    slate.Editor.withoutNormalizing(editor, () => {
+      var _a;
+      slate.Transforms.unsetNodes(editor, TYPOGRAPHY_KEY, { at: normalizationPath });
+      for (let i = 0; i < normalizationNode.children.length; i++) {
+        const resultingTypography = shallowMergeTypographies(normalizationNode.typography, (_a = normalizationNode.children.at(i)) == null ? void 0 : _a.typography);
+        slate.Transforms.setNodes(editor, { typography: resultingTypography }, { at: [...normalizationPath, i] });
+      }
+    });
+    return true;
+  }
+  return false;
+}
+function shallowAnd(a, b) {
+  const bKeys = state_breakpoints.keys(b);
+  const aPrime = __spreadValues({}, a);
+  const and = {};
+  bKeys.forEach((key) => {
+    if (deepEqual(aPrime[key], b[key]))
+      and[key] = aPrime[key];
+  });
+  return and;
+}
+function shallowAndTypographies(...typographies) {
+  var _a;
+  return {
+    id: typographies.every((typography) => {
+      var _a2;
+      return (typography == null ? void 0 : typography.id) === ((_a2 = typographies.at(0)) == null ? void 0 : _a2.id);
+    }) ? (_a = typographies.at(0)) == null ? void 0 : _a.id : void 0,
+    style: [
+      ...new Set(typographies.flatMap((typography) => {
+        var _a2;
+        return (_a2 = typography == null ? void 0 : typography.style.map((node) => node.deviceId)) != null ? _a2 : [];
+      }))
+    ].flatMap((deviceId) => {
+      const stylesForThisDevice = typographies.map((typography) => {
+        var _a2;
+        return (_a2 = typography.style.find((s) => s.deviceId === deviceId)) == null ? void 0 : _a2.value;
+      }).filter((typography) => Boolean(typography));
+      if (typographies.length !== stylesForThisDevice.length)
+        return [];
+      const value = stylesForThisDevice.reduce((acc, curr) => {
+        return shallowAnd(acc, curr);
+      }, stylesForThisDevice.at(0));
+      if (value == null || Object.keys(value).length === 0) {
+        return [];
+      }
+      return [
+        {
+          deviceId,
+          value
+        }
+      ];
+    })
+  };
+}
+function shallowInverseAnd(a, b) {
+  const bKeys = Array.from(/* @__PURE__ */ new Set([...state_breakpoints.keys(b), ...state_breakpoints.keys(a)]));
+  const aPrime = __spreadValues({}, a);
+  const bPrime = __spreadValues({}, b);
+  const xor = {};
+  bKeys.forEach((key) => {
+    if (aPrime[key] == null && bPrime[key] == null || !deepEqual(aPrime[key], bPrime[key]))
+      xor[key] = aPrime[key];
+  });
+  return xor;
+}
+function shallowInverseAndTypographies(a, b) {
+  const typography = { style: [] };
+  if ((a == null ? void 0 : a.id) !== b.id) {
+    typography.id = a == null ? void 0 : a.id;
+  }
+  if (a && a.style.length > 0) {
+    const styles = [];
+    for (const style of a.style) {
+      const bDeviceTypography = b.style.find((s) => s.deviceId === style.deviceId);
+      if (bDeviceTypography == null) {
+        styles.push(style);
+      } else {
+        const uniquePropertiesOfA = shallowInverseAnd(style.value, bDeviceTypography.value);
+        if (Object.keys(uniquePropertiesOfA).length > 0) {
+          styles.push({
+            deviceId: style.deviceId,
+            value: uniquePropertiesOfA
+          });
+        }
+      }
+    }
+    typography.style = styles;
+  }
+  return typography;
+}
+function isException(node) {
+  return slate.Text.isText(node) && node.text === "";
+}
+function normalizeTypographyUp(editor, entry) {
+  const [node, path] = entry;
+  if (slate.Element.isElement(node) && node.children.length) {
+    const typographiesOfChildren = node.children.filter((child) => !isException(child)).map((child) => child.typography);
+    const definedTypographiesOfChildren = typographiesOfChildren.filter((typography) => Boolean(typography));
+    if (typographiesOfChildren.length === definedTypographiesOfChildren.length) {
+      let sharedTypography = shallowAndTypographies(...definedTypographiesOfChildren);
+      if (sharedTypography.style.length > 0 || sharedTypography.id != null) {
+        const rootTypography = shallowMergeTypographies(sharedTypography, node.typography);
+        slate.Editor.withoutNormalizing(editor, () => {
+          var _a, _b;
+          slate.Transforms.setNodes(editor, { typography: rootTypography }, { at: path });
+          for (let i = 0; i < node.children.length; i++) {
+            const typography = shallowInverseAndTypographies((_b = (_a = node.children.at(i)) == null ? void 0 : _a.typography) != null ? _b : { style: [] }, sharedTypography);
+            slate.Transforms.setNodes(editor, { typography }, { at: [...path, i] });
+          }
+        });
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function isTextEqual(a, b) {
+  const _a = a, { text: aText } = _a, aRest = __objRest(_a, ["text"]);
+  const _b = b, { text: bText } = _b, bRest = __objRest(_b, ["text"]);
+  return deepEqual(aRest, bRest);
+}
+function normalizeSimilarText(editor, entry) {
+  const [node, path] = entry;
+  if (slate.Text.isText(node))
+    return false;
+  let hasMergedNodes = false;
+  for (let i = node.children.length; i > 0; i--) {
+    const currentNode = slate.Node.get(editor, path);
+    if (slate.Text.isText(currentNode))
+      continue;
+    const child = currentNode.children[i];
+    const prev = currentNode.children[i - 1];
+    if (slate.Text.isText(child) && prev != null && slate.Text.isText(prev) && isTextEqual(child, prev)) {
+      slate.Transforms.mergeNodes(editor, { at: path.concat(i), voids: true });
+      hasMergedNodes = true;
+    }
+  }
+  return hasMergedNodes;
+}
 const TypographyActions = {
   setActiveTypographyId,
   setActiveTypographyStyle,
@@ -3628,14 +3790,20 @@ function withTypography(editor) {
   editor.normalizeNode = (entry) => {
     var _a, _b;
     const [normalizationNode, normalizationPath] = entry;
-    if (slate.Text.isText(normalizationNode) && ((_a = normalizationNode == null ? void 0 : normalizationNode.typography) == null ? void 0 : _a.id) == null && ((_b = normalizationNode == null ? void 0 : normalizationNode.typography) == null ? void 0 : _b.style.length) === 0) {
+    if ("typography" in normalizationNode && ((_a = normalizationNode == null ? void 0 : normalizationNode.typography) == null ? void 0 : _a.id) == null && ((_b = normalizationNode == null ? void 0 : normalizationNode.typography) == null ? void 0 : _b.style.length) === 0) {
       slate.Transforms.unsetNodes(editor, TYPOGRAPHY_KEY, { at: normalizationPath });
       return;
     }
-    if (slate.Text.isText(normalizationNode) && (normalizationNode == null ? void 0 : normalizationNode.slice) != null) {
+    if ("slice" in normalizationNode && (normalizationNode == null ? void 0 : normalizationNode.slice) != null) {
       slate.Transforms.unsetNodes(editor, "slice", { at: normalizationPath });
       return;
     }
+    if (normalizeSimilarText(editor, entry))
+      return;
+    if (editor.typographyNormalizationDirection === "up" && normalizeTypographyUp(editor, entry))
+      return;
+    if ((editor.typographyNormalizationDirection === "down" || editor.typographyNormalizationDirection == null) && normalizeTypographyDown(editor, entry))
+      return;
     normalizeNode(entry);
   };
   return editor;
@@ -4002,6 +4170,8 @@ function getInlineOrTextTranslatableData(descendant, path = []) {
     let string = escapeHtml__default["default"](descendant.text);
     if (string === "")
       return null;
+    if (descendant.typography === void 0)
+      return string;
     return `<span key="${pathToString(path)}">${string}</span>`;
   }
   const children = descendant.children.map((child, i) => getInlineOrTextTranslatableData(child, [...path, i])).join("");
@@ -4020,8 +4190,17 @@ function getInlineOrTextTranslatableData(descendant, path = []) {
       return children;
   }
 }
-function getRichTextV2TranslatableData(data) {
-  return data.descendants.reduce((acc, descendant, i) => __spreadValues(__spreadValues({}, acc), getDescendantTranslatableData(descendant, [i])), {});
+function getRichTextV2TranslatableData(definition2, data) {
+  var _a;
+  const plugins = ((_a = definition2 == null ? void 0 : definition2.config) == null ? void 0 : _a.mode) === RichTextV2Mode.Inline ? [InlineModePlugin()] : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin()];
+  const editor = plugins.reduceRight((editor2, plugin) => {
+    var _a2, _b;
+    return (_b = (_a2 = plugin == null ? void 0 : plugin.withPlugin) == null ? void 0 : _a2.call(plugin, editor2)) != null ? _b : editor2;
+  }, slate.createEditor());
+  editor.children = data.descendants;
+  editor.typographyNormalizationDirection = "up";
+  slate.Editor.normalize(editor, { force: true });
+  return editor.children.reduce((acc, descendant, i) => __spreadValues(__spreadValues({}, acc), getDescendantTranslatableData(descendant, [i])), {});
 }
 function deserializeTranslationHtmlString(el, translationKey) {
   var _a, _b;
@@ -4066,6 +4245,8 @@ function mergeRichTextV2TranslatedData(definition2, data, translatedData) {
     return (_b = (_a2 = plugin == null ? void 0 : plugin.withPlugin) == null ? void 0 : _a2.call(plugin, editor)) != null ? _b : editor;
   }, slate.createEditor());
   sourceEditor.children = data.descendants;
+  sourceEditor.typographyNormalizationDirection = "up";
+  slate.Editor.normalize(sourceEditor, { force: true });
   Object.entries(translatedData).reverse().forEach(([blockStringPath, htmlString]) => {
     var _c2;
     const blockPath = stringToPath(blockStringPath);
@@ -4074,6 +4255,7 @@ function mergeRichTextV2TranslatedData(definition2, data, translatedData) {
     const html = parse5.parseFragment(htmlString);
     const inlineDescendants = deserializeTranslationHtmlString(html);
     targetEditor.children = [{ type: BlockType.Default, children: inlineDescendants }];
+    targetEditor.typographyNormalizationDirection = "neutral";
     slate.Editor.normalize(targetEditor, { force: true });
     for (const [descendant, absolutePathToTargetNode] of slate.Node.descendants(targetEditor)) {
       if (!slate.Text.isText(descendant) && !ElementUtils.isInline(descendant) || descendant.translationKey == null || descendant.translationKey === "") {
@@ -4100,6 +4282,8 @@ function mergeRichTextV2TranslatedData(definition2, data, translatedData) {
       slate.Transforms.insertNodes(sourceEditor, translatedChildren, { at: [...blockPath, 0] });
     });
   });
+  sourceEditor.typographyNormalizationDirection = "down";
+  slate.Editor.normalize(sourceEditor, { force: true });
   return __spreadProps(__spreadValues({}, data), { descendants: sourceEditor.children });
 }
 function copy(definition2, value, context) {
@@ -4159,7 +4343,7 @@ function getTranslatableData(definition2, data) {
       const richTextData = data;
       if (isRichTextV1Data(richTextData))
         return null;
-      return getRichTextV2TranslatableData(richTextData);
+      return getRichTextV2TranslatableData(definition2, richTextData);
     case ListControlType:
       if (data == null)
         return null;
@@ -4173,6 +4357,8 @@ function getTranslatableData(definition2, data) {
   }
 }
 function mergeTranslatedData(definition2, data, translatedData, context) {
+  if (data == null)
+    return data;
   switch (definition2.type) {
     case Types.TextInput:
     case Types.TextArea: