easy-email-pro-theme 1.11.0 → 1.12.1

package/lib/index.js

@@ -860,12 +860,6 @@ const getNodePathName = (path2, name) => {
     return path2.join(".children.");
   return path2.join(".children.") + "." + name;
 };
-const unauthorizedHtml = `<div style="position: fixed;z-index: 9999999999;bottom: 40px;right: 40px;background-color: #ffffff;width: 320px;padding: 20px;box-sizing: border-box;box-shadow: 1px 1px 5px 0px #ccc;">
-<div style="font-weight:bold">Authorization Terminated</div>
-<div>We regret to inform you that your authorization has been terminated.</div>
-<div>Please contact us: <a target="_blank" style="font-weight: bold;color: rgb(0, 120, 212);cursor:pointer;" href="mailto:ch.mao@qq.com">ch.mao@qq.com</a></div>
-
-</div>`;
 const EditorContext = createContext({});
 const getInited = (editor) => {
   let inited = false;
@@ -883,46 +877,29 @@ const EditorContextProvider = (props) => {
   const editor = useSlate();
   const { form } = Form.useFormContext();
   const values2 = form.getFieldsValue();
-  const { attributesVariables, loadingElement } = useEditorProps();
+  const { attributesVariables } = useEditorProps();
   const [mergetagsData, setMergetagsData] = useState({});
   const initialValuesRef = useRef(props.initialValues);
   const lastAdapterNonPageValues = useRef({});
   const mergetagsDataRef = useRefState(mergetagsData);
   const [inited, setInited] = useState(false);
-  const [hasAuth, setHasAuth] = useState(false);
-  const [isUnauthorized, setIsUnauthorized] = useState(false);
   useEffect(() => {
     if (isEqual$3(props.mergetagsData, mergetagsDataRef.current))
       return;
     setMergetagsData(cloneDeep(props.mergetagsData) || {});
   }, [mergetagsDataRef, props.mergetagsData]);
   const pageElement = editor.children[0];
-  useEffect(() => {
-    EditorCore.auth(props.clientId).then(() => {
-      setHasAuth(true);
-    }).catch((error2) => {
-      const status = get(error2, "response.status");
-      if (status === 401) {
-        setIsUnauthorized(true);
-      } else {
-        const errorMessage = unauthorizedHtml;
-        const div = document.createElement("div");
-        div.innerHTML = errorMessage;
-        document.body.appendChild(div);
-      }
-    });
-  }, [props.clientId]);
   useEffect(() => {
     const timer = setInterval(() => {
       const inited2 = getInited(editor);
-      if (inited2 && hasAuth) {
+      if (inited2) {
         setInited(true);
       } else {
         setInited(false);
       }
     }, 100);
     return () => timer && clearInterval(timer);
-  }, [editor, hasAuth]);
+  }, [editor]);
   const { lock } = useEditorState();
   const { universalElementSetting } = useEditorProps();
   const valid = !lock;
@@ -1064,8 +1041,7 @@ const EditorContextProvider = (props) => {
       valid,
       reset,
       getFieldValue,
-      submit,
-      hasAuth
+      submit
     };
   }, [
     adapterValues,
@@ -1077,18 +1053,11 @@ const EditorContextProvider = (props) => {
     valid,
     reset,
     getFieldValue,
-    submit,
-    hasAuth
+    submit
   ]);
   return useMemo$1(() => {
-    if (!hasAuth) {
-      return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, loadingElement) || null;
-    }
-    if (isUnauthorized) {
-      return /* @__PURE__ */ React__default.createElement("div", { dangerouslySetInnerHTML: { __html: unauthorizedHtml } });
-    }
     return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(EditorContext.Provider, { value: data }, props.children));
-  }, [hasAuth, isUnauthorized, data, props.children, loadingElement]);
+  }, [data, props.children]);
 };
 const FormProvider = ({ children }) => {
   const props = useEditorProps();
@@ -1386,26 +1355,64 @@ const useElementInteract = () => {
     },
     [editor, setSelectedNodePath]
   );
+  const moveUp3 = useCallback$1(
+    (path2) => {
+      try {
+        const previous = Path.previous(path2);
+        if (!Node$1.get(editor, previous))
+          return;
+        Transforms.moveNodes(editor, {
+          at: path2,
+          to: previous
+        });
+        setSelectedNodePath(previous);
+        return previous;
+      } catch (error2) {
+      }
+    },
+    [editor, setSelectedNodePath]
+  );
+  const moveDown3 = useCallback$1(
+    (path2) => {
+      try {
+        const next = Path.next(path2);
+        if (!Node$1.get(editor, next))
+          return;
+        Transforms.moveNodes(editor, {
+          at: path2,
+          to: next
+        });
+        setSelectedNodePath(next);
+        return next;
+      } catch (error2) {
+      }
+    },
+    [editor, setSelectedNodePath]
+  );
   const deleteBlock = useCallback$1(
     (path2) => {
-      const [entry] = Editor.nodes(editor, {
-        match(node, currentPath) {
-          return Path.equals(path2, currentPath);
-        }
-      });
-      if (entry) {
-        setSelectedNodePath(null);
-        setTimeout(() => {
+      try {
+        const [entry] = Editor.nodes(editor, {
+          match(node, currentPath) {
+            return Path.equals(path2, currentPath);
+          }
+        });
+        if (entry) {
+          setSelectedNodePath(null);
+          setTimeout(() => {
+            Transforms.delete(editor, {
+              at: path2
+            });
+          }, 0);
+        } else {
           Transforms.delete(editor, {
             at: path2
           });
-        }, 0);
-      } else {
-        Transforms.delete(editor, {
-          at: path2
-        });
+        }
+        setHoverNodePath(null);
+      } catch (error2) {
+        console.log(error2);
       }
-      setHoverNodePath(null);
     },
     [editor, setHoverNodePath, setSelectedNodePath]
   );
@@ -1456,7 +1463,9 @@ const useElementInteract = () => {
     deleteBlock,
     clearCanvas,
     isChanged: !isEqual$3(lastSelectedNode.current, selectedNode),
-    resetSelectedNode
+    resetSelectedNode,
+    moveUp: moveUp3,
+    moveDown: moveDown3
   };
 };
 const defaultFontList = [
@@ -1649,7 +1658,12 @@ const useMinimalistContext = () => {
 const ElementTools$1 = ({ element, nodeElement, path: path2 }) => {
   const editor = useSlate();
   const { copyBlock, deleteBlock } = useElementInteract();
-  const { universalElementSetting, quantityLimitCheck } = useEditorProps();
+  const {
+    universalElementSetting,
+    quantityLimitCheck,
+    ElementTools: ElementTools2,
+    ElementToolsInner
+  } = useEditorProps();
   const { open } = useUniversalContent();
   const { setSelectedNodePath, universalElementEditing, universalElementPath } = useEditorState();
   const { dragHandle: dragHandle2 } = useDragging({
@@ -1703,7 +1717,14 @@ const ElementTools$1 = ({ element, nodeElement, path: path2 }) => {
       "data-is-wrapper-category": isWrapperCategory,
       "data-is-full-width": isFullWidth
     },
-    /* @__PURE__ */ React__default.createElement(
+    ElementTools2 ? /* @__PURE__ */ React__default.createElement(
+      ElementTools2,
+      {
+        element,
+        nodeElement,
+        path: path2
+      }
+    ) : /* @__PURE__ */ React__default.createElement(
       "div",
       {
         className: classnames$1(
@@ -1728,9 +1749,21 @@ const ElementTools$1 = ({ element, nodeElement, path: path2 }) => {
         ),
         BlockManager.getBlockTitle(element)
       ),
-      !isEditingUniversalElement && /* @__PURE__ */ React__default.createElement("div", { className: "element-tools-item", onPointerDown: onCopy }, /* @__PURE__ */ React__default.createElement(IconFont, { iconName: "icon-copy" })),
-      universalElementSetting && !universalElementEditing && !isUniversalElement && /* @__PURE__ */ React__default.createElement("div", { className: "element-tools-item", onPointerDown: openModal }, /* @__PURE__ */ React__default.createElement(IconFont, { iconName: "icon-collection" })),
-      !isEditingUniversalElement && /* @__PURE__ */ React__default.createElement("div", { className: "element-tools-item", onPointerDown: onDelete }, /* @__PURE__ */ React__default.createElement(IconFont, { iconName: "icon-delete" }))
+      ElementToolsInner ? /* @__PURE__ */ React__default.createElement(
+        ElementToolsInner,
+        {
+          element,
+          nodeElement,
+          path: path2
+        }
+      ) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, !isEditingUniversalElement && /* @__PURE__ */ React__default.createElement("div", { className: "element-tools-item", onPointerDown: onCopy }, /* @__PURE__ */ React__default.createElement(IconFont, { iconName: "icon-copy" })), universalElementSetting && !universalElementEditing && !isUniversalElement && /* @__PURE__ */ React__default.createElement(
+        "div",
+        {
+          className: "element-tools-item",
+          onPointerDown: openModal
+        },
+        /* @__PURE__ */ React__default.createElement(IconFont, { iconName: "icon-collection" })
+      ), !isEditingUniversalElement && /* @__PURE__ */ React__default.createElement("div", { className: "element-tools-item", onPointerDown: onDelete }, /* @__PURE__ */ React__default.createElement(IconFont, { iconName: "icon-delete" })))
     )
   ), /* @__PURE__ */ React__default.createElement("div", { className: "element-dragover" }), /* @__PURE__ */ React__default.createElement("style", null, styleText$b));
   const isContentElement = NodeUtils.isContentElement(element);
@@ -18933,7 +18966,7 @@ const DirectionOptions = [
   {
     value: "ltr",
     get label() {
-      return t("Left to tight");
+      return t("Left to right");
     }
   },
   {
@@ -39627,7 +39660,7 @@ const useCreateConfig$1 = (_m) => {
   });
 };
 const Layout$1 = ({ children }) => {
-  const { inited } = useEditorContext();
+  const { inited, values: values2 } = useEditorContext();
   const {
     controller = true,
     showSidebar = true,
@@ -39635,6 +39668,7 @@ const Layout$1 = ({ children }) => {
     height,
     compact
   } = useEditorProps();
+  const pageDataWidth = parseInt(values2.content.attributes.width || "600") || 600;
   const editor = useSlate();
   const getRoot = () => {
     try {
@@ -39683,7 +39717,12 @@ const Layout$1 = ({ children }) => {
         },
         /* @__PURE__ */ React__default.createElement(SharedComponents.BlockSideBar, { height })
       ),
-      /* @__PURE__ */ React__default.createElement("div", { style: { height, minWidth: 800, flex: 1 } }, /* @__PURE__ */ React__default.createElement(SharedComponents.EditorTabs, null, /* @__PURE__ */ React__default.createElement(EmailEditor, null, /* @__PURE__ */ React__default.createElement("style", { id: "Retro-CSS" }, styleText$c, RetroStyleText)), children)),
+      /* @__PURE__ */ React__default.createElement("div", { style: { height, minWidth: 800, flex: 1 } }, /* @__PURE__ */ React__default.createElement(SharedComponents.EditorTabs, null, /* @__PURE__ */ React__default.createElement(EmailEditor, null, /* @__PURE__ */ React__default.createElement("style", { id: "Retro-CSS" }, styleText$c, RetroStyleText, `
+                    body {
+                      --page-width: ${pageDataWidth}px;
+                    }
+
+                    `), children))),
       showSidebar && compact && /* @__PURE__ */ React__default.createElement(
         Layout$2.Sider,
         {

package/lib/typings/hooks/useElementInteract.d.ts

@@ -5,4 +5,6 @@ export declare const useElementInteract: () => {
     clearCanvas: () => void;
     isChanged: boolean;
     resetSelectedNode: () => void;
+    moveUp: (path: Path) => Path | undefined;
+    moveDown: (path: Path) => Path | undefined;
 };

package/lib/typings/typings/custom-types.d.ts

@@ -98,7 +98,16 @@ export interface PluginsCustomEditorTypes {
         widgetMode?: boolean;
         widgetElement?: SectionWidgetElement | ContentWidgetElement;
         emptyPageElement?: PageElement;
-        loadingElement?: React.ReactNode;
+        ElementToolsInner?: React.FC<{
+            element: Element;
+            nodeElement: HTMLElement;
+            path: Path;
+        }>;
+        ElementTools?: React.FC<{
+            element: Element;
+            nodeElement: HTMLElement;
+            path: Path;
+        }>;
     };
     EmailTemplate: BasicEmailTemplate;
 }

package/package.json

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