@flozy/editor 3.2.9 → 3.3.1

package/dist/Editor/Elements/Form/Form.js

@@ -40,7 +40,8 @@ const Form = props => {
     formTitle,
     textSize,
     fontFamily,
-    textAlign
+    textAlign,
+    alignment
   } = element;
   const btnR = buttonProps?.borderRadius || {};
   const btnSpacing = buttonProps?.bannerSpacing || {};
@@ -218,7 +219,8 @@ const Form = props => {
       contentEditable: false,
       style: {
         top: "-42px",
-        left: "0px"
+        left: "0px",
+        textAlign: "left"
       },
       children: [/*#__PURE__*/_jsx(Tooltip, {
         title: "Form Settings",
@@ -260,7 +262,8 @@ const Form = props => {
     className: "form-wrapper element-root",
     style: {
       border: !readOnly ? "none" : "none",
-      padding: "10px"
+      padding: "10px",
+      width: "100%"
     },
     onMouseOver: onMouseOver,
     onMouseLeave: onMouseLeave,
@@ -290,6 +293,9 @@ const Form = props => {
         children: /*#__PURE__*/_jsxs(Grid, {
           container: true,
           spacing: 2,
+          sx: {
+            justifyContent: alignment?.horizantal || "start"
+          },
           children: [/*#__PURE__*/_jsx("legend", {
             style: {
               fontSize: `${textSize}px` || "inherit",

package/dist/Editor/Elements/Form/FormElements/validations.js

@@ -1,16 +1,9 @@
 export const validationMethods = {
   isEmail: value => {
-    const regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/; //eslint-disable-line 
-    const result = regex.test(String(value).toLowerCase());
-    if (result) {
-      let domain = String(value).toLowerCase().split('@')[1];
-      let validExtensions = ['com', 'net', 'org', 'edu'];
-      let extension = domain.split('.').pop();
-      if (validExtensions.includes(extension)) {
-        return "";
-      } else {
-        return "Enter valid email address";
-      }
+    const regex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    const isValidEmail = regex.test(String(value).toLowerCase());
+    if (isValidEmail) {
+      return "";
     } else {
       return "Enter valid email address";
     }

package/dist/Editor/Elements/Signature/SignaturePopup.js

@@ -8,6 +8,7 @@ import "./Signature.css";
 import { DrawSignature, PencilIcon, TypeSignature, UploadSignature } from "../../common/EditorIcons";
 import useCommonStyle from "../../commonStyle";
 import { useEditorContext } from "../../hooks/useMouseMove";
+import { validationMethods } from "../Form/FormElements/validations";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -25,7 +26,8 @@ const SignaturePopup = props => {
   } = props;
   const {
     readOnly,
-    metadata
+    metadata,
+    isSignerDetailsRequired = false
   } = customProps;
   const [open, setOpen] = useState(false);
   const [tab, setTab] = useState(0);
@@ -33,7 +35,9 @@ const SignaturePopup = props => {
   const [signedData, setSignedData] = useState({
     signedOn: new Date(),
     signature: "",
-    signedText: ""
+    signedText: "",
+    signedBy: "",
+    signedByEmail: ""
   });
   const [brush, setBrush] = useState({
     size: 1,
@@ -49,14 +53,22 @@ const SignaturePopup = props => {
     await customProps?.services("workFlowAction", {
       resource_id: customProps?.page_id
     });
-    onSave(signedData);
-    // manual delay
-    setTimeout(() => {
-      if (metadata && metadata?.actionHandler) {
-        metadata?.actionHandler("signed", signedData);
-      }
-      handleClose();
-    }, 0);
+    let isValidEmail = "";
+    if (isSignerDetailsRequired && signedData?.signedByEmail !== "") {
+      isValidEmail = validationMethods?.isEmail(signedData?.signedByEmail);
+    }
+    if (isValidEmail === "Enter valid email address") {
+      alert(isValidEmail);
+    } else {
+      onSave(signedData);
+      // manual delay
+      setTimeout(() => {
+        if (metadata && metadata?.actionHandler) {
+          metadata?.actionHandler("signed", signedData);
+        }
+        handleClose();
+      }, 0);
+    }
   };
   const handleClear = () => {
     onClear();
@@ -99,10 +111,15 @@ const SignaturePopup = props => {
     setSignedData({
       signedOn: new Date(),
       signature: "",
-      signedText: ""
+      signedText: "",
+      signedBy: "",
+      signedByEmail: ""
     });
   };
-  const isEmpty = signedData?.signature === "" && signedData?.signedText === "";
+  let isEmpty = signedData?.signature === "" && signedData?.signedText === "";
+  if (isSignerDetailsRequired) {
+    isEmpty = signedData?.signature === "" && signedData?.signedText === "" || signedData?.signedBy === "" || signedData?.signedByEmail === "";
+  }
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx("div", {
       className: `signature-btn-container`,

package/dist/Editor/common/LinkSettings/NavComponents.js

@@ -51,7 +51,7 @@ export const SelectPage = props => {
         ...rest
       } = r;
       return {
-        label: title,
+        label: url_name,
         value: url_name,
         ...rest
       };
@@ -78,7 +78,7 @@ export const SelectPage = props => {
   }, [value, pages]);
   return /*#__PURE__*/_jsxs("div", {
     children: [/*#__PURE__*/_jsx(FreeSoloCreateOption, {
-      label: page?.label || "Home",
+      label: page?.label,
       setValue: val => onChange(val?.value),
       placeholder: "Select Page",
       options: pages

package/dist/Editor/common/StyleBuilder/appHeaderStyle.js

@@ -33,7 +33,7 @@ const appHeaderStyle = [{
     key: "appLogo",
     type: "text"
   }, {
-    label: "App Logo Height",
+    label: "Logo Height",
     key: "logoHeight",
     type: "text",
     placeholder: "40px"

package/dist/Editor/utils/helper.js

@@ -214,6 +214,13 @@ export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick =
       component: "button"
     };
   }
+  if (!linkType && url) {
+    if (url?.includes("http")) {
+      linkType = "webAddress";
+    } else {
+      linkType = "page";
+    }
+  }
   switch (linkType) {
     case "webAddress":
       const refUrl = url ? url.includes("http") ? url : `//${url}` : "Link";
@@ -236,7 +243,7 @@ export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick =
       break;
     case "page":
       props.component = "a";
-      const [page, section] = url.split("#");
+      const [page, section] = url?.split("#") || [];
       const sec = section ? `#${section}` : "";
       const isHome = page === "home" || !page;
       props.href = isHome ? `${sec}` : `/${url}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "3.2.9",
+  "version": "3.3.1",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"