@flozy/editor 11.1.0 → 11.1.1

package/dist/Editor/Toolbar/FormatTools/TextSize.js

@@ -1,36 +1,27 @@
 import React, { useEffect, useRef, useState } from "react";
 import { TextField, IconButton } from "@mui/material";
-import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
-import { getBreakPointsValue, getTextSizeVal } from "../../helper/theme.js";
+import { addMarkData, activeMark, isBlockActive } from "../../utils/SlateUtilityFunctions.js";
+import { headingMap, sizeMap } from "../../utils/font.js";
+import { getBreakPointsValue } from "../../helper/theme.js";
 import useWindowResize from "../../hooks/useWindowResize.js";
 import { BREAKPOINTS_DEVICES } from "../../helper/theme.js";
 import { TextSizeDownArrow, TextSizeUpArrow } from "../../common/iconListV2.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-const TextSize = props => {
-  const {
-    classes,
-    editor,
-    format,
-    fullWidth,
-    fromMiniTextFormat,
-    setResizedSize,
-    resizedSize
-  } = props;
-  const [fontSize, setFontSize] = useState();
-  const sizeValue = fromMiniTextFormat ? resizedSize : fontSize;
-  const setSizeValue = fromMiniTextFormat ? setResizedSize : setFontSize;
-  const timerRef = useRef();
+const TextSize = ({
+  classes,
+  editor,
+  format,
+  fullWidth
+}) => {
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-
-  // const noFontSize =
-  //   val === "normal" || (typeof val === "object" && !Object.keys(val)?.length);
-
-  const value = getTextSizeVal(editor);
+  const value = getBreakPointsValue(val, size?.device);
+  const [fontSize, setFontSize] = useState();
+  const timerRef = useRef();
   useEffect(() => {
-    setSizeValue(getSizeVal());
+    setFontSize(getSizeVal());
   }, [value]);
   const updateMarkData = newVal => {
     let upData = {
@@ -57,33 +48,38 @@ const TextSize = props => {
     if (value) {
       let inc = parseInt(value);
       inc = inc > 200 ? 200 : inc;
-      setSizeValue(inc);
       updateMarkData(inc);
     } else {
-      setSizeValue(null);
+      setFontSize(null);
     }
   };
   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 "";
     }
   };
+  const combinedOldVal = getSizeVal();
   const onIncreaseSize = () => {
-    const newValue = Math.min((sizeValue || 16) + 1, 200);
-    setSizeValue(newValue);
-    updateMarkData(newValue);
+    let inc = (combinedOldVal || 0) + 1;
+    inc = inc > 200 ? 200 : inc;
+    updateMarkData(inc);
   };
   const onDecreaseSize = () => {
-    const newValue = sizeValue ? Math.max(sizeValue - 1, 1) : 16;
-    setSizeValue(newValue);
-    updateMarkData(newValue);
+    const newVal = combinedOldVal - 1 < 0 ? 0 : combinedOldVal - 1;
+    updateMarkData(newVal);
   };
   const onChange = e => {
     clearTimeout(timerRef.current);
     const value = e.target.value;
-    setSizeValue(value);
+    setFontSize(value);
     timerRef.current = setTimeout(() => {
       onChangeSize(value);
     }, 500);
@@ -91,7 +87,7 @@ const TextSize = props => {
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(TextField, {
       sx: classes?.textSize,
-      value: sizeValue || 16,
+      value: fontSize,
       onChange: onChange,
       size: "small",
       inputProps: {

package/dist/Editor/Toolbar/Mini/MiniToolbar.js

@@ -215,8 +215,7 @@ const MiniToolbar = props => {
           setPopper: setPopper,
           onClose: onClose,
           search: search,
-          onSearch: onSearch,
-          closeMainPopup: onClose
+          onSearch: onSearch
         })]
       }) : null
     })]

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

@@ -12,7 +12,6 @@ function MiniColorPicker(props) {
     classes,
     id,
     editor,
-    type,
     customProps
   } = props;
   const [openColorTool, setOpenColorTool] = useState(null);
@@ -39,8 +38,7 @@ function MiniColorPicker(props) {
       classes: classes,
       forMiniTool: true,
       openColorTool: openColorTool,
-      closeColorTool: () => setOpenColorTool(null),
-      type: type
+      closeColorTool: () => setOpenColorTool(null)
     }, id)]
   });
 }

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

@@ -1,30 +1,25 @@
 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];
-function SelectFontSize(props) {
-  const {
-    editor,
-    classes,
-    fromMiniTextFormat,
-    setResizedSize,
-    resizedSize
-  } = props;
+function SelectFontSize({
+  editor,
+  classes
+}) {
   const format = "fontSize";
   const [fontSize, setFontSize] = useState();
-  const sizeValue = fromMiniTextFormat ? resizedSize : fontSize;
-  const setSizeValue = fromMiniTextFormat ? setResizedSize : setFontSize;
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   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 = {
@@ -51,28 +46,31 @@ function SelectFontSize(props) {
     if (value) {
       let inc = parseInt(value);
       inc = inc > 200 ? 200 : inc;
-      setSizeValue(inc);
       updateMarkData(inc);
     } else {
-      setSizeValue(null);
+      setFontSize(null);
     }
   };
   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 isNaN(parseInt(size)) ? 14 : parseInt(size);
     } catch (err) {
       return "";
     }
   };
   useEffect(() => {
-    if (value) {
-      setSizeValue(getSizeVal());
-    }
+    setFontSize(getSizeVal());
   }, [value]);
   const onChange = e => {
     clearTimeout(timerRef.current);
     const value = e.target.value;
-    setSizeValue(value);
+    setFontSize(value);
     timerRef.current = setTimeout(() => {
       onChangeSize(value);
     }, 500);
@@ -85,7 +83,7 @@ function SelectFontSize(props) {
     },
     children: [/*#__PURE__*/_jsx(TextField, {
       sx: classes?.miniFontSizeInput,
-      value: sizeValue,
+      value: fontSize,
       onChange: onChange,
       size: "small"
     }), /*#__PURE__*/_jsx(IconButton, {
@@ -99,16 +97,16 @@ function SelectFontSize(props) {
       anchorEl: anchorEl,
       onClose: () => setAnchorEl(null),
       anchorOrigin: {
-        vertical: "bottom",
-        horizontal: "left"
+        vertical: 'bottom',
+        horizontal: 'left'
       },
       sx: classes.customSelectPopoverWrapper,
       children: fontSizeOptions.map((s, i) => {
         return /*#__PURE__*/_jsx("div", {
           children: /*#__PURE__*/_jsx(Button, {
-            className: `customSelectOptionLabel ${sizeValue === s ? "selected" : ""}`,
+            className: `customSelectOptionLabel ${fontSize === s ? "selected" : ""}`,
             onClick: () => {
-              setSizeValue(s);
+              setFontSize(s);
               onChangeSize(s);
             },
             children: s

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 { useEditorTheme } from "../../../hooks/useEditorTheme";
-import { MenuItem, Select } from "@mui/material";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function Label({
@@ -21,29 +18,26 @@ 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, translation) {
-  const typographyOptions = [{
+function getTypographyOptions(translation) {
+  return [{
     id: 11,
     format: "headingOne",
     type: "block",
     title: /*#__PURE__*/_jsx(Label, {
       label: "H1",
-      type: "Heading",
+      type: "Header",
       translation: translation
     }),
     label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 1,
-      isCustomized: isCustomized
+      type: 1
     }),
     group: "typography",
     value: "headingOne"
@@ -53,12 +47,11 @@ function getTypographyOptions(isCustomized, translation) {
     type: "block",
     title: /*#__PURE__*/_jsx(Label, {
       label: "H2",
-      type: "Heading",
+      type: "Header",
       translation: translation
     }),
     label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 2,
-      isCustomized: isCustomized
+      type: 2
     }),
     group: "typography",
     value: "headingTwo"
@@ -68,156 +61,63 @@ function getTypographyOptions(isCustomized, translation) {
     type: "block",
     title: /*#__PURE__*/_jsx(Label, {
       label: "H3",
-      type: "Heading",
+      type: "Header",
       translation: translation
     }),
     label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 3,
-      isCustomized: isCustomized
+      type: 3
     }),
     group: "typography",
     value: "headingThree"
   }, {
-    id: 17,
-    format: "headingFour",
-    type: "block",
+    id: 14,
+    format: "fontSize",
+    type: "mark",
     title: /*#__PURE__*/_jsx(Label, {
-      label: "H4",
-      type: "Heading",
+      label: "L",
+      type: "Large",
       translation: translation
     }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 4,
-      isCustomized: isCustomized
-    }),
+    label: "L",
     group: "typography",
-    value: "headingFour"
+    value: "huge"
   }, {
-    id: 18,
-    format: "headingFive",
-    type: "block",
+    id: 15,
+    format: "fontSize",
+    type: "mark",
     title: /*#__PURE__*/_jsx(Label, {
-      label: "H5",
-      type: "Heading",
+      label: "M",
+      type: "Medium",
       translation: translation
     }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 5,
-      isCustomized: isCustomized
-    }),
+    label: "M",
     group: "typography",
-    value: "headingFive"
+    value: "medium"
   }, {
-    id: 19,
-    format: "headingSix",
-    type: "block",
+    id: 16,
+    format: "fontSize",
+    type: "mark",
     title: /*#__PURE__*/_jsx(Label, {
-      label: "H6",
-      type: "Heading",
+      label: "S",
+      type: "Small",
       translation: translation
     }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 6,
-      isCustomized: isCustomized
-    }),
+    label: "S",
     group: "typography",
-    value: "headingSix"
-  }, {
-    id: 20,
-    format: "paragraphOne",
-    type: "block",
-    title: /*#__PURE__*/_jsx(Label, {
-      label: "P1",
-      type: "Paragraph",
-      translation: translation
-    }),
-    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",
-      translation: translation
-    }),
-    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",
-      translation: translation
-    }),
-    label: /*#__PURE__*/_jsx(DisplayHeaderLabel, {
-      type: 3,
-      isCustomized: isCustomized,
-      isPara: true
-    }),
-    group: "typography",
-    value: "paragraphThree"
-  }
-  // {
-  //   id: 14,
-  //   format: "fontSize",
-  //   type: "mark",
-  //   title: <Label label="L" type="Large" />,
-  //   label: "L",
-  //   group: "typography",
-  //   value: "huge",
-  // },
-  // {
-  //   id: 15,
-  //   format: "fontSize",
-  //   type: "mark",
-  //   title: <Label label="M" type="Medium" />,
-  //   label: "M",
-  //   group: "typography",
-  //   value: "medium",
-  // },
-  // {
-  //   id: 16,
-  //   format: "fontSize",
-  //   type: "mark",
-  //   title: <Label label="S" type="Small" />,
-  //   label: "S",
-  //   group: "typography",
-  //   value: "small",
-  // },
-  ];
-
-  return typographyOptions;
+    value: "small"
+  }];
 }
 function SelectTypography({
   editor,
   classes,
   closeMainPopup,
-  type,
   customProps
 }) {
   const [size] = useWindowResize();
-  const {
-    theme
-  } = useEditorTheme();
   const {
     translation
   } = customProps;
-  const isTextCustomized = theme?.id ? isCustomized(editor) : false;
-  const typographyOptions = getTypographyOptions(isTextCustomized, translation);
+  const typographyOptions = getTypographyOptions(translation);
   const updateMarkData = newVal => {
     const val = activeMark(editor, "fontSize");
     let upData = {
@@ -239,10 +139,7 @@ function SelectTypography({
         ...upData
       }
     });
-
-    // closeMainPopup();
   };
-
   const selectedBlock = useMemo(() => {
     return typographyOptions.find(t => {
       if (t.type === "block") {
@@ -264,13 +161,15 @@ 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
+      // let updatedValue = !selectedBlock ? {} : { xs: "16px", sm: "16px", md: "16px", lg: "16px" }
+      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");
@@ -278,35 +177,11 @@ function SelectTypography({
     }
     closeMainPopup();
   };
-  const typographyValue = selectedBlock?.value || "headingOne";
-  if (type === "fullWidth") {
-    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: typographyValue,
+    value: selectedBlock?.value || "headingOne",
     classes: classes
   });
 }

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

@@ -1,4 +1,4 @@
-import { Fade, Grid, IconButton, Paper, Popper, useTheme } from "@mui/material";
+import { Fade, Grid, IconButton, Paper, Popper } from "@mui/material";
 import SelectTypography from "./SelectTypography";
 import SelectList from "./SelectList";
 import { toolbarGroups } from "../../toolbarGroups";
@@ -14,7 +14,7 @@ import MiniColorPicker from "./MiniColorPicker";
 import SelectAlignment from "./SelectAlignment";
 import SelectFontSize from "./SelectFontSize";
 import InfinityAITool from "./InfinityAITool";
-import { getSelectedElementColor, viewSlateSelection } from "../../../utils/helper";
+import { viewSlateSelection } from "../../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const DEFAULT_COLOR = {
@@ -34,14 +34,12 @@ const MiniTextFormat = props => {
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   const id = open ? "popup-edit-tool" : "";
-  const [resizedSize, setResizedSize] = useState();
   const [size] = useWindowResize();
-  const theme = useTheme();
   const removeFontStyles = ["superscript", "subscript"];
   const fontStyle = allTools.filter(f => f.type === "mark" && !removeFontStyles.includes(f.format));
   const link = allTools.find(f => f.format?.indexOf("link") >= 0);
   const fontAlign = allTools.filter(f => f.format?.indexOf("align") >= 0);
-  const activeColor = getSelectedElementColor(editor, textColorFormat, theme);
+  const activeColor = activeMark(editor, textColorFormat) || DEFAULT_COLOR[textColorFormat];
   const activeBg = activeMark(editor, textBgFormat) || DEFAULT_COLOR[textBgFormat];
   return /*#__PURE__*/_jsx(Grid, {
     container: true,
@@ -59,7 +57,6 @@ const MiniTextFormat = props => {
           classes: classes,
           editor: editor,
           closeMainPopup: closeMainPopup,
-          type: "miniToolBar",
           customProps: customProps
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine"
@@ -80,10 +77,7 @@ const MiniTextFormat = props => {
           className: "verticalLine mr-1"
         }), /*#__PURE__*/_jsx(SelectFontSize, {
           classes: classes,
-          editor: editor,
-          fromMiniTextFormat: true,
-          setResizedSize: setResizedSize,
-          resizedSize: resizedSize
+          editor: editor
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine mr-1"
         }), fontStyle?.map((m, i) => {
@@ -98,7 +92,6 @@ const MiniTextFormat = props => {
           activeColor: activeColor,
           id: "11_cc",
           editor: editor,
-          type: "textColor",
           customProps: customProps
         }), /*#__PURE__*/_jsx(MiniColorPicker, {
           format: textBgFormat,
@@ -145,10 +138,7 @@ const MiniTextFormat = props => {
                 editor: editor,
                 classes: classes,
                 closeMainPopup: closeMainPopup,
-                customProps: customProps,
-                fromMiniTextFormat: true,
-                setResizedSize: setResizedSize,
-                resizedSize: resizedSize
+                customProps: customProps
               })]
             })
           })

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

@@ -50,8 +50,7 @@ const PopperHeader = props => {
     padding: 2,
     className: "headerContainer",
     style: {
-      paddingTop: "5px",
-      paddingBottom: "0px"
+      paddingTop: "5px"
     },
     children: /*#__PURE__*/_jsxs(Grid, {
       item: true,