@flozy/editor 6.0.4 → 6.0.5

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

@@ -4,7 +4,6 @@ import TemplateCard from "./TemplateCard";
 import FullViewCard from "./FullViewCard";
 import ButtonTemplateCard from "./ButtonTemplatesCard";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const CATEGORIES_SORT_INDEX = {
   Brief: 1,
@@ -47,7 +46,7 @@ const ProgressBar = ({
       alignItems: "center",
       margin: 0,
       padding: 0,
-      height: "300px",
+      height: "50px",
       overflow: "hidden"
     },
     children: /*#__PURE__*/_jsx(CircularProgress, {})
@@ -70,49 +69,41 @@ const AddTemplates = props => {
   const [categories, setCategories] = useState([]);
   const [category, setCategory] = useState("");
   const [templates, setTemplates] = useState([]);
+  const [filteredTemplates, setFilteredTemplates] = useState([]);
   useEffect(() => {
-    getCategoryList();
+    getTemplatesList();
   }, []);
-  const getCategoryList = async () => {
-    setLoading(true);
-    const categoryDB = await services("listCategory");
-    if (categoryDB?.data?.Template?.length > 0) {
-      setCategories(categoryDB.data.Template);
-      setCategory(categoryDB.data.Template[0]);
-      getTemplatesList(categoryDB.data.Template[0]);
-    }
-    setLoading(false);
+  const sortCategory = (a, b) => {
+    return (CATEGORIES_SORT_INDEX[a] || Infinity) - (CATEGORIES_SORT_INDEX[b] || Infinity);
   };
-  const getTemplatesList = async selectedCategory => {
+  const getTemplatesList = async () => {
     setLoading(true);
-    const result = await services("listTemplates", {
-      category: selectedCategory
-    });
-    setTemplates(result?.data || []);
+    const result = await services("listTemplates", {});
+    const tempList = result?.data?.filter(f => f.type === "Template");
+    const lic = tempList?.reduce((a, b) => {
+      if (a.indexOf(b.category) < 0) {
+        a.push(b.category);
+      }
+      return a;
+    }, []).sort(sortCategory);
+    const ft = tempList?.filter(f => f.category === lic[0]);
+    setTemplates(tempList);
+    setCategories(lic);
+    setCategory(lic[0]);
+    setFilteredTemplates(ft);
     setLoading(false);
   };
   const handleChange = (event, newValue) => {
-    setTemplates([]);
     onSearch("");
     setCategory(newValue);
-    getTemplatesList(newValue);
+    setFilteredTemplates(templates.filter(f => f.category === newValue));
   };
-  const onSelectTemplate = card => async () => {
+  const onSelectTemplate = card => () => {
     try {
-      const {
-        data
-      } = await services("templateContent", {
-        id: card?.id
-      });
-      const content = data?.content;
-      if (content) {
-        editor.insertNode(JSON.parse(content));
-      } else {
-        console.log("No data found");
-      }
+      editor.insertNode(JSON.parse(card.content));
       onClose();
     } catch (err) {
-      console.log("Error inserting template content into editor:", err);
+      console.log(err);
     }
   };
   const filterByTitle = f => {
@@ -182,16 +173,16 @@ const AddTemplates = props => {
         data: categories,
         handleChange: handleChange
       })
-    }), /*#__PURE__*/_jsx(Grid, {
+    }), /*#__PURE__*/_jsxs(Grid, {
       container: true,
       spacing: 0,
       className: `${fullScreen ? "fullscreen" : ""}`,
       sx: classes.templateCardsWrpr,
-      children: loading ? /*#__PURE__*/_jsx(ProgressBar, {
+      children: [/*#__PURE__*/_jsx(ProgressBar, {
         loading: loading
-      }) : /*#__PURE__*/_jsx(_Fragment, {
-        children: templates.filter(filterByTitle).map(renderTemplate)
-      })
+      }), filteredTemplates.filter(filterByTitle).map(m => {
+        return renderTemplate(m);
+      })]
     })]
   });
 };

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

@@ -51,8 +51,7 @@ const alignmentOptions = [{
 }];
 function SelectAlignment({
   editor,
-  classes,
-  closeMainPopup
+  classes
 }) {
   const selected = useMemo(() => {
     return alignmentOptions.find(t => isBlockActive(editor, t.value));
@@ -60,7 +59,6 @@ function SelectAlignment({
   const onChange = (format, option) => {
     if (option.type === "block") {
       toggleBlock(editor, format);
-      closeMainPopup();
     }
   };
   return /*#__PURE__*/_jsx(CustomSelectTool, {

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

@@ -59,7 +59,7 @@ function SelectFontSize({
           size = value;
         }
       });
-      return isNaN(parseInt(size)) ? 14 : parseInt(size);
+      return parseInt(size);
     } catch (err) {
       return "";
     }

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

@@ -68,8 +68,7 @@ const listOptions = [{
 }];
 function SelectList({
   editor,
-  classes,
-  closeMainPopup
+  classes
 }) {
   const selectedList = useMemo(() => {
     return listOptions.find(t => isBlockActive(editor, t.value));
@@ -80,7 +79,6 @@ function SelectList({
     } else if (option.type === "accordion") {
       insertAccordion(editor);
     }
-    closeMainPopup();
   };
   return /*#__PURE__*/_jsx(CustomSelectTool, {
     options: listOptions,

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

@@ -125,6 +125,7 @@ function SelectTypography({
         ...upData
       }
     });
+    closeMainPopup();
   };
   const selectedBlock = useMemo(() => {
     return typographyOptions.find(t => {
@@ -151,17 +152,21 @@ function SelectTypography({
     toggleBlock(editor, format);
     if (option.type === "block") {
       // reset old font size
-      // let updatedValue = !selectedBlock ? {} : { xs: "16px", sm: "16px", md: "16px", lg: "16px" }
+      let updatedValue = !selectedBlock ? {} : {
+        xs: "16px",
+        sm: "16px",
+        md: "16px",
+        lg: "16px"
+      };
       addMarkData(editor, {
         format: "fontSize",
-        value: {}
+        value: updatedValue
       });
     } else if (option.type === "mark") {
       const size = sizeMap[option.value] || "";
       const [sizeInNumber] = size.split("px");
       updateMarkData(Number(sizeInNumber));
     }
-    closeMainPopup();
   };
   return /*#__PURE__*/_jsx(CustomSelectTool, {
     options: typographyOptions,

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

@@ -14,7 +14,6 @@ import MiniColorPicker from "./MiniColorPicker";
 import SelectAlignment from "./SelectAlignment";
 import SelectFontSize from "./SelectFontSize";
 import InfinityAITool from "./InfinityAITool";
-import { viewSlateSelection } from "../../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const DEFAULT_COLOR = {
@@ -61,15 +60,13 @@ const MiniTextFormat = props => {
           className: "verticalLine"
         }), /*#__PURE__*/_jsx(SelectList, {
           classes: classes,
-          editor: editor,
-          closeMainPopup: closeMainPopup
+          editor: editor
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine mr-1"
         }), /*#__PURE__*/_jsx(SelectAlignment, {
           fontAlign: fontAlign,
           classes: classes,
-          editor: editor,
-          closeMainPopup: closeMainPopup
+          editor: editor
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine mr-1"
         }), /*#__PURE__*/_jsx(SelectFontSize, {
@@ -101,10 +98,7 @@ const MiniTextFormat = props => {
           editor: editor,
           customProps: customProps
         }, link.id), /*#__PURE__*/_jsx(IconButton, {
-          onClick: e => {
-            viewSlateSelection();
-            setAnchorEl(document.getElementById("mini-text-editor-wrapper"));
-          },
+          onClick: e => setAnchorEl(document.getElementById("mini-text-editor-wrapper")),
           className: `textSettingsIcon ${open ? "btnActive" : ""}`,
           children: /*#__PURE__*/_jsx(TextToolIcon, {})
         }), /*#__PURE__*/_jsx(Popper, {

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

@@ -47,7 +47,7 @@ const TemplateCard = props => {
         }), /*#__PURE__*/_jsx(CardMedia, {
           className: `template-card-media ${fullScreen ? "fullscreen" : ""}`,
           component: "div",
-          image: m?.compressedThum || m?.thumbnail,
+          image: m?.thumbnail,
           alt: m?.title,
           sx: classes.templateCardMedia
         }), /*#__PURE__*/_jsx(PreviewAndSelect, {

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

@@ -14,8 +14,6 @@ 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 { getPageSettings } from "../../utils/pageSettings";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const allTools = toolbarGroups.flat();
@@ -33,18 +31,10 @@ const TextFormat = props => {
   const [anchorEl, setAnchorEl] = useState(null);
   const [type, setType] = useState(null);
   const open = Boolean(anchorEl);
-  const {
-    element: pageSt
-  } = getPageSettings(editor) || {};
-  const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
     theme
   } = useEditorContext();
-  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);
@@ -61,8 +51,6 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-  let lineSpacingValue = activeMark(editor, 'lineHeight');
-  lineSpacingValue = lineSpacingValue?.[breakpoint] !== undefined ? lineSpacingValue : pageSettingLine;
   const handleColorPicker = type => e => {
     setType(type);
     setAnchorEl(e.currentTarget);
@@ -103,13 +91,6 @@ const TextFormat = props => {
       value
     });
   };
-  const handleLineSpacing = data => {
-    const [[format, value]] = Object.entries(data);
-    addMarkData(editor, {
-      format,
-      value
-    });
-  };
   return /*#__PURE__*/_jsxs(Grid, {
     container: true,
     sx: classes.textFormatWrapper,
@@ -379,32 +360,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,

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";
@@ -9,7 +9,6 @@ import { useEditorContext } from "../../hooks/useMouseMove";
 import usePopupStyles from "../PopupTool/PopupToolStyle";
 import useEditorScroll from "../../hooks/useEditorScroll";
 import { isCarouselSelected } from "../../helper";
-import { hideSlateSelection } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 const PopupTool = props => {
   const {
@@ -21,7 +20,8 @@ const PopupTool = props => {
   const classes = usePopupStyles(theme);
   const {
     setPopupType,
-    openAI
+    openAI,
+    selectedElement
   } = useEditorContext();
   const [anchorEl, setAnchorEl] = useState(null);
   const [open, setOpen] = useState(false);
@@ -32,13 +32,10 @@ const PopupTool = props => {
   const [event] = useDrag(anchorEl);
   const id = open ? "popup-edit-tool" : "";
   const [size] = useWindowResize();
-  const {
-    selectedElement
-  } = useEditorContext();
-  const updateAnchorEl = useCallback(() => {
+  const updateAnchorEl = isScroll => {
     try {
       const isHavingSelection = selection && !Range.isCollapsed(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();
@@ -47,16 +44,21 @@ const PopupTool = props => {
           rect.y = -500; // hide the popper
         }
 
-        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);
     }
-  }, [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
@@ -80,18 +82,12 @@ const PopupTool = props => {
     }
   }, [event, anchorEl]);
   useEffect(() => {
-    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "") {
+    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "" || selectedElement?.enable === 1) {
       setAnchorEl(null);
     } else {
       updateAnchorEl();
-      hideSlateSelection(); // removes slate selection background, when there is no selection
-    }
-  }, [selection]);
-  useEffect(() => {
-    if (selectedElement?.enable === 1) {
-      setAnchorEl(null);
     }
-  }, [selection, selectedElement?.path, selectedElement?.enable]);
+  }, [selection, event, selectedElement?.enable]);
   const handleClose = () => {
     // setAnchorEl(null);
     setOpen(false);
@@ -117,24 +113,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

@@ -18,7 +18,7 @@ const Upload = props => {
     item: true,
     xs: 12,
     sx: {
-      padding: '10px',
+      padding: 0,
       height: '100%'
     },
     className: "ims-right",

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

@@ -6,8 +6,7 @@ const UploadStyles = theme => ({
     boxShadow: "0px 4px 10px rgba(0, 0, 0, 0.16)",
     background: theme?.palette?.editor?.uploadFileBg,
     height: '100%',
-    minHeight: '150px',
-    height: "inherit"
+    minHeight: '150px'
   },
   uploadField: {
     width: "100%",