@flozy/editor 10.6.8 → 10.7.0

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

@@ -268,7 +268,7 @@ function AppHeader(props) {
               style: {
                 display: "inline-flex",
                 alignItems: "center",
-                color: textColor || "#000000",
+                color: textColor,
                 fontSize: logoFontSize,
                 fontFamily: titleFontFamily,
                 justifyContent: isLogoRight ? "end" : "start"
@@ -323,7 +323,7 @@ function AppHeader(props) {
                     fontFamily: fontFamily,
                     textTransform: "none",
                     fontSize: fontSize || "16px",
-                    color: textColor || "#000",
+                    color: textColor || "#FFF",
                     background: bgColor || "none",
                     border: borderColorHover ? `1px solid transparent` : "none",
                     "& .m-settings": {
@@ -339,7 +339,7 @@ function AppHeader(props) {
                       background: "#FFF"
                     },
                     "&:hover": {
-                      color: textColorHover || textColor || "#000",
+                      color: textColorHover || textColor || "#FFF",
                       background: bgColorHover || bgColor || "none",
                       border: borderColorHover ? `1px solid ${borderColorHover}` : "none",
                       "& .m-settings": {

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

@@ -9,8 +9,6 @@ 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";
@@ -42,12 +40,6 @@ 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,
@@ -62,7 +54,7 @@ const EditorButton = props => {
     textColorHover,
     bgColorHover,
     borderColorHover,
-    // buttonIcon,
+    buttonIcon,
     iconPosition = "start",
     borderStyle,
     borderWidth,
@@ -83,7 +75,6 @@ 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 () => {
@@ -174,7 +165,6 @@ const EditorButton = props => {
                 display: "inline-flex",
                 color: "rgba(0, 0, 0, 0.54)",
                 marginBottom: "0px !important",
-                ...classes.buttonMoreOption,
                 ...classes.buttonMoreOption3
               },
               ...btnProps,
@@ -275,14 +265,19 @@ 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 || borderColorHover ? "1px" : "0px",
             ...btnSp,
             borderStyle: borderStyle || "solid",
+            color: `${textColor || "#FFFFFF"}`,
+            fontSize: textSize || "inherit",
+            fontFamily: fontFamily || "PoppinsRegular",
             display: "inline-flex",
             alignItems: "center",
             position: "relative",
@@ -297,17 +292,6 @@ const EditorButton = props => {
               "& .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,

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

@@ -1,15 +1,11 @@
 import React, { useState } from "react";
-import { Box, IconButton, Popover, Typography, useTheme } from "@mui/material";
+import { Box, IconButton, Popover } from "@mui/material";
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
 import Button from "../../common/Button";
 import { colors } from "./defaultColors";
 import ColorPicker from "./colorPicker.svg";
-import { useSlateStatic } from "slate-react";
-import { Transforms } from "slate";
-import { useEditorContext } from "../../hooks/useMouseMove";
 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) {
@@ -36,8 +32,8 @@ const SingleColorButton = ({
       width: "100%",
       display: "flex",
       alignItems: "center",
-      padding: padding || "8px 0px"
-      // justifyContent: "center",
+      padding: padding || "8px 0px",
+      justifyContent: "center"
     },
     children: [crs.map(m => /*#__PURE__*/_jsx(Button, {
       onClick: handleSelect(m),
@@ -114,18 +110,12 @@ const ColorButtons = props => {
     openColorTool,
     onClose,
     onColorPickerClick,
-    disableEditTheme,
     defaultColors = []
   } = props;
   const [row1, ...restRows] = ColorChunks([]);
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   const firstRow = defaultColors?.length ? defaultColors : row1;
-  const theme = useTheme();
-  const editor = useSlateStatic();
-  const {
-    setOpenTheme
-  } = useEditorContext();
   const handleMore = e => {
     setAnchorEl(e.currentTarget);
   };
@@ -138,7 +128,6 @@ const ColorButtons = props => {
   const handleSelect = color => () => {
     onSelect(color);
   };
-  const colorVars = theme?.vars?.colors || {};
   return /*#__PURE__*/_jsxs(Box, {
     component: "span",
     sx: classes.colorButtons,
@@ -155,7 +144,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,
@@ -169,40 +158,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 colours"
-            }), disableEditTheme ? null : /*#__PURE__*/_jsx("div", {
-              className: "editBtn",
-              onClick: () => {
-                Transforms.deselect(editor, {
-                  at: editor.selection
-                });
-                handleClose();
-                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,
@@ -211,19 +169,14 @@ const ColorButtons = props => {
             classes: classes,
             activeColor: activeColor
           }, `si_btn_${m}_${i}`);
-        }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
-          onClick: onColorPickerClick,
-          style: {
-            alignSelf: "start",
-            margin: "6px",
-            padding: "0px"
-          },
-          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]
     })]
   });
 };

package/dist/Editor/Elements/Color Picker/ColorPicker.css

@@ -60,28 +60,4 @@
   padding: 0 15px !important;
   width: 60px !important;
   flex-shrink: 0;
-}
-
-
-.singleColorTitleWrapper {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px;
-  width: 100%;
-  border-bottom: 1px solid #DCE4EC;
-}
-
-.singleColorTitleWrapper .MuiTypography-root {
-  font-weight: 600;
-}
-
-.singleColorTitleWrapper .editBtn {
-  text-transform: none;
-  color: #2563EB;
-  text-decoration: underline;
-  padding: 0px;
-  min-width: unset;
-  cursor: pointer;
-  font-size: 14px;
-}
+}

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

@@ -1,14 +1,13 @@
 import React, { useState } from "react";
 import { ReactEditor } from "slate-react";
-import { IconButton, Tooltip, Box, Popover, useTheme } from "@mui/material";
+import ColorPickerTool from "react-gcolor-picker";
+import { IconButton, Tooltip, Box, Popover } from "@mui/material";
 import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions";
 import ColorButtons from "./ColorButtons";
 import ColorPickerStyles from "./Styles";
 import colorWheel from "./colorWheel.png";
 import "./ColorPicker.css";
 import { useEditorContext } from "../../hooks/useMouseMove";
-import CustomColorPicker from "../../common/CustomColorPicker";
-import { getSelectedElementColor } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -26,8 +25,7 @@ const ColorPicker = props => {
     classes,
     forMiniTool,
     openColorTool,
-    closeColorTool,
-    type
+    closeColorTool
   } = props;
   const {
     theme
@@ -36,7 +34,6 @@ const ColorPicker = props => {
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   const pickerStyles = ColorPickerStyles(theme);
-  const muiTheme = useTheme();
   const onOpen = e => {
     e.preventDefault();
     setAnchorEl(e.currentTarget);
@@ -61,7 +58,7 @@ const ColorPicker = props => {
     setAnchorEl(null);
     setSelection(null);
   };
-  const activeColor = type === "textColor" ? getSelectedElementColor(editor, format, muiTheme) : activeMark(editor, format) || DEFAULT_COLOR[format];
+  const activeColor = activeMark(editor, format) || DEFAULT_COLOR[format];
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [forMiniTool ? null : /*#__PURE__*/_jsx(Tooltip, {
       title: title,
@@ -99,10 +96,10 @@ const ColorPicker = props => {
         horizontal: "top"
       },
       sx: classes.colorPickerPopup,
-      children: /*#__PURE__*/_jsx(CustomColorPicker, {
+      children: /*#__PURE__*/_jsx(ColorPickerTool, {
         gradient: true,
-        onChange: handleFormSubmit,
-        color: activeColor
+        value: activeColor,
+        onChange: handleFormSubmit
       })
     })]
   });

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

@@ -20,26 +20,24 @@ const ColorPickerStyles = theme => ({
       background: `${theme?.palette?.editor?.miniToolBarBackground}`,
       border: `1px solid ${theme?.palette?.editor?.miniToolBarBorder} !important`,
       borderRadius: "7px !important",
-      padding: "0px 10px",
-      "@media only screen and (max-width: 600px)": {
+      padding: "0px 5px",
+      '@media only screen and (max-width: 600px)': {
         marginTop: "-40px"
       }
     }
   },
   colorButtonSingle: {
-    border: "1.5px solid #DCE4EC !important",
     "&.active": {
-      // "&:before": {
-      //   content: '" "',
-      //   position: "absolute",
-      //   top: "-4px",
-      //   left: "-4px",
-      //   width: "calc(100% + 8px)",
-      //   height: "calc(100% + 8px)",
-      //   border: "2px solid #2563EB",
-      //   borderRadius: "50%",
-      // },
-      outline: "2px solid #2563EB"
+      "&:before": {
+        content: '" "',
+        position: "absolute",
+        top: "-4px",
+        left: "-4px",
+        width: "calc(100% + 8px)",
+        height: "calc(100% + 8px)",
+        border: "2px solid #2563EB",
+        borderRadius: "50%"
+      }
     }
   },
   colorButtonsInner: {
@@ -61,7 +59,7 @@ const ColorPickerStyles = theme => ({
       width: "24px",
       height: "24px",
       margin: "0px 4px",
-      border: "1.5px solid #DCE4EC"
+      border: "unset"
     }
   },
   colorPickerIcon: {