easy-email-pro-theme 1.59.5 → 1.59.7

package/lib/index.js

@@ -32632,6 +32632,9 @@ function Columns(props) {
 const generateLogic = (option) => {
   if (!option)
     return null;
+  if ("expression" in option) {
+    return /* @__PURE__ */ React__default.createElement(Tag, { color: "arcoblue" }, option.expression);
+  }
   const { symbol, groups } = option;
   const generateExpression = (condition, symbol2, index2) => {
     if (condition.operator === ConditionOperator.TRUTHY) {
@@ -32654,6 +32657,27 @@ const generateLogic = (option) => {
     ), index2 !== groups.length - 1 && /* @__PURE__ */ React__default.createElement("div", null, symbol.toLocaleUpperCase()));
   }));
 };
+function isExpressionCondition(condition) {
+  return !!condition && "expression" in condition;
+}
+function createDefaultBuilderCondition() {
+  return {
+    enabled: true,
+    symbol: ConditionOperatorSymbol.AND,
+    groups: [
+      {
+        symbol: ConditionOperatorSymbol.AND,
+        groups: [
+          {
+            left: "",
+            operator: ConditionOperator.EQUAL,
+            right: ""
+          }
+        ]
+      }
+    ]
+  };
+}
 function Condition(props) {
   var _a;
   const [conditionModalVisible, setConditionModalVisible] = useState(false);
@@ -32689,22 +32713,7 @@ function Condition(props) {
     if (condition)
       return { condition };
     return {
-      condition: {
-        enabled: true,
-        symbol: ConditionOperatorSymbol.AND,
-        groups: [
-          {
-            symbol: ConditionOperatorSymbol.AND,
-            groups: [
-              {
-                left: "",
-                operator: ConditionOperator.EQUAL,
-                right: ""
-              }
-            ]
-          }
-        ]
-      }
+      condition: createDefaultBuilderCondition()
     };
   }, [condition]);
   return /* @__PURE__ */ React__default.createElement(Collapse, { activeKey: ["Condition"] }, /* @__PURE__ */ React__default.createElement(
@@ -32736,6 +32745,50 @@ const ConditionModal = ({
   const { form } = Form.useFormContext();
   const { forceUpdate } = useForceUpdate();
   const condition = form.getFieldValue("condition");
+  const [mode, setMode] = useState(
+    isExpressionCondition(condition) ? "expression" : "builder"
+  );
+  useEffect(() => {
+    if (!visible)
+      return;
+    const nextCondition = form.getFieldValue("condition");
+    setMode(isExpressionCondition(nextCondition) ? "expression" : "builder");
+  }, [form, visible]);
+  const onModeChange = useCallback(
+    (nextMode) => {
+      if (nextMode === mode)
+        return;
+      const current = form.getFieldValue("condition");
+      if (nextMode === "builder") {
+        const switchToBuilder = () => {
+          form.setFieldValue("condition", createDefaultBuilderCondition());
+          setMode("builder");
+          forceUpdate();
+        };
+        if (isExpressionCondition(current) && current.expression) {
+          Modal.confirm({
+            title: t("Switch to Visual"),
+            content: t(
+              "Switching to visual mode will replace the current expression."
+            ),
+            okText: t("Confirm"),
+            cancelText: t("Cancel"),
+            onOk: switchToBuilder
+          });
+          return;
+        }
+        switchToBuilder();
+        return;
+      }
+      form.setFieldValue("condition", {
+        expression: isExpressionCondition(current) ? current.expression : "",
+        enabled: true
+      });
+      setMode("expression");
+      forceUpdate();
+    },
+    [forceUpdate, form, mode]
+  );
   const onAddCondition = useCallback(
     (path2) => {
       const groups = form.getFieldValue(path2);
@@ -32803,6 +32856,33 @@ const ConditionModal = ({
       }
     },
     /* @__PURE__ */ React__default.createElement(
+      Radio.Group,
+      {
+        type: "button",
+        value: mode,
+        onChange: onModeChange,
+        options: [
+          { label: t("Visual"), value: "builder" },
+          { label: t("Expression"), value: "expression" }
+        ],
+        style: { marginBottom: 16 }
+      }
+    ),
+    mode === "expression" ? /* @__PURE__ */ React__default.createElement(
+      Form.Item,
+      {
+        field: "condition.expression",
+        label: t("Expression"),
+        layout: "vertical"
+      },
+      /* @__PURE__ */ React__default.createElement(
+        Input.TextArea,
+        {
+          autoSize: { minRows: 4, maxRows: 8 },
+          placeholder: "ship_1_service_ship_travel_caption|default"
+        }
+      )
+    ) : !isExpressionCondition(condition) && /* @__PURE__ */ React__default.createElement(
       List$1,
       {
         header: /* @__PURE__ */ React__default.createElement(Grid.Row, { justify: "space-between" }, /* @__PURE__ */ React__default.createElement(Grid.Col, { span: 16 }, condition.groups.length > 1 && /* @__PURE__ */ React__default.createElement(
@@ -32864,16 +32944,22 @@ const ConditionModal = ({
                 ]
               }
             )
-          )), /* @__PURE__ */ React__default.createElement(Grid.Col, { span: 8 }, /* @__PURE__ */ React__default.createElement(Form.Item, { wrapperCol: { style: { textAlign: "right" } } }, /* @__PURE__ */ React__default.createElement(Tooltip, { content: t("Add logic") }, /* @__PURE__ */ React__default.createElement(
-            Button$2,
+          )), /* @__PURE__ */ React__default.createElement(Grid.Col, { span: 8 }, /* @__PURE__ */ React__default.createElement(
+            Form.Item,
             {
-              size: "small",
-              icon: /* @__PURE__ */ React__default.createElement(IconPlus, null),
-              onClick: () => onAddSubCondition(
-                `condition.groups.${gIndex}.groups`
-              )
-            }
-          ))))), /* @__PURE__ */ React__default.createElement(Divider$2, { style: { margin: "0px 0 20px 0" } }), group.groups.map((item2, ggIndex) => /* @__PURE__ */ React__default.createElement(
+              wrapperCol: { style: { textAlign: "right" } }
+            },
+            /* @__PURE__ */ React__default.createElement(Tooltip, { content: t("Add logic") }, /* @__PURE__ */ React__default.createElement(
+              Button$2,
+              {
+                size: "small",
+                icon: /* @__PURE__ */ React__default.createElement(IconPlus, null),
+                onClick: () => onAddSubCondition(
+                  `condition.groups.${gIndex}.groups`
+                )
+              }
+            ))
+          ))), /* @__PURE__ */ React__default.createElement(Divider$2, { style: { margin: "0px 0 20px 0" } }), group.groups.map((item2, ggIndex) => /* @__PURE__ */ React__default.createElement(
             ConditionItem,
             {
               onDelete,

package/package.json

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