@flozy/editor 4.0.1 → 4.0.2

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

@@ -19,6 +19,9 @@ const CustomSelectTool = ({
         e.preventDefault();
         setAnchorEl(e.currentTarget);
       },
+      style: {
+        margin: "0px"
+      },
       children: [selected?.label || selected?.title, " ", /*#__PURE__*/_jsx(DownArrowIcon, {})]
     }), /*#__PURE__*/_jsx(Popover, {
       open: open,

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/SelectSuperSubscript.js

@@ -0,0 +1,59 @@
+import { useMemo } from "react";
+import { activeMark, toggleMark } from "../../../utils/SlateUtilityFunctions";
+import CustomSelectTool from "./CustomSelectTool";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+function Label({
+  label,
+  type
+}) {
+  return /*#__PURE__*/_jsxs("span", {
+    children: [/*#__PURE__*/_jsx("strong", {
+      children: label
+    }), " ", type]
+  });
+}
+const superSubscriptOptions = [{
+  id: 9,
+  format: "superscript",
+  type: "mark",
+  title: /*#__PURE__*/_jsx(Label, {
+    label: "X²",
+    type: "Superscript"
+  }),
+  label: "X²",
+  group: "superSubscript",
+  value: "superscript"
+}, {
+  id: 10,
+  format: "subscript",
+  type: "mark",
+  title: /*#__PURE__*/_jsx(Label, {
+    label: "X₂",
+    type: "Subscript"
+  }),
+  label: "X₂",
+  group: "superSubscript",
+  value: "subscript"
+}];
+function SelectSuperSubscript({
+  editor,
+  classes,
+  closeMainPopup
+}) {
+  const selectedMark = useMemo(() => {
+    return superSubscriptOptions.find(option => activeMark(editor, option.format));
+  }, [editor]);
+  const onChange = format => {
+    toggleMark(editor, format);
+    closeMainPopup();
+  };
+  return /*#__PURE__*/_jsx(CustomSelectTool, {
+    options: superSubscriptOptions,
+    editor: editor,
+    onChange: onChange,
+    value: selectedMark?.value || "superscript",
+    classes: classes
+  });
+}
+export default SelectSuperSubscript;

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, {
@@ -120,7 +121,8 @@ const MiniTextFormat = props => {
                 onClose: () => setAnchorEl(null)
               }), /*#__PURE__*/_jsx(TextFormat, {
                 editor: editor,
-                classes: classes
+                classes: classes,
+                closeMainPopup: closeMainPopup
               })]
             })
           })