@flozy/editor 11.0.6 → 11.0.8

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

@@ -247,6 +247,9 @@ const useFreeGridStyles = ({
           },
           "& > .simple-text": {
             display: "none"
+          },
+          "& > .edt-paragraphs": {
+            display: "none"
           }
         },
         "& .fgi_type_form": {
@@ -309,6 +312,12 @@ const useFreeGridStyles = ({
             "& .toolbtn.remove": {
               display: "none"
             }
+          },
+          "& .edt-headings": {
+            margin: "0px"
+          },
+          "& .edt-paragraphs": {
+            margin: "0px"
           }
         },
         "& .fgi_type_embedScript": {
@@ -350,6 +359,12 @@ const useFreeGridStyles = ({
         "& .fgi_type_text": {
           "& .edt-headings": {
             margin: "0px"
+          },
+          "& .edt-paragraphs": {
+            margin: "0px"
+          },
+          "& blockquote": {
+            margin: "0px !important"
           }
         },
         /** element toolbar hide */

package/dist/Editor/Elements/Grid/GridItem.js

@@ -292,7 +292,7 @@ const GridItem = props => {
       ...getBRProps,
       display: "flex",
       flexDirection: flexDirection || "column",
-      background: bgColor || "transparent",
+      background: bgColor,
       borderColor: getBorderColor(),
       borderWidth: borderWidth || "1px",
       borderStyle: borderStyle || "solid",

package/dist/Editor/Elements/PageSettings/PageSettingsButton.js

@@ -46,7 +46,8 @@ const PageSettingsButton = props => {
   const onSave = data => {
     try {
       const updateData = {
-        ...data
+        ...data,
+        isUploading: false
       };
       delete updateData.children;
       updatePageSettings(editor, updateData);

package/dist/Editor/Elements/Signature/SignatureOptions/TypeSignature.js

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { signedTextFonts } from "../../../utils/font";
 import { Grid, Button, TextField, InputAdornment, IconButton, Typography } from "@mui/material";
-import ClearRoundedIcon from '@mui/icons-material/ClearRounded';
+import ClearRoundedIcon from "@mui/icons-material/ClearRounded";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const TypeSignature = props => {
@@ -80,7 +80,8 @@ const TypeSignature = props => {
                   children: /*#__PURE__*/_jsx(ClearRoundedIcon, {})
                 })
               })
-            }
+            },
+            autoComplete: "typeName"
           })
         })
       })

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

@@ -92,9 +92,17 @@ const SignaturePopup = props => {
   };
   const onChange = e => {
     e?.stopPropagation();
+    const {
+      name,
+      value
+    } = e.target;
+    const fieldMap = {
+      name: "signedBy",
+      email: "signedByEmail"
+    };
     setSignedData({
       ...signedData,
-      [e.target.name]: e.target.value
+      [fieldMap[name] || name]: value
     });
   };
   const onBrushSize = val => () => {
@@ -311,15 +319,19 @@ const SignaturePopup = props => {
                   xs: 12,
                   children: /*#__PURE__*/_jsx(TextField, {
                     fullWidth: true,
-                    id: "signedBy",
-                    name: "signedBy",
+                    id: "name",
+                    name: "name",
                     placeholder: translation("Enter Name"),
                     value: signedData.signedBy || ""
                     // defaultValue={defaultName || ""}
                     ,
                     size: "small",
                     onChange: onChange,
-                    sx: classes.signaturePopUpNameField
+                    sx: classes.signaturePopUpNameField,
+                    autoComplete: "name",
+                    inputProps: {
+                      autoComplete: "name"
+                    }
                   })
                 })]
               }), /*#__PURE__*/_jsxs(Grid, {
@@ -439,14 +451,20 @@ const SignaturePopup = props => {
                   item: true,
                   children: /*#__PURE__*/_jsx(TextField, {
                     fullWidth: true,
-                    id: "signedByEmail",
-                    name: "signedByEmail",
+                    id: "email",
+                    name: "email",
+                    type: "email",
                     placeholder: translation("Enter Email"),
                     size: "small",
                     onChange: onChange,
                     sx: classes.signaturePopUpNameField,
                     value: signedData.signedByEmail || ""
                     // defaultValue={defaultEmail || ""}
+                    ,
+                    autoComplete: "email",
+                    inputProps: {
+                      autoComplete: "email"
+                    }
                   })
                 })]
               })]

package/dist/Editor/Elements/SimpleText/style.js

@@ -35,8 +35,8 @@ const SimpleTextStyle = ({
       height: "24px",
       overflow: "hidden",
       fontSize: "14px",
-      display: 'inline-flex',
-      alignItems: 'center',
+      display: "inline-flex",
+      alignItems: "center",
       "& .bg-pad-sl": {
         padding: "2px 4px 2px 4px",
         background: "transparent",

package/dist/Editor/Elements/Table/Table.js

@@ -291,7 +291,8 @@ const Table = props => {
       dragRowBtnCls,
       tablePath: path,
       openSetttings,
-      exandTools
+      exandTools,
+      tableNode: element
     },
     children: [/*#__PURE__*/_jsxs("div", {
       style: {
@@ -307,7 +308,7 @@ const Table = props => {
       onScroll: handleScroll,
       onMouseOver: onMouseOver,
       onMouseLeave: onMouseLeave,
-      className: !hideTools.includes("add_column") ? "custom-scroll" : '',
+      className: "custom-scroll",
       children: [/*#__PURE__*/_jsx(TableComp, {
         className: readOnly ? "readOnly" : "",
         sx: {
@@ -345,8 +346,8 @@ const Table = props => {
       handleAction: handleAction,
       exandTools: exandTools,
       openSetttings: openSetttings,
-      translation: translation,
-      hideTools: hideTools
+      hideTools: hideTools,
+      translation: translation
     }), /*#__PURE__*/_jsx(MoreTableSettings, {
       exandTools: exandTools,
       handleAction: handleAction,

package/dist/Editor/Elements/Table/TableCell.js

@@ -13,7 +13,7 @@ import { Droppable } from "./Droppable";
 import { useDndContext } from "@dnd-kit/core";
 import { getNodeWithType } from "../../utils/helper";
 import { ResizeIcon } from "../../common/iconListV2";
-import { isEmptyTextNode } from "../../helper";
+import { getTextColor, isEmptyTextNode } from "../../helper";
 import SimpleText from "../SimpleText";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -443,8 +443,10 @@ const TableCell = props => {
   };
   const showRowDragBtn = (showRowDrag || isRowDragging) && containerEle?.scrollLeft <= 0;
   const TableResizer = isMobile && hoverCol === column ? MobileResizer : Resizer;
+  const cellTextColor = entireTextColor || rowProps?.textColor || parentProps?.textColor;
+  const textStyles = cellTextColor ? getTextColor(cellTextColor) : "inherit";
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsxs("td", {
+    children: [/*#__PURE__*/_jsxs(Box, {
       ...element.attr,
       ...attributes,
       className: `editor-table-cell ${hasSelected ? "selection" : ""}`,
@@ -455,14 +457,19 @@ const TableCell = props => {
         fontFamily: entireFontFamily || "inherit",
         fontWeight: entireFontWeight || "inherit",
         fontSize: entireTextSize || "inherit",
-        color: entireTextColor || "inherit",
         cursor: "text",
         verticalAlign: "top",
         padding: "0px",
         ...(sizeProps || {})
       },
+      sx: {
+        '& span[data-slate-string="true"]': {
+          ...textStyles
+        }
+      },
       ...tbProps,
       "data-cell": path.toString(),
+      component: "td",
       children: [isFirstRow && currentDraggingType === "col" ? /*#__PURE__*/_jsx(Droppable, {
         ...dndProps,
         dragType: currentDraggingType,

package/dist/Editor/Elements/Title/title.js

@@ -1,8 +1,14 @@
 import React, { useEffect, useState } from "react";
-import { Editor, Text } from "slate";
+import { Text } from "slate";
 import { useSlate } from "slate-react";
-import { getNodeText } from "../../utils/helper";
+import { getNodeText, getNodeWithType } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
+const isEmptyTextNode = node => {
+  if (Text.isText(node)) {
+    return !node.text.trim();
+  }
+  return false;
+};
 const Title = props => {
   const {
     attributes,
@@ -31,9 +37,8 @@ const useDetectExitFromTitle = (titleNode, onSaveTitle) => {
     if (!editor.selection) return;
 
     // Get the current node where the cursor is
-    const [nodeEntry] = Editor.nodes(editor, {
-      at: editor.selection,
-      match: n => n.type === "title"
+    const [nodeEntry] = getNodeWithType(editor, "title", {
+      at: editor.selection
     });
     if (nodeEntry) {
       setWasInsideTitle(true); // User was inside the title
@@ -47,10 +52,4 @@ const useDetectExitFromTitle = (titleNode, onSaveTitle) => {
     }
   }, [editor.selection]);
   return null;
-};
-const isEmptyTextNode = node => {
-  if (Text.isText(node)) {
-    return !node.text.trim();
-  }
-  return false;
 };

package/dist/Editor/Elements/TopBanner/TopBanner.js

@@ -28,8 +28,9 @@ export const TopBannerToolbar = props => {
     }
   };
   const onSelectImage = img => {
+    const embedURL = typeof img === "string" ? img : img?.embedURL ? img?.embedURL : null;
     updateTopBanner(editor, {
-      url: img
+      url: embedURL
     });
     handleClose();
   };
@@ -56,7 +57,8 @@ export const TopBannerToolbar = props => {
       open: open,
       onClose: handleClose,
       customProps: customProps,
-      onSelectImage: onSelectImage
+      onSelectImage: onSelectImage,
+      disableProgress: true
     })]
   });
 };

package/dist/Editor/Elements/TopBanner/TopBannerButton.js

@@ -17,9 +17,10 @@ const TopBannerButton = props => {
     translation
   } = customProps;
   const onSelectImage = url => {
-    if (url) {
+    const embedURL = typeof url === "string" ? url : url?.embedURL ? url?.embedURL : null;
+    if (embedURL) {
       insertTopBanner(editor, {
-        url
+        url: embedURL
       });
     }
     setOpen(false);
@@ -42,7 +43,8 @@ const TopBannerButton = props => {
       open: open,
       onClose: handleClose,
       customProps: customProps,
-      onSelectImage: onSelectImage
+      onSelectImage: onSelectImage,
+      disableProgress: true
     })]
   });
 };

package/dist/Editor/Elements/Variables/VariableButton.js

@@ -34,7 +34,8 @@ const VariableButton = props => {
       PaperProps: {
         style: {
           maxHeight: 300,
-          overflowY: "auto"
+          overflowY: "auto",
+          transformOrigin: 'top left'
         },
         sx: {
           "&::-webkit-scrollbar-track": {
@@ -44,6 +45,14 @@ const VariableButton = props => {
             borderRadius: "16px"
           }
         }
+      },
+      anchorOrigin: {
+        vertical: 'bottom',
+        horizontal: 'right'
+      },
+      transformOrigin: {
+        vertical: 'top',
+        horizontal: 'right'
       }
     },
     children: [/*#__PURE__*/_jsx(MenuItem, {

package/dist/Editor/MiniEditor.js

@@ -45,12 +45,13 @@ const MiniEditor = props => {
   const {
     translationMock
   } = otherProps;
+  const dummyTranslation = () => {};
   const customProps = {
     ...(otherProps || {}),
     readOnly: isReadOnly,
     editorPlaceholder: miniEditorPlaceholder,
     page_id: id,
-    translation: translation || translationMock
+    translation: translation || translationMock || dummyTranslation
   };
   const [mentions, setMentions] = useMentions({
     editor,

package/dist/Editor/Styles/EditorStyles.js

@@ -14,6 +14,9 @@ const editorStyles = ({
       "*": {
         boxSizing: "border-box"
       },
+      "& .blockQuoteComp": {
+        backgroundColor: `${theme?.palette?.editor?.colorBoxBg} !important`
+      },
       "&.iframe-editor": {
         "& .mini-tool-wrpr-ei": {
           display: "none"
@@ -133,7 +136,11 @@ const editorStyles = ({
       },
       "& .accordion-summary-collapse-btn": {
         padding: "4px",
-        width: '5px'
+        width: "5px",
+        "& svg:hover": {
+          background: theme?.palette?.editor?.tv_hover_bg,
+          borderRadius: "4px"
+        }
       },
       "& .workflow-icon-btn": {
         pointerEvents: "none",
@@ -215,6 +222,17 @@ const editorStyles = ({
         borderRadius: "12px",
         "& svg": {
           marginRight: "8px"
+        },
+        "& .circularProgress-cls": {
+          "& svg": {
+            width: "15px !important",
+            height: "15px !important"
+          }
+        },
+        "& .uploadCancel": {
+          color: theme?.palette?.editor?.closeButtonSvgStroke,
+          width: "25px !important",
+          height: "25px !important"
         }
       },
       "& .content-editable.empty": {
@@ -242,7 +260,7 @@ const editorStyles = ({
         }
       },
       "& .section-tw": {
-        background: 'transparent !important',
+        background: "transparent !important",
         "& button": {
           padding: "2px",
           borderRadius: "0px",
@@ -291,8 +309,8 @@ const editorStyles = ({
         }
       },
       "& ::selection": {
-        background: 'rgba(35, 131, 226, 0.35)!important',
-        color: 'inherit'
+        // background: 'rgba(35, 131, 226, 0.35)!important',
+        color: "inherit"
       },
       "&.readOnlyContainer": {
         "& .max-content": {
@@ -302,7 +320,7 @@ const editorStyles = ({
     },
     fullScreenWrapper: {
       "& .editor-wrapper": {
-        paddingTop: '20px'
+        paddingTop: "20px"
       },
       "& .MuiDialog-paper, & .MuiPopover-paper": {
         background: `${theme?.palette?.editor?.background} !important`

package/dist/Editor/Toolbar/FormatTools/Dropdown.js

@@ -1,8 +1,32 @@
 import React from "react";
 import { Select, MenuItem } from "@mui/material";
-import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
+import { addMarkData, activeMark, getSelectedElementStyle } from "../../utils/SlateUtilityFunctions.js";
+import { toolbarGroups } from "../toolbarGroups.js";
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
+import { googleFontList as defaultFonts } from "../../common/FontLoader/FontList.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+const allTools = toolbarGroups.flat();
+const fontWeight = allTools.find(f => f.format === "fontWeight");
+export const getValue = (editor, format) => {
+  switch (format) {
+    case "fontFamily":
+      {
+        const style = getSelectedElementStyle("font-family", editor, format);
+        return style || defaultFonts[0];
+      }
+    case "fontWeight":
+      {
+        const {
+          options
+        } = fontWeight || {};
+        const fontWeightStyle = getSelectedElementStyle("font-weight", editor, format);
+        const selected = options?.find(o => o.value === fontWeightStyle || o.numVal === fontWeightStyle);
+        return selected?.value;
+      }
+    default:
+      return activeMark(editor, format);
+  }
+};
 const Dropdown = ({
   classes,
   editor,
@@ -10,7 +34,7 @@ const Dropdown = ({
   options,
   width
 }) => {
-  const value = activeMark(editor, format);
+  const value = activeMark(editor, format, true) || getValue(editor, format);
   const changeMarkData = (event, format) => {
     event.preventDefault();
     const value = event.target.value;
@@ -20,7 +44,7 @@ const Dropdown = ({
     });
   };
   return /*#__PURE__*/_jsx(Select, {
-    value: value,
+    value: value || options?.[0]?.value,
     className: "editor-dd",
     onChange: e => changeMarkData(e, format),
     MenuProps: {

package/dist/Editor/Toolbar/FormatTools/FontFamilyAutocomplete.js

@@ -1,9 +1,10 @@
 import React from "react";
 import { Autocomplete, TextField } from "@mui/material";
-import { activeMark, addMarkData } from "../../utils/SlateUtilityFunctions.js";
+import { addMarkData } from "../../utils/SlateUtilityFunctions.js";
 import usePopupStyle from "../PopupTool/PopupToolStyle.js";
 import { useEditorContext } from "../../hooks/useMouseMove.js";
-import KeyboardArrowDownRoundedIcon from '@mui/icons-material/KeyboardArrowDownRounded';
+import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
+import { getValue } from "./Dropdown.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const FontFamilyAutocomplete = ({
   editor,
@@ -14,7 +15,7 @@ const FontFamilyAutocomplete = ({
   val = "",
   webFont = false
 }) => {
-  const markValue = activeMark(editor, format);
+  const markValue = getValue(editor, format);
   const value = !webFont ? markValue : val;
   const changeMarkData = (event, newValue, format) => {
     if (!webFont) {

package/dist/Editor/Toolbar/FormatTools/MarkButton.js

@@ -1,7 +1,7 @@
 import React from "react";
 import Icon from "../../common/Icon";
 import Button from "../../common/Button";
-import { toggleMark, isMarkActive } from "../../utils/SlateUtilityFunctions.js";
+import { toggleMark, isMarkBtnActive } from "../../utils/SlateUtilityFunctions.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const MarkButton = ({
   editor,
@@ -13,7 +13,7 @@ const MarkButton = ({
     translation
   } = customProps;
   return /*#__PURE__*/_jsx(Button, {
-    active: isMarkActive(editor, format),
+    active: isMarkBtnActive(editor, format),
     format: format,
     onMouseDown: e => {
       e.preventDefault();

package/dist/Editor/Toolbar/FormatTools/TextSize.js

@@ -1,27 +1,36 @@
 import React, { useEffect, useRef, useState } from "react";
 import { TextField, IconButton } from "@mui/material";
-import { addMarkData, activeMark, isBlockActive } from "../../utils/SlateUtilityFunctions.js";
-import { headingMap, sizeMap } from "../../utils/font.js";
-import { getBreakPointsValue } from "../../helper/theme.js";
+import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
+import { getBreakPointsValue, getTextSizeVal } from "../../helper/theme.js";
 import useWindowResize from "../../hooks/useWindowResize.js";
 import { BREAKPOINTS_DEVICES } from "../../helper/theme.js";
 import { TextSizeDownArrow, TextSizeUpArrow } from "../../common/iconListV2.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-const TextSize = ({
-  classes,
-  editor,
-  format,
-  fullWidth
-}) => {
-  const [size] = useWindowResize();
-  const val = activeMark(editor, format);
-  const value = getBreakPointsValue(val, size?.device);
+const TextSize = props => {
+  const {
+    classes,
+    editor,
+    format,
+    fullWidth,
+    fromMiniTextFormat,
+    setResizedSize,
+    resizedSize
+  } = props;
   const [fontSize, setFontSize] = useState();
+  const sizeValue = fromMiniTextFormat ? resizedSize : fontSize;
+  const setSizeValue = fromMiniTextFormat ? setResizedSize : setFontSize;
   const timerRef = useRef();
+  const [size] = useWindowResize();
+  const val = activeMark(editor, format);
+
+  // const noFontSize =
+  //   val === "normal" || (typeof val === "object" && !Object.keys(val)?.length);
+
+  const value = getTextSizeVal(editor);
   useEffect(() => {
-    setFontSize(getSizeVal());
+    setSizeValue(getSizeVal());
   }, [value]);
   const updateMarkData = newVal => {
     let upData = {
@@ -48,38 +57,33 @@ const TextSize = ({
     if (value) {
       let inc = parseInt(value);
       inc = inc > 200 ? 200 : inc;
+      setSizeValue(inc);
       updateMarkData(inc);
     } else {
-      setFontSize(null);
+      setSizeValue(null);
     }
   };
   const getSizeVal = () => {
     try {
-      let size = `${value}`?.indexOf("px") >= 0 ? value : sizeMap[value] || value;
-      Object.entries(headingMap).forEach(([format, value]) => {
-        if (isBlockActive(editor, format) && isNaN(parseInt(size))) {
-          size = value;
-        }
-      });
-      return parseInt(size);
+      return parseInt(value);
     } catch (err) {
       return "";
     }
   };
-  const combinedOldVal = getSizeVal();
   const onIncreaseSize = () => {
-    let inc = (combinedOldVal || 0) + 1;
-    inc = inc > 200 ? 200 : inc;
-    updateMarkData(inc);
+    const newValue = Math.min((sizeValue || 16) + 1, 200);
+    setSizeValue(newValue);
+    updateMarkData(newValue);
   };
   const onDecreaseSize = () => {
-    const newVal = combinedOldVal - 1 < 0 ? 0 : combinedOldVal - 1;
-    updateMarkData(newVal);
+    const newValue = sizeValue ? Math.max(sizeValue - 1, 1) : 16;
+    setSizeValue(newValue);
+    updateMarkData(newValue);
   };
   const onChange = e => {
     clearTimeout(timerRef.current);
     const value = e.target.value;
-    setFontSize(value);
+    setSizeValue(value);
     timerRef.current = setTimeout(() => {
       onChangeSize(value);
     }, 500);
@@ -87,7 +91,7 @@ const TextSize = ({
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(TextField, {
       sx: classes?.textSize,
-      value: fontSize,
+      value: sizeValue || 16,
       onChange: onChange,
       size: "small",
       inputProps: {

package/dist/Editor/Toolbar/Mini/MiniToolbar.js

@@ -215,7 +215,8 @@ const MiniToolbar = props => {
           setPopper: setPopper,
           onClose: onClose,
           search: search,
-          onSearch: onSearch
+          onSearch: onSearch,
+          closeMainPopup: onClose
         })]
       }) : null
     })]

package/dist/Editor/Toolbar/PopupTool/MiniTextFormat/MiniColorPicker.js

@@ -12,7 +12,8 @@ function MiniColorPicker(props) {
     classes,
     id,
     editor,
-    customProps
+    customProps,
+    type
   } = props;
   const [openColorTool, setOpenColorTool] = useState(null);
   const {
@@ -38,7 +39,8 @@ function MiniColorPicker(props) {
       classes: classes,
       forMiniTool: true,
       openColorTool: openColorTool,
-      closeColorTool: () => setOpenColorTool(null)
+      closeColorTool: () => setOpenColorTool(null),
+      type: type
     }, id)]
   });
 }