@flozy/editor 6.0.5 → 6.0.7

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({
@@ -17,93 +20,190 @@ 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, {
-    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 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;
+}
 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 = {
@@ -125,8 +225,10 @@ function SelectTypography({
         ...upData
       }
     });
-    closeMainPopup();
+
+    // closeMainPopup();
   };
+
   const selectedBlock = useMemo(() => {
     return typographyOptions.find(t => {
       if (t.type === "block") {
@@ -148,31 +250,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
-      let updatedValue = !selectedBlock ? {} : {
-        xs: "16px",
-        sm: "16px",
-        md: "16px",
-        lg: "16px"
-      };
-      addMarkData(editor, {
-        format: "fontSize",
-        value: updatedValue
+      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));
     }
+    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

@@ -14,6 +14,7 @@ import MiniColorPicker from "./MiniColorPicker";
 import SelectAlignment from "./SelectAlignment";
 import SelectFontSize from "./SelectFontSize";
 import InfinityAITool from "./InfinityAITool";
+import { viewSlateSelection } from "../../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const DEFAULT_COLOR = {
@@ -55,18 +56,21 @@ const MiniTextFormat = props => {
         }), /*#__PURE__*/_jsx(SelectTypography, {
           classes: classes,
           editor: editor,
-          closeMainPopup: closeMainPopup
+          closeMainPopup: closeMainPopup,
+          type: "miniToolBar"
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine"
         }), /*#__PURE__*/_jsx(SelectList, {
           classes: classes,
-          editor: editor
+          editor: editor,
+          closeMainPopup: closeMainPopup
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine mr-1"
         }), /*#__PURE__*/_jsx(SelectAlignment, {
           fontAlign: fontAlign,
           classes: classes,
-          editor: editor
+          editor: editor,
+          closeMainPopup: closeMainPopup
         }), /*#__PURE__*/_jsx("div", {
           className: "verticalLine mr-1"
         }), /*#__PURE__*/_jsx(SelectFontSize, {
@@ -98,7 +102,10 @@ const MiniTextFormat = props => {
           editor: editor,
           customProps: customProps
         }, link.id), /*#__PURE__*/_jsx(IconButton, {
-          onClick: e => setAnchorEl(document.getElementById("mini-text-editor-wrapper")),
+          onClick: e => {
+            viewSlateSelection();
+            setAnchorEl(document.getElementById("mini-text-editor-wrapper"));
+          },
           className: `textSettingsIcon ${open ? "btnActive" : ""}`,
           children: /*#__PURE__*/_jsx(TextToolIcon, {})
         }), /*#__PURE__*/_jsx(Popper, {

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

@@ -130,7 +130,7 @@ const usePopupStyle = theme => ({
       },
       "& .accordionIcon": {
         "& p": {
-          textAlign: 'left'
+          textAlign: "left"
         }
       }
     },
@@ -416,6 +416,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,12 +429,6 @@ 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`
       },
@@ -440,8 +439,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`
         }
@@ -540,7 +539,7 @@ const usePopupStyle = theme => ({
         }
       },
       alignItems: "flexStart",
-      justifyContent: "center",
+      // justifyContent: "center",
       flexDirection: "row",
       "&:hover": {
         background: "unset"
@@ -789,8 +788,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",

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

@@ -47,7 +47,7 @@ const TemplateCard = props => {
         }), /*#__PURE__*/_jsx(CardMedia, {
           className: `template-card-media ${fullScreen ? "fullscreen" : ""}`,
           component: "div",
-          image: m?.thumbnail,
+          image: m?.compressedThum || m?.thumbnail,
           alt: m?.title,
           sx: classes.templateCardMedia
         }), /*#__PURE__*/_jsx(PreviewAndSelect, {

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

@@ -10,10 +10,14 @@ 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";
 import { useEditorContext } from "../../hooks/useMouseMove";
+import LineSpacing from "../../common/StyleBuilder/fieldTypes/lineSpacing";
+import { getPageSettings } from "../../utils/pageSettings";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const allTools = toolbarGroups.flat();
@@ -31,10 +35,18 @@ const TextFormat = props => {
   const [anchorEl, setAnchorEl] = useState(null);
   const [type, setType] = useState(null);
   const open = Boolean(anchorEl);
+  const {
+    element: pageSt
+  } = getPageSettings(editor) || {};
+  const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
-    theme
+    theme: appTheme
+  } = useEditorContext();
+  const {
+    activeBreakPoint
   } = useEditorContext();
+  const breakpoint = activeBreakPoint === "" ? "lg" : activeBreakPoint;
   const fontWeight = allTools.find(f => f.format === "fontWeight");
   const fontStyle = allTools.filter(f => f.type === "mark" && f.format !== "strikethrough" && f.format !== "superscript" && f.format !== "subscript");
   const fontAlign = allTools.filter(f => f.format?.indexOf("align") >= 0);
@@ -51,6 +63,13 @@ 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 => {
     setType(type);
     setAnchorEl(e.currentTarget);
@@ -91,11 +110,62 @@ const TextFormat = props => {
       value
     });
   };
+  const handleLineSpacing = data => {
+    const [[format, value]] = Object.entries(data);
+    addMarkData(editor, {
+      format,
+      value
+    });
+  };
   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: "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: () => {},
+          type: "fullWidth"
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -248,7 +318,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"
@@ -336,11 +406,7 @@ const TextFormat = props => {
         xs: 12,
         className: "typo-icons",
         sx: classes.evenSpace,
-        children: [/*#__PURE__*/_jsx(SelectTypography, {
-          classes: classes,
-          editor: editor,
-          closeMainPopup: closeMainPopup || onClose
-        }), fontStyle?.map((m, i) => {
+        children: [fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
             ...m
@@ -360,6 +426,32 @@ const TextFormat = props => {
       xs: 12,
       sx: classes.dividerGrid,
       children: /*#__PURE__*/_jsx(Divider, {})
+    }), /*#__PURE__*/_jsxs(Grid, {
+      item: true,
+      xs: 12,
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body1",
+        color: "primary",
+        sx: classes.typoLabel,
+        children: "Line Spacing"
+      }), /*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        className: "typo-icons",
+        sx: classes.evenSpace,
+        children: /*#__PURE__*/_jsx(LineSpacing, {
+          value: lineSpacingValue,
+          onChange: handleLineSpacing,
+          data: {
+            key: "lineHeight"
+          }
+        })
+      })]
+    }), /*#__PURE__*/_jsx(Grid, {
+      item: true,
+      xs: 12,
+      sx: classes.dividerGrid,
+      children: /*#__PURE__*/_jsx(Divider, {})
     }), /*#__PURE__*/_jsx(Grid, {
       item: true,
       xs: 12,