@flozy/editor 8.0.6 → 8.0.7

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

@@ -10,8 +10,6 @@ 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";
@@ -41,7 +39,7 @@ const TextFormat = props => {
   const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
-    theme: appTheme
+    theme
   } = useEditorContext();
   const {
     activeBreakPoint
@@ -63,12 +61,7 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-  const {
-    theme,
-    updateTheme
-  } = useEditorTheme();
-  const customized = isTextCustomized(editor);
-  let lineSpacingValue = activeMark(editor, "lineHeight");
+  let lineSpacingValue = activeMark(editor, 'lineHeight');
   lineSpacingValue = lineSpacingValue?.[breakpoint] !== undefined ? lineSpacingValue : pageSettingLine;
   const handleColorPicker = type => e => {
     setType(type);
@@ -122,50 +115,6 @@ const TextFormat = props => {
     sx: classes.textFormatWrapper,
     className: "text-formatter-popup",
     children: [/*#__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: "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: () => {},
-          type: "fullWidth"
-        })
-      })]
-    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -318,7 +267,7 @@ 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"
@@ -406,7 +355,11 @@ const TextFormat = props => {
         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
@@ -443,7 +396,7 @@ const TextFormat = props => {
           value: lineSpacingValue,
           onChange: handleLineSpacing,
           data: {
-            key: "lineHeight"
+            key: 'lineHeight'
           }
         })
       })]

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

@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from "react";
-import { Popper, Paper, ClickAwayListener } from "@mui/material";
+import React, { useCallback, useEffect, useState } from "react";
+import { Popper, Fade, Paper, ClickAwayListener } from "@mui/material";
 import { Editor, Range, Transforms } from "slate";
 import { ReactEditor, useSlate } from "slate-react";
 import useDrag from "../../hooks/useDrag";
@@ -14,15 +14,13 @@ import { jsx as _jsx } from "react/jsx-runtime";
 const PopupTool = props => {
   const {
     theme,
-    setIsTextSelected,
     customProps,
     editorWrapper
   } = props;
   const classes = usePopupStyles(theme);
   const {
     setPopupType,
-    openAI,
-    selectedElement
+    openAI
   } = useEditorContext();
   const [anchorEl, setAnchorEl] = useState(null);
   const [open, setOpen] = useState(false);
@@ -33,11 +31,18 @@ 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 => {
+  const {
+    selectedElement
+  } = useEditorContext();
+  console.log("Editor debug ====>", event, open, anchorEl, selection);
+  const updateAnchorEl = useCallback(() => {
     try {
+      const {
+        selection
+      } = editor;
       const isHavingSelection = selection && !Range.isCollapsed(selection);
-      if (isHavingSelection && event === "end") {
+      console.log("Editor isHavingSelection", isHavingSelection, selection);
+      if (isHavingSelection) {
         const domRange = ReactEditor.toDOMRange(editor, editor.selection);
         const editorContainer = document.querySelector("#slate-wrapper-scroll-container")?.getBoundingClientRect();
         const rect = domRange.getBoundingClientRect();
@@ -46,21 +51,17 @@ const PopupTool = props => {
           rect.y = -500; // hide the popper
         }
 
-        // 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);
-        }
+        console.log("Editor setAnchorEl", rect, domRange, editorContainer);
+        setAnchorEl({
+          clientWidth: rect.width,
+          clientHeight: rect.height,
+          getBoundingClientRect: () => rect
+        });
       }
     } 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
@@ -75,31 +76,46 @@ 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);
+    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "") {
       setAnchorEl(null);
     } else {
+      console.log("Editor updateAnchorEl", selection);
       updateAnchorEl();
       hideSlateSelection(); // removes slate selection background, when there is no selection
     }
-  }, [selection, event, selectedElement?.enable]);
+  }, [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]);
   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 && !isMobile) {
+      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
         handleClose();
       }
@@ -116,18 +132,24 @@ const PopupTool = props => {
       id: id,
       open: open,
       anchorEl: anchorEl,
+      transition: true,
       sx: classes.popupWrapper,
       placement: "top-start",
-      children: /*#__PURE__*/_jsx(Paper, {
-        style: {
-          borderRadius: "6px",
-          border: "1px solid #8360FD"
-        },
-        children: /*#__PURE__*/_jsx(MiniTextFormat, {
-          editor: editor,
-          classes: classes,
-          closeMainPopup: handleClose,
-          customProps: customProps
+      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
+          })
         })
       })
     })

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",

package/dist/Editor/common/ColorPickerButton.js

@@ -1,8 +1,8 @@
 import React, { useMemo, useState } from "react";
 import { Grid, Button, Popover } from "@mui/material";
+import ColorPickerTool from "react-gcolor-picker";
 import { colors } from "../Elements/Color Picker/defaultColors";
 import SwipeableDrawerComponent from "./SwipeableDrawer";
-import CustomColorPicker from "./CustomColorPicker";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -12,10 +12,7 @@ const ColorPickerToolComponent = ({
   onSave = () => {},
   recentColors = [],
   hideGradient,
-  handleClose,
-  closeDrawer,
-  hideThemeColors,
-  disableEditTheme
+  handleClose
 }) => {
   const [color, setColor] = useState(value);
   const handleSave = () => {
@@ -36,15 +33,11 @@ const ColorPickerToolComponent = ({
     item: true,
     xs: 12,
     children: [/*#__PURE__*/_jsx("div", {
-      children: /*#__PURE__*/_jsx(CustomColorPicker, {
+      children: /*#__PURE__*/_jsx(ColorPickerTool, {
         gradient: hideGradient ? false : true,
-        color: color,
+        value: color,
         onChange: handleColorChange,
-        recentColors: recentColors,
-        defaultColors: initialColors,
-        closeDrawer: closeDrawer,
-        hideThemeColors: hideThemeColors,
-        disableEditTheme: disableEditTheme
+        defaultColors: initialColors
       })
     }), /*#__PURE__*/_jsxs("div", {
       style: {
@@ -55,9 +48,6 @@ const ColorPickerToolComponent = ({
       children: [/*#__PURE__*/_jsx(Button, {
         onClick: handleClose,
         className: "secondaryBtn",
-        style: {
-          background: "none"
-        },
         children: "Cancel"
       }), /*#__PURE__*/_jsx(Button, {
         onClick: handleSave,
@@ -74,11 +64,7 @@ const ColorPickerButton = props => {
     defaultColors = [],
     classes = {},
     recentColors = [],
-    hideGradient,
-    children,
-    handleClose: closeDrawer,
-    hideThemeColors,
-    disableEditTheme
+    hideGradient
   } = props;
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
@@ -90,13 +76,7 @@ const ColorPickerButton = props => {
     setAnchorEl(null);
   };
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [children ? /*#__PURE__*/_jsx("div", {
-      onClick: handleColorPicker,
-      style: {
-        cursor: "pointer"
-      },
-      children: children
-    }) : /*#__PURE__*/_jsx(Button, {
+    children: [/*#__PURE__*/_jsx(Button, {
       style: {
         background: value,
         height: "22px",
@@ -123,10 +103,7 @@ const ColorPickerButton = props => {
           onSave: onSave,
           recentColors: recentColors,
           hideGradient: hideGradient,
-          handleClose: handleClose,
-          closeDrawer: closeDrawer,
-          hideThemeColors: hideThemeColors,
-          disableEditTheme: disableEditTheme
+          handleClose: handleClose
         })
       })
     }) : /*#__PURE__*/_jsx(Popover, {
@@ -152,10 +129,7 @@ const ColorPickerButton = props => {
           onSave: onSave,
           recentColors: recentColors,
           hideGradient: hideGradient,
-          handleClose: handleClose,
-          closeDrawer: closeDrawer,
-          hideThemeColors: hideThemeColors,
-          disableEditTheme: disableEditTheme
+          handleClose: handleClose
         })
       })
     })]

package/dist/Editor/common/DnD/DragHandleButton.js

@@ -7,7 +7,7 @@ import { useEditorContext } from "../../hooks/useMouseMove";
 import { Transforms } from "slate";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const DRAGGABLE_TYPES = ["paragraph", "headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree", "grid"];
+const DRAGGABLE_TYPES = ["paragraph", "headingOne", "headingTwo", "headingThree", "grid"];
 const DragHandleStyle = fromPopper => {
   const handleDragStyle = fromPopper ? {
     position: "absolute",

package/dist/Editor/common/DnD/Draggable.js

@@ -1,6 +1,7 @@
 import React, { useEffect } from "react";
 import { useDraggable } from "@dnd-kit/core";
 import { Box } from "@mui/material";
+import DragIndicatorIcon from "@mui/icons-material/DragIndicator";
 import { SectionDragIcon } from "../iconListV2";
 import { jsx as _jsx } from "react/jsx-runtime";
 const Draggable = props => {

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

@@ -1,3 +1,11 @@
-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"];
-export const googleFontList = [...mostUsedGoogleFonts, ...otherFonts];
+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];

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

@@ -1,11 +1,7 @@
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import WebFont from "webfontloader";
 import { useEditorContext } from "../../hooks/useMouseMove";
-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";
+import { defaultFonts, googleFontList, otherFonts } from "./FontList";
 const FontLoader = props => {
   const {
     otherProps,
@@ -14,72 +10,65 @@ const FontLoader = props => {
   const {
     setFontFamilies
   } = useEditorContext();
-  const [loading, setLoading] = useState(true);
   const loadFontsInBatches = (families, batchSize = 5, maxRetries = 3) => {
     let currentIndex = 0;
     let retryCount = 0;
-    let hideLoaderOn = 30;
-    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}`);
+    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.`
+            // );
             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 = [...googleFontList];
+    let families = [...otherFonts, ...defaultFonts];
     if (!readOnly) {
       otherProps?.services("listGoogleFont", []).then(data => {
-        families = [...(data?.data || [])];
+        families = [...families, ...(data?.data || [])];
+        const filteredfamilies = families?.filter(font => !font?.includes("Material"));
         setFontFamilies({
           id: 1,
           format: "fontFamily",
           type: "fontfamilydropdown",
-          options: families || []
+          options: filteredfamilies || []
         });
         loadFontsInBatches(families);
       }).catch(err => {
         // console.log(err);
-        setLoading(false);
       });
-      // setLoading(true);
     } else {
       function correctFontArray(fontString) {
         let fontsArray = fontString.split(",");
@@ -99,32 +88,11 @@ 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", ""));
+      families = families?.map(font => font?.replace(", sans-serif", "")); //This is temporary fix for patch
       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 /*#__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
-  });
+  return null;
 };
 export default FontLoader;