@flozy/editor 9.5.9 → 9.6.0

package/dist/Editor/Toolbar/PopupTool/TemplateCard.js

@@ -6,8 +6,7 @@ const PreviewAndSelect = props => {
   const {
     classes,
     data,
-    onSelectTemplate,
-    translation
+    onSelectTemplate
   } = props;
   return /*#__PURE__*/_jsxs(Box, {
     className: "template-card-action",
@@ -16,12 +15,12 @@ const PreviewAndSelect = props => {
     children: [/*#__PURE__*/_jsx(Button, {
       className: "blueBtn",
       onClick: onSelectTemplate(data),
-      children: translation("Select")
+      children: "Select"
     }), /*#__PURE__*/_jsx(Button, {
       href: data?.previewLink,
       target: "_blank",
       className: "outlineBtn",
-      children: translation("Preview")
+      children: "Preview"
     })]
   });
 };
@@ -30,12 +29,8 @@ const TemplateCard = props => {
     classes,
     m,
     onSelectTemplate,
-    fullScreen,
-    customProps
+    fullScreen
   } = props;
-  const {
-    translation
-  } = customProps;
   return /*#__PURE__*/_jsx(Grid, {
     item: true,
     xs: 4,
@@ -58,8 +53,7 @@ const TemplateCard = props => {
         }), /*#__PURE__*/_jsx(PreviewAndSelect, {
           classes: classes,
           onSelectTemplate: onSelectTemplate,
-          data: m,
-          translation: translation
+          data: m
         })]
       }), /*#__PURE__*/_jsx(CardContent, {
         sx: classes.templateCardTitle,

package/dist/Editor/Toolbar/PopupTool/TextFormat.js

@@ -10,13 +10,11 @@ import { AllColors } from "../../Elements/Color Picker/ColorButtons";
 import { fontFamilyMap } from "../../utils/font";
 import { getBorderColor } from "../../utils/helper";
 import SelectTypography from "./MiniTextFormat/SelectTypography";
-import { isTextCustomized, saveToTheme } from "../../helper/theme";
-import { useEditorTheme } from "../../hooks/useEditorTheme";
 import SelectSuperSubscript from "./MiniTextFormat/SelectSuperSubscript";
 import { ColorResetIcon, TextDefaultStyleIcon } from "../../common/iconListV2";
 import FontFamilyAutocomplete from "../FormatTools/FontFamilyAutocomplete";
 import { useEditorContext } from "../../hooks/useMouseMove";
-import LineSpacing from "../../common/StyleBuilder/fieldTypes/lineSpacing";
+// import LineSpacing from "../../common/StyleBuilder/fieldTypes/lineSpacing";
 import { getPageSettings } from "../../utils/pageSettings";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -35,21 +33,15 @@ const TextFormat = props => {
   const [anchorEl, setAnchorEl] = useState(null);
   const [type, setType] = useState(null);
   const open = Boolean(anchorEl);
-  const {
-    translation
-  } = customProps;
-  const {
-    element: pageSt
-  } = getPageSettings(editor) || {};
-  const pageSettingLine = pageSt?.pageProps?.lineHeight;
+
+  // const { element: pageSt } = getPageSettings(editor) || {};
+  // const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
-    theme: appTheme
-  } = useEditorContext();
-  const {
-    activeBreakPoint
+    theme
   } = useEditorContext();
-  const breakpoint = activeBreakPoint === "" ? "lg" : activeBreakPoint;
+  // const { activeBreakPoint } = useEditorContext();
+  // const breakpoint = activeBreakPoint === "" ? "lg" : activeBreakPoint;
   const fontWeight = allTools.find(f => f.format === "fontWeight");
   const fontStyle = allTools.filter(f => f.type === "mark" && f.format !== "strikethrough" && f.format !== "superscript" && f.format !== "subscript");
   const fontAlign = allTools.filter(f => f.format?.indexOf("align") >= 0);
@@ -66,13 +58,12 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-  const {
-    theme,
-    updateTheme
-  } = useEditorTheme();
-  const customized = isTextCustomized(editor);
-  let lineSpacingValue = activeMark(editor, "lineHeight");
-  lineSpacingValue = lineSpacingValue?.[breakpoint] !== undefined ? lineSpacingValue : pageSettingLine;
+
+  // let lineSpacingValue = activeMark(editor, "lineHeight");
+  // lineSpacingValue =
+  //   lineSpacingValue?.[breakpoint] !== undefined
+  //     ? lineSpacingValue
+  //     : pageSettingLine;
   const handleColorPicker = type => e => {
     setType(type);
     setAnchorEl(e.currentTarget);
@@ -113,13 +104,11 @@ const TextFormat = props => {
       value
     });
   };
-  const handleLineSpacing = data => {
-    const [[format, value]] = Object.entries(data);
-    addMarkData(editor, {
-      format,
-      value
-    });
-  };
+
+  // const handleLineSpacing = (data) => {
+  //   const [[format, value]] = Object.entries(data);
+  //   addMarkData(editor, { format, value });
+  // };
   return /*#__PURE__*/_jsxs(Grid, {
     container: true,
     sx: classes.textFormatWrapper,
@@ -137,52 +126,7 @@ const TextFormat = props => {
             variant: "body1",
             color: "primary",
             sx: classes.typoLabel,
-            children: "Style"
-          })
-        }), /*#__PURE__*/_jsx(Grid, {
-          item: true,
-          children: theme?.id ? /*#__PURE__*/_jsx(Button, {
-            sx: classes.defaultBtn,
-            onClick: () => {
-              const {
-                field,
-                theme
-              } = saveToTheme(editor) || {};
-              updateTheme(theme, {
-                action: "ELEMENT_PROPS_CHANGE",
-                fieldName: field
-              });
-            },
-            disabled: !customized,
-            children: "Save to theme"
-          }) : null
-        })]
-      }), /*#__PURE__*/_jsx(Grid, {
-        item: true,
-        xs: 12,
-        sx: classes.textFormatField,
-        children: /*#__PURE__*/_jsx(SelectTypography, {
-          editor: editor,
-          classes: classes,
-          closeMainPopup: closeMainPopup,
-          type: "fullWidth",
-          customProps: customProps
-        })
-      })]
-    }), /*#__PURE__*/_jsxs(Grid, {
-      item: true,
-      xs: 12,
-      children: [/*#__PURE__*/_jsxs(Grid, {
-        container: true,
-        justifyContent: "space-between",
-        alignItems: "center",
-        children: [/*#__PURE__*/_jsx(Grid, {
-          item: true,
-          children: /*#__PURE__*/_jsx(Typography, {
-            variant: "body1",
-            color: "primary",
-            sx: classes.typoLabel,
-            children: translation("fontFamily")
+            children: "Font Family"
           })
         }), /*#__PURE__*/_jsx(Grid, {
           item: true,
@@ -194,7 +138,7 @@ const TextFormat = props => {
               val: Object.values(fontFamilyMap)[0]
             }),
             className: "npr-0",
-            children: translation("defaultText")
+            children: "Default Text"
           })
         })]
       }), /*#__PURE__*/_jsx(Grid, {
@@ -219,7 +163,7 @@ const TextFormat = props => {
           variant: "body1",
           color: "primary",
           sx: classes.typoLabel3,
-          children: translation("fontWeight")
+          children: "Font Weight"
         }), /*#__PURE__*/_jsx(Grid, {
           item: true,
           xs: 12,
@@ -240,7 +184,7 @@ const TextFormat = props => {
           variant: "body1",
           color: "primary",
           sx: classes.typoLabel3,
-          children: translation("fontSize")
+          children: "Font Size"
         }), /*#__PURE__*/_jsx(Grid, {
           item: true,
           xs: 12,
@@ -273,7 +217,7 @@ const TextFormat = props => {
             variant: "body1",
             color: "primary",
             sx: classes.typoLabel,
-            children: translation("textColor")
+            children: "Text Color"
           })
         }), /*#__PURE__*/_jsx(Grid, {
           item: true,
@@ -283,7 +227,7 @@ const TextFormat = props => {
             onClick: handleDefault({
               format: "color"
             }),
-            children: translation("defaultColor")
+            children: "Default Color"
           })
         })]
       }), /*#__PURE__*/_jsx(Grid, {
@@ -294,10 +238,9 @@ const TextFormat = props => {
           editor: editor,
           showHex: false,
           rounded: true,
-          title: translation("textColor"),
+          title: "Text Color",
           id: "11_cc",
-          classes: classes,
-          type: "textColor"
+          classes: classes
         }, "11_cc")
       })]
     }), /*#__PURE__*/_jsxs(Grid, {
@@ -314,7 +257,7 @@ const TextFormat = props => {
             variant: "body1",
             color: "primary",
             sx: classes.typoLabel,
-            children: translation("backgroundColor")
+            children: "Background Color"
           })
         }), /*#__PURE__*/_jsx(Grid, {
           item: true,
@@ -323,12 +266,12 @@ const TextFormat = props => {
             children: /*#__PURE__*/_jsx(Button, {
               sx: classes.defaultBtn2,
               startIcon: /*#__PURE__*/_jsx(ColorResetIcon, {
-                stroke: appTheme?.palette?.type === "dark" ? "#505359" : "#A2B0B9"
+                stroke: theme?.palette?.type === "dark" ? "#505359" : "#A2B0B9"
               }),
               onClick: handleDefault({
                 format: "bgColor"
               }),
-              children: translation("defaultColor")
+              children: "Default Color"
             })
           })
         })]
@@ -342,7 +285,7 @@ const TextFormat = props => {
           editor: editor,
           showHex: false,
           rounded: true,
-          title: translation("textBgColor"),
+          title: "Text Background Color",
           classes: classes,
           id: "12_cc"
         }, "12_cc")
@@ -360,7 +303,7 @@ const TextFormat = props => {
         variant: "body1",
         color: "primary",
         sx: classes.typoLabel2,
-        children: translation("Alignment")
+        children: "Alignment"
       }), /*#__PURE__*/_jsx(Grid, {
         item: true,
         xs: 12,
@@ -368,8 +311,7 @@ const TextFormat = props => {
         children: fontAlign?.map((m, i) => {
           return /*#__PURE__*/_jsx(BlockButton, {
             editor: editor,
-            ...m,
-            customProps: customProps
+            ...m
           }, `pptool_block_${i}_${m.id}`);
         })
       })]
@@ -381,7 +323,7 @@ const TextFormat = props => {
         variant: "body1",
         color: "primary",
         sx: classes.typoLabel2,
-        children: translation("Lists")
+        children: "Lists"
       }), /*#__PURE__*/_jsx(Grid, {
         item: true,
         xs: 12,
@@ -390,8 +332,7 @@ const TextFormat = props => {
           const Comp = ButtonComp[m?.component] || BlockButton;
           return /*#__PURE__*/_jsx(Comp, {
             editor: editor,
-            ...m,
-            customProps: customProps
+            ...m
           }, `pptool_block_${i}_${m.id}`);
         })
       })]
@@ -407,17 +348,20 @@ const TextFormat = props => {
         variant: "body1",
         color: "primary",
         sx: classes.typoLabel,
-        children: translation("Typography")
+        children: "Typography"
       }), /*#__PURE__*/_jsxs(Grid, {
         item: true,
         xs: 12,
         className: "typo-icons",
         sx: classes.evenSpace,
-        children: [fontStyle?.map((m, i) => {
+        children: [/*#__PURE__*/_jsx(SelectTypography, {
+          classes: classes,
+          editor: editor,
+          closeMainPopup: closeMainPopup || onClose
+        }), fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
-            ...m,
-            customProps: customProps
+            ...m
           }, `pptool_mark_${i}_${m.id}`);
         }), /*#__PURE__*/_jsx(LinkButton, {
           active: isBlockActive(editor, link.format),
@@ -426,8 +370,7 @@ const TextFormat = props => {
         }, link.id), /*#__PURE__*/_jsx(SelectSuperSubscript, {
           classes: classes,
           editor: editor,
-          closeMainPopup: closeMainPopup || onClose,
-          customProps: customProps
+          closeMainPopup: closeMainPopup || onClose
         })]
       })]
     }), /*#__PURE__*/_jsx(Grid, {
@@ -435,32 +378,6 @@ const TextFormat = props => {
       xs: 12,
       sx: classes.dividerGrid,
       children: /*#__PURE__*/_jsx(Divider, {})
-    }), /*#__PURE__*/_jsxs(Grid, {
-      item: true,
-      xs: 12,
-      children: [/*#__PURE__*/_jsx(Typography, {
-        variant: "body1",
-        color: "primary",
-        sx: classes.typoLabel,
-        children: "Line Spacing"
-      }), /*#__PURE__*/_jsx(Grid, {
-        item: true,
-        xs: 12,
-        className: "typo-icons",
-        sx: classes.evenSpace,
-        children: /*#__PURE__*/_jsx(LineSpacing, {
-          value: lineSpacingValue,
-          onChange: handleLineSpacing,
-          data: {
-            key: "lineHeight"
-          }
-        })
-      })]
-    }), /*#__PURE__*/_jsx(Grid, {
-      item: true,
-      xs: 12,
-      sx: classes.dividerGrid,
-      children: /*#__PURE__*/_jsx(Divider, {})
     }), /*#__PURE__*/_jsx(Grid, {
       item: true,
       xs: 12,
@@ -472,7 +389,7 @@ const TextFormat = props => {
         variant: "body1",
         color: "primary",
         sx: classes.typoLabel3,
-        children: translation("Decorations")
+        children: "Decorations"
       })
     }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
@@ -492,7 +409,7 @@ const TextFormat = props => {
           style: {
             background: bqBgColor
           },
-          children: translation("Colorbox")
+          children: "Colorbox"
         }), /*#__PURE__*/_jsx("div", {
           className: "vl"
         }), /*#__PURE__*/_jsx(Button, {
@@ -513,7 +430,7 @@ const TextFormat = props => {
               ...getBorderColor(bqColor || "transparent", 3),
               borderWidth: bqColor ? "0px 0px 0px 3px" : "0px"
             },
-            children: translation("Quote")
+            children: "Quote"
           })
         }), /*#__PURE__*/_jsx("div", {
           className: "vl"

package/dist/Editor/Toolbar/PopupTool/index.js

@@ -11,13 +11,9 @@ import useEditorScroll from "../../hooks/useEditorScroll";
 import { isCarouselSelected } from "../../helper";
 import { hideSlateSelection } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
-const isSlateDOM = event => {
-  return event.target.getAttribute("data-slate-string") === "true";
-};
 const PopupTool = props => {
   const {
     theme,
-    setIsTextSelected,
     customProps,
     editorWrapper
   } = props;
@@ -36,9 +32,11 @@ const PopupTool = props => {
   const [event] = useDrag(anchorEl);
   const id = open ? "popup-edit-tool" : "";
   const [size] = useWindowResize();
-  const isMobile = window.matchMedia("(max-width: 899px)")?.matches || false;
   const updateAnchorEl = isScroll => {
     try {
+      const {
+        selection
+      } = editor;
       const isHavingSelection = selection && !Range.isCollapsed(selection);
       if (isHavingSelection && event === "end") {
         const domRange = ReactEditor.toDOMRange(editor, editor.selection);
@@ -78,44 +76,42 @@ const PopupTool = props => {
       if (!isCarouselEdit) {
         setOpen(true);
         setPopupType("textFormat");
-        setIsTextSelected(true);
+        // setIsTextSelected(true);
       }
     } else if (!anchorEl) {
       setOpen(false);
       setPopupType("");
-      setIsTextSelected(false);
+      // setIsTextSelected(false);
     }
   }, [event, anchorEl]);
   useEffect(() => {
-    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "" || selectedElement?.enable === 1) {
+    console.log("Editor useEffect", selection);
+    const {
+      path,
+      enable
+    } = selectedElement || {};
+    const isFreeGridElement = path && path.split("|").length > 2;
+    const isFreeGridEnabled = enable === 1 && isFreeGridElement;
+    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "" || isFreeGridEnabled) {
       setAnchorEl(null);
     } else {
+      console.log("Editor updateAnchorEl", selection);
       updateAnchorEl();
       hideSlateSelection(); // removes slate selection background, when there is no selection
     }
   }, [selection, event, selectedElement?.enable]);
   const handleClose = () => {
+    console.log("Editor closing");
     // setAnchorEl(null);
     setOpen(false);
     setPopupType("");
   };
   return open && !openAI ? /*#__PURE__*/_jsx(ClickAwayListener, {
     onClickAway: e => {
+      console.log("ClickAwayListener", e.target, document.body, e.target !== document.body);
       // close the mini toolbar, if user clicks outside the editor (in Flozy app.)
-
-      if (isSlateDOM(e)) {
-        return;
-      }
-      const wrapper = document.getElementById("slate-wrapper-scroll-container");
-      const isInsideWrapper = wrapper && wrapper.contains(e.target);
-      if (isInsideWrapper) {
-        return;
-      }
-      if (e.target === document.body) {
+      if (e.target !== document.body) {
         // e.target returns body, if the user clicks material ui select popup inside the tool bar, on that time, we don't need to close
-        return;
-      }
-      if (!isMobile) {
         handleClose();
       }
     },

package/dist/Editor/Toolbar/Toolbar.js

@@ -50,8 +50,7 @@ export const RenderToolbarIcon = props => {
       case "block":
         return /*#__PURE__*/_jsx(BlockButton, {
           ...element,
-          editor: editor,
-          customProps: customProps
+          editor: editor
         }, element.id);
       case "mark":
         return /*#__PURE__*/_jsx(MarkButton, {
@@ -106,8 +105,7 @@ export const RenderToolbarIcon = props => {
           editor: editor,
           customProps: customProps,
           icoBtnType: icoBtnType,
-          lbT: element.lbT,
-          onClose: () => {}
+          lbT: element.lbT
         }, element.id);
       case "color-picker":
         return /*#__PURE__*/_jsx(ColorPicker, {
@@ -119,14 +117,12 @@ export const RenderToolbarIcon = props => {
       case "table":
         return /*#__PURE__*/_jsx(TableSelector, {
           editor: editor,
-          icoBtnType: icoBtnType,
-          customProps: customProps
+          icoBtnType: icoBtnType
         }, element.id);
       case "dataView":
         return /*#__PURE__*/_jsx(DataViewButton, {
           editor: editor,
-          icoBtnType: icoBtnType,
-          customProps: customProps
+          icoBtnType: icoBtnType
         }, element.id);
       case "id":
         return /*#__PURE__*/_jsx(Id, {
@@ -155,25 +151,21 @@ export const RenderToolbarIcon = props => {
       case "newLine":
         return /*#__PURE__*/_jsx(NewLineButton, {
           editor: editor,
-          icoBtnType: icoBtnType,
-          customProps: customProps
+          icoBtnType: icoBtnType
         }, element.id);
       case "accordion":
         return /*#__PURE__*/_jsx(AccordionButton, {
-          editor: editor,
-          customProps: customProps
+          editor: editor
         }, element.id);
       case "signature":
         return /*#__PURE__*/_jsx(SignatureButton, {
           editor: editor,
-          icoBtnType: icoBtnType,
-          customProps: customProps
+          icoBtnType: icoBtnType
         }, element.id);
       case "button":
         return /*#__PURE__*/_jsx(ButtonToolIcon, {
           editor: editor,
-          icoBtnType: icoBtnType,
-          customProps: customProps
+          icoBtnType: icoBtnType
         }, element.id);
       case "page-settings":
         return /*#__PURE__*/_jsx(PageSettingsButton, {
@@ -184,8 +176,7 @@ export const RenderToolbarIcon = props => {
       case "carousel":
         return /*#__PURE__*/_jsx(CarouselButton, {
           editor: editor,
-          icoBtnType: icoBtnType,
-          customProps: customProps
+          icoBtnType: icoBtnType
         }, element.id);
       case "chip-text":
         return /*#__PURE__*/_jsx(ChipTextButton, {
@@ -293,8 +284,7 @@ const Toolbar = props => {
       })
     }, index)), /*#__PURE__*/_jsx(HtmlContextMenu, {
       editor: editor,
-      handleCodeToText: handleCodeToText,
-      customProps: customProps
+      handleCodeToText: handleCodeToText
     })]
   });
 };

package/dist/Editor/Toolbar/toolbarGroups.js

@@ -28,20 +28,16 @@ export const toolbarGroups = [[{
   type: "dropdown",
   options: [{
     text: "Normal",
-    value: "normal",
-    numVal: "400"
+    value: "normal"
   }, {
     text: "Bold",
-    value: "bold",
-    numVal: "700"
+    value: "bold"
   }, {
     text: "Bolder",
-    value: "bolder",
-    numVal: "700"
+    value: "bolder"
   }, {
     text: "Lighter",
-    value: "lighter",
-    numVal: "100"
+    value: "lighter"
   }],
   icon: FormatBoldIcon,
   width: "100px"
@@ -50,8 +46,7 @@ export const toolbarGroups = [[{
   format: "bold",
   type: "mark",
   title: "Bold",
-  basic: true,
-  themeEnabled: true
+  basic: true
 }, {
   id: 5,
   format: "underline",
@@ -62,8 +57,7 @@ export const toolbarGroups = [[{
   format: "italic",
   type: "mark",
   title: "Italic",
-  basic: true,
-  themeEnabled: true
+  basic: true
 }, {
   id: 6,
   format: "strikethrough",
@@ -107,42 +101,6 @@ export const toolbarGroups = [[{
   type: "block",
   title: "H3",
   group: "typography"
-}, {
-  id: 39,
-  format: "headingFour",
-  type: "block",
-  title: "H4",
-  group: "typography"
-}, {
-  id: 40,
-  format: "headingFive",
-  type: "block",
-  title: "H5",
-  group: "typography"
-}, {
-  id: 41,
-  format: "headingSix",
-  type: "block",
-  title: "H6",
-  group: "typography"
-}, {
-  id: 42,
-  format: "paragraphOne",
-  type: "block",
-  title: "Paragraph 1",
-  group: "typography"
-}, {
-  id: 43,
-  format: "paragraphTwo",
-  type: "block",
-  title: "Paragraph 2",
-  group: "typography"
-}, {
-  id: 44,
-  format: "paragraphThree",
-  type: "block",
-  title: "Paragraph 3",
-  group: "typography"
 }, {
   id: 14,
   format: "doublequote",