@flozy/editor 3.8.9 → 3.9.1

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

@@ -1,7 +1,6 @@
 import React, { useRef, useState } from "react";
 import { useSlateStatic, ReactEditor } from "slate-react";
 import { Transforms, Editor, Element } from "slate";
-import { useTheme } from "@mui/material";
 import AppBar from "@mui/material/AppBar";
 import Box from "@mui/material/Box";
 import CssBaseline from "@mui/material/CssBaseline";
@@ -17,7 +16,7 @@ import Toolbar from "@mui/material/Toolbar";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import AppHeaderPopup from "./AppHeaderPopup";
-import { getTRBLBreakPoints, groupByBreakpoint } from "../../helper/theme";
+import { getTRBLBreakPoints } from "../../helper/theme";
 import { handleLinkType } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -25,7 +24,6 @@ import { createElement as _createElement } from "react";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 const drawerWidth = 240;
 function AppHeader(props) {
-  const theme = useTheme();
   const navWrprRef = useRef(null);
   const [openSetttings, setOpenSettings] = useState(false);
   const {
@@ -64,6 +62,11 @@ function AppHeader(props) {
   const handleDrawerToggle = () => {
     setMobileOpen(prevState => !prevState);
   };
+  const closeDrawer = () => {
+    if (mobileOpen) {
+      handleDrawerToggle();
+    }
+  };
   const onSettings = e => {
     if (!readOnly) {
       e.stopPropagation();
@@ -123,6 +126,11 @@ function AppHeader(props) {
       }
     }
   };
+
+  // const onMenuSettings = (menuItem, i) => (event) => {
+  //   event.preventDefault();
+  // };
+
   const drawer = /*#__PURE__*/_jsxs(Box, {
     onClick: handleDrawerToggle,
     sx: {
@@ -145,10 +153,27 @@ 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, {
-            ...buttonProps,
+            ...props,
             sx: {
               textAlign: "center"
             },
@@ -161,20 +186,15 @@ function AppHeader(props) {
     })]
   });
   const container = window !== undefined ? () => window().document.body : undefined;
+  // const elevateStyle = useEleveateScroll({
+  //   ...props,
+  //   parentRef: navWrprRef,
+  //   needElevation: readOnly,
+  // });
+
   const elevateStyle = {
     position: "relative"
   };
-  const appbarSp = groupByBreakpoint({
-    padding: {
-      ...getTRBLBreakPoints(bannerSpacing)
-    }
-  }, theme);
-  const toolbarSp = groupByBreakpoint({
-    flexDirection: {
-      xs: "row-reverse !important",
-      lg: "unset"
-    }
-  }, theme);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs(Box, {
       sx: {
@@ -196,14 +216,13 @@ function AppHeader(props) {
             ...elevateStyle,
             background: bgColor,
             boxShadow: "none",
-            ...appbarSp,
+            padding: {
+              ...getTRBLBreakPoints(bannerSpacing)
+            },
             zIndex: 999
           },
           onClick: onSettings,
           children: /*#__PURE__*/_jsxs(Toolbar, {
-            sx: {
-              ...toolbarSp
-            },
             style: {
               flexDirection: isLogoRight ? "row-reverse" : "row",
               paddingLeft: "0px",
@@ -220,11 +239,8 @@ function AppHeader(props) {
               },
               sx: {
                 mr: 2,
-                [theme.breakpoints.up("sm")]: {
-                  display: "none"
-                },
-                [theme.breakpoints.between("xs", "md")]: {
-                  display: "block"
+                display: {
+                  sm: "none"
                 }
               },
               children: /*#__PURE__*/_jsx(MenuIcon, {})
@@ -235,21 +251,16 @@ function AppHeader(props) {
               style: {
                 display: "inline-flex",
                 alignItems: "center",
-                color: textColor,
+                color: textColor || "#000000",
                 fontSize: logoFontSize,
                 fontFamily: titleFontFamily,
                 justifyContent: isLogoRight ? "end" : "start"
               },
               sx: {
                 flexGrow: 1,
-                [theme.breakpoints.up("sm")]: {
-                  display: "block"
-                },
-                [theme.breakpoints.between("xs", "md")]: {
-                  display: "none"
-                },
-                "& img": {
-                  marginRight: "7px"
+                display: {
+                  xs: "none",
+                  sm: "block"
                 }
               },
               className: "app-logo",
@@ -263,11 +274,9 @@ function AppHeader(props) {
               }) : null, appTitle]
             }), /*#__PURE__*/_jsxs(Box, {
               sx: {
-                [theme.breakpoints.up("sm")]: {
-                  display: "block"
-                },
-                [theme.breakpoints.between("xs", "md")]: {
-                  display: "none"
+                display: {
+                  xs: "none",
+                  sm: "block"
                 }
               },
               children: [isDrawer ? /*#__PURE__*/_jsx(IconButton, {
@@ -290,7 +299,7 @@ function AppHeader(props) {
                     fontFamily: fontFamily,
                     textTransform: "none",
                     fontSize: fontSize || "16px",
-                    color: textColor || "#FFF",
+                    color: textColor || "#000",
                     background: bgColor || "none",
                     "& .m-settings": {
                       display: "none",
@@ -305,7 +314,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

@@ -1,7 +1,8 @@
 import React, { useState } from "react";
 import { Transforms } from "slate";
 import { ReactEditor, useSlateStatic } from "slate-react";
-import { IconButton, Tooltip, Box, useTheme } from "@mui/material";
+import { IconButton, Tooltip, Box } from "@mui/material";
+// import * as fIcons from "@mui/icons-material";
 import MUIIcon from "../../common/StyleBuilder/fieldTypes/loadIcon";
 import SettingsIcon from "@mui/icons-material/Settings";
 import OpenInNewIcon from "@mui/icons-material/OpenInNew";
@@ -9,13 +10,15 @@ import LinkIcon from "@mui/icons-material/Link";
 import ButtonPopup from "./ButtonPopup";
 import { actionButtonRedirect } from "../../service/actionTrigger";
 import { WorkflowIcon } from "../../common/iconslist";
-import { getTRBLBreakPoints, getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
+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 => {
-  const theme = useTheme();
   const {
     attributes,
     element,
@@ -30,6 +33,12 @@ 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,
@@ -43,7 +52,7 @@ const EditorButton = props => {
     fontFamily,
     textColorHover,
     bgColorHover,
-    buttonIcon,
+    // buttonIcon,
     iconPosition = "start",
     borderStyle,
     borderWidth,
@@ -62,13 +71,15 @@ const EditorButton = props => {
   } = actionTrigger || {
     options: []
   };
-  const isTrigger = linkType === "actionTrigger";
+  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 () => {
     if (metadata?.buttonLink?.handler) {
-      metadata.buttonLink.handler("click");
+      const response = isTrigger ? linkType : "click";
+      metadata.buttonLink.handler(response);
     } else if (redirectOnURLResult) {
       // call api and redirect based on api result
       const apiResult = await actionButtonRedirect({}, {
@@ -81,6 +92,7 @@ const EditorButton = props => {
     }
   };
   const buttonProps = handleLinkType(refURl, linkType, readOnly, openInNewTab, handleTrigger);
+  console.log(openInNewTab);
   const onMenuClick = val => () => {
     switch (val) {
       case "edit":
@@ -153,33 +165,21 @@ const EditorButton = props => {
   const onClose = () => {
     setEdit(false);
   };
-  const tAlign = alignment || textAlign || "left";
-  const btnSp = groupByBreakpoint({
-    borderRadius: {
-      ...getBreakPointsValue(borderRadius || {}, null, "overrideBorderRadius", true)
-    },
-    padding: {
-      ...getTRBLBreakPoints(bannerSpacing)
-    }
-  }, theme);
-  const pSp = groupByBreakpoint({
-    display: {
-      xs: xsHidden ? "none" : "inline-block",
-      lg: "inline-block"
-    }
-  }, theme);
   return /*#__PURE__*/_jsxs("div", {
-    className: `editor-btn-wrapper`,
+    className: "editor-btn-wrapper",
     ...attributes,
     style: {
-      textAlign: tAlign
+      textAlign: alignment || textAlign || "left"
     },
     contentEditable: false,
     children: [/*#__PURE__*/_jsx(Box, {
       component: "div",
       className: "editor-btn-wrapper-inner",
       sx: {
-        ...pSp,
+        display: {
+          lg: "inline-block",
+          xs: xsHidden ? "none" : "inline-block"
+        },
         "& .element-toolbar": {
           display: "none"
         },
@@ -195,18 +195,11 @@ const EditorButton = props => {
           display: "inline-block"
         },
         children: [/*#__PURE__*/_jsxs(Box, {
-          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",
@@ -214,14 +207,26 @@ 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} !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,11 +1,15 @@
-import React, { useState } from "react";
-import { Box, IconButton, Popover } from "@mui/material";
+import React, { useContext, useState } from "react";
+import { Box, IconButton, Popover, Typography, useTheme } 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) {
@@ -31,9 +35,7 @@ const SingleColorButton = ({
     style: {
       width: "100%",
       display: "flex",
-      alignItems: "center",
-      padding: padding || "8px",
-      justifyContent: "center"
+      padding: padding || "8px"
     },
     children: [crs.map(m => /*#__PURE__*/_jsx(Button, {
       onClick: handleSelect(m),
@@ -109,11 +111,17 @@ const ColorButtons = props => {
     forMiniTool,
     openColorTool,
     onClose,
-    onColorPickerClick
+    onColorPickerClick,
+    disableEditTheme
   } = 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);
   };
@@ -126,6 +134,7 @@ const ColorButtons = props => {
   const handleSelect = color => () => {
     onSelect(color);
   };
+  const colorVars = theme?.vars?.colors || {};
   return /*#__PURE__*/_jsxs(Box, {
     component: "span",
     sx: classes.colorButtons,
@@ -142,7 +151,7 @@ const ColorButtons = props => {
           activeColor: activeColor
         }, `si_btn_row1_${m}_${i}`);
       })
-    }), /*#__PURE__*/_jsxs(Popover, {
+    }), /*#__PURE__*/_jsx(Popover, {
       open: open || openColorTool,
       anchorEl: anchorEl || openColorTool,
       onClose: handleClose,
@@ -156,9 +165,39 @@ const ColorButtons = props => {
       },
       sx: classes.colorPopper,
       className: "colorPopper",
-      children: [/*#__PURE__*/_jsx(Box, {
+      children: /*#__PURE__*/_jsxs(Box, {
         sx: classes.colorButtonsInner,
-        children: restRows.map((m, i) => {
+        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) => {
           return /*#__PURE__*/_jsx(SingleColorButton, {
             id: `p2_${id}`,
             crs: m,
@@ -167,14 +206,18 @@ const ColorButtons = props => {
             classes: classes,
             activeColor: activeColor
           }, `si_btn_${m}_${i}`);
-        })
-      }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
-        onClick: onColorPickerClick,
-        children: /*#__PURE__*/_jsx("img", {
-          src: ColorPicker,
-          alt: "color wheel"
-        })
-      }) : null]
+        }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
+          onClick: onColorPickerClick,
+          style: {
+            alignSelf: "start",
+            margin: "6px"
+          },
+          children: /*#__PURE__*/_jsx("img", {
+            src: ColorPicker,
+            alt: "color wheel"
+          })
+        }) : null]
+      })
     })]
   });
 };

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

@@ -60,4 +60,28 @@
   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,7 +1,6 @@
 import React, { useState } from "react";
 import { ReactEditor } from "slate-react";
 import { Transforms } from "slate";
-import ColorPickerTool from "react-gcolor-picker";
 import { IconButton, Tooltip, Box, Popover } from "@mui/material";
 import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions";
 import ColorButtons from "./ColorButtons";
@@ -9,6 +8,7 @@ import ColorPickerStyles from "./Styles";
 import colorWheel from "./colorWheel.png";
 import "./ColorPicker.css";
 import { useEditorContext } from "../../hooks/useMouseMove";
+import CustomColorPicker from "../../common/CustomColorPicker";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -95,10 +95,10 @@ const ColorPicker = props => {
         horizontal: "top"
       },
       sx: classes.colorPickerPopup,
-      children: /*#__PURE__*/_jsx(ColorPickerTool, {
+      children: /*#__PURE__*/_jsx(CustomColorPicker, {
         gradient: true,
-        value: activeColor,
-        onChange: handleFormSubmit
+        onChange: handleFormSubmit,
+        color: activeColor
       })
     })]
   });

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

@@ -15,7 +15,8 @@ const ColorPickerStyles = theme => ({
   colorPopper: {
     "& .MuiPaper-root": {
       backgroundColor: theme?.palette?.editor?.background,
-      '@media only screen and (max-width: 600px)': {
+      padding: "4px 14px",
+      "@media only screen and (max-width: 600px)": {
         marginTop: "-40px"
       }
     }

package/dist/Editor/Elements/Embed/Image.js

@@ -4,16 +4,15 @@ import { Node, Transforms, Editor } from "slate";
 import AspectRatioIcon from "@mui/icons-material/AspectRatio";
 import useResize from "../../utils/customHooks/useResize";
 import EmbedPopup from "./EmbedPopup";
-import { IconButton, Tooltip, Box, useTheme } from "@mui/material";
+import { IconButton, Tooltip, Box } from "@mui/material";
 import { GridSettingsIcon, LinkIcon } from "../../common/iconslist";
 import { useEditorContext } from "../../hooks/useMouseMove";
-import { getTRBLBreakPoints, getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
+import { getTRBLBreakPoints, getBreakPointsValue } from "../../helper/theme";
 import Icon from "../../common/Icon";
 import frames from "./Frames";
 import ImageFrame from "./Frames/ImageFrame";
 import LinkSettings from "../../common/LinkSettings";
 import { handleLinkType } from "../../utils/helper";
-import { wrapThemeBreakpoints } from "../FreeGrid/breakpointConstants";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const ToolBar = ({
@@ -66,7 +65,6 @@ const ImageContent = ({
     objectFit,
     webAddress
   } = element;
-  const theme = useTheme();
   return !url && !readOnly ? /*#__PURE__*/_jsxs(Box, {
     component: "button",
     className: "element-empty-btn",
@@ -81,7 +79,9 @@ const ImageContent = ({
     component: "img",
     className: "emb-img",
     sx: {
-      ...wrapThemeBreakpoints(getBreakPointsValue(borderRadius || {}, null, "overrideBorderRadius", true), "borderRadius", theme),
+      borderRadius: {
+        ...getBreakPointsValue(borderRadius || {}, null, "overrideBorderRadius", true)
+      },
       objectFit: "cover",
       boxShadow: boxShadow || "none",
       height: objectFit ? "100%" : "auto",
@@ -105,7 +105,6 @@ const Image = ({
   children,
   customProps
 }) => {
-  const theme = useTheme();
   const {
     url,
     bannerSpacing,
@@ -228,14 +227,12 @@ const Image = ({
       };
     } else {
       return {
-        ...groupByBreakpoint({
-          width: url ? {
-            ...getBreakPointsValue(getSize(), null, "overrideReSize", true)
-          } : "100%",
-          height: objectFit && url ? {
-            ...getBreakPointsValue(getSize(), null, "overrideReSizeH", true)
-          } : "auto"
-        }, theme)
+        width: url ? {
+          ...getBreakPointsValue(getSize(), null, "overrideReSize", true)
+        } : "100%",
+        height: objectFit && url ? {
+          ...getBreakPointsValue(getSize(), null, "overrideReSizeH", true)
+        } : "auto"
       };
     }
   };
@@ -250,7 +247,9 @@ const Image = ({
       },
       width: `100%`,
       maxWidth: "100%",
-      ...wrapThemeBreakpoints(getTRBLBreakPoints(bannerSpacing), "padding", theme),
+      padding: {
+        ...getTRBLBreakPoints(bannerSpacing)
+      },
       backgroundColor: bgColor,
       justifyContent: horizantal,
       alignContent: vertical