easy-email-pro-theme 1.51.5 → 1.51.7

package/lib/index.js

@@ -704,7 +704,7 @@ const assignIdsToElementTree = (element, overwrite = false) => {
       if (overwrite) {
         node.id = nanoid();
       } else {
-        if (map.has(node.id)) {
+        if (!map.has(node.id)) {
           const newId = nanoid();
           node.id = newId;
         } else {
@@ -14776,12 +14776,22 @@ function ColorPickerContent(props) {
 }
 const BgColor = () => {
   const editor = useSlate();
-  const [nodeEntry] = Editor.nodes(editor, {
+  let [nodeEntry] = Editor.nodes(editor, {
     match: (node) => {
       return Text$2.isText(node);
     },
-    mode: "lowest"
+    mode: "lowest",
+    voids: true
   });
+  if (!nodeEntry) {
+    const [mergetagNodeEntry] = Editor.nodes(editor, {
+      match: (node) => {
+        return NodeUtils.isMergetagElement(node);
+      },
+      mode: "lowest"
+    });
+    nodeEntry = mergetagNodeEntry;
+  }
   const { setFieldValue } = useEditorContext();
   const activeTab = useActiveTab();
   const selectedNodePath = useSelectedNodePath();
@@ -14890,12 +14900,22 @@ const BgColor = () => {
 };
 const FontColor = () => {
   const editor = useSlate();
-  const [nodeEntry] = Editor.nodes(editor, {
+  let [nodeEntry] = Editor.nodes(editor, {
     match: (node) => {
       return Text$2.isText(node);
     },
-    mode: "lowest"
+    mode: "lowest",
+    voids: true
   });
+  if (!nodeEntry) {
+    const [mergetagNodeEntry] = Editor.nodes(editor, {
+      match: (node) => {
+        return NodeUtils.isMergetagElement(node);
+      },
+      mode: "lowest"
+    });
+    nodeEntry = mergetagNodeEntry;
+  }
   const { setFieldValue } = useEditorContext();
   const activeTab = useActiveTab();
   const selectedNodePath = useSelectedNodePath();
@@ -15109,7 +15129,8 @@ const getLinkNode = (editor) => {
     match: (n) => {
       return Text$2.isText(n) && Boolean(n[TextFormat.LINK]);
     },
-    mode: "lowest"
+    mode: "lowest",
+    voids: true
   });
   return match;
 };
@@ -15567,6 +15588,7 @@ function isValidHttpUrl(str) {
 const TextLink = () => {
   const editor = useSlate();
   const linkNodeEntry = getLinkNode(editor);
+  console.log(linkNodeEntry);
   const ref = useRef(null);
   const linkNode = linkNodeEntry == null ? void 0 : linkNodeEntry[0];
   const selectedNodePath = useSelectedNodePath();
@@ -15651,7 +15673,8 @@ const TextLink = () => {
       {
         match: Text$2.isText,
         split: true,
-        at: mergeNodeEntry ? mergeNodeEntry[1] : void 0
+        at: mergeNodeEntry ? mergeNodeEntry[1] : void 0,
+        voids: true
       }
     );
     (_b = ref.current) == null ? void 0 : _b.click();
@@ -16499,7 +16522,7 @@ const RichTextBar = ({
   const content = useMemo(() => {
     const toolsMapping = {
       [TextFormat.TURN_INTO]: /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(TurnInto, null)),
-      [TextFormat.AI_ASSISTANT]: AIAssistant2 ? /* @__PURE__ */ React__default.createElement(SharedComponents.AIAssistant, null) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null),
+      [TextFormat.AI_ASSISTANT]: AIAssistant2 && !mergetagNode ? /* @__PURE__ */ React__default.createElement(SharedComponents.AIAssistant, null) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null),
       [TextFormat.FONT_SIZE]: /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(FontSize$2, null)),
       [TextFormat.FONT_FAMILY]: /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(FontFamily$2, null)),
       [TextFormat.LINK]: /* @__PURE__ */ React__default.createElement(TextLink, null),
@@ -16540,7 +16563,7 @@ const RichTextBar = ({
       [TextFormat.MERGETAG]: mergetags && !mergetagNode && /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(MergeTag, null)),
       [TextFormat.ALIGN]: /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(TextAlign$1, null)),
       [TextFormat.LIST]: /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(List, null)),
-      [TextFormat.IMAGE]: /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(Image$5, null)),
+      [TextFormat.IMAGE]: !mergetagNode && /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(Image$5, null)),
       [TextFormat.REMOVE_FORMAT]: /* @__PURE__ */ React__default.createElement(PreventFocusWrapper, null, /* @__PURE__ */ React__default.createElement(
         FormatButton,
         {
@@ -30067,7 +30090,9 @@ function Condition(props) {
   };
   const onSubmit = (values) => {
     setFieldValue(nodePath, "logic", __spreadProps(__spreadValues({}, selectedBlock.logic), {
-      condition: values.condition
+      condition: __spreadProps(__spreadValues({}, values.condition), {
+        enabled: true
+      })
     }));
     setConditionModalVisible(false);
   };

package/package.json

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