@flozy/editor 10.5.1 → 10.5.2

package/dist/Editor/Elements/DataView/Layouts/Options/AddOptions.js

@@ -1,10 +1,14 @@
-import React, { useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { Box, List, ListItemButton, ListItemText, ListItemIcon, TextField, Chip } from "@mui/material";
 import { colors } from "../../../Color Picker/defaultColors";
 import Icon from "../../../../common/Icon";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const DEFAULT_COLORS = colors?.filter(f => !(f.includes("linear") || f === "#000000"));
+const EXCLUDED_COLORS = new Set(["#000000", "#0F172A", "#2563EB", "#FFFFFF", "#64748B"]);
+const DEFAULT_COLORS = colors?.filter(f => !f?.includes("linear") && !EXCLUDED_COLORS?.has(f));
+
+// const DEFAULT_COLORS = colors?.filter((f) => !(f.includes("linear") || f === "#000000"));
+
 const AddOptions = props => {
   const {
     edit,
@@ -16,8 +20,14 @@ const AddOptions = props => {
   const [value, setValue] = useState("");
   const [error, setError] = useState("");
   const {
-    options
+    options = []
   } = edit;
+  const inputRef = useRef();
+  useEffect(() => {
+    if (inputRef?.current) {
+      inputRef.current.focus();
+    }
+  }, [addBox, options]);
   const onAddBox = () => {
     setAddBox(!addBox);
   };
@@ -36,7 +46,8 @@ const AddOptions = props => {
         ...edit,
         options: [{
           value: value,
-          color: getRandomColor()
+          color: getRandomColor(),
+          id: `multi_${Date.now().toString(36)}_${Math.random().toString(36).substring(2, 5)}`
         }, ...(options || [])]
       });
       setValue("");
@@ -56,7 +67,6 @@ const AddOptions = props => {
   };
   const onBlur = () => {
     setValue("");
-    setAddBox(false);
     setError("");
   };
   return edit?.type === "select" || edit?.type === "multi-select" ? /*#__PURE__*/_jsxs(Box, {
@@ -75,6 +85,7 @@ const AddOptions = props => {
       })
     }), addBox ? /*#__PURE__*/_jsx(Box, {
       children: /*#__PURE__*/_jsx(TextField, {
+        inputRef: inputRef,
         className: "mt",
         size: "small",
         fullWidth: true,
@@ -83,7 +94,7 @@ const AddOptions = props => {
         onChange: handleChange,
         onBlur: onBlur,
         helperText: error
-      })
+      }, `input_${options?.length}`)
     }) : null, /*#__PURE__*/_jsx(List, {
       children: options?.map((m, i) => {
         return /*#__PURE__*/_jsxs(ListItemButton, {

package/dist/Editor/Elements/DataView/Layouts/Options/EditOption.js

@@ -19,6 +19,7 @@ const EditOption = props => {
   const [edit, setEdit] = useState({
     ...(mode?.edit || {})
   });
+  const [errorMessage, setErrorMessage] = useState("");
   const editData = useRef({
     ...edit
   });
@@ -30,10 +31,14 @@ const EditOption = props => {
   } = edit;
   const selectedOption = edit?.options[optionIndex] || {};
   const pickerStyles = ColorPickerStyles(theme);
+  const hideBackButton = edit?.hideBackButton || false;
+  const errorMessageRef = useRef(errorMessage);
+  useEffect(() => {
+    errorMessageRef.current = errorMessage;
+  }, [errorMessage]);
   useEffect(() => {
     return () => {
-      // on un-mount update the option change
-      if (editData?.current) {
+      if (editData?.current && !errorMessageRef.current) {
         delete editData?.current?.edited;
         onEvent("updateProperty", {
           ...editData?.current
@@ -42,18 +47,24 @@ const EditOption = props => {
     };
   }, []);
   const onChange = e => {
-    const updatedOptions = edit?.options.map((m, i) => {
+    const {
+      name,
+      value,
+      delete: isDelete
+    } = e?.target || {};
+    const targetValue = value?.toLowerCase();
+    const updatedOptions = edit?.options?.map((m, i) => {
       if (i === edit?.optionIndex) {
         return {
           ...m,
-          [e.target.name]: e?.target?.value
+          [name]: value
         };
       }
       return m;
     });
 
-    // for delete
-    if (edit?.optionIndex > -1 && e?.target?.delete) {
+    // If deleting the option
+    if (edit?.optionIndex > -1 && isDelete) {
       updatedOptions.splice(edit?.optionIndex, 1);
     }
     const latest = {
@@ -67,14 +78,28 @@ const EditOption = props => {
       ...latest,
       edited: true
     };
+    if (name === "value" && !value?.trim()) {
+      setErrorMessage("Option name must not be empty");
+      return;
+    }
+    const isDuplicate = name === "value" && targetValue && edit?.options?.some((op, i) => i !== edit?.optionIndex && op?.value?.toLowerCase?.() === targetValue);
+    if (isDuplicate) {
+      setErrorMessage("Option name must be unique");
+      return;
+    }
+    setErrorMessage(""); // Clear error on valid input
 
-    // if delete go back
-    if (e?.target?.delete) {
-      onEvent("editProperty", {
-        edit: {
-          ...latest
-        }
-      });
+    // If delete go back
+    if (isDelete) {
+      if (hideBackButton) {
+        onClose();
+      } else {
+        onEvent("editProperty", {
+          edit: {
+            ...latest
+          }
+        });
+      }
     }
   };
   const onBack = () => {
@@ -104,14 +129,14 @@ const EditOption = props => {
     children: [/*#__PURE__*/_jsxs(Box, {
       className: "fe-dv-ap-title",
       children: [/*#__PURE__*/_jsxs("span", {
-        children: [/*#__PURE__*/_jsx(IconButton, {
+        children: [!hideBackButton ? /*#__PURE__*/_jsx(IconButton, {
           className: "tv-act-ico",
           size: "small",
           onClick: onBack,
           children: /*#__PURE__*/_jsx(Icon, {
             icon: 'leftArrow'
           })
-        }), translation("Edit Option")]
+        }) : null, translation("Edit Option")]
       }), /*#__PURE__*/_jsx(IconButton, {
         className: "tv-act-ico bg br1",
         size: "small",
@@ -136,7 +161,9 @@ const EditOption = props => {
           value: selectedOption?.value,
           onChange: onChange,
           fullWidth: true,
-          placeholder: translation("Option Name")
+          placeholder: translation("Option Name"),
+          helperText: errorMessage,
+          error: !!errorMessage
         }),
         labelPlacement: "top"
       })

package/dist/Editor/Elements/DataView/Layouts/Options/index.js

@@ -29,6 +29,16 @@ const POSITIONS = {
       vertical: "top",
       horizontal: "right"
     }
+  },
+  editOptionMulti: {
+    anchorOrigin: {
+      vertical: "top",
+      horizontal: "left"
+    },
+    transformOrigin: {
+      vertical: "top",
+      horizontal: "left"
+    }
   }
 };
 const PropertySettings = props => {
@@ -82,6 +92,7 @@ const PropertySettings = props => {
           translation: translation
         });
       case "editOption":
+      case "editOptionMulti":
         return /*#__PURE__*/_jsx(EditOption, {
           classes: classes,
           onClose: onClose,

package/dist/Editor/Elements/DataView/Layouts/ViewData.js

@@ -11,7 +11,8 @@ const RenderRow = props => {
     properties,
     onSelect,
     selected,
-    readOnly
+    readOnly,
+    translation
   } = props;
   const showProperties = properties?.filter(f => f.visible);
   return showProperties?.map((property, i) => {
@@ -22,7 +23,8 @@ const RenderRow = props => {
       property: property,
       onSelect: onSelect,
       selected: selected,
-      readOnly: readOnly
+      readOnly: readOnly,
+      translation: translation
     }, `${property.key}_${i}`);
   });
 };
@@ -33,7 +35,8 @@ const ViewData = props => {
     customProps
   } = props;
   const {
-    readOnly
+    readOnly,
+    translation
   } = customProps || {};
   const {
     properties,
@@ -67,7 +70,8 @@ const ViewData = props => {
           properties: properties,
           onSelect: onSelect,
           selected: selectedRows?.includes(row?.id),
-          readOnly: readOnly
+          readOnly: readOnly,
+          translation: translation
         }), /*#__PURE__*/_jsx("td", {}), /*#__PURE__*/_jsx("td", {})]
       }, i);
     }), /*#__PURE__*/_jsx("tr", {

package/dist/Editor/Elements/Divider/Divider.js

@@ -61,7 +61,7 @@ const Divider = props => {
       className: "element-toolbar dividerIcon",
       style: {
         top: "3px",
-        left: 0
+        right: "8px"
       },
       children: /*#__PURE__*/_jsx(Tooltip, {
         title: translation("Divider Settings"),

package/dist/Editor/Elements/Embed/Image.js

@@ -4,7 +4,7 @@ import { Node, Transforms, Editor } from "slate";
 import AspectRatioIcon from "@mui/icons-material/AspectRatio";
 import useResize from "../../utils/customHooks/useResize";
 import EmbedPopup from "./EmbedPopup";
-import { IconButton, Tooltip, Box, useTheme } from "@mui/material";
+import { IconButton, Tooltip, Box, useTheme, useMediaQuery } from "@mui/material";
 import { LinkIcon } from "../../common/iconslist";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import { getTRBLBreakPoints, getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
@@ -200,6 +200,7 @@ const Image = props => {
     theme: appTheme
   } = useEditorContext();
   const classes = useCommonStyle(appTheme);
+  const isMobile = useMediaQuery("(max-width:599px)");
   const handleImageClick = () => {
     try {
       Transforms.select(editor, {
@@ -280,7 +281,7 @@ const Image = props => {
     sx: {
       display: {
         lg: "flex",
-        xs: xsHidden ? "none" : "flex"
+        xs: xsHidden && isMobile ? "none" : "flex"
       },
       width: `100%`,
       maxWidth: "100%",

package/dist/Editor/Elements/Embed/Video.js

@@ -89,7 +89,7 @@ const VideoPlaceholder = props => {
     },
     children: [/*#__PURE__*/_jsx(Icon, {
       icon: "video"
-    }), TYPE_LABELS[type] || translation("Embed Video or Other")]
+    }), translation(TYPE_LABELS[type] || "Embed Video or Other")]
   }) : /*#__PURE__*/_jsxs(Box, {
     sx: {
       color: "#64748B !important",

package/dist/Editor/Elements/EmbedScript/Code.js

@@ -5,6 +5,7 @@ import { IconButton, Tooltip } from "@mui/material";
 import { DeleteIcon } from "../../assets/svg/AIIcons";
 import { ReactEditor, useSlateStatic } from "slate-react";
 import { Transforms } from "slate";
+import { CodeElementIcon } from "../../common/iconListV2";
 
 // const sanitize = (input) => {
 //   const doc = new DOMParser().parseFromString(input, "text/html");
@@ -18,6 +19,7 @@ import { Transforms } from "slate";
 //   return doc.body.innerHTML;
 // };
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 import { createElement as _createElement } from "react";
 const getCode = (embedData, isEncoded) => {
   if (isEncoded) {
@@ -61,6 +63,7 @@ const Code = props => {
   } = customProps;
   const editor = useSlateStatic();
   const path = ReactEditor.findPath(editor, element);
+  const hasCode = embedData && getCode(embedData, isEncoded);
   const onDelete = () => {
     Transforms.removeNodes(editor, {
       at: path
@@ -85,11 +88,20 @@ const Code = props => {
     }
   }, [embedData]);
   return /*#__PURE__*/_createElement("div", {
-    className: "embed-code has-hover",
+    className: `embed-code has-hover ${hasCode ? "has-code" : ""}`,
     contentEditable: false,
     ...attributes,
     key: element?.updatedOn
-  }, /*#__PURE__*/_jsx("div", {
+  }, !hasCode && /*#__PURE__*/_jsxs("div", {
+    className: "empty-code",
+    children: [/*#__PURE__*/_jsx("span", {
+      className: "code-icon",
+      children: /*#__PURE__*/_jsx(CodeElementIcon, {})
+    }), /*#__PURE__*/_jsx("span", {
+      className: "code-name",
+      children: translation("Embed Code")
+    })]
+  }), /*#__PURE__*/_jsx("div", {
     ref: codeRef
   }), children, !readOnly && /*#__PURE__*/_jsx(ToolBar, {
     onDelete: onDelete,

package/dist/Editor/Elements/EmbedScript/EmbedScriptPopup.js

@@ -1,7 +1,10 @@
 import React, { useEffect, useState } from "react";
-import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, Tooltip } from "@mui/material";
+import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, Divider, IconButton, Tooltip, Typography } from "@mui/material";
 import { insertEmbedScript, updateEmbedScript } from "../../utils/embedScript";
 import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
+import { useEditorContext } from "../../hooks/useMouseMove";
+import Styles from "./styles";
+import CloseRoundedIcon from "@mui/icons-material/CloseRounded";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -20,6 +23,10 @@ const EmbedScriptPopup = props => {
     error: false
   });
   const [allowedDomains, setAllowedDomains] = useState([]);
+  const {
+    theme
+  } = useEditorContext();
+  const classes = Styles(theme);
   const {
     loading,
     error
@@ -69,50 +76,70 @@ const EmbedScriptPopup = props => {
     }
     onClose();
   };
+  const handleClear = () => {
+    setCode("");
+  };
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsxs(Dialog, {
       open: open,
       fullWidth: true,
+      sx: classes.root,
       children: [/*#__PURE__*/_jsx(DialogTitle, {
         children: /*#__PURE__*/_jsxs(Box, {
           component: "div",
           sx: {
             display: "flex",
             alignItems: "center",
-            gap: "6px"
+            justifyContent: "space-between",
+            width: "100%"
           },
-          children: [translation("Embed Code"), allowedDomains?.length ? /*#__PURE__*/_jsx(Tooltip, {
-            title: /*#__PURE__*/_jsxs(Box, {
-              sx: {
-                textTransform: "none"
-              },
-              children: [/*#__PURE__*/_jsx("span", {
-                style: {
-                  fontWeight: "bold"
+          children: [/*#__PURE__*/_jsxs(Box, {
+            sx: {
+              display: "flex",
+              alignItems: "center",
+              gap: "6px"
+            },
+            children: [/*#__PURE__*/_jsx(Typography, {
+              className: "title",
+              variant: "h6",
+              children: translation("Embed Code")
+            }), allowedDomains?.length ? /*#__PURE__*/_jsx(Tooltip, {
+              title: /*#__PURE__*/_jsxs(Box, {
+                sx: {
+                  textTransform: "none"
                 },
-                children: translation("Allowed Domains")
-              }), /*#__PURE__*/_jsx("br", {}), allowedDomains.join(", ")]
-            }),
-            children: /*#__PURE__*/_jsx(InfoOutlinedIcon, {
-              color: "gray",
-              fontSize: "14px",
-              style: {
-                fill: "#94A3B8",
-                cursor: "pointer"
-              }
-            })
-          }) : null]
+                children: [/*#__PURE__*/_jsx("span", {
+                  style: {
+                    fontWeight: "bold"
+                  },
+                  children: translation("Allowed Domains")
+                }), /*#__PURE__*/_jsx("br", {}), allowedDomains.join(", ")]
+              }),
+              children: /*#__PURE__*/_jsx(InfoOutlinedIcon, {
+                sx: {
+                  fill: "#94A3B8",
+                  cursor: "pointer",
+                  fontSize: "18px"
+                }
+              })
+            }) : null]
+          }), /*#__PURE__*/_jsx(IconButton, {
+            className: "close-popupbtn",
+            onClick: onClose,
+            children: /*#__PURE__*/_jsx(CloseRoundedIcon, {})
+          })]
         })
+      }), /*#__PURE__*/_jsx(Divider, {
+        className: "divider"
       }), /*#__PURE__*/_jsxs(DialogContent, {
         children: [/*#__PURE__*/_jsx("textarea", {
           value: code,
           onChange: handleChange,
           style: {
-            minHeight: "200px",
+            minHeight: "260px",
             width: "100%",
             resize: "none",
-            padding: "4px",
-            boxSizing: "border-box"
+            padding: "4px"
           }
         }), /*#__PURE__*/_jsx(Box, {
           component: "div",
@@ -121,12 +148,14 @@ const EmbedScriptPopup = props => {
         })]
       }), /*#__PURE__*/_jsxs(DialogActions, {
         children: [/*#__PURE__*/_jsx(Button, {
+          onClick: handleClear,
+          className: "clear-btn",
+          children: translation("Clear")
+        }), /*#__PURE__*/_jsx(Button, {
           onClick: onSubmit,
           disabled: loading,
+          className: "save-btn",
           children: loading ? translation("Validating") : translation("Save")
-        }), /*#__PURE__*/_jsx(Button, {
-          onClick: onClose,
-          children: translation("Cancel")
         })]
       })]
     })

package/dist/Editor/Elements/EmbedScript/styles.js

@@ -0,0 +1,89 @@
+const Styles = theme => ({
+  root: {
+    "& .MuiPaper-root": {
+      borderRadius: "12px",
+      backgroundColor: theme?.palette?.editor?.miniToolBarBackground,
+      border: `1px solid ${theme?.palette?.editor?.miniToolBarBorder}`,
+      overflow: "hidden"
+    },
+    "& textarea": {
+      backgroundColor: theme?.palette?.editor?.inputFieldBgColor,
+      border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
+      borderRadius: "12px",
+      padding: "10px !important",
+      color: theme?.palette?.editor?.textColor,
+      boxShadow: "0px 4px 18px 0px #00000014",
+      "&:focus": {
+        border: `1px solid #2563EB`,
+        boxShadow: "0px 4px 18px 0px #2563EB1F",
+        outline: "none"
+      },
+      "&:focus-visible": {
+        border: `1px solid #2563EB`,
+        boxShadow: "0px 4px 18px 0px #2563EB1F",
+        outline: "none"
+      }
+    },
+    "& .MuiDialogTitle-root": {
+      padding: "20px 24px 16px 24px"
+    },
+    "& .title": {
+      color: theme?.palette?.editor?.textColor,
+      fontWeight: 600,
+      fontSize: "20px",
+      fontFamily: "Inter, sans-serif"
+    },
+    "& .close-popupbtn": {
+      background: theme?.palette?.editor?.closeButtonBgColor,
+      color: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`,
+      "& svg": {
+        color: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
+      }
+    },
+    "& .divider": {
+      margin: "0px 24px",
+      background: theme?.palette?.editor?.deviderBgColor
+    },
+    "& .save-btn": {
+      backgroundColor: "#2563EB",
+      color: "#ffffff",
+      fontWeight: 600,
+      fontSize: "14px",
+      opacity: 1,
+      borderRadius: "8px",
+      textTransform: "math-auto",
+      height: "36px",
+      padding: "0px 12px",
+      minWidth: "90px",
+      "&:hover": {
+        backgroundColor: "#2563EB"
+      },
+      "@media only screen and (max-width: 899px)": {
+        width: "50%"
+      }
+    },
+    "& .clear-btn": {
+      padding: "8px 12px",
+      color: theme?.palette?.editor?.customDialogueCloseBtnColor,
+      fontWeight: 600,
+      fontSize: "14px",
+      opacity: 1,
+      borderRadius: "8px",
+      textTransform: "math-auto",
+      height: "36px",
+      minWidth: "90px",
+      backgroundColor: theme?.palette?.editor?.closeButtonBackground,
+      border: `1px solid ${theme?.palette?.editor?.customDialogueCloseBtnBorder}`,
+      "&:hover": {
+        backgroundColor: theme?.palette?.editor?.closeButtonBackground
+      },
+      "@media only screen and (max-width: 899px)": {
+        width: "50%"
+      }
+    },
+    "& .MuiDialogActions-root": {
+      padding: "0px 22px 16px 0px"
+    }
+  }
+});
+export default Styles;