@flozy/editor 3.8.9 → 3.9.1

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

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

@@ -3,9 +3,8 @@ const usePopupStyle = theme => ({
     boxShadow: "0px 4px 10px 0px rgba(0, 0, 0, 0.16)",
     zIndex: 1300,
     marginBottom: "12px !important",
-    border: "1px solid #E0E0E0",
-    borderRadius: "10px",
-    maxWidth: "100%",
+    borderRadius: "6px",
+    maxWidth: "96%",
     "&.fullscreen": {
       marginBottom: "0px !important",
       "& .papper-wrpr": {
@@ -19,7 +18,7 @@ const usePopupStyle = theme => ({
       backgroundColor: theme?.palette?.editor?.background
     },
     "&.textSettings": {
-      '@media only screen and (max-width: 600px)': {
+      "@media only screen and (max-width: 600px)": {
         margin: "4px !important",
         marginBottom: "54px !important"
       }
@@ -78,7 +77,7 @@ const usePopupStyle = theme => ({
         paddingTop: "4px"
       },
       "@media only screen and (max-width: 599px)": {
-        width: '330px'
+        width: "330px"
       }
     },
     "&.templates": {
@@ -89,7 +88,7 @@ const usePopupStyle = theme => ({
         maxHeight: "fit-content"
       },
       "@media only screen and (max-width: 599px)": {
-        width: '330px'
+        width: "330px"
       }
     },
     "& .headerContainer": {},
@@ -144,7 +143,7 @@ const usePopupStyle = theme => ({
       }
     },
     "@media only screen and (max-width: 599px)": {
-      width: '330px'
+      width: "330px"
     }
   },
   textFormatLabel: {
@@ -155,13 +154,13 @@ const usePopupStyle = theme => ({
     lineHeight: "25px",
     marginTop: "12px",
     marginBottom: "8px",
-    '& .searchContainer': {
+    "& .searchContainer": {
       position: "absolute",
       right: 0,
       zIndex: 3
     },
-    '& .MuiFormControl-root.MuiTextField-root input': {
-      padding: '8px 35px 6px 12px'
+    "& .MuiFormControl-root.MuiTextField-root input": {
+      padding: "8px 35px 6px 12px"
     }
   },
   textFormatField: {
@@ -205,7 +204,8 @@ const usePopupStyle = theme => ({
     fontSize: "14px",
     marginBottom: "5px",
     paddingLeft: "5px",
-    fontWeight: 500
+    fontWeight: 500,
+    color: "#000000"
   },
   templateCard: {
     borderRadius: "10px",
@@ -327,8 +327,13 @@ const usePopupStyle = theme => ({
     }
   },
   defaultBtn: {
-    color: "#0F172A",
-    textTransform: "none"
+    color: "#2563EB !important",
+    textTransform: "none",
+    textDecoration: "underline",
+    "&.Mui-disabled": {
+      color: "#A0AEC0 !important",
+      textDecoration: "none"
+    }
   },
   templateCardBtnGrp: {
     display: "none",
@@ -413,7 +418,8 @@ const usePopupStyle = theme => ({
   colorPopper: {
     "& .MuiPaper-root": {
       backgroundColor: theme?.palette?.editor?.background,
-      '@media only screen and (max-width: 600px)': {
+      padding: "4px 14px",
+      "@media only screen and (max-width: 600px)": {
         marginTop: "-40px"
       }
     }
@@ -524,9 +530,9 @@ const usePopupStyle = theme => ({
   },
   customSelectPopoverWrapper: {
     "& .MuiPopover-paper": {
-      maxHeight: '140px',
+      maxHeight: "140px",
       background: theme?.palette?.editor?.background,
-      '@media only screen and (max-width: 600px)': {
+      "@media only screen and (max-width: 600px)": {
         marginTop: "-40px"
       }
     },

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

@@ -14,6 +14,9 @@ import { getPageSettings, updatePageSettings } from "../../utils/pageSettings";
 import { AllColors } from "../../Elements/Color Picker/ColorButtons";
 import { fontFamilyMap } from "../../utils/font";
 import { getBorderColor } from "../../utils/helper";
+import SelectTypography from "./MiniTextFormat/SelectTypography";
+import { isTextCustomized, saveToTheme } from "../../helper/theme";
+import { useEditorTheme } from "../../hooks/useEditorTheme";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const allTools = toolbarGroups.flat();
@@ -34,7 +37,6 @@ const TextFormat = props => {
   const fontAlign = allTools.filter(f => f.format?.indexOf("align") >= 0);
   const link = allTools.find(f => f.format?.indexOf("link") >= 0);
   const lists = allTools.filter(f => f.group?.indexOf("list") >= 0);
-  const typo = allTools.filter(f => f.group?.indexOf("typography") >= 0);
   const {
     pageProps
   } = getPageSettings(editor)?.element || {};
@@ -52,6 +54,11 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
+  const {
+    theme,
+    updateTheme
+  } = useEditorTheme();
+  const customized = isTextCustomized(editor);
   const handlePageWidth = width => () => {
     updatePageSettings(editor, {
       ...(pageProps || {}),
@@ -100,8 +107,50 @@ const TextFormat = props => {
   return /*#__PURE__*/_jsxs(Grid, {
     container: true,
     sx: classes.textFormatWrapper,
-    className: "text-formatter-popup",
     children: [/*#__PURE__*/_jsxs(Grid, {
+      item: true,
+      xs: 12,
+      children: [/*#__PURE__*/_jsxs(Grid, {
+        container: true,
+        justifyContent: "space-between",
+        alignItems: "center",
+        children: [/*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: /*#__PURE__*/_jsx(Typography, {
+            variant: "body1",
+            color: "primary",
+            sx: classes.typoLabel,
+            children: "Theme Style"
+          })
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: theme?.id ? /*#__PURE__*/_jsx(Button, {
+            sx: classes.defaultBtn,
+            onClick: () => {
+              const {
+                field,
+                theme
+              } = saveToTheme(editor) || {};
+              updateTheme(theme, {
+                action: "ELEMENT_PROPS_CHANGE",
+                fieldName: field
+              });
+            },
+            disabled: !customized,
+            children: "Save to theme"
+          }) : null
+        })]
+      }), /*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        sx: classes.textFormatField,
+        children: /*#__PURE__*/_jsx(SelectTypography, {
+          editor: editor,
+          classes: classes,
+          closeMainPopup: () => {}
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -320,12 +369,7 @@ const TextFormat = props => {
         xs: 12,
         className: "typo-icons",
         sx: classes.evenSpace,
-        children: [typo?.map((m, i) => {
-          return /*#__PURE__*/_jsx(BlockButton, {
-            editor: editor,
-            ...m
-          }, `pptool_mark_${i}_${m.id}`);
-        }), fontStyle?.map((m, i) => {
+        children: [fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
             ...m