@flozy/editor 10.1.1 → 10.1.3

package/dist/Editor/ChatEditor.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useRef, useImperativeHandle, forwardRef, useState } from "react";
-import { Editable, Slate, ReactEditor } from 'slate-react';
-import { createEditor, Transforms, Editor } from 'slate';
+import { Editable, Slate, ReactEditor } from "slate-react";
+import { createEditor, Transforms, Editor } from "slate";
 import withCommon from "./hooks/withCommon";
 import { getBlock, getMarked, serializeMentions } from "./utils/chatEditor/SlateUtilityFunctions";
 import MiniTextFormat from "./Toolbar/PopupTool/MiniTextFormat";
@@ -33,15 +33,15 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
     isMobile = false,
     debounceTimeOut = 10,
     isMarkDown = false,
-    markDownContent = '',
+    markDownContent = "",
     translation
   } = props;
   const classes = usePopupStyle(theme);
   const convertedContent = draftToSlate({
     data: content && content?.length > 0 ? content : [{
-      type: 'paragraph',
+      type: "paragraph",
       children: [{
-        text: ''
+        text: ""
       }]
     }]
   });
@@ -153,14 +153,6 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
     // needLayout = true,
   } = otherProps || {};
   const mentionsRef = useRef();
-  const customProps = {
-    ...(otherProps || {}),
-    hideTools: ["settings", "add_column", "drag", "resize"],
-    readOnly: isReadOnly,
-    editorPlaceholder: "Write Something",
-    page_id: 1,
-    translation: translation || translationMock
-  };
   const [mentions, setMentions] = useMentions({
     editor,
     selection: editor?.selection
@@ -222,6 +214,15 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
     debounced(newValue);
     debouncedValue.current = newValue;
   };
+  const dummyTranslation = () => {};
+  const customProps = {
+    ...(otherProps || {}),
+    hideTools: ["settings", "add_column", "drag", "resize"],
+    readOnly: isReadOnly,
+    editorPlaceholder: "Write Something",
+    page_id: 1,
+    translation: translation || translationMock || dummyTranslation
+  };
   const Element = props => {
     return getBlock(props);
   };
@@ -257,7 +258,7 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
         editor
       });
     } else if (event.key === "Enter" && !isMobile) {
-      const isEmpty = debouncedValue?.current.length === 1 && debouncedValue?.current[0].type === 'paragraph' && debouncedValue?.current[0].children.length === 1 && debouncedValue?.current[0].children[0].text === '';
+      const isEmpty = debouncedValue?.current.length === 1 && debouncedValue?.current[0].type === "paragraph" && debouncedValue?.current[0].children.length === 1 && debouncedValue?.current[0].children[0].text === "";
       if (isEmpty) {
         event.preventDefault();
         return;
@@ -297,10 +298,10 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
     }
   };
 
+  const html = isMarkDown ? convertMDToHTML(markDownContent) : null;
   const handleFocus = () => {
     setIsFocused(true);
   };
-  const html = isMarkDown ? convertMDToHTML(markDownContent) : null;
   return !isMarkDown ? /*#__PURE__*/_jsx(EditorProvider, {
     theme: theme,
     editor: editor,
@@ -314,13 +315,13 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
         closeMainPopup: handleClose,
         customProps: customProps
       }), /*#__PURE__*/_jsx(Editable, {
-        onFocus: handleFocus,
         className: "chatEditorRoot",
         renderElement: renderElement,
         renderLeaf: renderLeaf,
         decorate: decorators,
         placeholder: "Start typing ...",
         spellCheck: true,
+        onFocus: handleFocus,
         onBlur: handleBlur,
         onKeyDown: onKeyDown,
         onPaste: handlePaste,

package/dist/Editor/CommonEditor.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
-import React, { useRef, useCallback, useEffect, useMemo, useState, forwardRef, useImperativeHandle } from "react";
+import React, { useRef, useCallback, useEffect, useMemo, useState, forwardRef, useImperativeHandle, createContext } from "react";
 import PropTypes from "prop-types";
-import { createEditor, Range, Transforms } from "slate";
+import { createEditor, Editor, Range, Transforms } from "slate";
 import { Slate, Editable, ReactEditor } from "slate-react";
 import { useDebouncedCallback } from "use-debounce";
 import { getMarked, getBlock } from "./utils/SlateUtilityFunctions";
@@ -17,7 +17,7 @@ import { serializeToText } from "./utils/serializeToText";
 import { getPageSettings } from "./utils/pageSettings";
 import { getThumbnailImage, invertColor, pageTextStyle } from "./helper";
 import PopupTool from "./Toolbar/PopupTool";
-import { Box, Typography, useTheme } from "@mui/material";
+import { Box, Typography, useTheme, IconButton } from "@mui/material";
 import Shorthands from "./common/Shorthands";
 import MiniToolbar from "./Toolbar/Mini/MiniToolbar";
 import { EditorProvider } from "./hooks/useMouseMove";
@@ -26,9 +26,12 @@ import editorStyles from "./Styles/EditorStyles";
 import DragAndDrop from "./common/DnD";
 import Section from "./common/Section";
 import decorators from "./utils/Decorators";
-import { getBreakpointLineSpacing, getTRBLBreakPoints } from "./helper/theme";
+import { getTRBLBreakPoints, getVariableValue, getBreakpointLineSpacing } from "./helper/theme";
 import { getInitialValue, handleInsertLastElement, isEverythingSelected, isFreeGrid, isFreeGridFragment, isRestrictedNode, outsideEditorClickLabel } from "./utils/helper";
 import useWindowResize from "./hooks/useWindowResize";
+import { getTheme } from "./theme";
+import ThemeSettings from "./themeSettings";
+import ThemeSettingsAI from "./themeSettingsAI";
 import PopoverAIInput from "./Elements/AI/PopoverAIInput";
 import RnDCopy from "./common/RnD/RnDCopy";
 import SwitchViewport from "./common/RnD/SwitchViewport/SwitchViewport";
@@ -37,9 +40,12 @@ import "./font.css";
 import "./Editor.css";
 import "animate.css";
 import FontLoader from "./common/FontLoader/FontLoader";
+import { ThemeAIIcon, ThemePaintIcon } from "./assets/svg/ThemeIcons";
 import { CustomDialogComponent } from "./common/CustomDialog";
+import { extractTextWithPath, replaceTextPath } from "./helper/textIndeces.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+export const ThemeContext = /*#__PURE__*/createContext(null);
 const Item = /*#__PURE__*/forwardRef(({
   children,
   ...props
@@ -81,6 +87,7 @@ const updateTopBanner = (content = [], setTopBanner) => {
     return firstNode?.type === "topbanner" ? firstNode : null;
   });
 };
+const dummyTranslation = () => {};
 const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     id,
@@ -94,6 +101,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     otherProps,
     isIframe,
     theme,
+    showThemeButtons,
     showViewport = false,
     overrideWrapperStyles = {},
     translation
@@ -101,7 +109,8 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const editorWrapper = useRef();
   const mentionsRef = useRef();
   const convertedContent = draftToSlate({
-    data: content
+    data: content,
+    needLayout: otherProps?.needLayout
   });
   const [value, setValue] = useState(convertedContent);
   const [isInteracted, setIsInteracted] = useState(false);
@@ -145,10 +154,11 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     bannerSpacing,
     pageBgImage,
-    pageColor,
+    pageColor = "",
     color: pageTextColor,
     pageWidth,
     maxWidth: pageMaxWidth,
+    theme: selectedTheme,
     lineHeight
   } = pageSt?.pageProps || {
     bannerSpacing: {
@@ -160,10 +170,17 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   };
   const classes = editorStyles({
     padHeight: !fullScreen ? otherProps?.padHeight : 20,
-    placeHolderColor: invertColor(pageColor || "#FFF"),
+    placeHolderColor: invertColor(pageColor.startsWith("var") ? getVariableValue(pageColor) : pageColor || "#FFF"),
     theme,
     overrideWrapperStyles
   });
+  const [openTheme, setOpenTheme] = useState(false);
+  const [openAITheme, setOpenAITheme] = useState(false);
+  const [, setThemeUpdated] = useState(0);
+  const triggerRender = () => {
+    setThemeUpdated(prev => prev + 1); // Incrementing forces a re-render while updating theme
+  };
+
   const isMobile = window.matchMedia("(max-width: 899px)")?.matches || false;
   useEffect(() => {
     setValue(draftToSlate({
@@ -177,11 +194,11 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const debounced = useDebouncedCallback(
   // function
   value => {
+    debouncedValue.current = value;
     const {
       value: strVal,
       ...restVal
     } = getOnSaveData(value);
-    debouncedValue.current = value;
     onSave(strVal, restVal);
   },
   // delay in ms
@@ -192,7 +209,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     return {
       value: JSON.stringify(val),
       text: text,
-      title: serializeToText(title?.children) || "Untitled"
+      title: serializeToText(title?.children) || ""
     };
   };
   const getTitleSaveData = title => {
@@ -305,6 +322,12 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     redo() {
       editor?.redo();
     },
+    toggleTheme() {
+      setOpenTheme(!openTheme);
+    },
+    toggleAITheme() {
+      setOpenAITheme(!openAITheme);
+    },
     getPageSettings: {
       background: pageBgImage && pageBgImage !== "none" ? `url(${pageBgImage})` : pageColor || ""
     }
@@ -345,6 +368,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const onDrawerOpen = status => {
     setIsDrawerOpen(status);
   };
+  const lineH = getBreakpointLineSpacing(lineHeight, breakpoint || (isMobile ? "xs" : ""));
   const isReadOnly = readOnly === "readonly";
   const customProps = {
     ...(otherProps || {}),
@@ -357,9 +381,9 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     onDrawerOpen: onDrawerOpen,
     ICON_API: "https://assets.agenciflow.com",
     translation: translationFn,
-    getTitleSaveData
+    getTitleSaveData,
+    customLineHeight: lineH
   };
-  const lineH = getBreakpointLineSpacing(lineHeight, breakpoint);
   const renderElement = useCallback(props => {
     return /*#__PURE__*/_jsx(Element, {
       ...props,
@@ -502,6 +526,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     }
     return style;
   }, [pageBgImage, pageColor, pageTextColor]);
+  const themeProps = getTheme(selectedTheme);
 
   // const handleContextMenu = (e) => {
   //   if (!readOnly) {
@@ -532,14 +557,75 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
       console.log("handleCursorScroll", err);
     }
   };
+  window.getTextIndeces = () => {
+    try {
+      const textWithPaths = extractTextWithPath(editor.children, []);
+      return textWithPaths;
+    } catch (err) {
+      console.log(err);
+    }
+  };
+  window.replaceTextIndeces = (path_data = []) => {
+    try {
+      const replacedJson = replaceTextPath(JSON.parse(JSON.stringify(editor.children)), path_data);
+
+      // loop delete all
+      editor.children.forEach(() => {
+        Transforms.delete(editor, {
+          at: [0]
+        });
+      });
+
+      // Insert new nodes
+      Transforms.insertNodes(editor, replacedJson, {
+        at: [0]
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };
+  window.replaceEditorContent = (fragments = []) => {
+    try {
+      // loop delete all
+      editor.children.forEach(() => {
+        Transforms.delete(editor, {
+          at: [0]
+        });
+      });
+
+      // Insert new nodes
+      Transforms.insertNodes(editor, fragments, {
+        at: [0]
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };
   return /*#__PURE__*/_jsxs(EditorProvider, {
     theme: theme,
     editor: editor,
-    children: [/*#__PURE__*/_jsx(DialogWrapper, {
+    openTheme: openTheme,
+    setOpenTheme: setOpenTheme,
+    triggerRender: triggerRender,
+    children: [showThemeButtons ? /*#__PURE__*/_jsxs("div", {
+      className: "theme-buttons",
+      children: [/*#__PURE__*/_jsx(IconButton, {
+        onClick: () => setOpenTheme(true),
+        className: "themePaintIcon",
+        children: /*#__PURE__*/_jsx(ThemePaintIcon, {})
+      }), /*#__PURE__*/_jsx(IconButton, {
+        onClick: () => setOpenAITheme(true),
+        style: {
+          marginTop: "4px"
+        },
+        children: /*#__PURE__*/_jsx(ThemeAIIcon, {})
+      })]
+    }) : null, /*#__PURE__*/_jsx(DialogWrapper, {
       classes: classes,
       ...props,
       fullScreen: fullScreen,
       footer: footer || "",
+      selectedTheme: selectedTheme,
       children: /*#__PURE__*/_jsxs(Box, {
         component: "div",
         className: `et-wrpr stimulate-${breakpoint} ${editorClass || ""} ${isIframe ? "iframe-editor" : ""}`,
@@ -574,6 +660,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
                 children: /*#__PURE__*/_jsxs(Box, {
                   component: "div",
                   className: "max-content",
+                  sx: themeProps?.sxProps || {},
                   "data-info": outsideEditorClickLabel,
                   children: [renderTopBanner(), /*#__PURE__*/_jsx("div", {
                     className: "scroll-area",
@@ -618,8 +705,8 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
                         chars: chars,
                         type: type,
                         theme: theme,
-                        otherProps: customProps,
-                        customProps: customProps
+                        customProps: customProps,
+                        otherProps: customProps
                       }) : null, /*#__PURE__*/_jsx(RnDCopy, {
                         readOnly: readOnly
                       })]
@@ -642,6 +729,18 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
                     "data-info": outsideEditorClickLabel,
                     onClick: handleFooterClick,
                     children: footer
+                  }), openTheme ? /*#__PURE__*/_jsx(ThemeSettings, {
+                    open: openTheme,
+                    setOpen: setOpenTheme,
+                    editor: editor,
+                    services: otherProps?.services,
+                    appTheme: theme,
+                    customProps: customProps
+                  }) : null, /*#__PURE__*/_jsx(ThemeSettingsAI, {
+                    openAITheme: openAITheme,
+                    setOpenAITheme: setOpenAITheme,
+                    onSaveTheme: otherProps?.onSaveTheme,
+                    theme: theme
                   })]
                 })
               }), !readOnly ? /*#__PURE__*/_jsx(PopupTool, {
@@ -650,8 +749,9 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
                 setIsTextSelected: setIsTextSelected,
                 customProps: customProps,
                 editorWrapper: editorWrapper
-              }) : null, !readOnly && showViewport ? /*#__PURE__*/_jsx(SwitchViewport, {
+              }) : null, !readOnly ? /*#__PURE__*/_jsx(SwitchViewport, {
                 breakpoint: breakpoint,
+                show: showViewport,
                 onChange: b => onSwitchBreakpoint(b),
                 translation: translationFn
               }) : null]

package/dist/Editor/DialogWrapper.js

@@ -2,6 +2,7 @@ import React from "react";
 import { Dialog, DialogTitle, DialogContent, IconButton, Grid } from "@mui/material";
 import CloseIcon from "@mui/icons-material/Close";
 import ViewportStimulator from "./common/RnD/Theme/ViewportStimulator";
+import MainThemeProvider from "./common/RnD/Theme/MainThemeProvider";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const DialogWrapper = props => {
@@ -9,40 +10,45 @@ const DialogWrapper = props => {
     fullScreen,
     onClose,
     children,
-    classes
+    classes,
+    selectedTheme
   } = props;
-  return fullScreen ? /*#__PURE__*/_jsxs(Dialog, {
-    className: `dialogComp`,
-    open: fullScreen,
-    fullScreen: fullScreen,
-    onClose: onClose,
-    style: {
-      zIndex: 1000
-    },
-    sx: classes.fullScreenWrapper,
-    children: [/*#__PURE__*/_jsx(DialogTitle, {
+  return fullScreen ? /*#__PURE__*/_jsx(MainThemeProvider, {
+    userSelectedTheme: selectedTheme,
+    children: /*#__PURE__*/_jsxs(Dialog, {
+      className: `dialogComp`,
+      open: fullScreen,
+      fullScreen: fullScreen,
+      onClose: onClose,
       style: {
-        padding: "6px 8px"
+        zIndex: 1000
       },
-      children: /*#__PURE__*/_jsx(Grid, {
+      sx: classes.fullScreenWrapper,
+      children: [/*#__PURE__*/_jsx(DialogTitle, {
+        style: {
+          padding: "6px 8px"
+        },
         children: /*#__PURE__*/_jsx(Grid, {
-          style: {
-            display: "flex",
-            justifyContent: "end"
-          },
-          children: /*#__PURE__*/_jsx(IconButton, {
-            onClick: onClose,
+          children: /*#__PURE__*/_jsx(Grid, {
             style: {
-              background: "rgba(255,255,255,0.5)"
+              display: "flex",
+              justifyContent: "end"
             },
-            children: /*#__PURE__*/_jsx(CloseIcon, {})
+            children: /*#__PURE__*/_jsx(IconButton, {
+              onClick: onClose,
+              style: {
+                background: "rgba(255,255,255,0.5)"
+              },
+              children: /*#__PURE__*/_jsx(CloseIcon, {})
+            })
           })
         })
-      })
-    }), /*#__PURE__*/_jsx(DialogContent, {
-      children: children
-    })]
+      }), /*#__PURE__*/_jsx(DialogContent, {
+        children: children
+      })]
+    })
   }) : /*#__PURE__*/_jsx(ViewportStimulator, {
+    selectedTheme: selectedTheme,
     children: children
   });
 };

package/dist/Editor/Editor.css

@@ -1342,21 +1342,29 @@ code.markcode {
   background-color: #f3f3f3;
   font-family: 'Source Code Pro' !important;
 }
+
 /* Hide the popper when the reference is hidden */
 .hide-popper-on-overlap[data-popper-escaped],
 .hide-popper-on-overlap[data-popper-reference-hidden] {
   visibility: hidden;
   pointer-events: none;
 }
-code.markcode {
-  border-radius: 4px;
-  padding: 6px 8px;
-  margin: 8px 0px;
-  display: block;
-  background-color: #f3f3f3;
-  font-family: 'Source Code Pro' !important;
+
+.theme-buttons {
+  display: flex;
+  justify-content: end;
+  align-items: center;
+  margin: auto;
+  position: absolute;
+  top: 60px;
+  right: 20px;
+  z-index: 1000;
+}
+
+.themePaintIcon:hover .iconBorder {
+  fill: #2563EB;
 }
 
 .hyperLink {
   word-break: break-all;
-}
+}

package/dist/Editor/Elements/AI/PopoverAIInput.js

@@ -167,6 +167,7 @@ function PopoverAIInput({
   const [generatedText, setGeneratedText] = useState("");
   const [inputValue, setInputValue] = useState("");
   const [selectedOption, setSelectedOption] = useState();
+  const [threadId, setThreadId] = useState("");
   const selectedEleRef = useRef({});
   const classes = Styles();
   const editor = useSlate();
@@ -188,6 +189,7 @@ function PopoverAIInput({
   useEffect(() => {
     if (openAI) {
       scrollToAIInput(editor);
+      setThreadId("");
     }
   }, [openAI]);
   useEffect(() => {
@@ -196,8 +198,12 @@ function PopoverAIInput({
   const framePayload = (type, option) => {
     let payload = {
       mode: option.mode || 0,
-      query: option?.inputValue || inputValue
+      query: option?.inputValue || inputValue,
+      useSession: true
     };
+    if (threadId) {
+      payload.threadId = threadId;
+    }
     if (option.mode === MODES.translate || option.mode === MODES.rephraseTone) {
       payload.textOptionInput = type;
     }
@@ -257,12 +263,14 @@ function PopoverAIInput({
       setLoading(false);
       setInputValue("");
       let {
-        data: text
-      } = result || {};
+        body: text,
+        threadId
+      } = result?.data || {};
       if (!text) {
         onClickOutside();
         return;
       }
+      setThreadId(threadId || "");
 
       // if (!option.replace) {
       if (type === "continue_writing") {

package/dist/Editor/Elements/AppHeader/AppHeader.js

@@ -265,7 +265,7 @@ function AppHeader(props) {
               style: {
                 display: "inline-flex",
                 alignItems: "center",
-                color: textColor,
+                color: textColor || "#000000",
                 fontSize: logoFontSize,
                 fontFamily: titleFontFamily,
                 justifyContent: isLogoRight ? "end" : "start"
@@ -320,7 +320,7 @@ function AppHeader(props) {
                     fontFamily: fontFamily,
                     textTransform: "none",
                     fontSize: fontSize || "16px",
-                    color: textColor || "#FFF",
+                    color: textColor || "#000",
                     background: bgColor || "none",
                     "& .m-settings": {
                       display: "none",
@@ -335,7 +335,7 @@ function AppHeader(props) {
                       background: "#FFF"
                     },
                     "&:hover": {
-                      color: textColorHover || textColor || "#FFF",
+                      color: textColorHover || textColor || "#000",
                       background: bgColorHover || bgColor || "none",
                       "& .m-settings": {
                         display: "block"

package/dist/Editor/Elements/Button/EditorButton.js

@@ -9,6 +9,8 @@ import { WorkflowIcon } from "../../common/iconslist";
 import { getTRBLBreakPoints, getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
 import { handleLinkType, windowVar } from "../../utils/helper";
 import LinkSettings from "../../common/LinkSettings";
+import { useEditorTheme } from "../../hooks/useEditorTheme";
+import { getTheme } from "../../theme";
 import Icon from "../../common/Icon";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import useCommonStyle from "../../commonStyle";
@@ -40,6 +42,12 @@ const EditorButton = props => {
   const [openMoreOptions, setOpenMoreOptions] = useState(false);
   const [, setIconLoaded] = useState(false);
   const classes = useCommonStyle(appTheme);
+  const {
+    theme: selectedTheme
+  } = useEditorTheme();
+  const {
+    buttonTheme
+  } = getTheme(selectedTheme);
   const {
     label,
     bgColor,
@@ -53,7 +61,7 @@ const EditorButton = props => {
     fontFamily,
     textColorHover,
     bgColorHover,
-    buttonIcon,
+    // buttonIcon,
     iconPosition = "start",
     borderStyle,
     borderWidth,
@@ -74,6 +82,7 @@ const EditorButton = props => {
   };
   const isTrigger = linkType === "nextTrigger" || linkType === "prevTrigger";
   const refURl = isTrigger ? buttonLink?.url : url;
+  const buttonIcon = element?.buttonIcon || buttonTheme?.buttonIcon;
   const BtnIcon = buttonIcon ? buttonIcon : null;
   windowVar.lastButtonProps = element;
   const handleTrigger = async () => {
@@ -164,6 +173,7 @@ const EditorButton = props => {
                 display: "inline-flex",
                 color: "rgba(0, 0, 0, 0.54)",
                 marginBottom: "0px !important",
+                ...classes.buttonMoreOption,
                 ...classes.buttonMoreOption3
               },
               ...btnProps,
@@ -264,19 +274,14 @@ const EditorButton = props => {
           display: "inline-block"
         },
         children: [/*#__PURE__*/_jsxs(Box, {
+          className: `btn textAlign-${tAlign} button theme-element`,
           ref: buttonRef,
-          className: `btn textAlign-${tAlign}`,
           sx: {
             textDecoration: "none",
-            background: bgColor || "rgb(30, 75, 122)",
             borderBlockStyle: "solid",
-            borderColor: borderColor || "transparent",
             borderWidth: borderWidth !== undefined ? borderWidth : borderColor ? "1px" : "0px",
             ...btnSp,
             borderStyle: borderStyle || "solid",
-            color: `${textColor || "#FFFFFF"}`,
-            fontSize: textSize || "inherit",
-            fontFamily: fontFamily || "PoppinsRegular",
             display: "inline-flex",
             alignItems: "center",
             position: "relative",
@@ -285,11 +290,22 @@ const EditorButton = props => {
               display: "none"
             },
             "&:hover": {
-              color: `${textColorHover || textColor || "#FFFFFF"}`,
-              background: bgColorHover || bgColor || "rgb(30, 75, 122)",
+              color: `${textColorHover || textColor}`,
+              background: bgColorHover || bgColor,
               "& .element-toolbar": {
                 display: "flex"
               }
+            },
+            color: textColor ? `${textColor} !important` : "#FFFFFF",
+            fontSize: textSize ? `${textSize}px !important` : "inherit",
+            fontFamily: fontFamily ? `${fontFamily}  !important` : "PoppinsRegular",
+            background: `${bgColor} !important`,
+            borderColor: `${borderColor} !important`,
+            borderRadius: {
+              ...getBreakPointsValue(borderRadius || buttonTheme?.borderRadius || {}, null, "overrideBorderRadius", true)
+            },
+            padding: {
+              ...getTRBLBreakPoints(bannerSpacing || buttonTheme?.bannerSpacing || {})
             }
           },
           ...buttonProps,