@flozy/editor 3.8.1 → 3.8.2

package/dist/Editor/Elements/Accordion/Accordion.js

@@ -9,55 +9,6 @@ import Icon from "../../common/Icon";
 import { useEditorSelection } from "../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const accordionBtnStyleKeys = {
-  accordionTextColor: "textColor",
-  accordionBgColor: "bgColor",
-  accordionBorderColor: "borderColor"
-};
-const getAccordionData = updateData => {
-  const accordionBtnStyle = {}; // accordion btn style will come under type: accordion node
-  const accordionTitleStyle = {}; // accordion title style will come under type: accordion-summary node
-
-  Object.entries(updateData).forEach(([key, value]) => {
-    const accordionBtnStyleKey = accordionBtnStyleKeys[key];
-    if (accordionBtnStyleKey) {
-      // converting accordion button elementProp keys to node keys e.g: accordionTextColor -> textColor
-      accordionBtnStyle[accordionBtnStyleKey] = value;
-      return;
-    }
-    accordionTitleStyle[key] = value;
-  });
-  return {
-    accordionBtnStyle,
-    accordionTitleStyle
-  };
-};
-const convertAccordionBtnStyleKeys = (data = {}) => {
-  const style = {
-    ...data
-  };
-  Object.entries(accordionBtnStyleKeys).forEach(([key, value]) => {
-    const val = data[value];
-    if (val) {
-      // deleting the existing style key in node e.g: textColor
-      delete style[value];
-
-      // convertint into new key in element props e.g: accordionTextColor
-      style[key] = val;
-    }
-  });
-  return style;
-};
-const getElementProps = element => {
-  const accordionSummary = element.children?.find(c => c.type === "accordion-summary");
-
-  // joining accordion title and button styles
-  const elementProps = {
-    ...accordionSummary,
-    ...convertAccordionBtnStyleKeys(element)
-  };
-  return elementProps;
-};
 const Accordion = props => {
   const {
     attributes,
@@ -118,34 +69,16 @@ const Accordion = props => {
       at: path
     });
   };
-  const setNodes = (data, path) => {
-    Transforms.setNodes(editor, data, {
-      at: path
-    });
-  };
   const onSave = data => {
     const updateData = {
       ...data
     };
-    const {
-      accordionBtnStyle,
-      accordionTitleStyle
-    } = getAccordionData(updateData);
-
-    // applying accordion title style
-    const accordionSummary = data.children?.find(c => c.type === "accordion-summary");
-    const accordionSummaryPath = ReactEditor.findPath(editor, accordionSummary);
-    setNodes({
-      ...accordionTitleStyle,
-      type: "accordion-summary",
-      children: accordionSummary.children
-    }, accordionSummaryPath);
-
-    // applying accordion button style
-    delete accordionBtnStyle.children;
-    setNodes({
-      ...accordionBtnStyle
-    }, path);
+    delete updateData.children;
+    Transforms.setNodes(editor, {
+      ...updateData
+    }, {
+      at: path
+    });
     onClose();
   };
   const onClose = () => {
@@ -190,7 +123,7 @@ const Accordion = props => {
       },
       children: children[1]
     }), !readOnly && /*#__PURE__*/_jsx(ToolBar, {}), openSetttings ? /*#__PURE__*/_jsx(AccordionBtnPopup, {
-      element: getElementProps(element),
+      element: element,
       onSave: onSave,
       onClose: onClose,
       customProps: customProps

package/dist/Editor/Elements/Accordion/AccordionBtnPopup.js

@@ -1,7 +1,6 @@
 import React from "react";
 import StyleBuilder from "../../common/StyleBuilder";
 import accordionTitleBtnStyle from "../../common/StyleBuilder/accordionTitleBtnStyle";
-import accordionTitleStyle from "../../common/StyleBuilder/accordionTitleStyle";
 import { jsx as _jsx } from "react/jsx-runtime";
 const AccordionBtnPopup = props => {
   const {
@@ -11,12 +10,12 @@ const AccordionBtnPopup = props => {
     customProps
   } = props;
   return /*#__PURE__*/_jsx(StyleBuilder, {
-    title: "Accordion Settings",
+    title: "Accordion Collapse Button",
     type: "accordionTitleBtnStyle",
     element: element,
     onSave: onSave,
     onClose: onClose,
-    renderTabs: [...accordionTitleBtnStyle, ...accordionTitleStyle],
+    renderTabs: accordionTitleBtnStyle,
     customProps: customProps
   });
 };

package/dist/Editor/Elements/Accordion/AccordionSummary.js

@@ -1,17 +1,68 @@
-import React from "react";
+import React, { useState } from "react";
+import { Transforms } from "slate";
+import { useSelected, useSlateStatic, ReactEditor } from "slate-react";
+import AccordionTitlePopup from "./AccordionTitlePopup";
+import { IconButton, Tooltip } from "@mui/material";
+import { GridSettingsIcon } from "../../common/iconslist";
+import { useEditorSelection } from "../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 const AccordionSummary = props => {
   const {
     attributes,
     children,
-    element
+    element,
+    customProps
   } = props;
+  const {
+    readOnly
+  } = customProps;
+  const [openSetttings, setOpenSettings] = useState(false);
+  const editor = useSlateStatic();
+  const [showTool] = useEditorSelection(editor);
+  const selected = useSelected();
+  const path = ReactEditor.findPath(editor, element);
   const {
     textColor,
     bgColor,
     borderColor
   } = element;
-  return /*#__PURE__*/_jsx("div", {
+  const ToolBar = () => {
+    return selected && !showTool ? /*#__PURE__*/_jsx("div", {
+      className: "element-toolbar hr",
+      contentEditable: false,
+      style: {
+        top: "-42px"
+      },
+      children: /*#__PURE__*/_jsx(Tooltip, {
+        title: "Settings",
+        arrow: true,
+        children: /*#__PURE__*/_jsx(IconButton, {
+          onClick: onSettings,
+          children: /*#__PURE__*/_jsx(GridSettingsIcon, {})
+        })
+      })
+    }) : null;
+  };
+  const onSettings = () => {
+    setOpenSettings(true);
+  };
+  const onSave = data => {
+    const updateData = {
+      ...data
+    };
+    delete updateData.children;
+    Transforms.setNodes(editor, {
+      ...updateData
+    }, {
+      at: path
+    });
+    onClose();
+  };
+  const onClose = () => {
+    setOpenSettings(false);
+  };
+  return /*#__PURE__*/_jsxs("div", {
     className: `accordion-summary-container`,
     ...attributes,
     style: {
@@ -21,7 +72,12 @@ const AccordionSummary = props => {
       border: `1px solid ${borderColor}`,
       color: textColor
     },
-    children: children
+    children: [children, !readOnly && /*#__PURE__*/_jsx(ToolBar, {}), openSetttings ? /*#__PURE__*/_jsx(AccordionTitlePopup, {
+      element: element,
+      onSave: onSave,
+      onClose: onClose,
+      customProps: customProps
+    }) : null]
   });
 };
 export default AccordionSummary;

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,
@@ -71,15 +62,13 @@ const EditorButton = props => {
   } = actionTrigger || {
     options: []
   };
-  const isTrigger = linkType === "nextTrigger" || linkType === "prevTrigger";
+  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 () => {
     if (metadata?.buttonLink?.handler) {
-      const response = isTrigger ? linkType : "click";
-      metadata.buttonLink.handler(response);
+      metadata.buttonLink.handler("click");
     } else if (redirectOnURLResult) {
       // call api and redirect based on api result
       const apiResult = await actionButtonRedirect({}, {
@@ -197,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",
@@ -207,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]
     })]
   });
 };

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,6 +1,7 @@
 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";
@@ -8,7 +9,6 @@ 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(CustomColorPicker, {
+      children: /*#__PURE__*/_jsx(ColorPickerTool, {
         gradient: true,
-        onChange: handleFormSubmit,
-        color: activeColor
+        value: activeColor,
+        onChange: handleFormSubmit
       })
     })]
   });

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

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

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

@@ -167,19 +167,15 @@ const Image = ({
     onTouchEnd
   } = handleLinkType(webAddress, linkType, readOnly, isNewTab);
   const handleImageClick = () => {
-    try {
-      Transforms.select(editor, {
-        anchor: Editor.start(editor, path),
-        focus: Editor.end(editor, path)
-      });
-      if (onClick) {
-        onClick();
-      }
-      if (onTouchEnd) {
-        onTouchEnd();
-      }
-    } catch (err) {
-      console.log(err);
+    Transforms.select(editor, {
+      anchor: Editor.start(editor, path),
+      focus: Editor.end(editor, path)
+    });
+    if (onClick) {
+      onClick();
+    }
+    if (onTouchEnd) {
+      onTouchEnd();
     }
   };
   useEffect(() => {
@@ -193,20 +189,16 @@ const Image = ({
     setOpenSettings(true);
   };
   const onSave = data => {
-    try {
-      const updateData = {
-        ...data
-      };
-      delete updateData.children;
-      Transforms.setNodes(editor, {
-        ...updateData
-      }, {
-        at: path
-      });
-      onClose();
-    } catch (err) {
-      console.log(err);
-    }
+    const updateData = {
+      ...data
+    };
+    delete updateData.children;
+    Transforms.setNodes(editor, {
+      ...updateData
+    }, {
+      at: path
+    });
+    onClose();
   };
   const onClose = () => {
     setOpenSettings(false);
@@ -239,7 +231,7 @@ const Image = ({
   return /*#__PURE__*/_jsxs(Box, {
     ...attributes,
     component: "div",
-    className: "embed has-hover dpath",
+    className: "embed has-hover",
     sx: {
       display: {
         lg: "flex",