@flozy/editor 9.0.3 → 9.0.4

package/dist/Editor/CommonEditor.js

@@ -54,13 +54,14 @@ const Item = /*#__PURE__*/forwardRef(({
   });
 });
 Item.displayName = "Item";
-const Element = props => {
+const Element = /*#__PURE__*/React.memo(props => {
   return /*#__PURE__*/_jsx(Section, {
     ...props,
     children: getBlock(props)
   });
-};
-const Leaf = ({
+});
+Element.displayName = "Element";
+const Leaf = /*#__PURE__*/React.memo(({
   attributes,
   children,
   leaf
@@ -71,7 +72,8 @@ const Leaf = ({
     ...attributes,
     children: children
   });
-};
+});
+Leaf.displayName = "Leaf";
 const updateTopBanner = (content = [], setTopBanner) => {
   setTopBanner(() => {
     const firstNode = content ? content[0] : {};
@@ -314,7 +316,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
       updateTopBanner(newValue, setTopBanner);
       debounced(newValue);
       if (!isInteracted) {
-        setIsInteracted(true);
+        // setIsInteracted(true);
       }
     }
   };
@@ -495,7 +497,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
       ...props,
       fullScreen: fullScreen,
       footer: footer || "",
-      children: /*#__PURE__*/_jsx(Box, {
+      children: /*#__PURE__*/_jsxs(Box, {
         component: "div",
         className: `et-wrpr stimulate-${breakpoint} ${editorClass || ""} ${isIframe ? "iframe-editor" : ""}`,
         sx: classes.root,
@@ -505,7 +507,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
         "data-breakpoint": breakpoint
         // onContextMenu={handleContextMenu}
         ,
-        children: /*#__PURE__*/_jsxs(Slate, {
+        children: [/*#__PURE__*/_jsxs(Slate, {
           editor: editor,
           initialValue: getInitialValue(debouncedValue?.current, readOnly),
           onChange: handleEditorChange,
@@ -606,10 +608,13 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
           }), htmlAction.showInput && /*#__PURE__*/_jsx(CodeToText, {
             ...htmlAction,
             handleCodeToText: handleCodeToText
-          }), /*#__PURE__*/_jsx(FontLoader, {
-            ...props
           })]
-        }, id)
+        }, id), /*#__PURE__*/_jsx(FontLoader, {
+          otherProps: {
+            services: otherProps?.services
+          },
+          readOnly: readOnly
+        })]
       })
     })
   });

package/dist/Editor/Editor.css

@@ -1280,8 +1280,8 @@ blockquote {
 }
 @media (max-width: 899px) {
   /* Qa validation required */
-  /* .MuiPopover-root {
-    z-index: 1302 !important;
+    /* .MuiPopover-root {
+      z-index: 1302 !important;
   } */
 
   canvas {

package/dist/Editor/Elements/Color Picker/ColorPicker.js

@@ -43,21 +43,19 @@ const ColorPicker = props => {
   };
   const handleFormSubmit = color => {
     if (!color) return;
-    // selection && Transforms.select(editor, selection);
+    selection && Transforms.select(editor, selection);
     addMarkData(editor, {
       format,
       value: color
     });
-    // selection && ReactEditor.focus(editor);
-    // handleClose();
+    selection && ReactEditor.focus(editor);
+    handleClose();
   };
-
   const onSelect = color => {
     handleFormSubmit(color);
   };
   const handleClose = () => {
     setAnchorEl(null);
-    setSelection(null);
   };
   const activeColor = activeMark(editor, format) || DEFAULT_COLOR[format];
   return /*#__PURE__*/_jsxs(_Fragment, {

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

@@ -1,7 +1,7 @@
 import React from "react";
 import { useSlateStatic, useSelected, ReactEditor } from "slate-react";
 import { Box } from "@mui/material";
-import { getPageSettings } from "../../utils/pageSettings";
+// import { getPageSettings } from "../../utils/pageSettings";
 import { isTextSelected } from "../../utils/helper";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import SimpleTextStyle from "./style";
@@ -12,7 +12,6 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { createElement as _createElement } from "react";
 const SimpleText = props => {
   const {
-    theme,
     openAI
   } = useEditorContext() || {};
   const editor = useSlateStatic();
@@ -28,20 +27,10 @@ const SimpleText = props => {
     readOnly,
     editorPlaceholder
   } = customProps;
-  const {
-    element: pageSt
-  } = getPageSettings(editor) || {};
-  const {
-    pageColor
-  } = pageSt?.pageProps || {};
-  const {
-    activeBreakPoint
-  } = useEditorContext();
-  const lineHeight = element?.children[0]?.lineHeight;
-  const lineH = getBreakpointLineSpacing(lineHeight, activeBreakPoint);
+  // const { element: pageSt } = getPageSettings(editor) || {};
+  // const { pageColor } = pageSt?.pageProps || {};
   const classes = SimpleTextStyle({
-    pageColor: pageColor || theme?.palette?.editor?.background || "#FFFFFF",
-    lineHeight: lineH
+    pageColor: "#FFFFFF"
   });
   const selected = useSelected();
   const path = ReactEditor.findPath(editor, element);
@@ -59,14 +48,14 @@ const SimpleText = props => {
     contentEditable: false,
     className: "placeholder-simple-text",
     children: isEmptyEditor ? editorPlaceholder || "Write Something..." : showPlaceHolder ? opacity && selected ? /*#__PURE__*/_jsxs(_Fragment, {
-      children: ["Type ", /*#__PURE__*/_jsx("span", {
+      children: ["Type", " ", /*#__PURE__*/_jsx("span", {
         style: {
-          backgroundColor: '#F2F6FA',
+          backgroundColor: "#F2F6FA",
           padding: "0px 2px",
           borderRadius: "2px"
         },
         children: "/"
-      }), " to browse elements"]
+      }), " ", "to browse elements"]
     }) : "" : ""
   }));
 };

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

@@ -869,19 +869,14 @@ const usePopupStyle = theme => ({
       overflow: "auto",
       backgroundColor: theme?.palette?.editor?.background,
       borderRadius: "14px !important",
-      border: `1px solid ${theme?.palette?.editor?.inputFieldBorder} !important`,
-      minWidth: "fit-content",
-      "@media only screen and (max-width: 599px)": {
-        left: "0px !important"
-      }
+      border: `1px solid ${theme?.palette?.editor?.inputFieldBorder} !important`
     },
     "& .popup_tabs": {
-      backgroundColor: theme?.palette?.editor?.inputFieldBgColor
-      // "@media only screen and (max-width: 599px)": {
-      //   width: "100% !important",
-      // },
+      backgroundColor: theme?.palette?.editor?.inputFieldBgColor,
+      "@media only screen and (max-width: 899px)": {
+        width: "100% !important"
+      }
     },
-
     "& .popup_tabs-header": {
       fontFamily: "Inter, sans-serif",
       fontWeight: 700,

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

@@ -1,5 +1,5 @@
-import React, { useCallback, useEffect, useState } from "react";
-import { Popper, Fade, Paper, ClickAwayListener } from "@mui/material";
+import React, { useEffect, useState } from "react";
+import { Popper, Paper, ClickAwayListener } from "@mui/material";
 import { Editor, Range, Transforms } from "slate";
 import { ReactEditor, useSlate } from "slate-react";
 import useDrag from "../../hooks/useDrag";
@@ -14,13 +14,15 @@ import { jsx as _jsx } from "react/jsx-runtime";
 const PopupTool = props => {
   const {
     theme,
+    setIsTextSelected,
     customProps,
     editorWrapper
   } = props;
   const classes = usePopupStyles(theme);
   const {
     setPopupType,
-    openAI
+    openAI,
+    selectedElement
   } = useEditorContext();
   const [anchorEl, setAnchorEl] = useState(null);
   const [open, setOpen] = useState(false);
@@ -31,18 +33,10 @@ const PopupTool = props => {
   const [event] = useDrag(anchorEl);
   const id = open ? "popup-edit-tool" : "";
   const [size] = useWindowResize();
-  const {
-    selectedElement
-  } = useEditorContext();
-  console.log("Editor debug ====>", event, open, anchorEl, selection);
-  const updateAnchorEl = useCallback(() => {
+  const updateAnchorEl = isScroll => {
     try {
-      const {
-        selection
-      } = editor;
       const isHavingSelection = selection && !Range.isCollapsed(selection);
-      console.log("Editor isHavingSelection", isHavingSelection, selection);
-      if (isHavingSelection) {
+      if (isHavingSelection && event === "end") {
         const domRange = ReactEditor.toDOMRange(editor, editor.selection);
         const editorContainer = document.querySelector("#slate-wrapper-scroll-container")?.getBoundingClientRect();
         const rect = domRange.getBoundingClientRect();
@@ -51,17 +45,21 @@ const PopupTool = props => {
           rect.y = -500; // hide the popper
         }
 
-        console.log("Editor setAnchorEl", rect, domRange, editorContainer);
-        setAnchorEl({
-          clientWidth: rect.width,
-          clientHeight: rect.height,
-          getBoundingClientRect: () => rect
-        });
+        // Create a dummy anchor element to match Popper's requirements
+        const anchor = document.createElement("div");
+        anchor.style.position = "absolute";
+        anchor.style.top = `${rect.top + window.scrollY}px`;
+        anchor.style.left = `${rect.left + window.scrollX}px`;
+        document.body.appendChild(anchor);
+        if (!anchorEl || isScroll === "scroll") {
+          setAnchorEl(anchor);
+          setOpen(true);
+        }
       }
     } catch (err) {
       console.log(err);
     }
-  }, [editor?.selection]);
+  };
   useEditorScroll(editorWrapper, updateAnchorEl);
   useEffect(() => {
     const userStoppedSelection = size?.device === "xs" ? true : event === "end"; // for mobile, when user starts the selection, we are gonna show the popup tool
@@ -76,44 +74,29 @@ 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(() => {
-    console.log("Editor useEffect", selection);
-    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "") {
+    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "" || selectedElement?.enable === 1) {
       setAnchorEl(null);
     } else {
-      console.log("Editor updateAnchorEl", selection);
       updateAnchorEl();
       hideSlateSelection(); // removes slate selection background, when there is no selection
     }
-  }, [editor?.selection]);
-  useEffect(() => {
-    const {
-      path,
-      enable
-    } = selectedElement || {};
-    const isFreeGridElement = path && path.split("|").length > 2;
-    if (enable === 1 && isFreeGridElement) {
-      console.log("Editor useEffect isFreeGridElement", selectedElement);
-      setAnchorEl(null);
-    }
-  }, [selection, selectedElement?.path, selectedElement?.enable]);
+  }, [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 (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
@@ -132,24 +115,18 @@ const PopupTool = props => {
       id: id,
       open: open,
       anchorEl: anchorEl,
-      transition: true,
       sx: classes.popupWrapper,
       placement: "top-start",
-      children: ({
-        TransitionProps
-      }) => /*#__PURE__*/_jsx(Fade, {
-        ...TransitionProps,
-        children: /*#__PURE__*/_jsx(Paper, {
-          style: {
-            borderRadius: "6px",
-            border: "1px solid #8360FD"
-          },
-          children: /*#__PURE__*/_jsx(MiniTextFormat, {
-            editor: editor,
-            classes: classes,
-            closeMainPopup: handleClose,
-            customProps: customProps
-          })
+      children: /*#__PURE__*/_jsx(Paper, {
+        style: {
+          borderRadius: "6px",
+          border: "1px solid #8360FD"
+        },
+        children: /*#__PURE__*/_jsx(MiniTextFormat, {
+          editor: editor,
+          classes: classes,
+          closeMainPopup: handleClose,
+          customProps: customProps
         })
       })
     })

package/dist/Editor/common/FontLoader/FontList.js

@@ -1,11 +1,11 @@
-export const defaultFonts = [
-// "EB Garamond",
-"Anton", "DM Serif Text", "Libre Baskerville", "Montserrat", "Open Sans", "Public Sans", "Raleway", "Space Mono", "Great Vibes", "Zeyada", "Allura", "Pinyon Script", "Dancing Script", "Gaegu", "Kite One", "Merriweather"];
-export const otherFonts = ["PoppinsRegular", "PoppinsBold", "Monaco", "Qwitcher Grypen", "Bulgarian Garamond", "Redacted Script", "Herr Von Muellerhoff", "Dawning of a New Day", "Coming Soon", "Engagement", "Ingrid Darling", "La Belle Aurore", "Mea Culpa", "The Girl Next Door", "Helvetica", "Georgia", "Times New Roman", "Courier New", "Impact"];
-export const googleFontList = ["Roboto", "Noto Sans JP", "Poppins", "Lato", "Inter", "Roboto Condensed", "Roboto Mono", "Oswald", "Noto Sans", "Nunito", "Nunito Sans", "Ubuntu", "Rubik", "Playfair Display", "Noto Sans KR", "Roboto Slab", "PT Sans", "Kanit", "Work Sans", "Lora", "DM Sans", "Mulish", "Quicksand", "Fira Sans", "Noto Sans TC", "Inconsolata", "Barlow", "Manrope", "IBM Plex Sans", "PT Serif", "Karla", "Titillium Web", "Heebo", "Noto Serif", "Nanum Gothic", "Noto Color Emoji", "Agdasima", "Bebas Neue", "Libre Franklin", "Mukta", "Outfit", "Josefin Sans", "Source Code Pro", "Jost", "Space Grotesk", "Hind Siliguri", "Arimo", "Cabin", "Barlow Condensed", "Dosis", "Fira Sans Condensed", "Bitter", "Archivo", "Figtree", "Noto Serif JP", "PT Sans Narrow", "Abel", "Noto Sans SC",
-// "Source Sans 3",
-"Hind",
-// "Exo 2",
-"Teko", "Oxygen", "Cairo", "Crimson Text", "Plus Jakarta Sans", "Overpass", "Pacifico", "Prompt", "Red Hat Display", "Varela Round", "Cormorant Garamond", "Assistant", "Comfortaa", "Lexend", "Signika Negative",
-// "M PLUS Rounded 1c",
-"Fjalla One", "Caveat", "IBM Plex Mono", "Arvo", "Lobster", "Schibsted Grotesk", "Chakra Petch", "Maven Pro", "Sora", "Kalam", "Onest", "Space Grotesk", "Outfit", 'Titillium Web', ...defaultFonts];
+const otherFonts = ["PoppinsRegular", "PoppinsBold", "Qwitcher Grypen", "Bulgarian Garamond", "Redacted Script", "Herr Von Muellerhoff", "Dawning of a New Day", "Coming Soon", "Engagement", "Ingrid Darling", "La Belle Aurore", "Mea Culpa", "The Girl Next Door"];
+const mostUsedGoogleFonts = ["Roboto", "Poppins", "Lato", "Inter", "Nunito", "Ubuntu", "Oswald", "Rubik", "Roboto Slab", "PT Sans", "Work Sans", "Lora", "Mulish", "DM Sans", "Fira Sans", "Quicksand", "Barlow", "Manrope", "IBM Plex Sans", "PT Serif", "Libre Franklin", "Bebas Neue", "Cabin", "Titillium Web", "Heebo", "Noto Serif", "Jost", "Source Code Pro", "Josefin Sans", "Dosis", "Fira Sans Condensed", "Archivo", "Noto Serif JP", "Crimson Text", "Cairo", "Pacifico", "Red Hat Display", "Assistant", "Comfortaa", "Lexend", "Fjalla One", "Caveat", "Arvo", "Lobster", "Schibsted Grotesk", "EB Garamond", "Sora", "Kalam", "Onest", "Space Grotesk", "Outfit", "Plus Jakarta Sans"];
+const systemFonts = ["Monaco", "Helvetica", "Georgia", "Times New Roman", "Courier New", "Impact"];
+export const googleFontList = [...mostUsedGoogleFonts, ...otherFonts];
+const fontList = [...mostUsedGoogleFonts, ...otherFonts, ...systemFonts];
+export const defaultFontFamilies = {
+  id: 1,
+  format: "fontFamily",
+  type: "fontfamilydropdown",
+  options: fontList || []
+};

package/dist/Editor/common/FontLoader/FontLoader.js

@@ -1,7 +1,11 @@
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import WebFont from "webfontloader";
 import { useEditorContext } from "../../hooks/useMouseMove";
-import { defaultFonts, googleFontList, otherFonts } from "./FontList";
+import { googleFontList } from "./FontList";
+import CircularProgress from "@mui/material/CircularProgress";
+import Box from "@mui/material/Box";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 const FontLoader = props => {
   const {
     otherProps,
@@ -10,69 +14,74 @@ const FontLoader = props => {
   const {
     setFontFamilies
   } = useEditorContext();
+  const [loading, setLoading] = useState(true);
   const loadFontsInBatches = (families, batchSize = 5, maxRetries = 3) => {
     let currentIndex = 0;
     let retryCount = 0;
-    function loadNextBatch() {
-      if (currentIndex >= families?.length) {
-        // console.log("All fonts have been loaded");
-        return;
-      }
-      const batch = families?.slice(currentIndex, currentIndex + batchSize);
-      const batchWithWeights = batch.map(font => `${font}:300,400,600,700`);
-      WebFont.load({
-        google: {
-          families: [...batchWithWeights]
-        },
-        classes: false,
-        timeout: 2000,
-        active: () => {
-          // console.log(`Fonts loaded successfully: ${batch}`);
-          currentIndex += batchSize;
-          retryCount = 0; // Reset retry count for the next batch
-          loadNextBatch();
-        },
-        inactive: () => {
-          // console.log(`Font loading failed for: ${batch}`);
-
-          if (retryCount < maxRetries) {
-            retryCount++;
-            // console.log(`Retrying batch (${retryCount}/${maxRetries})...`);
-            // Retry loading the same batch
-            loadNextBatch();
-          } else {
-            // console.log(
-            //   `Max retries reached for batch: ${batch}. Moving to the next batch.`
-            // );
+    const loadNextBatch = () => {
+      try {
+        if (currentIndex >= families?.length) {
+          // console.log("All fonts have been loaded");
+          setLoading(false);
+          return;
+        }
+        const batch = families?.slice(currentIndex, currentIndex + batchSize);
+        const batchWithWeights = batch?.map(font => `${font}:300,400,600,700`);
+        WebFont.load({
+          google: {
+            families: [...batchWithWeights]
+          },
+          classes: false,
+          timeout: 2000,
+          active: () => {
+            // console.log(`Fonts loaded successfully: ${batch}`);
             currentIndex += batchSize;
             retryCount = 0; // Reset retry count for the next batch
             loadNextBatch();
+          },
+          inactive: () => {
+            // console.log(`Font loading failed for: ${batch}`);
+            if (retryCount < maxRetries) {
+              retryCount++;
+              // console.log(`Retrying batch (${retryCount}/${maxRetries})...`);
+              // Retry loading the same batch
+              loadNextBatch();
+            } else {
+              // console.log(
+              //   `Max retries reached for batch: ${batch}. Moving to the next batch.`
+              // );
+              currentIndex += batchSize;
+              retryCount = 0;
+              loadNextBatch();
+            }
           }
-        }
-      });
-    }
+        });
+      } catch (err) {
+        setLoading(false);
+      }
+    };
     loadNextBatch();
   };
   useEffect(() => {
-    let families = [...otherFonts, ...defaultFonts];
+    let families = [...googleFontList];
     if (!readOnly) {
       otherProps?.services("listGoogleFont", []).then(data => {
-        families = [...families, ...(data?.data || [])];
-        const filteredfamilies = families?.filter(font => !font?.includes("Material"));
+        families = [...(data?.data || [])];
         setFontFamilies({
           id: 1,
           format: "fontFamily",
           type: "fontfamilydropdown",
-          options: filteredfamilies || []
+          options: families || []
         });
         loadFontsInBatches(families);
       }).catch(err => {
         // console.log(err);
+        setLoading(false);
       });
     } else {
       function correctFontArray(fontString) {
-        let fontsArray = fontString.split(",");
-        let cleanedFontsArray = [...new Set(fontsArray.map(font => font.trim()))];
+        let fontsArray = fontString?.split(",");
+        let cleanedFontsArray = [...new Set(fontsArray?.map(font => font.trim()))];
         return cleanedFontsArray;
       }
       function sanitizeFontFamily(fontFamily) {
@@ -88,11 +97,32 @@ const FontLoader = props => {
       let families = Array.from(fontSet);
       families = correctFontArray(families.join(", "));
       families = families?.map(font => font?.replace(/\"/g, ""));
-      families = families?.map(font => font?.replace(", sans-serif", "")); //This is temporary fix for patch
-      families = families.filter(font => googleFontList.includes(font));
+      families = families?.map(font => font?.replace(", sans-serif", ""));
+      families = families?.filter(font => googleFontList?.includes(font));
       loadFontsInBatches(families);
     }
+
+    // Set timeout to hide loader after 5 seconds
+    const timeoutId = setTimeout(() => {
+      setLoading(false);
+    }, 5000);
+    return () => clearTimeout(timeoutId);
   }, []);
-  return null;
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: loading ? /*#__PURE__*/_jsx(Box, {
+      sx: {
+        position: "absolute",
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        zIndex: 99999,
+        display: "flex",
+        justifyContent: "center",
+        alignItems: "center"
+      },
+      children: /*#__PURE__*/_jsx(CircularProgress, {})
+    }) : null
+  });
 };
 export default FontLoader;

package/dist/Editor/common/ImageSelector/Options/Upload.js

@@ -19,7 +19,7 @@ const Upload = props => {
     xs: 12,
     sx: {
       padding: "10px",
-      height: "100%"
+      height: '100%'
     },
     className: "ims-right",
     children: /*#__PURE__*/_jsx(Uploader, {

package/dist/Editor/common/ImageSelector/UploadStyles.js

@@ -5,9 +5,9 @@ const UploadStyles = theme => ({
     borderRadius: "11px",
     boxShadow: "0px 4px 10px rgba(0, 0, 0, 0.16)",
     background: theme?.palette?.editor?.uploadFileBg,
-    height: "100%",
-    minHeight: "150px",
-    height: "inherit"
+    height: '100%',
+    minHeight: '150px',
+    height: 'inherit'
   },
   uploadField: {
     width: "100%",
@@ -19,21 +19,21 @@ const UploadStyles = theme => ({
     backgroundColor: theme?.palette?.editor?.uploadFileInnerBg,
     borderRadius: "9px",
     border: "1px dashed #2563EB",
-    minHeight: "150px"
+    minHeight: '150px'
   },
   uploadIcon: {
     display: "grid !important",
     "& svg": {
-      display: "flex",
-      width: "100%",
+      display: 'flex',
+      width: '100%',
       "& path": {
         stroke: "#2563EB"
       }
     },
-    "& span": {
-      display: "flex",
-      width: "100%",
-      marginTop: "5px"
+    '& span': {
+      display: 'flex',
+      width: '100%',
+      marginTop: '5px'
     }
   }
 });

package/dist/Editor/common/MentionsPopup/index.js

@@ -131,6 +131,7 @@ const MentionsPopup = /*#__PURE__*/forwardRef((props, ref) => {
           setOpenAI("fromElements");
         }
         insertMention(editor, char, type);
+        Transforms.insertText(editor, " "); //Added to insert space after inserting mention node
         setMentions({
           ...mentions,
           target: null

package/dist/Editor/common/RnD/ElementSettings/styles.js

@@ -58,7 +58,6 @@ const useElementSettingsStyle = theme => ({
       maxHeight: "500px",
       overflowX: "hidden",
       overflowY: "auto",
-      paddingLeft: "4px",
       background: theme?.palette?.editor?.background,
       paddingLeft: "4px",
       "& .MuiTypography-root, .MuiInputBase-root, input": {

package/dist/Editor/common/Section/index.js

@@ -2,36 +2,34 @@ import React, { useRef, useState } from "react";
 import { useTheme } from "@mui/material";
 import { Transforms } from "slate";
 import { ReactEditor, useSlateStatic } from "slate-react";
-import { Box, IconButton, Popper, Tooltip } from "@mui/material";
+import { Box, IconButton, Tooltip } from "@mui/material";
 import SectionPopup from "../../Elements/Grid/SectionPopup";
 import { getBreakPointsValue, getTRBLBreakPoints, groupByBreakpoint } from "../../helper/theme";
-import DragHandle from "../DnD/DragHandleButton";
-import { useEditorSelection } from "../../hooks/useMouseMove";
+// import DragHandle from "../DnD/DragHandleButton";
+// import { useEditorSelection } from "../../hooks/useMouseMove";
 import SectionStyle from "./styles";
 import useWindowResize from "../../hooks/useWindowResize";
 import { SectionSettingIcon } from "../iconListV2";
+
+// const list_types = ["orderedList", "unorderedList"];
 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 Toolbar = ({
-  fromPopper,
   readOnly,
   showTool,
-  onSettings
+  onSettings,
+  isSectionFullWidth
 }) => {
   return !readOnly && !showTool ? /*#__PURE__*/_jsx(Box, {
     component: "div",
     className: `element-toolbar no-border-button hr section-tw sectionIcon`,
     contentEditable: false,
-    style: fromPopper ? {
-      position: "unset",
-      marginLeft: "28px",
-      paddingTop: "4px",
-      marginRight: "10px",
-      height: "100%"
-    } : {
-      left: "-28px",
-      top: "1px"
+    sx: {
+      left: isSectionFullWidth ? "0px" : "-28px",
+      top: isSectionFullWidth ? "-28px" : "1px",
+      "&:hover": {
+        backgroundColor: "rgba(0,0,0,0.5)"
+      }
     },
     children: /*#__PURE__*/_jsx(Tooltip, {
       title: "Section Settings",
@@ -42,7 +40,6 @@ const Toolbar = ({
     })
   }) : null;
 };
-const list_types = ["orderedList", "unorderedList"];
 const Section = props => {
   const themeReact = useTheme();
   const theme = props?.theme;
@@ -56,7 +53,8 @@ const Section = props => {
     readOnly
   } = customProps;
   const editor = useSlateStatic();
-  const [showTool] = useEditorSelection(editor);
+  // const [isHovering, setIsHovering] = useState(false);
+  const [size] = useWindowResize();
   const [openSetttings, setOpenSettings] = useState(false);
   const {
     sectionBgColor,
@@ -73,41 +71,11 @@ const Section = props => {
   } = sectionAlignment || {};
   const path = ReactEditor.findPath(editor, element);
   const anchorEl = useRef(null);
-  const popperEl = useRef(null);
-  const [size] = useWindowResize();
+  // const popperEl = useRef(null);
+  // const [showTool] = useEditorSelection(editor);
   const isSectionFullWidth = sectionGridSize && sectionGridSize[size?.device] >= 12;
-  const [isHovering, setIsHovering] = useState(false);
-  const onMouseEnter = () => {
-    setIsHovering(true);
-  };
-  const onMouseLeave = () => {
-    setIsHovering(false);
-  };
-  const onSettings = () => {
-    setOpenSettings(true);
-  };
-  const onSave = data => {
-    const updateData = {
-      ...data
-    };
-    delete updateData.children;
-    Transforms.setNodes(editor, {
-      ...updateData
-    }, {
-      at: path
-    });
-    onClose();
-  };
-  const onClose = () => {
-    setOpenSettings(false);
-  };
-  const onDelete = () => {
-    Transforms.removeNodes(editor, {
-      at: path
-    });
-  };
-  const isFreeGrid = element?.children?.find(f => f.type === "freegrid");
-  const needHover = element?.children?.find(f => f.type === "grid" && !list_types.includes(element.type)) ? "" : "";
+  const isFreeGrid = element?.children[0]?.type === "freegrid";
+  const needHover = false;
   let tempProps = {};
   if (element?.type === "temp") {
     tempProps = {
@@ -131,6 +99,38 @@ const Section = props => {
       ...getBreakPointsValue(sectionGridSize || 8, null, "overrideGridSize", true)
     }
   }, themeReact);
+
+  // const onMouseEnter = () => {
+  //   setIsHovering(true);
+  // };
+
+  // const onMouseLeave = () => {
+  //   setIsHovering(false);
+  // };
+
+  const onSettings = () => {
+    setOpenSettings(true);
+  };
+  const onSave = data => {
+    const updateData = {
+      ...data
+    };
+    delete updateData.children;
+    Transforms.setNodes(editor, {
+      ...updateData
+    }, {
+      at: path
+    });
+    onClose();
+  };
+  const onClose = () => {
+    setOpenSettings(false);
+  };
+  const onDelete = () => {
+    Transforms.removeNodes(editor, {
+      at: path
+    });
+  };
   return path.length === 1 && !isFreeGrid ? /*#__PURE__*/_jsxs(Box, {
     component: "div",
     className: `ed-section-wrapper ${readOnly ? "" : "hselect"} ${needHover} is-${element?.type}`,
@@ -145,9 +145,10 @@ const Section = props => {
       flexDirection: flexDirection || "column",
       alignItems: horizantal,
       justifyContent: vertical
-    },
-    onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave,
+    }
+    // onMouseEnter={onMouseEnter}
+    // onMouseLeave={onMouseLeave}
+    ,
     children: [/*#__PURE__*/_jsxs(Box, {
       className: "ed-section-inner",
       sx: {
@@ -155,41 +156,11 @@ const Section = props => {
         ...edInnerSp
       },
       ref: anchorEl,
-      children: [isHovering && isSectionFullWidth ? /*#__PURE__*/_jsx(Popper, {
-        open: isHovering && isSectionFullWidth,
-        anchorEl: anchorEl?.current,
-        placement: "top-start",
-        sx: {
-          zIndex: 9999
-        },
-        disablePortal: true,
-        ref: popperEl,
-        className: "sectionPopper",
-        children: /*#__PURE__*/_jsxs(Box, {
-          sx: {
-            bgcolor: "background.paper",
-            height: "30px",
-            position: "relative",
-            background: theme?.palette?.type === "dark" ? theme?.palette?.editor?.miniToolBarBackground : "#F6F6F6"
-          },
-          children: [!readOnly && !showTool ? /*#__PURE__*/_jsx(DragHandle, {
-            ...props,
-            fromPopper: true
-          }) : null, /*#__PURE__*/_jsx(Toolbar, {
-            fromPopper: true,
-            readOnly: readOnly,
-            showTool: showTool,
-            onSettings: onSettings
-          })]
-        })
-      }) : /*#__PURE__*/_jsxs(_Fragment, {
-        children: [!readOnly && !showTool ? /*#__PURE__*/_jsx(DragHandle, {
-          ...props
-        }) : null, /*#__PURE__*/_jsx(Toolbar, {
-          readOnly: readOnly,
-          showTool: showTool,
-          onSettings: onSettings
-        })]
+      children: [/*#__PURE__*/_jsx(Toolbar, {
+        isSectionFullWidth: isSectionFullWidth,
+        readOnly: readOnly,
+        showTool: false,
+        onSettings: onSettings
       }), children]
     }), openSetttings ? /*#__PURE__*/_jsx(SectionPopup, {
       element: {

package/dist/Editor/helper/deserialize/index.js

@@ -175,7 +175,7 @@ const deserialize = el => {
   if (el.nodeType === 3) {
     // if there is any line-breaks
     const match = /\r|\n/.exec(el.textContent);
-    const text = el.textContent.replace(/\r|\n/g, "").trim();
+    const text = el.textContent?.trim()?.length === 0 ? el.textContent.replace(/\r|\n/g, "").trim() : el.textContent;
     return match && !text ? null : {
       text,
       ...getInlineTextStyles(el.parentNode)

package/dist/Editor/hooks/useDrag.js

@@ -1,20 +1,26 @@
-import { useCallback, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 const useDrag = () => {
   const [event, setEvent] = useState("");
-  const onMouseDown = useCallback(() => {
-    setEvent("start");
-  }, []);
-  const onMouseUp = useCallback(() => {
-    setEvent("end");
-  }, []);
   useEffect(() => {
-    document.addEventListener("pointerdown", onMouseDown);
-    document.addEventListener("pointerup", onMouseUp);
+    addListener();
     return () => {
-      document.removeEventListener("pointerdown", onMouseDown);
-      document.removeEventListener("pointerup", onMouseUp);
+      removeListener();
     };
   }, []);
+  const onMouseDown = () => {
+    setEvent("start");
+  };
+  const onMouseUp = () => {
+    setEvent("end");
+  };
+  const addListener = () => {
+    document.addEventListener("pointerdown", onMouseDown);
+    document.addEventListener("pointerup", onMouseUp);
+  };
+  const removeListener = () => {
+    document.removeEventListener("pointerdown", onMouseDown);
+    document.removeEventListener("pointerup", onMouseUp);
+  };
   return [event];
 };
 export default useDrag;

package/dist/Editor/hooks/useEditorScroll.js

@@ -4,9 +4,8 @@ function useEditorScroll(editorWrapper = {
 }, callback) {
   useEffect(() => {
     const handleScroll = () => {
-      console.log("Editor debug useEditorScroll ====>", editorWrapper, callback);
       if (editorWrapper.current) {
-        callback();
+        callback("scroll");
       }
     };
     const currentEditorWrapper = editorWrapper.current;

package/dist/Editor/hooks/useMouseMove.js

@@ -1,6 +1,7 @@
 import { useEffect, useState, createContext, useContext, useMemo } from "react";
 import { getSelectedText } from "../utils/helper";
 import { debounce } from "../helper";
+import { defaultFontFamilies } from "../common/FontLoader/FontList";
 import { jsx as _jsx } from "react/jsx-runtime";
 const EditorContext = /*#__PURE__*/createContext();
 export const useEditorSelection = editor => {
@@ -34,7 +35,7 @@ export const EditorProvider = ({
   const [contextMenu, setContextMenu] = useState({
     path: null
   });
-  const [fontFamilies, setFontFamilies] = useState({});
+  const [fontFamilies, setFontFamilies] = useState(defaultFontFamilies);
   const [activeBreakPoint, setActiveBreakPoint] = useState("");
   useEffect(() => {
     window.updateSelectedItem = d => {

package/dist/Editor/utils/SlateUtilityFunctions.js

@@ -630,6 +630,11 @@ export const getBlock = props => {
         children: children
       });
     default:
+      // return (
+      //   <span {...attributes} {...element.attr}>
+      //     {children}
+      //   </span>
+      // );
       return /*#__PURE__*/_jsx(SimpleText, {
         ...props,
         isEmpty: isEmpty

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "9.0.3",
+  "version": "9.0.4",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"
@@ -61,7 +61,7 @@
   "scripts": {
     "prepare": "husky install .husky",
     "analyze": "source-map-explorer build/static/js/*.js",
-    "lint": "./node_modules/. bin/eslint --ignore-path .gitignore .",
+    "lint": "./node_modules/.bin/eslint --ignore-path .gitignore .",
     "start": "craco start",
     "build": "NODE_OPTIONS='--max_old_space_size=4096' craco build",
     "test": "craco test --passWithNoTests",
@@ -69,7 +69,7 @@
     "storybook": "storybook dev -p 6006",
     "build-storybook": "NODE_OPTIONS='--max_old_space_size=4096' storybook build",
     "publish:npm": "rm -rf dist && mkdir dist &&  babel src/components -d dist --copy-files",
-    "publish:local": "rm -rf /Users/agmac30/Documents/CODE_BASE/flozy/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agmac30/Documents/CODE_BASE/flozy/client/node_modules/@flozy/editor/dist --copy-files"
+    "publish:local": "rm -rf /Users/agmac03/flozy/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agmac03/flozy/client/node_modules/@flozy/editor/dist --copy-files"
   },
   "eslintConfig": {
     "extends": [