@flozy/editor 10.3.2 → 10.3.3

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,4 +1,4 @@
-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";
@@ -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 = {
@@ -35,11 +35,12 @@ const MiniTextFormat = props => {
   const open = Boolean(anchorEl);
   const id = open ? "popup-edit-tool" : "";
   const [size] = useWindowResize();
+  const theme = useTheme();
   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 +58,7 @@ const MiniTextFormat = props => {
           classes: classes,
           editor: editor,
           closeMainPopup: closeMainPopup,
+          type: "miniToolBar",
           customProps: customProps
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine"
@@ -92,7 +94,8 @@ const MiniTextFormat = props => {
           activeColor: activeColor,
           id: "11_cc",
           editor: editor,
-          customProps: customProps
+          customProps: customProps,
+          type: "textColor"
         }), /*#__PURE__*/_jsx(MiniColorPicker, {
           format: textBgFormat,
           classes: classes,

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,

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

@@ -98,6 +98,9 @@ const usePopupStyle = theme => ({
         }
       }
     },
+    "& .MuiDivider-root": {
+      border: `0.5px solid ${theme?.palette?.editor?.deviderBgColor}`
+    },
     "@media only screen and (max-width: 599px)": {
       // margin: "10px !important",
       background: "unset",
@@ -111,6 +114,7 @@ const usePopupStyle = theme => ({
     width: "323px",
     maxWidth: "100%",
     overflowX: "hidden !important",
+    marginTop: "6px",
     // 30% of window height
     maxHeight: `${window.innerHeight * 0.45}px`,
     overflow: "auto",
@@ -130,7 +134,7 @@ const usePopupStyle = theme => ({
       },
       "& .accordionIcon": {
         "& p": {
-          textAlign: 'left'
+          textAlign: "left"
         }
       }
     },
@@ -304,6 +308,21 @@ const usePopupStyle = theme => ({
       paddingRight: "0px !important"
     }
   },
+  textFormatContainer: {
+    ".saveThemeBtnsWrapper": {
+      position: "sticky",
+      bottom: "0px",
+      right: "0px",
+      boxShadow: `0px -3px 16px 0px ${theme?.palette?.editor?.cardShadow}`,
+      padding: "10px",
+      borderRadius: "8px 8px 19px 19px",
+      display: "flex",
+      justifyContent: "end",
+      alignItems: "center",
+      gap: "8px",
+      background: theme?.palette?.editor?.miniToolBarBackground
+    }
+  },
   textFormatLabel: {
     display: "flex",
     alignItems: "center",
@@ -335,9 +354,10 @@ const usePopupStyle = theme => ({
     borderBottom: `1px solid ${theme?.palette?.editor?.deviderBgColor} !important`
   },
   textFormatField: {
-    marginBottom: "8px",
-    marginTop: "8px"
+    marginBottom: "8px"
+    // marginTop: "8px",
   },
+
   textFormatField1: {
     marginBottom: "16px",
     marginTop: "10px"
@@ -416,6 +436,11 @@ const usePopupStyle = theme => ({
     "& .MuiOutlinedInput-notchedOutline": {
       border: `1px solid ${theme?.palette?.editor?.inputFieldBorder} !important`
     },
+    "& .MuiInputBase-root": {
+      "& input": {
+        border: "none !important"
+      }
+    },
     "& svg": {
       width: "20px",
       height: "24px"
@@ -424,9 +449,6 @@ const usePopupStyle = theme => ({
   fontFamilyListOptions: {
     "& .MuiAutocomplete-listbox": {
       padding: "0px",
-      // "&::-webkit-scrollbar-thumb": {
-      //   background: `none !important`,
-      // },
       "&::-webkit-scrollbar-thumb": {
         background: `${theme?.palette?.editor?.brainPopupScroll} !important`
       },
@@ -437,8 +459,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`
         }
@@ -537,7 +559,7 @@ const usePopupStyle = theme => ({
         }
       },
       alignItems: "flexStart",
-      justifyContent: "center",
+      // justifyContent: "center",
       flexDirection: "row",
       "&:hover": {
         background: "unset"
@@ -786,8 +808,13 @@ const usePopupStyle = theme => ({
     padding: "0px"
   },
   defaultBtn: {
-    color: "#0F172A",
-    textTransform: "none"
+    color: "#2563EB !important",
+    textTransform: "none",
+    textDecoration: "underline",
+    "&.Mui-disabled": {
+      color: "#A0AEC0 !important",
+      textDecoration: "none"
+    }
   },
   templateCardBtnGrp: {
     display: "none",
@@ -864,7 +891,7 @@ const usePopupStyle = theme => ({
     margin: "30px",
     "& .MuiPaper-root": {
       overflow: "auto",
-      backgroundColor: theme?.palette?.editor?.background,
+      backgroundColor: theme?.palette?.editor?.miniToolBarBackground,
       borderRadius: "14px !important",
       border: `1px solid ${theme?.palette?.editor?.inputFieldBorder} !important`,
       minWidth: "fit-content",
@@ -1138,6 +1165,39 @@ const usePopupStyle = theme => ({
     "& fieldset": {
       border: "none !important"
     }
+  },
+  customCheckBox: {
+    marginTop: "4px",
+    padding: "0px",
+    "& .MuiCheckbox-root": {
+      padding: "8px 8px 8px 10px",
+      "&:hover": {
+        background: "unset !important"
+      }
+    },
+    "& button": {
+      width: "14px !important",
+      height: "14px !important",
+      borderRadius: "3px",
+      border: `1px solid ${theme?.palette?.editor?.buttonBorder3}`,
+      padding: "0px",
+      "& svg": {
+        width: "10px",
+        height: "10px"
+      }
+    },
+    "& .checkedIcon": {
+      background: "#2563EB",
+      borderColor: "#2563EB"
+    },
+    "& .unCheckedIcon": {
+      background: theme?.palette?.editor?.checkedIconBg
+    },
+    "& p": {
+      margin: "0px !important",
+      color: theme?.palette?.editor?.tv_text,
+      fontSize: "13px"
+    }
   }
 });
 export default usePopupStyle;

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

@@ -10,6 +10,8 @@ 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 SelectSuperSubscript from "./MiniTextFormat/SelectSuperSubscript";
 import { ColorResetIcon, TextDefaultStyleIcon } from "../../common/iconListV2";
 import FontFamilyAutocomplete from "../FormatTools/FontFamilyAutocomplete";
@@ -43,7 +45,7 @@ const TextFormat = props => {
   const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
-    theme
+    theme: appTheme
   } = useEditorContext();
   const breakpoint = getDevice(window.innerWidth);
   const fontWeight = allTools.find(f => f.format === "fontWeight");
@@ -62,6 +64,11 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
+  const {
+    theme,
+    updateTheme
+  } = useEditorTheme();
+  const customized = isTextCustomized(editor);
   let lineSpacingValue = activeMark(editor, "lineHeight");
   lineSpacingValue = lineSpacingValue?.[breakpoint] !== undefined ? lineSpacingValue : pageSettingLine;
   const handleColorPicker = type => e => {
@@ -116,6 +123,51 @@ const TextFormat = props => {
     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: "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: closeMainPopup,
+          type: "fullWidth",
+          customProps: customProps
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -242,7 +294,8 @@ const TextFormat = props => {
           rounded: true,
           title: translation("textColor"),
           id: "11_cc",
-          classes: classes
+          classes: classes,
+          type: "textColor"
         }, "11_cc")
       })]
     }), /*#__PURE__*/_jsxs(Grid, {
@@ -268,7 +321,7 @@ const TextFormat = props => {
             children: /*#__PURE__*/_jsx(Button, {
               sx: classes.defaultBtn2,
               startIcon: /*#__PURE__*/_jsx(ColorResetIcon, {
-                stroke: theme?.palette?.type === "dark" ? "#505359" : "#A2B0B9"
+                stroke: appTheme?.palette?.type === "dark" ? "#505359" : "#A2B0B9"
               }),
               onClick: handleDefault({
                 format: "bgColor"
@@ -358,12 +411,7 @@ const TextFormat = props => {
         xs: 12,
         className: "typo-icons",
         sx: classes.evenSpace,
-        children: [/*#__PURE__*/_jsx(SelectTypography, {
-          classes: classes,
-          editor: editor,
-          closeMainPopup: closeMainPopup || onClose,
-          customProps: customProps
-        }), fontStyle?.map((m, i) => {
+        children: [fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
             ...m,
@@ -402,7 +450,7 @@ const TextFormat = props => {
           value: lineSpacingValue,
           onChange: handleLineSpacing,
           data: {
-            key: 'lineHeight'
+            key: "lineHeight"
           }
         })
       })]