@flozy/editor 10.2.2 → 10.2.4

package/dist/Editor/CommonEditor.js

@@ -611,7 +611,12 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     openTheme: openTheme,
     setOpenTheme: setOpenTheme,
     triggerRender: triggerRender,
-    children: [showThemeButtons ? /*#__PURE__*/_jsxs("div", {
+    children: [/*#__PURE__*/_jsx(FontLoader, {
+      otherProps: {
+        services: otherProps?.services
+      },
+      readOnly: readOnly
+    }), showThemeButtons ? /*#__PURE__*/_jsxs("div", {
       className: "theme-buttons",
       children: [/*#__PURE__*/_jsx(IconButton, {
         onClick: () => setOpenTheme(true),
@@ -630,7 +635,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
       fullScreen: fullScreen,
       footer: footer || "",
       selectedTheme: selectedTheme,
-      children: /*#__PURE__*/_jsxs(Box, {
+      children: /*#__PURE__*/_jsx(Box, {
         component: "div",
         className: `et-wrpr stimulate-${breakpoint} ${editorClass || ""} ${isIframe ? "iframe-editor" : ""}`,
         sx: classes.root,
@@ -640,7 +645,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,
@@ -765,12 +770,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
             handleCodeToText: handleCodeToText,
             translation: translationFn
           })]
-        }, id), /*#__PURE__*/_jsx(FontLoader, {
-          otherProps: {
-            services: otherProps?.services
-          },
-          readOnly: readOnly
-        })]
+        }, id)
       })
     }), /*#__PURE__*/_jsx(CustomDialogComponent, {
       ref: dialogRef,

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

@@ -358,6 +358,14 @@ const useFreeGridStyles = ({
             margin: "0px"
           }
         },
+        "& .fgi_type_table": {
+          "& .edt-headings": {
+            margin: "0px"
+          },
+          "& .edt-paragraphs": {
+            margin: "0px"
+          }
+        },
         /** element toolbar hide */
         "& .element-toolbar": {
           display: "none"

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

@@ -1,11 +1,11 @@
-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 CircularProgress from "@mui/material/CircularProgress";
+// import Box from "@mui/material/Box";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 const FontLoader = props => {
   const {
     otherProps,
@@ -14,7 +14,8 @@ const FontLoader = props => {
   const {
     setFontFamilies
   } = useEditorContext();
-  const [loading, setLoading] = useState(true);
+  // const [loading, setLoading] = useState(true);
+
   const loadFontsInBatches = (families, batchSize = 5, maxRetries = 3) => {
     let currentIndex = 0;
     let retryCount = 0;
@@ -24,7 +25,7 @@ const FontLoader = props => {
       try {
         if (currentIndex >= families?.length) {
           // console.log("All fonts have been loaded");
-          setLoading(false);
+          // setLoading(false);
           return;
         }
         const batch = families?.slice(currentIndex, currentIndex + batchSize);
@@ -59,7 +60,7 @@ const FontLoader = props => {
           }
         });
       } catch (err) {
-        setLoading(false);
+        // setLoading(false);
       }
     };
     loadNextBatch();
@@ -78,7 +79,7 @@ const FontLoader = props => {
         loadFontsInBatches(families);
       }).catch(err => {
         // console.log(err);
-        setLoading(false);
+        // setLoading(false);
       });
       // setLoading(true);
     } else {
@@ -106,26 +107,12 @@ const FontLoader = props => {
     }
 
     // Set timeout to hide loader after 5 seconds
-    const timeoutId = setTimeout(() => {
-      setLoading(false);
-    }, 5000);
-    return () => clearTimeout(timeoutId);
+    // 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 /*#__PURE__*/_jsx(_Fragment, {});
 };
 export default FontLoader;

package/dist/Editor/themeSettings/index.js

@@ -70,6 +70,14 @@ const ThemeSettings = props => {
         type: themeType,
         template_tag
       });
+      const currentSelectedTheme = result?.data?.find(d => d.id === id);
+      const currThemeName = currentSelectedTheme?.name;
+      if (currThemeName && currThemeName !== name) {
+        // for theme templates created by design team
+        updateTheme({
+          name: currThemeName
+        });
+      }
       setThemes(result?.data || []);
     } catch (err) {
       console.log(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "10.2.2",
+  "version": "10.2.4",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"