@flozy/editor 3.9.1 → 3.9.3

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

@@ -1,9 +1,10 @@
 import { useEffect, useRef, useState } from "react";
-import { activeMark, addMarkData } from "../../../utils/SlateUtilityFunctions";
+import { activeMark, addMarkData, isBlockActive } from "../../../utils/SlateUtilityFunctions";
 import { Button, IconButton, Popover, TextField } from "@mui/material";
 import DownArrowIcon from "../../../assets/svg/DownArrowIcon";
 import useWindowResize from "../../../hooks/useWindowResize";
-import { BREAKPOINTS_DEVICES, getBreakPointsValue, getTextSizeVal } from "../../../helper/theme";
+import { BREAKPOINTS_DEVICES, getBreakPointsValue } from "../../../helper/theme";
+import { headingMap, sizeMap } from "../../../utils/font";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const fontSizeOptions = [8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 26, 32, 36, 40, 48, 64, 96, 128];
@@ -18,7 +19,7 @@ function SelectFontSize({
   const containerRef = useRef();
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-  const value = getTextSizeVal(editor);
+  const value = getBreakPointsValue(val, size?.device);
   const timerRef = useRef();
   const updateMarkData = newVal => {
     let upData = {
@@ -52,7 +53,13 @@ function SelectFontSize({
   };
   const getSizeVal = () => {
     try {
-      return parseInt(value);
+      let size = `${value}`?.indexOf("px") >= 0 ? value : sizeMap[value] || value;
+      Object.entries(headingMap).forEach(([format, value]) => {
+        if (isBlockActive(editor, format) && isNaN(parseInt(size))) {
+          size = value;
+        }
+      });
+      return parseInt(size);
     } catch (err) {
       return "";
     }

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

@@ -2,11 +2,8 @@ import { useMemo } from "react";
 import { activeMark, addMarkData, isBlockActive, toggleBlock } from "../../../utils/SlateUtilityFunctions";
 import CustomSelectTool from "./CustomSelectTool";
 import useWindowResize from "../../../hooks/useWindowResize";
-import { BREAKPOINTS_DEVICES, getBreakPointsValue, isTextCustomized as isCustomized, textThemeFields as themeFields } from "../../../helper/theme";
+import { BREAKPOINTS_DEVICES, getBreakPointsValue } from "../../../helper/theme";
 import { sizeMap } from "../../../utils/font";
-import { Editor } from "slate";
-import { MenuItem, Select } from "@mui/material";
-import { useEditorTheme } from "../../../hooks/useEditorTheme";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function Label({
@@ -20,194 +17,93 @@ function Label({
   });
 }
 function DisplayHeaderLabel({
-  type,
-  isCustomized,
-  isPara = false
+  type
 }) {
   return /*#__PURE__*/_jsxs("div", {
-    children: [isCustomized ? "*" : "", isPara ? "P" : "H", /*#__PURE__*/_jsx("sub", {
+    children: ["H", /*#__PURE__*/_jsx("sub", {
       children: type
     })]
   });
 }
-function getTypographyOptions(isCustomized) {
-  const typographyOptions = [{
-    id: 11,
-    format: "headingOne",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "H1",
-      type: "Heading"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 1,
-      isCustomized: isCustomized
-    }),
-    group: "typography",
-    value: "headingOne"
-  }, {
-    id: 12,
-    format: "headingTwo",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "H2",
-      type: "Heading"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 2,
-      isCustomized: isCustomized
-    }),
-    group: "typography",
-    value: "headingTwo"
-  }, {
-    id: 13,
-    format: "headingThree",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "H3",
-      type: "Heading"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 3,
-      isCustomized: isCustomized
-    }),
-    group: "typography",
-    value: "headingThree"
-  }, {
-    id: 17,
-    format: "headingFour",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "H4",
-      type: "Heading"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 4,
-      isCustomized: isCustomized
-    }),
-    group: "typography",
-    value: "headingFour"
-  }, {
-    id: 18,
-    format: "headingFive",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "H5",
-      type: "Heading"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 5,
-      isCustomized: isCustomized
-    }),
-    group: "typography",
-    value: "headingFive"
-  }, {
-    id: 19,
-    format: "headingSix",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "H6",
-      type: "Heading"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 6,
-      isCustomized: isCustomized
-    }),
-    group: "typography",
-    value: "headingSix"
-  }, {
-    id: 20,
-    format: "paragraphOne",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "P1",
-      type: "Paragraph"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 1,
-      isCustomized: isCustomized,
-      isPara: true
-    }),
-    group: "typography",
-    value: "paragraphOne"
-  }, {
-    id: 21,
-    format: "paragraphTwo",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "P2",
-      type: "Paragraph"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 2,
-      isCustomized: isCustomized,
-      isPara: true
-    }),
-    group: "typography",
-    value: "paragraphTwo"
-  }, {
-    id: 22,
-    format: "paragraphThree",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "P3",
-      type: "Paragraph"
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 3,
-      isCustomized: isCustomized,
-      isPara: true
-    }),
-    group: "typography",
-    value: "paragraphThree"
-  }, {
-    id: 14,
-    format: "fontSize",
-    type: "mark",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "L",
-      type: "Large"
-    }),
+const typographyOptions = [{
+  id: 11,
+  format: "headingOne",
+  type: "block",
+  title: /*#__PURE__*/_jsx(Label, {
+    label: "H1",
+    type: "Header"
+  }),
+  label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
+    type: 1
+  }),
+  group: "typography",
+  value: "headingOne"
+}, {
+  id: 12,
+  format: "headingTwo",
+  type: "block",
+  title: /*#__PURE__*/_jsx(Label, {
+    label: "H2",
+    type: "Header"
+  }),
+  label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
+    type: 2
+  }),
+  group: "typography",
+  value: "headingTwo"
+}, {
+  id: 13,
+  format: "headingThree",
+  type: "block",
+  title: /*#__PURE__*/_jsx(Label, {
+    label: "H3",
+    type: "Header"
+  }),
+  label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
+    type: 3
+  }),
+  group: "typography",
+  value: "headingThree"
+}, {
+  id: 14,
+  format: "fontSize",
+  type: "mark",
+  title: /*#__PURE__*/_jsx(Label, {
     label: "L",
-    group: "typography",
-    value: "huge"
-  }, {
-    id: 15,
-    format: "fontSize",
-    type: "mark",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "M",
-      type: "Medium"
-    }),
+    type: "Large"
+  }),
+  label: "L",
+  group: "typography",
+  value: "huge"
+}, {
+  id: 15,
+  format: "fontSize",
+  type: "mark",
+  title: /*#__PURE__*/_jsx(Label, {
     label: "M",
-    group: "typography",
-    value: "medium"
-  }, {
-    id: 16,
-    format: "fontSize",
-    type: "mark",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "S",
-      type: "Small"
-    }),
+    type: "Medium"
+  }),
+  label: "M",
+  group: "typography",
+  value: "medium"
+}, {
+  id: 16,
+  format: "fontSize",
+  type: "mark",
+  title: /*#__PURE__*/_jsx(Label, {
     label: "S",
-    group: "typography",
-    value: "small"
-  }];
-  return typographyOptions;
-}
+    type: "Small"
+  }),
+  label: "S",
+  group: "typography",
+  value: "small"
+}];
 function SelectTypography({
   editor,
   classes,
-  closeMainPopup,
-  type
+  closeMainPopup
 }) {
   const [size] = useWindowResize();
-  const {
-    theme
-  } = useEditorTheme();
-  const isTextCustomized = theme?.id ? isCustomized(editor) : false;
-  const typographyOptions = getTypographyOptions(isTextCustomized);
   const updateMarkData = newVal => {
     const val = activeMark(editor, "fontSize");
     let upData = {
@@ -252,49 +148,26 @@ function SelectTypography({
     });
   }, [typographyOptions, activeMark, isBlockActive, editor]);
   const onChange = (format, option) => {
+    // add/reset block elements
+    toggleBlock(editor, format);
     if (option.type === "block") {
-      themeFields.forEach(field => {
-        Editor.removeMark(editor, field);
+      // reset old font size
+      addMarkData(editor, {
+        format: "fontSize",
+        value: {}
       });
-
-      // add/reset block elements
-      toggleBlock(editor, format);
     } else if (option.type === "mark") {
       const size = sizeMap[option.value] || "";
       const [sizeInNumber] = size.split("px");
       updateMarkData(Number(sizeInNumber));
     }
   };
-  const typographyValue = selectedBlock?.value || "headingOne";
-  if (type === "miniToolBar") {
-    return /*#__PURE__*/_jsx(CustomSelectTool, {
-      options: typographyOptions,
-      editor: editor,
-      onChange: onChange,
-      value: typographyValue,
-      classes: classes
-    });
-  }
-  return /*#__PURE__*/_jsx(Select, {
-    value: typographyValue,
-    className: "editor-dd",
-    onChange: e => {
-      const {
-        value
-      } = e.target;
-      const option = typographyOptions?.find(o => o.value === value);
-      onChange(value, option);
-    },
-    style: {
-      width: "100%",
-      height: "36px",
-      borderRadius: "10px",
-      fontSize: "14px"
-    },
-    children: typographyOptions.map((item, index) => /*#__PURE__*/_jsxs(MenuItem, {
-      value: item.value,
-      children: [item.title, " ", isTextCustomized && item.value === typographyValue ? " *" : ""]
-    }, index))
+  return /*#__PURE__*/_jsx(CustomSelectTool, {
+    options: typographyOptions,
+    editor: editor,
+    onChange: onChange,
+    value: selectedBlock?.value || "headingOne",
+    classes: classes
   });
 }
 export default SelectTypography;

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

@@ -53,8 +53,7 @@ const MiniTextFormat = props => {
         children: [customProps?.hideTools?.includes("infinityAI") ? null : /*#__PURE__*/_jsx(InfinityAITool, {}), /*#__PURE__*/_jsx(SelectTypography, {
           classes: classes,
           editor: editor,
-          closeMainPopup: closeMainPopup,
-          type: "miniToolBar"
+          closeMainPopup: closeMainPopup
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine"
         }), /*#__PURE__*/_jsx(SelectList, {

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

@@ -3,8 +3,9 @@ const usePopupStyle = theme => ({
     boxShadow: "0px 4px 10px 0px rgba(0, 0, 0, 0.16)",
     zIndex: 1300,
     marginBottom: "12px !important",
-    borderRadius: "6px",
-    maxWidth: "96%",
+    border: "1px solid #E0E0E0",
+    borderRadius: "10px",
+    maxWidth: "100%",
     "&.fullscreen": {
       marginBottom: "0px !important",
       "& .papper-wrpr": {
@@ -18,7 +19,7 @@ const usePopupStyle = theme => ({
       backgroundColor: theme?.palette?.editor?.background
     },
     "&.textSettings": {
-      "@media only screen and (max-width: 600px)": {
+      '@media only screen and (max-width: 600px)': {
         margin: "4px !important",
         marginBottom: "54px !important"
       }
@@ -77,7 +78,7 @@ const usePopupStyle = theme => ({
         paddingTop: "4px"
       },
       "@media only screen and (max-width: 599px)": {
-        width: "330px"
+        width: '330px'
       }
     },
     "&.templates": {
@@ -88,7 +89,7 @@ const usePopupStyle = theme => ({
         maxHeight: "fit-content"
       },
       "@media only screen and (max-width: 599px)": {
-        width: "330px"
+        width: '330px'
       }
     },
     "& .headerContainer": {},
@@ -143,7 +144,7 @@ const usePopupStyle = theme => ({
       }
     },
     "@media only screen and (max-width: 599px)": {
-      width: "330px"
+      width: '330px'
     }
   },
   textFormatLabel: {
@@ -154,13 +155,13 @@ const usePopupStyle = theme => ({
     lineHeight: "25px",
     marginTop: "12px",
     marginBottom: "8px",
-    "& .searchContainer": {
+    '& .searchContainer': {
       position: "absolute",
       right: 0,
       zIndex: 3
     },
-    "& .MuiFormControl-root.MuiTextField-root input": {
-      padding: "8px 35px 6px 12px"
+    '& .MuiFormControl-root.MuiTextField-root input': {
+      padding: '8px 35px 6px 12px'
     }
   },
   textFormatField: {
@@ -204,8 +205,7 @@ const usePopupStyle = theme => ({
     fontSize: "14px",
     marginBottom: "5px",
     paddingLeft: "5px",
-    fontWeight: 500,
-    color: "#000000"
+    fontWeight: 500
   },
   templateCard: {
     borderRadius: "10px",
@@ -327,13 +327,8 @@ const usePopupStyle = theme => ({
     }
   },
   defaultBtn: {
-    color: "#2563EB !important",
-    textTransform: "none",
-    textDecoration: "underline",
-    "&.Mui-disabled": {
-      color: "#A0AEC0 !important",
-      textDecoration: "none"
-    }
+    color: "#0F172A",
+    textTransform: "none"
   },
   templateCardBtnGrp: {
     display: "none",
@@ -418,8 +413,7 @@ const usePopupStyle = theme => ({
   colorPopper: {
     "& .MuiPaper-root": {
       backgroundColor: theme?.palette?.editor?.background,
-      padding: "4px 14px",
-      "@media only screen and (max-width: 600px)": {
+      '@media only screen and (max-width: 600px)': {
         marginTop: "-40px"
       }
     }
@@ -530,9 +524,9 @@ const usePopupStyle = theme => ({
   },
   customSelectPopoverWrapper: {
     "& .MuiPopover-paper": {
-      maxHeight: "140px",
+      maxHeight: '140px',
       background: theme?.palette?.editor?.background,
-      "@media only screen and (max-width: 600px)": {
+      '@media only screen and (max-width: 600px)': {
         marginTop: "-40px"
       }
     },

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

@@ -14,9 +14,6 @@ import { getPageSettings, updatePageSettings } from "../../utils/pageSettings";
 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 { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const allTools = toolbarGroups.flat();
@@ -37,6 +34,7 @@ const TextFormat = props => {
   const fontAlign = allTools.filter(f => f.format?.indexOf("align") >= 0);
   const link = allTools.find(f => f.format?.indexOf("link") >= 0);
   const lists = allTools.filter(f => f.group?.indexOf("list") >= 0);
+  const typo = allTools.filter(f => f.group?.indexOf("typography") >= 0);
   const {
     pageProps
   } = getPageSettings(editor)?.element || {};
@@ -54,11 +52,6 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-  const {
-    theme,
-    updateTheme
-  } = useEditorTheme();
-  const customized = isTextCustomized(editor);
   const handlePageWidth = width => () => {
     updatePageSettings(editor, {
       ...(pageProps || {}),
@@ -108,49 +101,6 @@ const TextFormat = props => {
     container: true,
     sx: classes.textFormatWrapper,
     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: "Theme 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: () => {}
-        })
-      })]
-    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -369,7 +319,12 @@ const TextFormat = props => {
         xs: 12,
         className: "typo-icons",
         sx: classes.evenSpace,
-        children: [fontStyle?.map((m, i) => {
+        children: [typo?.map((m, i) => {
+          return /*#__PURE__*/_jsx(BlockButton, {
+            editor: editor,
+            ...m
+          }, `pptool_mark_${i}_${m.id}`);
+        }), fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
             ...m

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

@@ -1,9 +1,10 @@
 import React, { useEffect, useState } from "react";
 import { Popper, Fade, Paper, ClickAwayListener } from "@mui/material";
 import { Editor, Range } from "slate";
-import { useSlate } from "slate-react";
+import { useSlate, useFocused } from "slate-react";
 import useDrag from "../../hooks/useDrag";
 import { TableUtil } from "../../utils/table";
+import useWindowResize from "../../hooks/useWindowResize";
 import MiniTextFormat from "./MiniTextFormat";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import usePopupStyles from "../PopupTool/PopupToolStyle";
@@ -22,12 +23,14 @@ const PopupTool = props => {
   const [anchorEl, setAnchorEl] = useState(null);
   const [open, setOpen] = useState(false);
   const editor = useSlate();
+  const inFocus = useFocused();
   const {
     selection
   } = editor;
   const [event] = useDrag(anchorEl);
   const id = open ? "popup-edit-tool" : "";
   const table = new TableUtil(editor);
+  const [size] = useWindowResize();
   useEffect(() => {
     if (event === "end" && anchorEl && !open) {
       // for table cell selection
@@ -44,7 +47,7 @@ const PopupTool = props => {
     }
   }, [event, anchorEl]);
   useEffect(() => {
-    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "") {
+    if (!selection || !inFocus || Range.isCollapsed(selection) || Editor.string(editor, selection) === "") {
       setAnchorEl(null);
     } else {
       updateAnchorEl();
@@ -83,28 +86,35 @@ const PopupTool = props => {
         handleClose();
       }
     },
-    children: /*#__PURE__*/_jsx(Popper, {
+    children: size.device === "xs" ? /*#__PURE__*/_jsx("div", {
+      className: "mobileMiniTextWrapper",
+      children: /*#__PURE__*/_jsx(MiniTextFormat, {
+        editor: editor,
+        classes: classes,
+        closeMainPopup: handleClose,
+        customProps: customProps
+      })
+    }) : /*#__PURE__*/_jsx(Popper, {
       id: id,
       open: open,
       anchorEl: anchorEl,
       transition: true,
       placement: "auto-end",
       sx: classes.popupWrapper,
+      className: `tools-drawer ${size?.device}`,
       children: ({
         TransitionProps
       }) => /*#__PURE__*/_jsx(Fade, {
         ...TransitionProps,
         children: /*#__PURE__*/_jsx(Paper, {
           style: {
-            borderRadius: "6px",
-            border: "1px solid #8360FD"
+            borderRadius: "10px"
           },
           children: /*#__PURE__*/_jsx(MiniTextFormat, {
             editor: editor,
             classes: classes,
             closeMainPopup: handleClose,
-            customProps: customProps,
-            theme: theme
+            customProps: customProps
           })
         })
       })