easy-email-pro-theme 1.50.9 → 1.50.10

package/lib/index.js

@@ -15714,23 +15714,55 @@ const MergeTag = React__default.memo(() => {
     }
   ));
 });
+function styleStringToObject(styleString) {
+  return styleString.split(";").filter(Boolean).reduce(
+    (acc, style) => {
+      const [property, value] = style.split(":").map((str) => str.trim());
+      acc[property] = value;
+      return acc;
+    },
+    {}
+  );
+}
 const TextAlign$1 = () => {
+  var _a, _b;
   const editor = useSlate();
   const [match] = Editor.nodes(editor, {
     match: (n) => NodeUtils.isContentElement(n),
     mode: "all"
   });
+  const [matchHtmlBlockNode] = Editor.nodes(editor, {
+    match: (node2) => {
+      return NodeUtils.isHTMLBlockNodeElement(node2);
+    },
+    mode: "lowest"
+  });
   const { enabledHtmlBlockNodeAlign } = useEditorProps();
   const node = match == null ? void 0 : match[0];
   const { setFieldValue } = useEditorContext();
-  const matchAlign = match && get(node.attributes, "align");
+  let styleObject;
+  if (matchHtmlBlockNode == null ? void 0 : matchHtmlBlockNode[0]) {
+    styleObject = styleStringToObject(
+      ((_b = (_a = matchHtmlBlockNode == null ? void 0 : matchHtmlBlockNode[0]) == null ? void 0 : _a.attributes) == null ? void 0 : _b.style) || ""
+    );
+  }
+  const matchAlign = get(styleObject, "text-align") || get(node.attributes, "align");
   const onAlignHandle = (align) => {
+    var _a2;
     if (!match)
       return;
     if (!enabledHtmlBlockNodeAlign) {
       setFieldValue(match[1], "attributes.align", align);
       return;
     }
+    const selection = editor.selection;
+    const mergeNodeEntry = editor.selection ? editor.findSelfOrAncestorNodeByType({
+      type: ElementType.MERGETAG,
+      path: (_a2 = editor.selection) == null ? void 0 : _a2.anchor.path
+    }) : null;
+    const isCollapsed = Boolean(
+      selection && (Range.isCollapsed(selection) || Editor.string(editor, selection) === "") && !mergeNodeEntry
+    );
     const htmlBlockNodeElementEntry = Editor.above(editor, {
       match(node2, path2) {
         return NodeUtils.isHTMLBlockNodeElement(node2);
@@ -15738,6 +15770,10 @@ const TextAlign$1 = () => {
       mode: "highest"
     });
     if (!htmlBlockNodeElementEntry) {
+      if (isCollapsed) {
+        setFieldValue(match[1], "attributes.align", align);
+        return;
+      }
       Transforms.wrapNodes(
         editor,
         {
@@ -15751,7 +15787,9 @@ const TextAlign$1 = () => {
           }
         },
         {
-          match: (node2) => !NodeUtils.isBlockElement(node2) && !NodeUtils.isHTMLBlockNodeElement(node2)
+          match: (node2) => NodeUtils.isTextNode(node2) || NodeUtils.isInlineElement(node2),
+          mode: "highest",
+          at: match[1]
         }
       );
     } else {

package/lib/typings/utils/styleStringToObject.d.ts

@@ -0,0 +1 @@
+export declare function styleStringToObject(styleString: string): Record<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-email-pro-theme",
-  "version": "1.50.9",
+  "version": "1.50.10",
   "description": "",
   "files": [
     "lib"