@flozy/editor 4.0.0 → 4.0.1

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

@@ -1,8 +1,9 @@
-import React, { useEffect, useRef, useState } from "react";
+import React from "react";
 import { TextField, IconButton } from "@mui/material";
-import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
+import { addMarkData, activeMark, isBlockActive } from "../../utils/SlateUtilityFunctions.js";
+import { headingMap, sizeMap } from "../../utils/font.js";
 import { TextMinusIcon, TextPlusIcon } from "../../common/iconslist.js";
-import { getBreakPointsValue, getTextSizeVal } from "../../helper/theme.js";
+import { getBreakPointsValue } from "../../helper/theme.js";
 import useWindowResize from "../../hooks/useWindowResize.js";
 import { BREAKPOINTS_DEVICES } from "../../helper/theme.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -16,13 +17,7 @@ const TextSize = ({
 }) => {
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-  const noFontSize = val === "normal" || typeof val === "object" && !Object.keys(val)?.length;
-  const value = noFontSize ? getTextSizeVal(editor) : getBreakPointsValue(val, size?.device);
-  const [fontSize, setFontSize] = useState();
-  const timerRef = useRef();
-  useEffect(() => {
-    setFontSize(getSizeVal());
-  }, [value]);
+  const value = getBreakPointsValue(val, size?.device);
   const updateMarkData = newVal => {
     let upData = {
       ...getBreakPointsValue(val),
@@ -44,18 +39,20 @@ const TextSize = ({
       }
     });
   };
-  const onChangeSize = value => {
-    if (value) {
-      let inc = parseInt(value);
-      inc = inc > 200 ? 200 : inc;
-      updateMarkData(inc);
-    } else {
-      setFontSize(null);
-    }
+  const onChangeSize = e => {
+    let inc = parseInt(e.target.value) || 8;
+    inc = inc > 200 ? 200 : inc;
+    updateMarkData(inc || 8);
   };
   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 "";
     }
@@ -70,19 +67,11 @@ const TextSize = ({
     const newVal = combinedOldVal - 1 < 0 ? 0 : combinedOldVal - 1;
     updateMarkData(newVal);
   };
-  const onChange = e => {
-    clearTimeout(timerRef.current);
-    const value = e.target.value;
-    setFontSize(value);
-    timerRef.current = setTimeout(() => {
-      onChangeSize(value);
-    }, 500);
-  };
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(TextField, {
       sx: classes?.textSize,
-      value: fontSize,
-      onChange: onChange,
+      value: combinedOldVal,
+      onChange: onChangeSize,
       size: "small",
       inputProps: {
         style: {

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

@@ -48,8 +48,6 @@ const MiniToolbar = props => {
   const {
     popupType
   } = useEditorContext();
-  const canUndo = editor.history.undos.length > 0;
-  const canRedo = editor.history.redos.length > 0;
   const [toolTip, setToolTip] = useState(false);
   const [data, setData] = useState(null);
   useEffect(() => {
@@ -94,14 +92,14 @@ const MiniToolbar = props => {
         label,
         icon: Icon
       }) => {
-        const isDisabled = popupType === type || type === "undo" ? !canUndo : type === "redo" ? !canRedo : false; // for textFormat type
+        const isDisabled = popupType === type; // for textFormat type
 
         return /*#__PURE__*/_jsx(Tooltip, {
           arrow: true,
           title: label,
           disableHoverListener: toolTip,
           children: /*#__PURE__*/_jsx(IconButton, {
-            className: `${type === popper ? "active" : ""} ${type === "undo" && !canUndo || type === "redo" && !canRedo ? "disabled" : ""}`,
+            className: type === popper ? "active" : "",
             onClick: handleClick(type),
             disabled: isDisabled,
             children: type === "page-settings" ? /*#__PURE__*/_jsx(PageSettingsButton, {

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

@@ -2,8 +2,6 @@ import TextIcon from "../../../assets/svg/TextIcon";
 import AddElementIcon from "../../../assets/svg/AddElementIcon";
 import AddTemplateIcon from "../../../assets/svg/AddTemplateIcon";
 import PageSettingsButton from "../../../Elements/PageSettings/PageSettingsButton";
-import UndoButton from "../../../Elements/Undo/UndoButton";
-import RedoButton from "../../../Elements/Redo/RedoButton";
 const MENU_OPTIONS = [{
   type: "textFormat",
   icon: TextIcon,
@@ -20,13 +18,5 @@ const MENU_OPTIONS = [{
   type: "page-settings",
   icon: PageSettingsButton,
   label: "Page Settings"
-}, {
-  type: "undo",
-  icon: UndoButton,
-  label: "Undo"
-}, {
-  type: "redo",
-  icon: RedoButton,
-  label: "Redo"
 }];
 export default MENU_OPTIONS;

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

@@ -41,13 +41,6 @@ const miniToolbarStyles = theme => ({
           "& svg": {
             stroke: theme?.palette?.editor?.activeColor
           }
-        },
-        "&.disabled": {
-          "& svg": {
-            '& path': {
-              stroke: theme?.palette?.editor?.svgStrokeDisabled
-            }
-          }
         }
       }
     }

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { Box, Button, Card, CardMedia, Grid } from "@mui/material";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 const Select = props => {
   const {
     classes,
@@ -33,19 +34,19 @@ const ButtonTemplateCard = props => {
     xs: 3,
     children: /*#__PURE__*/_jsx(Card, {
       sx: classes.paperOverrides,
-      children: /*#__PURE__*/_jsx(Box, {
+      children: /*#__PURE__*/_jsxs(Box, {
         sx: classes.buttonCardMediaWrpr,
-        onClick: onSelectTemplate(m),
-        children: /*#__PURE__*/_jsx("div", {
-          className: "img-wrapper",
-          children: /*#__PURE__*/_jsx(CardMedia, {
-            className: `template-card-media`,
-            component: "div",
-            image: m?.thumbnail,
-            alt: m?.title,
-            sx: classes.buttonCardMedia
-          })
-        })
+        children: [/*#__PURE__*/_jsx(CardMedia, {
+          className: `template-card-media`,
+          component: "div",
+          image: m?.thumbnail,
+          alt: m?.title,
+          sx: classes.buttonCardMedia
+        }), /*#__PURE__*/_jsx(Select, {
+          classes: classes,
+          onSelectTemplate: onSelectTemplate,
+          data: m
+        })]
       })
     })
   }, `template_${m.id}`);

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { Box, Button, Card, CardMedia, Grid } from "@mui/material";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 const Select = props => {
   const {
     classes,
@@ -34,19 +35,19 @@ const FullViewCard = props => {
     children: /*#__PURE__*/_jsx(Card, {
       sx: classes.paperOverrides,
       className: "paperOverrides",
-      children: /*#__PURE__*/_jsx(Box, {
+      children: /*#__PURE__*/_jsxs(Box, {
         sx: classes.buttonCardMediaWrpr,
-        onClick: onSelectTemplate(m),
-        children: /*#__PURE__*/_jsx("div", {
-          className: "img-wrapper",
-          children: /*#__PURE__*/_jsx(CardMedia, {
-            component: "div",
-            image: m?.thumbnail,
-            alt: m?.title,
-            sx: classes.fullViewCardMedia,
-            className: height
-          })
-        })
+        children: [/*#__PURE__*/_jsx(CardMedia, {
+          component: "div",
+          image: m?.thumbnail,
+          alt: m?.title,
+          sx: classes.fullViewCardMedia,
+          className: height
+        }), /*#__PURE__*/_jsx(Select, {
+          classes: classes,
+          onSelectTemplate: onSelectTemplate,
+          data: m
+        })]
       })
     })
   }, `template_${m.id}`);

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, {