@flozy/editor 5.9.2 → 5.9.3

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

@@ -1,9 +1,11 @@
 import { useEffect, useState } from "react";
 import WebFont from "webfontloader";
-import { Backdrop, CircularProgress } from "@mui/material";
 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,
@@ -12,67 +14,72 @@ const FontLoader = props => {
   const {
     setFontFamilies
   } = useEditorContext();
-  const [loader, setLoader] = useState(true);
+  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");
-        setLoader(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.`
-            );
+    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}`);
             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);
+        // console.log(err);
+        setLoading(false);
       });
+      // setLoading(true);
     } else {
       function correctFontArray(fontString) {
         let fontsArray = fontString.split(",");
@@ -92,20 +99,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?.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 /*#__PURE__*/_jsx(Backdrop, {
-    open: loader,
-    sx: {
-      color: "#fff",
-      zIndex: 9999 // Ensure it's above other UI elements
-    },
-    children: /*#__PURE__*/_jsx(CircularProgress, {
-      color: "inherit"
-    })
+  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/RnD/ElementSettings/Settings/FormSettings.js

@@ -62,6 +62,7 @@ const FormSettings = props => {
       MuiAccordion: {
         styleOverrides: {
           root: {
+            background: theme?.palette?.editor?.miniToolBarBackground,
             "& .MuiAccordionSummary-root": {
               flexDirection: "row-reverse",
               "& .MuiSvgIcon-root": {

package/dist/Editor/common/RnD/SwitchViewport/SwitchViewport.js

@@ -3,24 +3,35 @@ import PersonalVideoIcon from "@mui/icons-material/PersonalVideo";
 import PhoneIphoneIcon from "@mui/icons-material/PhoneIphone";
 import useSwitchViewport from "./styles";
 import { useEffect } from "react";
+import { useEditorContext } from "../../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const SwitchViewport = props => {
   const {
     breakpoint,
-    onChange
+    onChange,
+    show
   } = props;
   const classes = useSwitchViewport();
+  const {
+    setSelectedElement,
+    setActiveBreakPoint
+  } = useEditorContext();
   useEffect(() => {
-    console.log(breakpoint);
+    // to reset selection on viewport changes - FS-6589
+    setSelectedElement({});
   }, [breakpoint]);
   return /*#__PURE__*/_jsxs(Box, {
     sx: classes.root,
+    style: {
+      display: show ? "block" : "none"
+    },
     children: [/*#__PURE__*/_jsx(Tooltip, {
       title: "Desktop View",
       children: /*#__PURE__*/_jsx(IconButton, {
         className: `${!breakpoint || breakpoint === "lg" ? "active" : ""}`,
         onClick: () => {
+          setActiveBreakPoint("");
           onChange("");
         },
         children: /*#__PURE__*/_jsx(PersonalVideoIcon, {})
@@ -30,6 +41,7 @@ const SwitchViewport = props => {
       children: /*#__PURE__*/_jsx(IconButton, {
         className: `${breakpoint === "xs" ? "active" : ""}`,
         onClick: () => {
+          setActiveBreakPoint("xs");
           onChange("xs");
         },
         children: /*#__PURE__*/_jsx(PhoneIphoneIcon, {})

package/dist/Editor/common/StyleBuilder/fieldTypes/backgroundImage.js

@@ -73,6 +73,11 @@ const BackgroundImage = props => {
             children: "REMOVE"
           }) : /*#__PURE__*/_jsx(Grid, {
             className: "uploadImageText",
+            sx: {
+              padding: 0,
+              background: `${theme?.palette?.editor?.inputFieldBgColor}`,
+              border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`
+            },
             children: /*#__PURE__*/_jsxs(Button, {
               component: "label",
               variant: "text",

package/dist/Editor/common/StyleBuilder/fieldTypes/card.js

@@ -1,6 +1,7 @@
 import { Box, Card, Checkbox, FormControlLabel, Grid, Tooltip, Typography } from "@mui/material";
 import React from "react";
 import Icon from "../../Icon";
+import { useEditorContext } from "../../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -15,7 +16,10 @@ const RenderCard = ({
   return /*#__PURE__*/_jsx(Card, {
     sx: {
       position: 'relative',
-      padding: "10px"
+      padding: "10px",
+      '& .MuiCheckbox-root svg': {
+        fill: 'unset !important'
+      }
     },
     children: /*#__PURE__*/_jsx(FormControlLabel, {
       control: /*#__PURE__*/_jsx(Checkbox, {
@@ -81,6 +85,9 @@ const CardsMapping = props => {
     selectedCard,
     infoIcon
   } = data;
+  const {
+    theme
+  } = useEditorContext();
   const activeCard = value === selectedCard;
   const handleChange = e => {
     if (selectedCard === data?.value) {
@@ -99,7 +106,8 @@ const CardsMapping = props => {
     sx: {
       marginBottom: "12px",
       "& .MuiPaper-root": {
-        border: activeCard ? "1px solid #2563EB" : "1px solid #C8D8FA",
+        background: theme?.palette?.editor?.miniToolBarBackground,
+        border: activeCard ? "1px solid #2563EB" : `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
         borderRadius: "8px",
         boxShadow: activeCard ? "0px 4px 16px 0px #2563EB40" : "unset"
       }

package/dist/Editor/common/StyleBuilder/fieldTypes/index.js

@@ -18,6 +18,7 @@ import FontSize from "./fontSize";
 import SelectSwitch from "./selectSwitch";
 import CardsMapping from "./card";
 import MetaDataMapping from "./metaDataMapping";
+import LineSpacing from "./lineSpacing";
 const FieldMap = {
   text: Text,
   bannerSpacing: BannerSpacing,
@@ -38,6 +39,7 @@ const FieldMap = {
   fontSize: FontSize,
   selectSwitch: SelectSwitch,
   card: CardsMapping,
-  metadatamapping: MetaDataMapping
+  metadatamapping: MetaDataMapping,
+  lineSpacing: LineSpacing
 };
 export default FieldMap;

package/dist/Editor/common/StyleBuilder/fieldTypes/lineSpacing.js

@@ -0,0 +1,79 @@
+import React, { useState } from "react";
+import { Grid, Slider, Typography, Box } from "@mui/material";
+import { getBreakPointsValue } from "../../../helper/theme";
+import useWindowResize from "../../../hooks/useWindowResize";
+import { useEditorContext } from "../../../hooks/useMouseMove";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+const LineSpacing = props => {
+  const {
+    value: val,
+    data,
+    onChange
+  } = props;
+  const {
+    theme
+  } = useEditorContext();
+  const {
+    key
+  } = data;
+  const [size] = useWindowResize();
+  const pro_value = getBreakPointsValue(val, size?.device);
+  const [value, setValue] = useState(pro_value);
+  let breakpointValue = getBreakPointsValue(val, null);
+  breakpointValue = typeof breakpointValue['lg'] === 'object' ? breakpointValue['lg'] : breakpointValue;
+  useState(() => {
+    setValue(pro_value);
+  }, [pro_value]);
+  const handleChange = e => {
+    onChange({
+      [key]: {
+        ...breakpointValue,
+        [size?.device]: e.target.value
+      }
+    });
+  };
+  return /*#__PURE__*/_jsxs(Grid, {
+    item: true,
+    xs: 12,
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "body1",
+      color: "primary",
+      style: {
+        fontSize: "14px",
+        fontWeight: 500
+      },
+      children: data?.label
+    }), /*#__PURE__*/_jsxs(Grid, {
+      container: true,
+      wrap: "nowrap",
+      className: "sld-wrpr",
+      children: [/*#__PURE__*/_jsx(Slider, {
+        className: "spacingSlider",
+        defaultValue: value || 1.43,
+        "aria-label": "Default",
+        valueLabelDisplay: "auto",
+        min: 0.5,
+        max: 3.0,
+        step: 0.1,
+        name: "lineHeight",
+        onChange: handleChange
+      }), /*#__PURE__*/_jsx(Box, {
+        component: "input",
+        sx: {
+          background: theme?.palette?.editor?.background,
+          color: theme?.palette?.editor?.textColor
+        },
+        name: "lineHeight",
+        value: pro_value,
+        className: "sliderInput",
+        onChange: handleChange,
+        type: "number",
+        placeholder: "0",
+        disabled: true,
+        defaultValue: pro_value || 1.43
+      })]
+    })]
+  });
+};
+export default LineSpacing;

package/dist/Editor/common/StyleBuilder/pageSettingsStyle.js

@@ -25,6 +25,10 @@ const pageSettingsStyle = [{
     label: "Padding",
     key: "bannerSpacing",
     type: "bannerSpacing"
+  }, {
+    label: "Line Spacing",
+    key: "lineHeight",
+    type: "lineSpacing"
   }]
 }, {
   tab: "Max Width",

package/dist/Editor/common/Uploader.js

@@ -4,6 +4,7 @@ import { convertBase64 } from "../utils/helper";
 import { uploadFile } from "../service/fileupload";
 import Icon from "./Icon";
 import UploadStyles from "../common/ImageSelector/UploadStyles";
+import { useEditorContext } from "../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -18,6 +19,9 @@ const Uploader = props => {
   const [base64, setBase64] = useState(value?.url);
   const [fileName, setFileName] = useState("");
   const [uploading, setUploading] = useState(false);
+  const {
+    theme
+  } = useEditorContext();
   const handleChange = async e => {
     const uFile = e.target.files[0];
     const strImage = await convertBase64(uFile);
@@ -99,6 +103,10 @@ const Uploader = props => {
           className: "uploadImageSection",
           children: base64 ? renderThumb() : /*#__PURE__*/_jsx(Grid, {
             className: "uploadImageText",
+            sx: {
+              background: `${theme?.palette?.editor?.inputFieldBgColor}`,
+              border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`
+            },
             children: /*#__PURE__*/_jsxs(Button, {
               component: "label",
               variant: "text",

package/dist/Editor/common/iconslist.js

@@ -1654,13 +1654,12 @@ export const CsvIcon = () => /*#__PURE__*/_jsxs("svg", {
     fill: "white"
   })]
 });
-export const CloseIcon = props => /*#__PURE__*/_jsxs("svg", {
+export const CloseIcon = () => /*#__PURE__*/_jsxs("svg", {
   width: "20",
   height: "20",
   viewBox: "0 0 20 20",
   fill: "none",
   xmlns: "http://www.w3.org/2000/svg",
-  ...(props || {}),
   children: [/*#__PURE__*/_jsx("path", {
     d: "M14.1245 5.875L5.87493 14.1246",
     stroke: "#64748B",

package/dist/Editor/commonStyle.js

@@ -49,15 +49,19 @@ const useCommonStyle = theme => ({
         fontWeight: "500",
         fontFamily: "Inter, sans-serif"
       },
+      "& .MuiPaper-root": {
+        border: `unset !important`,
+        borderRadius: "0px",
+        height: "fit-content",
+        padding: "2px"
+      },
       "& p": {
         marginBottom: "7px",
         marginTop: "4px"
       },
-      "& .MuiPaper-root": {
-        border: 'unset !important',
-        borderRadius: '0px',
-        height: 'fit-content',
-        padding: '2px'
+      "& p": {
+        marginBottom: "7px",
+        marginTop: "4px"
       },
       "& .muiIconsListParent": {
         "& svg": {
@@ -71,15 +75,12 @@ const useCommonStyle = theme => ({
         },
         "&::-webkit-scrollbar-thumb": {
           background: `${theme?.palette?.editor?.brainPopupScroll} !important`
-        },
-        "&::-webkit-scrollbar-track": {
-          visibility: "hidden"
         }
       },
       "& .MuiGrid-root>.MuiGrid-item": {
         paddingRight: "0px !important",
         fontFamily: "Inter, sans-serif",
-        height: 'fit-content'
+        height: "fit-content"
       },
       "& .MuiInputBase-root": {
         borderRadius: "10px",
@@ -140,11 +141,11 @@ const useCommonStyle = theme => ({
           borderRadius: "10px",
           width: "46px !important",
           marginLeft: "10px",
-          height: '36px !important'
+          height: "36px !important"
         }
       },
-      '& .MuiFormHelperText-root': {
-        margin: '4px 0px 0px 0px',
+      "& .MuiFormHelperText-root": {
+        margin: "4px 0px 0px 0px",
         color: theme?.palette?.editor?.closeButtonSvgStroke,
         fontFamily: "Inter, sans-serif"
       }
@@ -400,14 +401,14 @@ const useCommonStyle = theme => ({
       padding: "8px 12px",
       fontSize: "12px",
       color: theme?.palette?.editor?.menuOptionTextColor,
-      fontWeight: '500',
+      fontWeight: "500",
       fontFamily: "Inter, sans-serif",
-      minHeight: '36px',
+      minHeight: "36px",
       "&:hover": {
         backgroundColor: theme?.palette?.editor?.menuOptionHoverBackground
       }
     },
-    '& .Mui-selected': {
+    "& .Mui-selected": {
       background: `${theme?.palette?.editor?.menuOptionSelectedOption} !important`
     },
     "& .MuiListSubheader-root": {
@@ -416,16 +417,16 @@ const useCommonStyle = theme => ({
       fontSize: "12px"
     },
     "& .MuiPaper-root": {
-      borderRadius: '8px',
-      padding: '0px',
+      borderRadius: "8px",
+      padding: "0px",
       background: `${theme?.palette?.editor?.textWeightPopUpBackground} !important`
     },
-    '& .MuiButtonBase-root': {
-      margin: '4px',
-      borderRadius: '6px'
+    "& .MuiButtonBase-root": {
+      margin: "4px",
+      borderRadius: "6px"
     },
-    '& .MuiList-root': {
-      padding: '0px'
+    "& .MuiList-root": {
+      padding: "0px"
     }
   },
   datePicker: {
@@ -470,27 +471,27 @@ const useCommonStyle = theme => ({
       }
     }
   },
-  pageSettingPopUpRoot: {
-    padding: "16px 8px 16px 10px!important",
-    height: "100%"
-  },
   buttonMoreOption: {
     background: `${theme?.palette?.editor?.aiInputBackground} !important`,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1} !important`,
-    padding: '4px !important',
-    '& svg': {
-      width: '18px !important',
-      height: '18px !important',
-      '& path': {
+    padding: "4px !important",
+    "& svg": {
+      width: "18px !important",
+      height: "18px !important",
+      "& path": {
         stroke: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }
   },
+  pageSettingPopUpRoot: {
+    padding: "16px 8px 16px 10px!important",
+    height: "100%"
+  },
   buttonMoreOption2: {
     background: `${theme?.palette?.editor?.aiInputBackground} !important`,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1} !important`,
-    '& svg': {
-      '& path': {
+    "& svg": {
+      "& path": {
         fill: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }
@@ -498,11 +499,11 @@ const useCommonStyle = theme => ({
   buttonMoreOption3: {
     background: `${theme?.palette?.editor?.aiInputBackground} !important`,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1} !important`,
-    padding: '5px !important',
-    '& svg': {
-      width: '16px !important',
-      height: '16px !important',
-      '& path': {
+    padding: "5px !important",
+    "& svg": {
+      width: "16px !important",
+      height: "16px !important",
+      "& path": {
         stroke: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }
@@ -510,37 +511,37 @@ const useCommonStyle = theme => ({
   resizeButton: {
     background: theme?.palette?.editor?.aiInputBackground,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1}`,
-    padding: '5px !important',
-    borderRadius: '50% !important',
-    '& svg': {
-      width: '18px',
-      height: '18px',
-      '& path': {
+    padding: "5px !important",
+    borderRadius: "50% !important",
+    "& svg": {
+      width: "18px",
+      height: "18px",
+      "& path": {
         fill: `${theme?.palette?.editor?.closeButtonSvgStroke}`
       }
     },
-    '&:hover': {
+    "&:hover": {
       background: theme?.palette?.editor?.aiInputBackground
     }
   },
   gradientFillBtn: {
     background: `linear-gradient(112.61deg, #2C63ED 19.3%, #8360FD 88.14%) !important`,
-    textTransform: 'math-auto !important',
-    color: '#FFFFFF !important',
-    padding: '0px 12px !important',
-    height: '32px',
-    borderRadius: '8px',
-    fontWeight: '500',
-    fontSize: '14px'
+    textTransform: "math-auto !important",
+    color: "#FFFFFF !important",
+    padding: "0px 12px !important",
+    height: "32px",
+    borderRadius: "8px",
+    fontWeight: "500",
+    fontSize: "14px"
   },
   emptyThumbBtn: {
     background: `${theme?.palette?.editor?.sectionSettingIconHover} !important`,
     color: `${theme?.palette?.editor?.textColor} !important`,
-    fontSize: '14px !important',
-    '& svg': {
-      width: '20px !important',
-      height: '20px !important',
-      '& path': {
+    fontSize: "14px !important",
+    "& svg": {
+      width: "20px !important",
+      height: "20px !important",
+      "& path": {
         stroke: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }

package/dist/Editor/helper/ensureWrappedVariables.js

@@ -0,0 +1,28 @@
+export const ensureWrappedVariables = content => {
+  return content.map(node => {
+    if (node.children) {
+      return {
+        ...node,
+        children: node.children.reduce((result, child, index, arr) => {
+          if (child.type === "variables") {
+            if (index === 0 || !arr[index - 1].text || arr[index - 1].text.trim() === "") {
+              result.push({
+                text: ""
+              });
+            }
+            result.push(child);
+            if (index === arr.length - 1 || !arr[index + 1]?.text || arr[index + 1]?.text.trim() === "") {
+              result.push({
+                text: ""
+              });
+            }
+          } else {
+            result.push(child);
+          }
+          return result;
+        }, [])
+      };
+    }
+    return node;
+  });
+};