@flozy/editor 3.6.7 → 3.6.8

package/dist/Editor/ChatEditor.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useRef, useState, useEffect, useImperativeHandle, forwardRef } from "react";
-import { Editable, Slate } from 'slate-react';
+import { Editable, Slate, ReactEditor } from 'slate-react';
 import { createEditor } from 'slate';
 import { useDebounce } from "use-debounce";
 import withCommon from "./hooks/withCommon";
@@ -44,7 +44,16 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const isReadOnly = readOnly === "readonly";
   useImperativeHandle(ref, () => ({
     emojiClick: emoji => {
-      insertEmoji(editor, emoji?.native, editor.selection);
+      if (editor) {
+        insertEmoji(editor, emoji?.native, editor.selection);
+        ReactEditor.focus(editor);
+      }
+    },
+    // Focus enable
+    enableFocus: () => {
+      if (editor) {
+        ReactEditor.focus(editor);
+      }
     }
   }));
   useEffect(() => {

package/dist/Editor/CommonEditor.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-import React, { useRef, useCallback, useEffect, useMemo, useState, forwardRef, useImperativeHandle, createContext } from "react";
+import React, { useRef, useCallback, useEffect, useMemo, useState, forwardRef, useImperativeHandle } from "react";
 import { createEditor, Transforms } from "slate";
 import { Slate, Editable, ReactEditor } from "slate-react";
 import { useDebounce, useDebouncedCallback } from "use-debounce";
@@ -18,7 +18,7 @@ import { getThumbnailImage, invertColor } from "./helper";
 import PopupTool from "./Toolbar/PopupTool";
 import "./font.css";
 import "./Editor.css";
-import { Box, IconButton, Typography } from "@mui/material";
+import { Box, Button, Typography } from "@mui/material";
 import Shorthands from "./common/Shorthands";
 import MiniToolbar from "./Toolbar/Mini/MiniToolbar";
 import { EditorProvider } from "./hooks/useMouseMove";
@@ -28,19 +28,12 @@ import DragAndDrop from "./common/DnD";
 import Section from "./common/Section";
 import "animate.css";
 import decorators from "./utils/Decorators";
-import { getTRBLBreakPoints, getVariableValue } from "./helper/theme";
+import { getTRBLBreakPoints } from "./helper/theme";
 import { handleInsertLastElement, outsideEditorClickLabel } from "./utils/helper";
 import useWindowResize from "./hooks/useWindowResize";
-import { getTheme } from "./theme";
-import { useTheme } from "@emotion/react";
-import ThemeSettings from "./themeSettings";
-import ThemeSettingsAI from "./themeSettingsAI";
-import { Experimental_CssVarsProvider as CssVarsProvider, experimental_extendTheme as extendTheme } from "@mui/material/styles";
 import PopoverAIInput from "./Elements/AI/PopoverAIInput";
-import { ThemeAIIcon, ThemePaintIcon } from "./assets/svg/ThemeIcons";
 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
@@ -67,8 +60,7 @@ const Leaf = ({
   children,
   leaf
 }) => {
-  const theme = useTheme();
-  children = getMarked(leaf, children, theme);
+  children = getMarked(leaf, children);
   return /*#__PURE__*/_jsx("span", {
     ...attributes,
     children: children
@@ -87,8 +79,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     toolbarOptions,
     otherProps,
     isIframe,
-    theme,
-    showThemeButtons
+    theme
   } = props;
   const editorWrapper = useRef();
   const mentionsRef = useRef();
@@ -132,11 +123,10 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     bannerSpacing,
     pageBgImage,
-    pageColor = "",
+    pageColor,
     color: pageTextColor,
     pageWidth,
-    maxWidth: pageMaxWidth,
-    theme: selectedTheme
+    maxWidth: pageMaxWidth
   } = pageSt?.pageProps || {
     bannerSpacing: {
       left: 0,
@@ -147,11 +137,9 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   };
   const classes = editorStyles({
     padHeight: !fullScreen ? otherProps?.padHeight : 20,
-    placeHolderColor: invertColor(pageColor.startsWith("var") ? getVariableValue(pageColor) : pageColor || "#FFF"),
+    placeHolderColor: invertColor(pageColor || "#FFF"),
     theme
   });
-  const [openTheme, setOpenTheme] = useState(false);
-  const [openAITheme, setOpenAITheme] = useState(false);
   useEffect(() => {
     setValue(draftToSlate({
       data: content
@@ -251,12 +239,6 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     redo() {
       editor?.redo();
     },
-    toggleTheme() {
-      setOpenTheme(!openTheme);
-    },
-    toggleAITheme() {
-      setOpenAITheme(!openAITheme);
-    },
     getPageSettings: {
       background: pageBgImage && pageBgImage !== "none" ? `url(${pageBgImage})` : pageColor || ""
     }
@@ -403,152 +385,113 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     }
     return style;
   }, [pageBgImage, pageColor]);
-  const themeProps = getTheme(selectedTheme);
-  return /*#__PURE__*/_jsx(ThemeContext.Provider, {
-    value: {
-      openTheme,
-      setOpenTheme
-    },
-    children: /*#__PURE__*/_jsx(CssVarsProvider, {
-      theme: extendTheme(selectedTheme?.theme?.cssVars || {}),
-      children: /*#__PURE__*/_jsxs(EditorProvider, {
-        theme: theme,
-        editor: editor,
-        children: [showThemeButtons ? /*#__PURE__*/_jsxs("div", {
-          style: {
-            display: "flex",
-            justifyContent: "end",
-            alignItems: "center",
-            gap: "8px",
-            width: "70vw",
-            margin: "auto"
-          },
-          children: [/*#__PURE__*/_jsx(IconButton, {
-            onClick: () => setOpenTheme(true),
-            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 || "",
-          children: /*#__PURE__*/_jsx(Box, {
-            component: "div",
-            className: `${editorClass || ""} ${isIframe ? "iframe-editor" : ""}`,
-            sx: classes.root,
-            style: {
-              ...dotBg
-            },
-            children: /*#__PURE__*/_jsxs(Slate, {
-              editor: editor,
-              initialValue: value,
-              onChange: handleEditorChange,
-              children: [/*#__PURE__*/_jsx(DragAndDrop, {
-                children: /*#__PURE__*/_jsxs(Overlay, {
-                  children: [/*#__PURE__*/_jsx(Box, {
-                    className: `${hasTopBanner() ? "has-topbanner" : ""} ${!pageColor ? "no-color" : ""} ${isScrolling ? "" : "hideScroll"} scrollable-content scrollSmooth`,
-                    sx: classes.slateWrapper,
-                    id: "slate-wrapper-scroll-container"
-                    // style={editorWrapperStyle}
-                    ,
-                    ref: editorWrapper,
-                    onClick: e => {
-                      handleInsertLastElement(e, editor);
-                    },
-                    onScroll: handleScroll,
-                    style: editorWrapperStyle,
+  return /*#__PURE__*/_jsx(EditorProvider, {
+    theme: theme,
+    editor: editor,
+    children: /*#__PURE__*/_jsx(DialogWrapper, {
+      classes: classes,
+      ...props,
+      fullScreen: fullScreen,
+      footer: footer || "",
+      children: /*#__PURE__*/_jsx(Box, {
+        component: "div",
+        className: `${editorClass || ""} ${isIframe ? "iframe-editor" : ""}`,
+        sx: classes.root,
+        style: {
+          ...dotBg
+        },
+        children: /*#__PURE__*/_jsxs(Slate, {
+          editor: editor,
+          initialValue: value,
+          onChange: handleEditorChange,
+          children: [/*#__PURE__*/_jsx(DragAndDrop, {
+            children: /*#__PURE__*/_jsxs(Overlay, {
+              children: [/*#__PURE__*/_jsx(Box, {
+                className: `${hasTopBanner() ? "has-topbanner" : ""} ${!pageColor ? "no-color" : ""} ${isScrolling ? "" : "hideScroll"} scrollable-content scrollSmooth`,
+                sx: classes.slateWrapper,
+                id: "slate-wrapper-scroll-container"
+                // style={editorWrapperStyle}
+                ,
+                ref: editorWrapper,
+                onClick: e => {
+                  handleInsertLastElement(e, editor);
+                },
+                onScroll: handleScroll,
+                style: editorWrapperStyle,
+                children: /*#__PURE__*/_jsxs(Box, {
+                  component: "div",
+                  className: "max-content",
+                  "data-info": outsideEditorClickLabel,
+                  children: [renderTopBanner(), /*#__PURE__*/_jsx("div", {
+                    className: "scroll-area",
+                    "data-info": outsideEditorClickLabel,
                     children: /*#__PURE__*/_jsxs(Box, {
                       component: "div",
-                      className: "max-content",
-                      sx: themeProps?.sxProps || {},
-                      "data-info": outsideEditorClickLabel,
-                      children: [renderTopBanner(), /*#__PURE__*/_jsx("div", {
-                        className: "scroll-area",
-                        "data-info": outsideEditorClickLabel,
-                        children: /*#__PURE__*/_jsxs(Box, {
-                          component: "div",
-                          className: `editor-wrapper ${pageWidth === "fixed" ? "fixed" : "full"}`,
-                          sx: {
-                            backgroundColor: "transparent",
-                            padding: {
-                              ...getTRBLBreakPoints(bannerSpacing)
-                            },
-                            width: !pageWidth || pageWidth === "fixed" ? fixedWidth : fullWidth,
-                            height: viewport.h ? `${viewport.h}px` : `100%`,
-                            alignSelf: "center",
-                            transformOrigin: "left top",
-                            transition: "all 0.3s",
-                            minHeight: "87%",
-                            maxWidth: pageMaxWidth ? `${parseInt(pageMaxWidth)}px !important` : "auto"
-                          },
-                          "data-info": outsideEditorClickLabel,
-                          children: [/*#__PURE__*/_jsx(Editable, {
-                            className: "innert-editor-textbox",
-                            readOnly: isReadOnly,
-                            renderElement: renderElement,
-                            renderLeaf: renderLeaf,
-                            decorate: decorators,
-                            onKeyDown: onKeyDown
-                          }), !readOnly ? /*#__PURE__*/_jsx(MentionsPopup, {
-                            ref: mentionsRef,
-                            mentions: mentions,
-                            setMentions: setMentions,
-                            editor: editor,
-                            target: target,
-                            index: index,
-                            chars: chars,
-                            type: type,
-                            theme: theme
-                          }) : null]
-                        })
-                      }), !hideMiniToolBar ? /*#__PURE__*/_jsx(MiniToolbar, {
-                        customProps: customProps,
-                        toolbarOptions: toolbarOptions,
-                        theme: theme
-                      }) : null, /*#__PURE__*/_jsx(PopoverAIInput, {
-                        otherProps: otherProps || {}
-                      }), footer && (fullScreen || readOnly) && /*#__PURE__*/_jsx(Typography, {
-                        sx: {
-                          color: "rgb(100, 116, 139)",
-                          fontSize: "13px",
-                          paddingBottom: hideMiniToolBar ? "0px" : "12px",
-                          cursor: "pointer"
+                      className: `editor-wrapper ${pageWidth === "fixed" ? "fixed" : "full"}`,
+                      sx: {
+                        backgroundColor: "transparent",
+                        padding: {
+                          ...getTRBLBreakPoints(bannerSpacing)
                         },
-                        align: "center",
-                        "data-info": outsideEditorClickLabel,
-                        onClick: handleFooterClick,
-                        children: footer
-                      }), openTheme ? /*#__PURE__*/_jsx(ThemeSettings, {
-                        open: openTheme,
-                        setOpen: setOpenTheme,
+                        width: !pageWidth || pageWidth === "fixed" ? fixedWidth : fullWidth,
+                        height: viewport.h ? `${viewport.h}px` : `100%`,
+                        alignSelf: "center",
+                        transformOrigin: "left top",
+                        transition: "all 0.3s",
+                        minHeight: "87%",
+                        maxWidth: pageMaxWidth ? `${parseInt(pageMaxWidth)}px !important` : "auto"
+                      },
+                      "data-info": outsideEditorClickLabel,
+                      children: [/*#__PURE__*/_jsx(Editable, {
+                        className: "innert-editor-textbox",
+                        readOnly: isReadOnly,
+                        renderElement: renderElement,
+                        renderLeaf: renderLeaf,
+                        decorate: decorators,
+                        onKeyDown: onKeyDown
+                      }), !readOnly ? /*#__PURE__*/_jsx(MentionsPopup, {
+                        ref: mentionsRef,
+                        mentions: mentions,
+                        setMentions: setMentions,
                         editor: editor,
-                        services: otherProps?.services
-                      }) : null, /*#__PURE__*/_jsx(ThemeSettingsAI, {
-                        openAITheme: openAITheme,
-                        setOpenAITheme: setOpenAITheme,
-                        onSaveTheme: otherProps?.onSaveTheme
-                      })]
+                        target: target,
+                        index: index,
+                        chars: chars,
+                        type: type,
+                        theme: theme
+                      }) : null]
                     })
-                  }), !readOnly ? /*#__PURE__*/_jsx(PopupTool, {
-                    onDrawerOpen: onDrawerOpen,
-                    theme: theme,
-                    setIsTextSelected: setIsTextSelected,
-                    customProps: customProps
-                  }) : null]
+                  }), !hideMiniToolBar ? /*#__PURE__*/_jsx(MiniToolbar, {
+                    customProps: customProps,
+                    toolbarOptions: toolbarOptions,
+                    theme: theme
+                  }) : null, /*#__PURE__*/_jsx(PopoverAIInput, {
+                    otherProps: otherProps || {}
+                  }), footer && (fullScreen || readOnly) && /*#__PURE__*/_jsx(Typography, {
+                    sx: {
+                      color: "rgb(100, 116, 139)",
+                      fontSize: "13px",
+                      paddingBottom: hideMiniToolBar ? "0px" : "12px",
+                      cursor: "pointer"
+                    },
+                    align: "center",
+                    "data-info": outsideEditorClickLabel,
+                    onClick: handleFooterClick,
+                    children: footer
+                  })]
                 })
-              }), htmlAction.showInput && /*#__PURE__*/_jsx(CodeToText, {
-                ...htmlAction,
-                handleCodeToText: handleCodeToText
-              })]
-            }, id)
-          })
-        })]
+              }), !readOnly ? /*#__PURE__*/_jsx(PopupTool, {
+                onDrawerOpen: onDrawerOpen,
+                theme: theme,
+                setIsTextSelected: setIsTextSelected,
+                customProps: customProps
+              }) : null]
+            })
+          }), htmlAction.showInput && /*#__PURE__*/_jsx(CodeToText, {
+            ...htmlAction,
+            handleCodeToText: handleCodeToText
+          })]
+        }, id)
       })
     })
   });

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

@@ -62,11 +62,6 @@ function AppHeader(props) {
   const handleDrawerToggle = () => {
     setMobileOpen(prevState => !prevState);
   };
-  const closeDrawer = () => {
-    if (mobileOpen) {
-      handleDrawerToggle();
-    }
-  };
   const onSettings = e => {
     if (!readOnly) {
       e.stopPropagation();
@@ -153,27 +148,10 @@ function AppHeader(props) {
     }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx(List, {
       children: menus.map((item, i) => {
         const buttonProps = handleLinkType(item.url, item.linkType, true, item.target === "_blank");
-        const onTouchEnd = e => {
-          if (buttonProps?.onTouchEnd) {
-            buttonProps?.onTouchEnd(e);
-            closeDrawer();
-          }
-        };
-        const onClick = e => {
-          if (buttonProps?.onClick) {
-            buttonProps?.onClick(e);
-            closeDrawer();
-          }
-        };
-        const props = {
-          ...buttonProps,
-          onTouchEnd,
-          onClick
-        };
         return /*#__PURE__*/_jsx(ListItem, {
           disablePadding: true,
           children: /*#__PURE__*/_jsx(ListItemButton, {
-            ...props,
+            ...buttonProps,
             sx: {
               textAlign: "center"
             },
@@ -251,7 +229,7 @@ function AppHeader(props) {
               style: {
                 display: "inline-flex",
                 alignItems: "center",
-                color: textColor || "#000000",
+                color: textColor,
                 fontSize: logoFontSize,
                 fontFamily: titleFontFamily,
                 justifyContent: isLogoRight ? "end" : "start"
@@ -299,7 +277,7 @@ function AppHeader(props) {
                     fontFamily: fontFamily,
                     textTransform: "none",
                     fontSize: fontSize || "16px",
-                    color: textColor || "#000",
+                    color: textColor || "#FFF",
                     background: bgColor || "none",
                     "& .m-settings": {
                       display: "none",
@@ -314,7 +292,7 @@ function AppHeader(props) {
                       background: "#FFF"
                     },
                     "&:hover": {
-                      color: textColorHover || textColor || "#000",
+                      color: textColorHover || textColor || "#FFF",
                       background: bgColorHover || bgColor || "none",
                       "& .m-settings": {
                         display: "block"

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

@@ -13,9 +13,6 @@ import { WorkflowIcon } from "../../common/iconslist";
 import { getTRBLBreakPoints, getBreakPointsValue } from "../../helper/theme";
 import { handleLinkType, windowVar } from "../../utils/helper";
 import LinkSettings from "../../common/LinkSettings";
-import { useEditorTheme } from "../../hooks/useEditorTheme";
-import { getTheme } from "../../theme";
-import { fontFamilyMap } from "../../utils/font";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const EditorButton = props => {
@@ -33,12 +30,6 @@ const EditorButton = props => {
   const path = ReactEditor.findPath(editor, element);
   const [edit, setEdit] = useState(false);
   const [openNav, setOpenNav] = useState(false);
-  const {
-    theme
-  } = useEditorTheme();
-  const {
-    buttonTheme
-  } = getTheme(theme);
   const {
     label,
     bgColor,
@@ -52,7 +43,7 @@ const EditorButton = props => {
     fontFamily,
     textColorHover,
     bgColorHover,
-    // buttonIcon,
+    buttonIcon,
     iconPosition = "start",
     borderStyle,
     borderWidth,
@@ -73,7 +64,6 @@ const EditorButton = props => {
   };
   const isTrigger = linkType === "actionTrigger";
   const refURl = isTrigger ? buttonLink?.url : url;
-  const buttonIcon = element?.buttonIcon || buttonTheme?.buttonIcon;
   const BtnIcon = buttonIcon ? buttonIcon : null;
   windowVar.lastButtonProps = element;
   const handleTrigger = async () => {
@@ -196,9 +186,20 @@ const EditorButton = props => {
         children: [/*#__PURE__*/_jsxs(Box, {
           sx: {
             textDecoration: "none",
+            background: bgColor || "rgb(30, 75, 122)",
             borderBlockStyle: "solid",
+            borderColor: borderColor || "transparent",
             borderWidth: borderWidth !== undefined ? borderWidth : borderColor ? "1px" : "0px",
+            borderRadius: {
+              ...getBreakPointsValue(borderRadius || {}, null, "overrideBorderRadius", true)
+            },
             borderStyle: borderStyle || "solid",
+            padding: {
+              ...getTRBLBreakPoints(bannerSpacing)
+            },
+            color: `${textColor || "#FFFFFF"}`,
+            fontSize: textSize || "inherit",
+            fontFamily: fontFamily || "PoppinsRegular",
             display: "inline-flex",
             alignItems: "center",
             position: "relative",
@@ -206,26 +207,14 @@ const EditorButton = props => {
               display: "none"
             },
             "&:hover": {
-              color: `${textColorHover || textColor}`,
-              background: bgColorHover || bgColor,
+              color: `${textColorHover || textColor || "#FFFFFF"}`,
+              background: bgColorHover || bgColor || "rgb(30, 75, 122)",
               "& .element-toolbar": {
                 display: "flex"
               }
-            },
-            color: `${textColor} !important`,
-            fontSize: `${textSize}px !important`,
-            fontFamily: `${fontFamilyMap[fontFamily] || ""}  !important`,
-            background: `${bgColor} !important`,
-            borderColor: `${borderColor} !important`,
-            borderRadius: {
-              ...getBreakPointsValue(borderRadius || buttonTheme?.borderRadius || {}, null, "overrideBorderRadius", true)
-            },
-            padding: {
-              ...getTRBLBreakPoints(bannerSpacing || buttonTheme?.bannerSpacing || {})
             }
           },
           ...buttonProps,
-          className: "button theme-element",
           children: [BtnIcon && iconPosition === "start" && /*#__PURE__*/_jsx(MUIIcon, {
             iconName: buttonIcon,
             style: {

package/dist/Editor/Elements/Color Picker/ColorButtons.js

@@ -1,15 +1,11 @@
-import React, { useContext, useState } from "react";
-import { Box, IconButton, Popover, Typography, useTheme } from "@mui/material";
+import React, { useState } from "react";
+import { Box, IconButton, Popover } from "@mui/material";
 import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
 import Button from "../../common/Button";
 import { colors } from "./defaultColors";
 import ColorPicker from "./colorPicker.svg";
-import { ThemeContext } from "../../CommonEditor";
-import { useSlateStatic } from "slate-react";
-import { Transforms } from "slate";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 let c = [];
 const ColorChunks = (recentColors = []) => [...recentColors, ...colors].reduce((a, b, i) => {
   if (i % 7 === 0) {
@@ -35,7 +31,9 @@ const SingleColorButton = ({
     style: {
       width: "100%",
       display: "flex",
-      padding: padding || "8px"
+      alignItems: "center",
+      padding: padding || "8px",
+      justifyContent: "center"
     },
     children: [crs.map(m => /*#__PURE__*/_jsx(Button, {
       onClick: handleSelect(m),
@@ -111,17 +109,11 @@ const ColorButtons = props => {
     forMiniTool,
     openColorTool,
     onClose,
-    onColorPickerClick,
-    disableEditTheme
+    onColorPickerClick
   } = props;
   const [row1, ...restRows] = ColorChunks([]);
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
-  const theme = useTheme();
-  const editor = useSlateStatic();
-  const {
-    setOpenTheme
-  } = useContext(ThemeContext);
   const handleMore = e => {
     setAnchorEl(e.currentTarget);
   };
@@ -134,7 +126,6 @@ const ColorButtons = props => {
   const handleSelect = color => () => {
     onSelect(color);
   };
-  const colorVars = theme?.vars?.colors || {};
   return /*#__PURE__*/_jsxs(Box, {
     component: "span",
     sx: classes.colorButtons,
@@ -151,7 +142,7 @@ const ColorButtons = props => {
           activeColor: activeColor
         }, `si_btn_row1_${m}_${i}`);
       })
-    }), /*#__PURE__*/_jsx(Popover, {
+    }), /*#__PURE__*/_jsxs(Popover, {
       open: open || openColorTool,
       anchorEl: anchorEl || openColorTool,
       onClose: handleClose,
@@ -165,39 +156,9 @@ const ColorButtons = props => {
       },
       sx: classes.colorPopper,
       className: "colorPopper",
-      children: /*#__PURE__*/_jsxs(Box, {
+      children: [/*#__PURE__*/_jsx(Box, {
         sx: classes.colorButtonsInner,
-        children: [Object.values(colorVars)?.length ? /*#__PURE__*/_jsxs(_Fragment, {
-          children: [/*#__PURE__*/_jsxs(Box, {
-            component: "div",
-            className: "singleColorTitleWrapper",
-            children: [/*#__PURE__*/_jsx(Typography, {
-              variant: "subtitle2",
-              children: "Theme colour"
-            }), disableEditTheme ? null : /*#__PURE__*/_jsx("div", {
-              className: "editBtn",
-              onClick: () => {
-                Transforms.deselect(editor, {
-                  at: editor.selection
-                });
-                setOpenTheme("editThemeColor");
-              },
-              children: "Edit"
-            })]
-          }), /*#__PURE__*/_jsx(SingleColorButton, {
-            crs: Object.values(colorVars),
-            handleSelect: handleSelect,
-            classes: classes,
-            activeColor: activeColor
-          })]
-        }) : null, /*#__PURE__*/_jsx(Box, {
-          component: "div",
-          className: "singleColorTitleWrapper",
-          children: /*#__PURE__*/_jsx(Typography, {
-            variant: "subtitle2",
-            children: "Custom colour"
-          })
-        }), restRows.map((m, i) => {
+        children: restRows.map((m, i) => {
           return /*#__PURE__*/_jsx(SingleColorButton, {
             id: `p2_${id}`,
             crs: m,
@@ -206,18 +167,14 @@ const ColorButtons = props => {
             classes: classes,
             activeColor: activeColor
           }, `si_btn_${m}_${i}`);
-        }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
-          onClick: onColorPickerClick,
-          style: {
-            alignSelf: "start",
-            margin: "6px"
-          },
-          children: /*#__PURE__*/_jsx("img", {
-            src: ColorPicker,
-            alt: "color wheel"
-          })
-        }) : null]
-      })
+        })
+      }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
+        onClick: onColorPickerClick,
+        children: /*#__PURE__*/_jsx("img", {
+          src: ColorPicker,
+          alt: "color wheel"
+        })
+      }) : null]
     })]
   });
 };