@flozy/editor 10.2.3 → 10.2.5

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

@@ -10,15 +10,12 @@ 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";
 import { useEditorContext } from "../../hooks/useMouseMove";
-import LineSpacing from "../../common/StyleBuilder/fieldTypes/lineSpacing";
-import { getPageSettings } from "../../utils/pageSettings";
-import { getDevice } from "../../helper/theme";
+// 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();
@@ -39,15 +36,15 @@ const TextFormat = props => {
   const {
     translation
   } = customProps;
-  const {
-    element: pageSt
-  } = getPageSettings(editor) || {};
-  const pageSettingLine = pageSt?.pageProps?.lineHeight;
+
+  // const { element: pageSt } = getPageSettings(editor) || {};
+  // const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
-    theme: appTheme
+    theme
   } = useEditorContext();
-  const breakpoint = getDevice(window.innerWidth);
+  // 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);
@@ -64,13 +61,12 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-  const {
-    theme,
-    updateTheme
-  } = useEditorTheme();
-  const customized = isTextCustomized(editor);
-  let lineSpacingValue = activeMark(editor, "lineHeight");
-  lineSpacingValue = lineSpacingValue?.[breakpoint] !== undefined ? lineSpacingValue : pageSettingLine;
+
+  // let lineSpacingValue = activeMark(editor, "lineHeight");
+  // lineSpacingValue =
+  //   lineSpacingValue?.[breakpoint] !== undefined
+  //     ? lineSpacingValue
+  //     : pageSettingLine;
   const handleColorPicker = type => e => {
     setType(type);
     setAnchorEl(e.currentTarget);
@@ -111,63 +107,16 @@ const TextFormat = props => {
       value
     });
   };
-  const handleLineSpacing = data => {
-    const [[format, value]] = Object.entries(data);
-    addMarkData(editor, {
-      format,
-      value
-    });
-  };
+
+  // const handleLineSpacing = (data) => {
+  //   const [[format, value]] = Object.entries(data);
+  //   addMarkData(editor, { format, value });
+  // };
   return /*#__PURE__*/_jsxs(Grid, {
     container: true,
     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: closeMainPopup,
-          type: "fullWidth",
-          customProps: customProps
-        })
-      })]
-    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -294,8 +243,7 @@ const TextFormat = props => {
           rounded: true,
           title: translation("textColor"),
           id: "11_cc",
-          classes: classes,
-          type: "textColor"
+          classes: classes
         }, "11_cc")
       })]
     }), /*#__PURE__*/_jsxs(Grid, {
@@ -321,7 +269,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"
@@ -411,7 +359,12 @@ 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,
+          customProps: customProps
+        }), fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
             ...m,
@@ -433,32 +386,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

@@ -95,9 +95,9 @@ const PopupTool = props => {
     const isFreeGridEnabled = enable === 1 && isFreeGridElement;
     if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "" || isFreeGridEnabled) {
       setAnchorEl(null);
-      hideSlateSelection(); // removes slate selection background, when there is no selection
     } else {
       updateAnchorEl();
+      hideSlateSelection(); // removes slate selection background, when there is no selection
     }
   }, [selection, event, selectedElement?.enable]);
   const handleClose = () => {

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/assets/svg/SettingsIcon.js

@@ -7,7 +7,6 @@ const SettingsIcon = props => {
     viewBox: "0 0 18 18",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg",
-    className: "settingsIcon",
     ...props,
     children: [/*#__PURE__*/_jsx("path", {
       d: "M9 11.25C10.2426 11.25 11.25 10.2426 11.25 9C11.25 7.75736 10.2426 6.75 9 6.75C7.75736 6.75 6.75 7.75736 6.75 9C6.75 10.2426 7.75736 11.25 9 11.25Z",

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 = () => {
@@ -35,29 +32,26 @@ const ColorPickerToolComponent = ({
   return /*#__PURE__*/_jsxs(Grid, {
     item: true,
     xs: 12,
-    style: {
-      position: "relative"
-    },
     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", {
-      className: "colorPickerActionBtns",
+      style: {
+        display: "flex",
+        justifyContent: "end",
+        margin: "8px"
+      },
       children: [/*#__PURE__*/_jsx(Button, {
         onClick: handleClose,
-        className: "cancelBtn",
+        className: "secondaryBtn",
         children: "Cancel"
       }), /*#__PURE__*/_jsx(Button, {
         onClick: handleSave,
-        className: "confirmBtn",
+        className: "primaryBtn",
         children: "Save"
       })]
     })]
@@ -70,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);
@@ -86,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",
@@ -119,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, {
@@ -148,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/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,17 +14,16 @@ 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;
-    // let hideLoaderOn = 30;
-
     const loadNextBatch = () => {
       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 +58,7 @@ const FontLoader = props => {
           }
         });
       } catch (err) {
-        setLoading(false);
+        // setLoading(false);
       }
     };
     loadNextBatch();
@@ -78,9 +77,8 @@ const FontLoader = props => {
         loadFontsInBatches(families);
       }).catch(err => {
         // console.log(err);
-        setLoading(false);
+        // setLoading(false);
       });
-      // setLoading(true);
     } else {
       function correctFontArray(fontString) {
         let fontsArray = fontString?.split(",");
@@ -106,26 +104,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/common/Icon.js

@@ -45,19 +45,8 @@ import TrashIcon from "../assets/svg/TrashCanIcon";
 import DataTableIcon from "../assets/svg/DataTableIcon";
 import ChervDown from "../assets/svg/ChervDown";
 import ChervUp from "../assets/svg/ChervUp";
-import ResetIconNew from "../assets/svg/ResetIconNew";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const HeadingIcon = ({
-  variant
-}) => {
-  return /*#__PURE__*/_jsx("div", {
-    style: {
-      color: "#64748B"
-    },
-    children: variant
-  });
-};
 const iconList = {
   fontFamily: /*#__PURE__*/_jsx(FontFamilyIcon, {
     size: 20
@@ -90,24 +79,6 @@ const iconList = {
     size: 18,
     fill: "#64748B"
   }),
-  headingFour: /*#__PURE__*/_jsx(HeadingIcon, {
-    variant: "H4"
-  }),
-  headingFive: /*#__PURE__*/_jsx(HeadingIcon, {
-    variant: "H5"
-  }),
-  headingSix: /*#__PURE__*/_jsx(HeadingIcon, {
-    variant: "H6"
-  }),
-  paragraphOne: /*#__PURE__*/_jsx(HeadingIcon, {
-    variant: "P1"
-  }),
-  paragraphTwo: /*#__PURE__*/_jsx(HeadingIcon, {
-    variant: "P2"
-  }),
-  paragraphThree: /*#__PURE__*/_jsx(HeadingIcon, {
-    variant: "P3"
-  }),
   blockquote: /*#__PURE__*/_jsx(MdFormatQuote, {
     size: 20,
     fill: "#64748B",
@@ -358,8 +329,7 @@ const iconList = {
       stroke: "#64748B",
       color: "#64748B"
     }
-  }),
-  resetIconNew: /*#__PURE__*/_jsx(ResetIconNew, {})
+  })
 };
 export const icons = {
   ...iconList

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

@@ -76,7 +76,7 @@ const ImageSelectorStyles = theme => ({
       background: theme?.palette?.editor?.deviderBgColor,
       "@media only screen and (min-width: 899px)": {
         margin: "0px 24px",
-        width: "calc(100% - 48px)"
+        width: 'calc(100% - 48px)'
       }
     },
     "& .primaryBtn": {
@@ -104,6 +104,12 @@ const ImageSelectorStyles = theme => ({
       marginRight: "8px !important"
     },
     "& .MuiGrid-root": {
+      "&::-webkit-scrollbar-thumb": {
+        background: `none !important`
+      },
+      "&::-webkit-scrollbar-track": {
+        visibility: "hidden"
+      },
       "&::-webkit-scrollbar-thumb": {
         background: `${theme?.palette?.editor?.brainPopupScroll} !important`
       },
@@ -112,10 +118,10 @@ const ImageSelectorStyles = theme => ({
       }
     },
     "& .MuiImageList-root": {
-      margin: "0px"
+      margin: '0px'
     },
     "& .MuiDialogContent-root": {
-      padding: "20px 24px 5px 24px"
+      padding: '20px 24px 5px 24px'
     }
   },
   titleTypo: {