@flozy/editor 8.0.8 → 9.0.1

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

@@ -1,10 +1,9 @@
 import React from "react";
 import { Autocomplete, TextField } from "@mui/material";
-import { addMarkData } from "../../utils/SlateUtilityFunctions.js";
+import { activeMark, addMarkData } from "../../utils/SlateUtilityFunctions.js";
 import usePopupStyle from "../PopupTool/PopupToolStyle.js";
 import { useEditorContext } from "../../hooks/useMouseMove.js";
-import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
-import { getValue } from "./Dropdown.js";
+import KeyboardArrowDownRoundedIcon from '@mui/icons-material/KeyboardArrowDownRounded';
 import { jsx as _jsx } from "react/jsx-runtime";
 const FontFamilyAutocomplete = ({
   editor,
@@ -15,7 +14,7 @@ const FontFamilyAutocomplete = ({
   val = "",
   webFont = false
 }) => {
-  const markValue = getValue(editor, format);
+  const markValue = activeMark(editor, format);
   const value = !webFont ? markValue : val;
   const changeMarkData = (event, newValue, format) => {
     if (!webFont) {

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, isMarkBtnActive } from "../../utils/SlateUtilityFunctions.js";
+import { toggleMark, isMarkActive } 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: isMarkBtnActive(editor, format),
+    active: isMarkActive(editor, format),
     format: format,
     onMouseDown: e => {
       e.preventDefault();

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

@@ -1,7 +1,10 @@
 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 ExpandLessRoundedIcon from "@mui/icons-material/ExpandLessRounded";
+import ExpandMoreRoundedIcon from "@mui/icons-material/ExpandMoreRounded";
+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";
@@ -14,12 +17,11 @@ const TextSize = ({
   format,
   fullWidth
 }) => {
-  const [fontSize, setFontSize] = useState();
-  const timerRef = useRef();
   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 value = getBreakPointsValue(val, size?.device);
+  const [fontSize, setFontSize] = useState();
+  const timerRef = useRef();
   useEffect(() => {
     setFontSize(getSizeVal());
   }, [value]);
@@ -55,7 +57,13 @@ const TextSize = ({
   };
   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/Mini/MiniToolbar.js

@@ -67,7 +67,6 @@ const MiniToolbar = props => {
     if (data) {
       setToolTip(false);
       setData(null);
-      setPopper(null);
     }
   }, [data]);
   useEffect(() => {

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

@@ -3,18 +3,17 @@ import { Grid, Tabs, Tab, CircularProgress } from "@mui/material";
 import TemplateCard from "./TemplateCard";
 import FullViewCard from "./FullViewCard";
 import ButtonTemplateCard from "./ButtonTemplatesCard";
-
-// const CATEGORIES_SORT_INDEX = {
-//   Brief: 1,
-//   Buttons: 2,
-//   Banners: 3,
-//   Tables: 4,
-//   Contract: 5,
-//   Proposal: 6,
-// };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+const CATEGORIES_SORT_INDEX = {
+  Brief: 1,
+  Buttons: 2,
+  Banners: 3,
+  Tables: 4,
+  Contract: 5,
+  Proposal: 6
+};
 const Categories = props => {
   const {
     value,

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 isNaN(parseInt(size)) ? 14 : parseInt(size);
     } catch (err) {
       return "";
     }
@@ -90,8 +97,8 @@ function SelectFontSize({
       anchorEl: anchorEl,
       onClose: () => setAnchorEl(null),
       anchorOrigin: {
-        vertical: "bottom",
-        horizontal: "left"
+        vertical: 'bottom',
+        horizontal: 'left'
       },
       sx: classes.customSelectPopoverWrapper,
       children: fontSizeOptions.map((s, i) => {

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({
@@ -20,190 +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: <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;
-}
+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",
+    type: "Large"
+  }),
+  label: "L",
+  group: "typography",
+  value: "huge"
+}, {
+  id: 15,
+  format: "fontSize",
+  type: "mark",
+  title: /*#__PURE__*/_jsx(Label, {
+    label: "M",
+    type: "Medium"
+  }),
+  label: "M",
+  group: "typography",
+  value: "medium"
+}, {
+  id: 16,
+  format: "fontSize",
+  type: "mark",
+  title: /*#__PURE__*/_jsx(Label, {
+    label: "S",
+    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 = {
@@ -225,10 +125,7 @@ function SelectTypography({
         ...upData
       }
     });
-
-    // closeMainPopup();
   };
-
   const selectedBlock = useMemo(() => {
     return typographyOptions.find(t => {
       if (t.type === "block") {
@@ -250,13 +147,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");
@@ -264,35 +163,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

@@ -56,8 +56,7 @@ const MiniTextFormat = props => {
         }), /*#__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

@@ -130,7 +130,7 @@ const usePopupStyle = theme => ({
       },
       "& .accordionIcon": {
         "& p": {
-          textAlign: "left"
+          textAlign: 'left'
         }
       }
     },
@@ -416,11 +416,6 @@ const usePopupStyle = theme => ({
     "& .MuiOutlinedInput-notchedOutline": {
       border: `1px solid ${theme?.palette?.editor?.inputFieldBorder} !important`
     },
-    '& .MuiInputBase-root': {
-      '& input': {
-        border: "none !important"
-      }
-    },
     "& svg": {
       width: "20px",
       height: "24px"
@@ -429,6 +424,12 @@ const usePopupStyle = theme => ({
   fontFamilyListOptions: {
     "& .MuiAutocomplete-listbox": {
       padding: "0px",
+      "&::-webkit-scrollbar-thumb": {
+        background: `none !important`
+      },
+      "&::-webkit-scrollbar-track": {
+        visibility: "hidden"
+      },
       "&::-webkit-scrollbar-thumb": {
         background: `${theme?.palette?.editor?.brainPopupScroll} !important`
       },
@@ -439,8 +440,8 @@ const usePopupStyle = theme => ({
         margin: "5px",
         borderRadius: "8px",
         color: theme?.palette?.editor?.menuOptionTextColor,
-        fontSize: "14px",
-        padding: "8px 12px",
+        fontSize: '14px',
+        padding: '8px 12px',
         '&[aria-selected="true"]': {
           backgroundColor: `${theme?.palette?.editor?.menuOptionSelectedOption} !important`
         }
@@ -539,7 +540,7 @@ const usePopupStyle = theme => ({
         }
       },
       alignItems: "flexStart",
-      // justifyContent: "center",
+      justifyContent: "center",
       flexDirection: "row",
       "&:hover": {
         background: "unset"
@@ -788,13 +789,8 @@ const usePopupStyle = theme => ({
     padding: "0px"
   },
   defaultBtn: {
-    color: "#2563EB !important",
-    textTransform: "none",
-    textDecoration: "underline",
-    "&.Mui-disabled": {
-      color: "#A0AEC0 !important",
-      textDecoration: "none"
-    }
+    color: "#0F172A",
+    textTransform: "none"
   },
   templateCardBtnGrp: {
     display: "none",