@flozy/editor 11.0.6 → 11.0.8

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

@@ -1,25 +1,30 @@
 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];
-function SelectFontSize({
-  editor,
-  classes
-}) {
+function SelectFontSize(props) {
+  const {
+    editor,
+    classes,
+    fromMiniTextFormat,
+    setResizedSize,
+    resizedSize
+  } = props;
   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 = getBreakPointsValue(val, size?.device);
+  const value = getTextSizeVal(editor);
   const timerRef = useRef();
   const updateMarkData = newVal => {
     let upData = {
@@ -46,31 +51,28 @@ function SelectFontSize({
     if (value) {
       let inc = parseInt(value);
       inc = inc > 200 ? 200 : inc;
+      setSizeValue(inc);
       updateMarkData(inc);
     } else {
-      setFontSize(null);
+      setSizeValue(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 isNaN(parseInt(size)) ? 14 : parseInt(size);
+      return parseInt(value);
     } catch (err) {
       return "";
     }
   };
   useEffect(() => {
-    setFontSize(getSizeVal());
+    if (value) {
+      setSizeValue(getSizeVal());
+    }
   }, [value]);
   const onChange = e => {
     clearTimeout(timerRef.current);
     const value = e.target.value;
-    setFontSize(value);
+    setSizeValue(value);
     timerRef.current = setTimeout(() => {
       onChangeSize(value);
     }, 500);
@@ -83,7 +85,7 @@ function SelectFontSize({
     },
     children: [/*#__PURE__*/_jsx(TextField, {
       sx: classes?.miniFontSizeInput,
-      value: fontSize,
+      value: sizeValue,
       onChange: onChange,
       size: "small"
     }), /*#__PURE__*/_jsx(IconButton, {
@@ -97,16 +99,16 @@ function SelectFontSize({
       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 ${fontSize === s ? "selected" : ""}`,
+            className: `customSelectOptionLabel ${sizeValue === s ? "selected" : ""}`,
             onClick: () => {
-              setFontSize(s);
+              setSizeValue(s);
               onChangeSize(s);
             },
             children: s

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

@@ -2,7 +2,7 @@ import { useMemo } from "react";
 import { isBlockActive, toggleBlock } from "../../../utils/SlateUtilityFunctions";
 import CustomSelectTool from "./CustomSelectTool";
 import Icon from "../../../common/Icon";
-import { insertAccordion } from "../../../utils/accordion";
+import { insertAccordion, toggleAccordion } from "../../../utils/accordion";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function Label({
@@ -16,8 +16,8 @@ function Label({
     }), " ", label]
   });
 }
-function getListOptions(translation) {
-  return [{
+function getListOptions(translation, listType) {
+  const list = [{
     id: 15,
     value: "orderedList",
     type: "block",
@@ -53,7 +53,8 @@ function getListOptions(translation) {
       icon: "check-list-item"
     }),
     group: "list"
-  }, {
+  }];
+  const accordion = [{
     id: 30,
     value: "accordion",
     type: "accordion",
@@ -67,17 +68,30 @@ function getListOptions(translation) {
       icon: "accordion"
     })
   }];
+  let options = [];
+  if (listType === "accordion-summary") {
+    options = [...accordion];
+  } else if (listType === "list-item") {
+    options = [...list];
+  } else {
+    options = [...list, ...accordion];
+  }
+  return options;
 }
 function SelectList({
   editor,
   classes,
   closeMainPopup,
-  customProps
+  customProps,
+  commonProps
 }) {
   const {
     translation
   } = customProps;
-  const listOptions = getListOptions(translation);
+  const {
+    listType
+  } = commonProps || {};
+  const listOptions = getListOptions(translation, listType);
   const selectedList = useMemo(() => {
     return listOptions.find(t => isBlockActive(editor, t.value));
   }, [listOptions, isBlockActive, editor]);
@@ -85,7 +99,11 @@ function SelectList({
     if (option.type === "block") {
       toggleBlock(editor, format);
     } else if (option.type === "accordion") {
-      insertAccordion(editor);
+      if (listType === "accordion-summary") {
+        toggleAccordion(editor);
+      } else {
+        insertAccordion(editor);
+      }
     }
     closeMainPopup();
   };

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

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

@@ -1,9 +1,9 @@
-import { Fade, Grid, IconButton, Paper, Popper } from "@mui/material";
+import { Fade, Grid, IconButton, Paper, Popper, useTheme } from "@mui/material";
 import SelectTypography from "./SelectTypography";
 import SelectList from "./SelectList";
 import { toolbarGroups } from "../../toolbarGroups";
 import { MarkButton } from "../../FormatTools";
-import { activeMark, isBlockActive } from "../../../utils/SlateUtilityFunctions";
+import { activeMark, getListType, isBlockActive } from "../../../utils/SlateUtilityFunctions";
 import LinkButton from "../../../Elements/Link/LinkButton";
 import TextToolIcon from "../../../assets/svg/TextToolIcon";
 import TextFormat from "../TextFormat";
@@ -14,7 +14,7 @@ import MiniColorPicker from "./MiniColorPicker";
 import SelectAlignment from "./SelectAlignment";
 import SelectFontSize from "./SelectFontSize";
 import InfinityAITool from "./InfinityAITool";
-import { viewSlateSelection } from "../../../utils/helper";
+import { getSelectedElementColor, viewSlateSelection } from "../../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const DEFAULT_COLOR = {
@@ -34,12 +34,18 @@ 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 listType = getListType(editor);
+  const commonProps = {
+    listType
+  };
   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 = activeMark(editor, textColorFormat) || DEFAULT_COLOR[textColorFormat];
+  const activeColor = getSelectedElementColor(editor, textColorFormat, theme);
   const activeBg = activeMark(editor, textBgFormat) || DEFAULT_COLOR[textBgFormat];
   return /*#__PURE__*/_jsx(Grid, {
     container: true,
@@ -57,6 +63,7 @@ const MiniTextFormat = props => {
           classes: classes,
           editor: editor,
           closeMainPopup: closeMainPopup,
+          type: "miniToolBar",
           customProps: customProps
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine"
@@ -64,7 +71,8 @@ const MiniTextFormat = props => {
           classes: classes,
           editor: editor,
           closeMainPopup: closeMainPopup,
-          customProps: customProps
+          customProps: customProps,
+          commonProps: commonProps
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine mr-1"
         }), /*#__PURE__*/_jsx(SelectAlignment, {
@@ -77,7 +85,10 @@ const MiniTextFormat = props => {
           className: "verticalLine mr-1"
         }), /*#__PURE__*/_jsx(SelectFontSize, {
           classes: classes,
-          editor: editor
+          editor: editor,
+          fromMiniTextFormat: true,
+          setResizedSize: setResizedSize,
+          resizedSize: resizedSize
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine mr-1"
         }), fontStyle?.map((m, i) => {
@@ -92,7 +103,8 @@ const MiniTextFormat = props => {
           activeColor: activeColor,
           id: "11_cc",
           editor: editor,
-          customProps: customProps
+          customProps: customProps,
+          type: "textColor"
         }), /*#__PURE__*/_jsx(MiniColorPicker, {
           format: textBgFormat,
           classes: classes,
@@ -138,7 +150,11 @@ const MiniTextFormat = props => {
                 editor: editor,
                 classes: classes,
                 closeMainPopup: closeMainPopup,
-                customProps: customProps
+                customProps: customProps,
+                commonProps: commonProps,
+                fromMiniTextFormat: true,
+                setResizedSize: setResizedSize,
+                resizedSize: resizedSize
               })]
             })
           })

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

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