@flozy/editor 3.9.0 → 3.9.1

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

@@ -1,8 +1,32 @@
 import React from "react";
 import { Select, MenuItem } from "@mui/material";
-import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
+import { addMarkData, activeMark, getSelectedElementStyle } from "../../utils/SlateUtilityFunctions.js";
 import { fontFamilyMap } from "../../utils/font";
+import { toolbarGroups } from "../toolbarGroups.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+const allTools = toolbarGroups.flat();
+const fontWeight = allTools.find(f => f.format === "fontWeight");
+const getValue = (editor, format) => {
+  switch (format) {
+    case "fontFamily":
+      {
+        const style = getSelectedElementStyle("font-family", editor);
+        const val = Object.entries(fontFamilyMap).find(([key, value]) => value === style)?.[0];
+        return val || fontFamilyMap.PoppinsRegular;
+      }
+    case "fontWeight":
+      {
+        const {
+          options
+        } = fontWeight || {};
+        const fontWeightStyle = getSelectedElementStyle("font-weight", editor);
+        const selected = options?.find(o => o.value === fontWeightStyle || o.numVal === fontWeightStyle);
+        return selected?.value;
+      }
+    default:
+      return activeMark(editor, format);
+  }
+};
 const Dropdown = ({
   classes,
   editor,
@@ -10,7 +34,7 @@ const Dropdown = ({
   options,
   width
 }) => {
-  const value = activeMark(editor, format);
+  const value = getValue(editor, format);
   const changeMarkData = (event, format) => {
     event.preventDefault();
     const value = event.target.value;

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

@@ -1,7 +1,7 @@
 import React from "react";
 import Icon from "../../common/Icon";
 import Button from "../../common/Button";
-import { toggleMark, isMarkActive } from "../../utils/SlateUtilityFunctions.js";
+import { toggleMark, isMarkBtnActive } from "../../utils/SlateUtilityFunctions.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const MarkButton = ({
   editor,
@@ -9,7 +9,7 @@ const MarkButton = ({
   title
 }) => {
   return /*#__PURE__*/_jsx(Button, {
-    active: isMarkActive(editor, format),
+    active: isMarkBtnActive(editor, format),
     format: format,
     onMouseDown: e => {
       e.preventDefault();

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

@@ -1,9 +1,8 @@
-import React from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { TextField, IconButton } from "@mui/material";
-import { addMarkData, activeMark, isBlockActive } from "../../utils/SlateUtilityFunctions.js";
-import { headingMap, sizeMap } from "../../utils/font.js";
+import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
 import { TextMinusIcon, TextPlusIcon } from "../../common/iconslist.js";
-import { getBreakPointsValue } from "../../helper/theme.js";
+import { getBreakPointsValue, getTextSizeVal } 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";
@@ -17,7 +16,13 @@ const TextSize = ({
 }) => {
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-  const value = getBreakPointsValue(val, size?.device);
+  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 updateMarkData = newVal => {
     let upData = {
       ...getBreakPointsValue(val),
@@ -39,20 +44,18 @@ const TextSize = ({
       }
     });
   };
-  const onChangeSize = e => {
-    let inc = parseInt(e.target.value) || 8;
-    inc = inc > 200 ? 200 : inc;
-    updateMarkData(inc || 8);
+  const onChangeSize = value => {
+    if (value) {
+      let inc = parseInt(value);
+      inc = inc > 200 ? 200 : inc;
+      updateMarkData(inc);
+    } else {
+      setFontSize(null);
+    }
   };
   const getSizeVal = () => {
     try {
-      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);
+      return parseInt(value);
     } catch (err) {
       return "";
     }
@@ -67,11 +70,19 @@ 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: combinedOldVal,
-      onChange: onChangeSize,
+      value: fontSize,
+      onChange: onChange,
       size: "small",
       inputProps: {
         style: {

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

@@ -48,6 +48,8 @@ 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(() => {
@@ -92,14 +94,14 @@ const MiniToolbar = props => {
         label,
         icon: Icon
       }) => {
-        const isDisabled = popupType === type; // for textFormat type
+        const isDisabled = popupType === type || type === "undo" ? !canUndo : type === "redo" ? !canRedo : false; // for textFormat type
 
         return /*#__PURE__*/_jsx(Tooltip, {
           arrow: true,
           title: label,
           disableHoverListener: toolTip,
           children: /*#__PURE__*/_jsx(IconButton, {
-            className: type === popper ? "active" : "",
+            className: `${type === popper ? "active" : ""} ${type === "undo" && !canUndo || type === "redo" && !canRedo ? "disabled" : ""}`,
             onClick: handleClick(type),
             disabled: isDisabled,
             children: type === "page-settings" ? /*#__PURE__*/_jsx(PageSettingsButton, {

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

@@ -2,6 +2,8 @@ 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,
@@ -18,5 +20,13 @@ 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,6 +41,13 @@ const miniToolbarStyles = theme => ({
           "& svg": {
             stroke: theme?.palette?.editor?.activeColor
           }
+        },
+        "&.disabled": {
+          "& svg": {
+            '& path': {
+              stroke: theme?.palette?.editor?.svgStrokeDisabled
+            }
+          }
         }
       }
     }

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

@@ -1,10 +1,9 @@
 import { useEffect, useRef, useState } from "react";
-import { activeMark, addMarkData, isBlockActive } from "../../../utils/SlateUtilityFunctions";
+import { activeMark, addMarkData } 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 } from "../../../helper/theme";
-import { headingMap, sizeMap } from "../../../utils/font";
+import { BREAKPOINTS_DEVICES, getBreakPointsValue, getTextSizeVal } from "../../../helper/theme";
 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];
@@ -19,7 +18,7 @@ function SelectFontSize({
   const containerRef = useRef();
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-  const value = getBreakPointsValue(val, size?.device);
+  const value = getTextSizeVal(editor);
   const timerRef = useRef();
   const updateMarkData = newVal => {
     let upData = {
@@ -53,13 +52,7 @@ function SelectFontSize({
   };
   const getSizeVal = () => {
     try {
-      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);
+      return parseInt(value);
     } catch (err) {
       return "";
     }

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

@@ -2,8 +2,11 @@ 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 } from "../../../helper/theme";
+import { BREAKPOINTS_DEVICES, getBreakPointsValue, isTextCustomized as isCustomized, textThemeFields as themeFields } 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({
@@ -17,93 +20,194 @@ function Label({
   });
 }
 function DisplayHeaderLabel({
-  type
+  type,
+  isCustomized,
+  isPara = false
 }) {
   return /*#__PURE__*/_jsxs("div", {
-    children: ["H", /*#__PURE__*/_jsx("sub", {
+    children: [isCustomized ? "*" : "", isPara ? "P" : "H", /*#__PURE__*/_jsx("sub", {
       children: type
     })]
   });
 }
-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, {
+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"
+    }),
     label: "L",
-    type: "Large"
-  }),
-  label: "L",
-  group: "typography",
-  value: "huge"
-}, {
-  id: 15,
-  format: "fontSize",
-  type: "mark",
-  title: /*#__PURE__*/_jsx(Label, {
+    group: "typography",
+    value: "huge"
+  }, {
+    id: 15,
+    format: "fontSize",
+    type: "mark",
+    title: /*#__PURE__*/_jsx(Label, {
+      label: "M",
+      type: "Medium"
+    }),
     label: "M",
-    type: "Medium"
-  }),
-  label: "M",
-  group: "typography",
-  value: "medium"
-}, {
-  id: 16,
-  format: "fontSize",
-  type: "mark",
-  title: /*#__PURE__*/_jsx(Label, {
+    group: "typography",
+    value: "medium"
+  }, {
+    id: 16,
+    format: "fontSize",
+    type: "mark",
+    title: /*#__PURE__*/_jsx(Label, {
+      label: "S",
+      type: "Small"
+    }),
     label: "S",
-    type: "Small"
-  }),
-  label: "S",
-  group: "typography",
-  value: "small"
-}];
+    group: "typography",
+    value: "small"
+  }];
+  return typographyOptions;
+}
 function SelectTypography({
   editor,
   classes,
-  closeMainPopup
+  closeMainPopup,
+  type
 }) {
   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 = {
@@ -148,26 +252,49 @@ function SelectTypography({
     });
   }, [typographyOptions, activeMark, isBlockActive, editor]);
   const onChange = (format, option) => {
-    // add/reset block elements
-    toggleBlock(editor, format);
     if (option.type === "block") {
-      // reset old font size
-      addMarkData(editor, {
-        format: "fontSize",
-        value: {}
+      themeFields.forEach(field => {
+        Editor.removeMark(editor, field);
       });
+
+      // 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));
     }
   };
-  return /*#__PURE__*/_jsx(CustomSelectTool, {
-    options: typographyOptions,
-    editor: editor,
-    onChange: onChange,
-    value: selectedBlock?.value || "headingOne",
-    classes: classes
+  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))
   });
 }
 export default SelectTypography;

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

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