@flozy/editor 6.0.6 → 6.0.7

package/dist/Editor/common/StyleBuilder/fieldTypes/fontSize.js

@@ -1,19 +1,26 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { TextField, IconButton, Grid, Typography } from "@mui/material";
 import { sizeMap } from "../../../utils/font.js";
 import { TextMinusIcon, TextPlusIcon } from "../../../common/iconslist.js";
+import { getElementStyle } from "../../../helper/theme.js";
+import { useSlateStatic } from "slate-react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const FontSize = props => {
   const {
-    value,
+    value: val,
     data,
-    onChange
+    onChange,
+    elementProps
   } = props;
   const {
     key,
     width
   } = data;
+  const editor = useSlateStatic();
+  const value = useMemo(() => {
+    return getElementStyle(editor, elementProps, "font-size") || val;
+  }, [editor, val]);
   const handleChange = e => {
     let inc = parseInt(e.target.value) || 16;
     inc = inc > 200 ? 200 : inc;
@@ -24,7 +31,9 @@ const FontSize = props => {
   const getSizeVal = () => {
     try {
       const size = `${value}`?.indexOf("px") >= 0 ? value : sizeMap[value] || value;
-      return parseInt(size || 16);
+      const defaultSize = 16;
+      const val = parseInt(size || defaultSize);
+      return isNaN(val) ? defaultSize : val;
     } catch (err) {
       return "";
     }

package/dist/Editor/common/StyleBuilder/fieldTypes/textOptions.js

@@ -1,13 +1,13 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { FormControl, Grid, ListItemIcon, ListSubheader, MenuItem, Select, Typography } from "@mui/material";
-import { getBreakPointsValue } from "../../../helper/theme";
+import { getBreakPointsValue, getElementStyle } from "../../../helper/theme";
 import useWindowResize from "../../../hooks/useWindowResize";
 import { useEditorContext } from "../../../hooks/useMouseMove";
 import FontFamilyAutocomplete from "../../../Toolbar/FormatTools/FontFamilyAutocomplete";
 import { useSlate } from "slate-react";
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
 
-// hideMetaDataOptions -- pass true to hide metadata option in select field 
+// hideMetaDataOptions -- pass true to hide metadata option in select field
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -30,14 +30,22 @@ const TextOptions = props => {
     renderOption,
     width,
     webFont = false,
-    hideMetaDataOptions = false
+    hideMetaDataOptions = false,
+    themeEnabled
   } = data;
   const {
     fontFamilies
   } = useEditorContext();
-  const editor = useSlate();
   const [size] = useWindowResize();
-  const value = isBreakpoint ? getBreakPointsValue(val, size?.device) : val;
+  const editor = useSlate();
+  const value = useMemo(() => {
+    const userValue = isBreakpoint ? getBreakPointsValue(val, size?.device) : val;
+    if (themeEnabled) {
+      // editor takes a little amount of time to update the new style in element, in that case userValue will be returned
+      return getElementStyle(editor, elementProps, key) || userValue;
+    }
+    return userValue;
+  }, [editor, isBreakpoint, val, size?.device]);
   const metaDataMappingOptions = metaMappings?.boards || [];
   const updatedOption = !hideMetaDataOptions && elementProps?.metadatamapping ? [...options, ...metaDataMappingOptions] : webFont ? fontFamilies?.options : options;
   const handleChange = (e, d) => {
@@ -116,7 +124,7 @@ const TextOptions = props => {
           editor: editor,
           format: key,
           options: fontFamilies.options,
-          width: '100%',
+          width: "100%",
           onChange: onChange,
           val: value,
           webFont: true

package/dist/Editor/common/Uploader.js

@@ -4,6 +4,7 @@ import { convertBase64 } from "../utils/helper";
 import { uploadFile } from "../service/fileupload";
 import Icon from "./Icon";
 import UploadStyles from "../common/ImageSelector/UploadStyles";
+import { useEditorContext } from "../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -18,6 +19,9 @@ const Uploader = props => {
   const [base64, setBase64] = useState(value?.url);
   const [fileName, setFileName] = useState("");
   const [uploading, setUploading] = useState(false);
+  const {
+    theme
+  } = useEditorContext();
   const handleChange = async e => {
     const uFile = e.target.files[0];
     const strImage = await convertBase64(uFile);
@@ -99,6 +103,10 @@ const Uploader = props => {
           className: "uploadImageSection",
           children: base64 ? renderThumb() : /*#__PURE__*/_jsx(Grid, {
             className: "uploadImageText",
+            sx: {
+              background: `${theme?.palette?.editor?.inputFieldBgColor}`,
+              border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`
+            },
             children: /*#__PURE__*/_jsxs(Button, {
               component: "label",
               variant: "text",

package/dist/Editor/commonStyle.js

@@ -51,40 +51,30 @@ const useCommonStyle = theme => ({
       },
       "& .MuiPaper-root": {
         border: `unset !important`,
-        borderRadius: '0px',
-        height: 'fit-content'
+        borderRadius: "0px",
+        height: "fit-content",
+        padding: "2px"
       },
       "& p": {
         marginBottom: "7px",
         marginTop: "4px"
       },
-      "& .MuiPaper-root": {
-        border: 'unset !important',
-        borderRadius: '0px',
-        height: 'fit-content',
-        padding: '2px'
+      "& p": {
+        marginBottom: "7px",
+        marginTop: "4px"
       },
       "& .muiIconsListParent": {
         "& svg": {
           color: `${theme?.palette?.editor?.svgTextAlignStrokeColor} !important`
         },
-        "&::-webkit-scrollbar-thumb": {
-          background: `none !important`
-        },
-        "&::-webkit-scrollbar-track": {
-          visibility: "hidden"
-        },
         "&::-webkit-scrollbar-thumb": {
           background: `${theme?.palette?.editor?.brainPopupScroll} !important`
-        },
-        "&::-webkit-scrollbar-track": {
-          visibility: "hidden"
         }
       },
       "& .MuiGrid-root>.MuiGrid-item": {
         paddingRight: "0px !important",
         fontFamily: "Inter, sans-serif",
-        height: 'fit-content'
+        height: "fit-content"
       },
       "& .MuiInputBase-root": {
         borderRadius: "10px",
@@ -145,11 +135,11 @@ const useCommonStyle = theme => ({
           borderRadius: "10px",
           width: "46px !important",
           marginLeft: "10px",
-          height: '36px !important'
+          height: "36px !important"
         }
       },
-      '& .MuiFormHelperText-root': {
-        margin: '4px 0px 0px 0px',
+      "& .MuiFormHelperText-root": {
+        margin: "4px 0px 0px 0px",
         color: theme?.palette?.editor?.closeButtonSvgStroke,
         fontFamily: "Inter, sans-serif"
       }
@@ -405,14 +395,14 @@ const useCommonStyle = theme => ({
       padding: "8px 12px",
       fontSize: "12px",
       color: theme?.palette?.editor?.menuOptionTextColor,
-      fontWeight: '500',
+      fontWeight: "500",
       fontFamily: "Inter, sans-serif",
-      minHeight: '36px',
+      minHeight: "36px",
       "&:hover": {
         backgroundColor: theme?.palette?.editor?.menuOptionHoverBackground
       }
     },
-    '& .Mui-selected': {
+    "& .Mui-selected": {
       background: `${theme?.palette?.editor?.menuOptionSelectedOption} !important`
     },
     "& .MuiListSubheader-root": {
@@ -421,16 +411,16 @@ const useCommonStyle = theme => ({
       fontSize: "12px"
     },
     "& .MuiPaper-root": {
-      borderRadius: '8px',
-      padding: '0px',
+      borderRadius: "8px",
+      padding: "0px",
       background: `${theme?.palette?.editor?.textWeightPopUpBackground} !important`
     },
-    '& .MuiButtonBase-root': {
-      margin: '4px',
-      borderRadius: '6px'
+    "& .MuiButtonBase-root": {
+      margin: "4px",
+      borderRadius: "6px"
     },
-    '& .MuiList-root': {
-      padding: '0px'
+    "& .MuiList-root": {
+      padding: "0px"
     }
   },
   datePicker: {
@@ -475,27 +465,27 @@ const useCommonStyle = theme => ({
       }
     }
   },
-  pageSettingPopUpRoot: {
-    padding: "16px 8px 16px 10px!important",
-    height: "100%"
-  },
   buttonMoreOption: {
     background: `${theme?.palette?.editor?.aiInputBackground} !important`,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1} !important`,
-    padding: '4px !important',
-    '& svg': {
-      width: '18px !important',
-      height: '18px !important',
-      '& path': {
+    padding: "4px !important",
+    "& svg": {
+      width: "18px !important",
+      height: "18px !important",
+      "& path": {
         stroke: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }
   },
+  pageSettingPopUpRoot: {
+    padding: "16px 8px 16px 10px!important",
+    height: "100%"
+  },
   buttonMoreOption2: {
     background: `${theme?.palette?.editor?.aiInputBackground} !important`,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1} !important`,
-    '& svg': {
-      '& path': {
+    "& svg": {
+      "& path": {
         fill: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }
@@ -503,11 +493,11 @@ const useCommonStyle = theme => ({
   buttonMoreOption3: {
     background: `${theme?.palette?.editor?.aiInputBackground} !important`,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1} !important`,
-    padding: '5px !important',
-    '& svg': {
-      width: '16px !important',
-      height: '16px !important',
-      '& path': {
+    padding: "5px !important",
+    "& svg": {
+      width: "16px !important",
+      height: "16px !important",
+      "& path": {
         stroke: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }
@@ -515,37 +505,37 @@ const useCommonStyle = theme => ({
   resizeButton: {
     background: theme?.palette?.editor?.aiInputBackground,
     border: `1px solid ${theme?.palette?.editor?.buttonBorder1}`,
-    padding: '5px !important',
-    borderRadius: '50% !important',
-    '& svg': {
-      width: '18px',
-      height: '18px',
-      '& path': {
+    padding: "5px !important",
+    borderRadius: "50% !important",
+    "& svg": {
+      width: "18px",
+      height: "18px",
+      "& path": {
         fill: `${theme?.palette?.editor?.closeButtonSvgStroke}`
       }
     },
-    '&:hover': {
+    "&:hover": {
       background: theme?.palette?.editor?.aiInputBackground
     }
   },
   gradientFillBtn: {
     background: `linear-gradient(112.61deg, #2C63ED 19.3%, #8360FD 88.14%) !important`,
-    textTransform: 'math-auto !important',
-    color: '#FFFFFF !important',
-    padding: '0px 12px !important',
-    height: '32px',
-    borderRadius: '8px',
-    fontWeight: '500',
-    fontSize: '14px'
+    textTransform: "math-auto !important",
+    color: "#FFFFFF !important",
+    padding: "0px 12px !important",
+    height: "32px",
+    borderRadius: "8px",
+    fontWeight: "500",
+    fontSize: "14px"
   },
   emptyThumbBtn: {
     background: `${theme?.palette?.editor?.sectionSettingIconHover} !important`,
     color: `${theme?.palette?.editor?.textColor} !important`,
-    fontSize: '14px !important',
-    '& svg': {
-      width: '20px !important',
-      height: '20px !important',
-      '& path': {
+    fontSize: "14px !important",
+    "& svg": {
+      width: "20px !important",
+      height: "20px !important",
+      "& path": {
         stroke: `${theme?.palette?.editor?.closeButtonSvgStroke} !important`
       }
     }

package/dist/Editor/helper/index.js

@@ -337,14 +337,14 @@ export const isCarouselSelected = editor => {
       return false;
     }
     const [nodeEntry] = Editor.nodes(editor, {
-      match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === 'carousel'
+      match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "carousel"
     });
     if (!nodeEntry) {
       return false;
     }
     const [node] = nodeEntry;
     const carouselDom = ReactEditor.toDOMNode(editor, node);
-    const isEdit = carouselDom.classList.contains('carousel_slider_edit');
+    const isEdit = carouselDom.classList.contains("carousel_slider_edit");
     return !isEdit;
   } catch (err) {
     console.log(err);

package/dist/Editor/helper/theme.js

@@ -1,4 +1,6 @@
+import { ReactEditor } from "slate-react";
 import { sizeMap } from "../utils/font";
+import { Editor, Node } from "slate";
 export const breakpoints = {
   small: 0,
   mobile: 600,
@@ -33,7 +35,7 @@ const overrideValues = (value, ot) => {
   return Object.keys(value).reduce((a, b) => {
     return {
       ...a,
-      [b]: overrides[ot] ? overrides[ot](value[b]) : value
+      [b]: overrides[ot] ? overrides[ot](value[b], value) : value
     };
   }, {});
 };
@@ -50,7 +52,15 @@ const overrides = {
   overrideReSizeH: val => {
     return val ? `${val?.height}px` : "auto";
   },
-  overrideBorderRadius: val => {
+  overrideBorderRadius: (val, breakpointValues) => {
+    if (!val?.topLeft) {
+      Object.values(breakpointValues || {}).forEach(v => {
+        if (v) {
+          // Applying the values from breakpoints that exist to those that do not have
+          val = v;
+        }
+      });
+    }
     return `${val?.topLeft}px ${val?.topRight}px ${val?.bottomLeft}px ${val?.bottomRight}px`;
   }
 };
@@ -118,6 +128,194 @@ export const getTRBLBreakPoints = (value, breakpoint) => {
     console.log(err);
   }
 };
+export function getElementStyle(editor, element, stylePropertyName) {
+  try {
+    const path = ReactEditor.findPath(editor, element);
+    if (path?.length) {
+      const currentEle = Node.get(editor, path);
+      const dom = ReactEditor.toDOMNode(editor, currentEle);
+      const editorBtn = dom?.querySelector(".button.theme-element");
+      return getElementProperty(editorBtn, stylePropertyName);
+    }
+  } catch (err) {
+    // console.log(err);
+  }
+}
+export function getTextSizeVal(editor) {
+  try {
+    const currentNode = Node.get(editor, editor.selection.anchor.path);
+    const currentElement = ReactEditor.toDOMNode(editor, currentNode);
+    if (currentElement) {
+      const element = currentElement.querySelector('span[data-slate-string="true"]');
+      return getElementProperty(element, "font-size");
+    }
+  } catch (err) {
+    // console.log(err);
+  }
+}
+export function getVariableValue(val) {
+  const bodyElement = document.body;
+  const computedStyle = getComputedStyle(bodyElement);
+  const [, variableName] = val?.match(/var\((--[^)]+)\)/) || [];
+  const varValue = computedStyle.getPropertyValue(variableName).trim();
+  return varValue;
+}
+const MAP_PROPERTY_KEYS = {
+  fontFamily: "font-family",
+  fontSize: "font-size",
+  textSize: "font-size",
+  fontWeight: "font-weight"
+};
+export function getElementProperty(element, styleProperty) {
+  if (!element) {
+    return "";
+  }
+  const computedStyle = window.getComputedStyle(element);
+  const property = MAP_PROPERTY_KEYS[styleProperty] || styleProperty;
+  let style = computedStyle.getPropertyValue(property);
+  if (property === "font-family") {
+    style = style.replace(/"/g, ""); // remove double quotes if exists e.g: '"Courier New"'
+  }
+
+  return style || "";
+}
+export const textThemeFields = ["fontFamily", "fontSize", "color", "bold", "italic"
+// "underline",
+// "strikethrough",
+];
+
+const themeElements = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree"];
+export const isTextCustomized = editor => {
+  try {
+    if (editor.selection) {
+      const currentElement = Node.parent(editor, editor?.selection?.anchor?.path);
+      if (!currentElement) {
+        return false;
+      }
+      const {
+        children,
+        type
+      } = currentElement;
+      if (!themeElements.includes(type)) {
+        return false;
+      }
+      if (children?.length > 1) {
+        return true;
+      }
+      const customized = textThemeFields.some(field => {
+        const element = children[0] || {};
+        const value = element[field];
+        if (field === "fontSize") {
+          return Object.keys(value || {}).length;
+        } else {
+          return value;
+        }
+      });
+      return customized;
+    } else {
+      return null;
+    }
+  } catch (err) {
+    return null;
+  }
+};
+const addToTheme = (field, value, element) => {
+  switch (field) {
+    case "fontFamily":
+      return {
+        fontFamily: value
+      };
+    case "fontSize":
+      return {
+        fontSize: value?.lg
+      };
+    case "color":
+      return {
+        color: value
+      };
+    case "bold":
+      return {
+        fontWeight: "bold"
+      };
+    case "italic":
+      return {
+        fontStyle: "italic"
+      };
+    // case "underline":
+    // case "strikethrough":
+    //   let textDecoration = "";
+
+    //   if (element.underline) {
+    //     textDecoration = "underline";
+    //   }
+
+    //   if (element.strikethrough) {
+    //     textDecoration += " strikethrough";
+    //   }
+
+    //   return { textDecoration };
+    default:
+      return {};
+  }
+};
+const MAP_TEXT_THEME_FIELD = {
+  headingOne: "h1",
+  headingTwo: "h2",
+  headingThree: "h3",
+  headingFour: "h4",
+  headingFive: "h5",
+  headingSix: "h6",
+  paragraphOne: "para1",
+  paragraphTwo: "para2",
+  paragraphThree: "para3"
+};
+export const saveToTheme = editor => {
+  try {
+    if (editor.selection) {
+      const currentElement = Node.parent(editor, editor?.selection?.anchor?.path);
+      if (!currentElement) {
+        return false;
+      }
+      const {
+        children
+      } = currentElement;
+      if (children?.length > 1) {
+        return true;
+      }
+      let theme = {};
+      textThemeFields.forEach(field => {
+        const element = children[0] || {};
+        const value = element[field];
+        let style = {};
+        let isValueExist = false;
+        if (value) {
+          isValueExist = true;
+          if (field === "fontSize") {
+            isValueExist = !!Object.keys(value).length;
+          }
+        }
+        if (isValueExist) {
+          style = addToTheme(field, value, element);
+        }
+        theme = {
+          ...theme,
+          ...style
+        };
+      });
+      textThemeFields.forEach(field => {
+        Editor.removeMark(editor, field);
+      });
+      return {
+        field: MAP_TEXT_THEME_FIELD[currentElement?.type],
+        theme
+      };
+    }
+  } catch (err) {
+    return;
+  }
+};
+export const HEADING_THEME_FIELDS = ["h1", "h2", "h3", "h4", "h5", "h6"];
+export const PARAGRAPH_THEME_FIELDS = ["para1", "para2", "para3"];
 export const getBRValue = (props, rbr = "lg") => {
   const {
     value,

package/dist/Editor/hooks/useDrag.js

@@ -1,20 +1,26 @@
-import { useCallback, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 const useDrag = () => {
   const [event, setEvent] = useState("");
-  const onMouseDown = useCallback(() => {
-    setEvent("start");
-  }, []);
-  const onMouseUp = useCallback(() => {
-    setEvent("end");
-  }, []);
   useEffect(() => {
-    document.addEventListener("pointerdown", onMouseDown);
-    document.addEventListener("pointerup", onMouseUp);
+    addListener();
     return () => {
-      document.removeEventListener("pointerdown", onMouseDown);
-      document.removeEventListener("pointerup", onMouseUp);
+      removeListener();
     };
   }, []);
+  const onMouseDown = () => {
+    setEvent("start");
+  };
+  const onMouseUp = () => {
+    setEvent("end");
+  };
+  const addListener = () => {
+    document.addEventListener("pointerdown", onMouseDown);
+    document.addEventListener("pointerup", onMouseUp);
+  };
+  const removeListener = () => {
+    document.removeEventListener("pointerdown", onMouseDown);
+    document.removeEventListener("pointerup", onMouseUp);
+  };
   return [event];
 };
 export default useDrag;

package/dist/Editor/hooks/useEditorScroll.js

@@ -4,9 +4,8 @@ function useEditorScroll(editorWrapper = {
 }, callback) {
   useEffect(() => {
     const handleScroll = () => {
-      console.log("Editor debug useEditorScroll ====>", editorWrapper, callback);
       if (editorWrapper.current) {
-        callback();
+        callback("scroll");
       }
     };
     const currentEditorWrapper = editorWrapper.current;