@flozy/editor 10.4.0 → 10.4.2

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,12 +10,15 @@ 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 LineSpacing from "../../common/StyleBuilder/fieldTypes/lineSpacing";
+import { getPageSettings } from "../../utils/pageSettings";
+import { getDevice } from "../../helper/theme";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const allTools = toolbarGroups.flat();
@@ -36,15 +39,15 @@ const TextFormat = props => {
   const {
     translation
   } = customProps;
-
-  // const { element: pageSt } = getPageSettings(editor) || {};
-  // const pageSettingLine = pageSt?.pageProps?.lineHeight;
+  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 breakpoint = getDevice(window.innerWidth);
   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);
@@ -61,12 +64,13 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-
-  // let lineSpacingValue = activeMark(editor, "lineHeight");
-  // lineSpacingValue =
-  //   lineSpacingValue?.[breakpoint] !== undefined
-  //     ? lineSpacingValue
-  //     : pageSettingLine;
+  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);
@@ -107,16 +111,63 @@ const TextFormat = props => {
       value
     });
   };
-
-  // const handleLineSpacing = (data) => {
-  //   const [[format, value]] = Object.entries(data);
-  //   addMarkData(editor, { format, 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: closeMainPopup,
+          type: "fullWidth",
+          customProps: customProps
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -243,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, {
@@ -269,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"
@@ -359,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,
@@ -386,6 +433,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,