@flozy/editor 7.0.9 → 8.0.1

package/dist/Editor/common/RnD/ElementSettings/Settings/ButtonSettings.js

@@ -8,7 +8,8 @@ const ButtonSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
@@ -28,7 +29,7 @@ const ButtonSettings = props => {
     });
   };
   const handleClose = () => {
-    console.log("close");
+    onClose();
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

package/dist/Editor/common/RnD/ElementSettings/Settings/CodeSettings.js

@@ -8,7 +8,8 @@ const CodeSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
@@ -27,7 +28,7 @@ const CodeSettings = props => {
     });
   };
   const handleClose = () => {
-    console.log("close");
+    onClose();
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

package/dist/Editor/common/RnD/ElementSettings/Settings/FormSettings.js

@@ -12,7 +12,8 @@ const FormSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path];
@@ -55,13 +56,14 @@ const FormSettings = props => {
     }
   };
   const handleClose = () => {
-    console.log("close");
+    onClose();
   };
   const muiTheme = createTheme({
     components: {
       MuiAccordion: {
         styleOverrides: {
           root: {
+            background: theme?.palette?.editor?.miniToolBarBackground,
             "& .MuiAccordionSummary-root": {
               flexDirection: "row-reverse",
               "& .MuiSvgIcon-root": {

package/dist/Editor/common/RnD/ElementSettings/Settings/ImageSettings.js

@@ -8,7 +8,8 @@ const ImageSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
@@ -27,7 +28,7 @@ const ImageSettings = props => {
     });
   };
   const handleClose = () => {
-    console.log("close");
+    onClose();
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

package/dist/Editor/common/RnD/ElementSettings/Settings/TableSettings.js

@@ -9,7 +9,8 @@ const TableSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
@@ -57,7 +58,7 @@ const TableSettings = props => {
     }
   };
   const handleClose = () => {
-    console.log("close");
+    onClose();
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

package/dist/Editor/common/RnD/ElementSettings/Settings/VideoSettings.js

@@ -8,7 +8,8 @@ const VideoSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
@@ -28,7 +29,7 @@ const VideoSettings = props => {
     });
   };
   const handleClose = () => {
-    console.log("close");
+    onClose();
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

package/dist/Editor/common/RnD/ElementSettings/styles.js

@@ -59,7 +59,6 @@ const useElementSettingsStyle = theme => ({
       overflowX: "hidden",
       overflowY: "auto",
       background: theme?.palette?.editor?.background,
-      paddingLeft: "4px",
       "& .MuiTypography-root, .MuiInputBase-root, input": {
         color: theme?.palette?.editor?.textColor
       },

package/dist/Editor/common/RnD/SwitchViewport/SwitchViewport.js

@@ -9,17 +9,23 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 const SwitchViewport = props => {
   const {
     breakpoint,
-    onChange
+    onChange,
+    show
   } = props;
   const classes = useSwitchViewport();
   const {
+    setSelectedElement,
     setActiveBreakPoint
   } = useEditorContext();
   useEffect(() => {
-    console.log(breakpoint);
+    // to reset selection on viewport changes - FS-6589
+    setSelectedElement({});
   }, [breakpoint]);
   return /*#__PURE__*/_jsxs(Box, {
     sx: classes.root,
+    style: {
+      display: show ? "block" : "none"
+    },
     children: [/*#__PURE__*/_jsx(Tooltip, {
       title: "Desktop View",
       children: /*#__PURE__*/_jsx(IconButton, {

package/dist/Editor/common/RnD/Theme/MainThemeProvider.js

@@ -0,0 +1,17 @@
+import { Experimental_CssVarsProvider as CssVarsProvider, experimental_extendTheme as extendTheme } from "@mui/material/styles";
+import { jsx as _jsx } from "react/jsx-runtime";
+function MainThemeProvider({
+  children,
+  userSelectedTheme,
+  theme = {}
+}) {
+  const themeVars = extendTheme(userSelectedTheme?.theme?.cssVars || {});
+  return /*#__PURE__*/_jsx(CssVarsProvider, {
+    theme: {
+      ...themeVars,
+      ...theme
+    },
+    children: children
+  });
+}
+export default MainThemeProvider;

package/dist/Editor/common/RnD/Theme/ViewportStimulator.js

@@ -1,6 +1,7 @@
 import React from "react";
-import { useTheme, ThemeProvider, createTheme } from "@mui/material";
+import { useTheme, createTheme } from "@mui/material";
 import { isStimulator, STIMULATOR_MOCK } from "../../../hooks/useBreakpoints";
+import MainThemeProvider from "./MainThemeProvider";
 
 // Custom breakpoints functions
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -51,12 +52,14 @@ const extendedTheme = prevTheme => createTheme({
   }
 });
 const ViewportStimulator = ({
-  children
+  children,
+  selectedTheme
 }) => {
   const theme = useTheme();
   const viewportTheme = extendedTheme(theme);
-  return /*#__PURE__*/_jsx(ThemeProvider, {
+  return /*#__PURE__*/_jsx(MainThemeProvider, {
     theme: viewportTheme,
+    userSelectedTheme: selectedTheme,
     children: children
   });
 };

package/dist/Editor/common/RnD/Utils/gridDropItem.js

@@ -2,10 +2,11 @@ import { Transforms, Node, Path } from "slate";
 import { ReactEditor } from "slate-react";
 import { handleNegativeInteger } from "../../../utils/helper";
 export const ROW_HEIGHT = 50;
-const MARGIN_OF = {
-  xs: 160,
-  lg: 490
-};
+
+// const MARGIN_OF = {
+//   xs: 160,
+//   lg: 490,
+// };
 
 /**
  * This method will update the grid template rows of parent section based on height

package/dist/Editor/common/RnD/Utils/index.js

@@ -1,6 +1,9 @@
 import { Transforms, Node } from "slate";
 import { ReactEditor } from "slate-react";
 import { getNearestItem } from "./calculateDropItem";
+import { ROW_HEIGHT, getBorderWidth } from "./gridDropItem";
+import { handleNegativeInteger } from "../../../utils/helper";
+import { getDevice } from "../../../helper/theme";
 const GUIDE_LINE_THRESHOLD = 5;
 const GUIDE_LINE_OVERLAP_THRESHOLD = 5;
 const handleMoveNode = (editor, path, newPath, {
@@ -248,4 +251,46 @@ export function getParentSectionPath(props, closestClass) {
   } catch (err) {
     console.log(err);
   }
+}
+export function getAbsolutePositionX(currentEle) {
+  const isMobile = getDevice(window.innerWidth) === "xs";
+  const {
+    left: currElementLeft
+  } = currentEle?.getBoundingClientRect() || {};
+  let parentBoxDom = currentEle?.closest(".fgi_type_box");
+  if (isMobile && !parentBoxDom) {
+    parentBoxDom = currentEle?.closest(".freegrid-section");
+  }
+  const relativeElementX = parentBoxDom || document.querySelector(".rnd-guideline-lv");
+  const {
+    left
+  } = relativeElementX?.getBoundingClientRect() || {};
+  const borderLeftWidth = getBorderWidth(relativeElementX, "borderLeftWidth");
+  const absolutePositionX = parseInt(currElementLeft - left - borderLeftWidth);
+  return {
+    absolutePositionX
+  };
+}
+export function getAbsolutePositionY(currentEle) {
+  const {
+    top: currElementTop
+  } = currentEle?.getBoundingClientRect() || {};
+  const relativeElementY = currentEle?.closest(".freegrid-container-parent");
+  const borderTopWidth = getBorderWidth(relativeElementY, "borderTopWidth");
+  const rect = relativeElementY.getBoundingClientRect();
+  const absolutePositionY = handleNegativeInteger(currElementTop - rect.top - borderTopWidth);
+
+  // Calculate grid position
+  const row = Math.floor(absolutePositionY / ROW_HEIGHT) + 1;
+
+  // Update grid area
+  const gridArea = `${row} / 1 / ${row + 1} / 2`;
+
+  // to calculate difference inside the grid
+  const marginTop = Math.abs((row - 1) * ROW_HEIGHT - absolutePositionY);
+  return {
+    absolutePositionY,
+    gridArea,
+    marginTop
+  };
 }

package/dist/Editor/common/RnD/index.js

@@ -6,7 +6,7 @@ import Handles from "./TransformHandles";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import ElementOptions from "./ElementOptions";
 import ElementSettings from "./ElementSettings";
-import { getClosestDraggable, getParentSectionPath } from "./Utils";
+import { getAbsolutePositionX, getAbsolutePositionY, getClosestDraggable, getParentSectionPath } from "./Utils";
 import DragInfo from "./DragInfo";
 import GuideLines from "./GuideLines";
 import ShadowElement from "./ShadowElement";
@@ -425,9 +425,26 @@ const RnD = props => {
   };
   const onResizeStop = (e, direction, ref, d, position) => {
     e.preventDefault();
+    let updatedPosition = {};
+    if (type !== "parent") {
+      // update element position while resizing, (for free grid box and item)
+      const {
+        absolutePositionX
+      } = getAbsolutePositionX(ref);
+      const {
+        gridArea,
+        marginTop
+      } = getAbsolutePositionY(ref);
+      updatedPosition = {
+        left: absolutePositionX,
+        gridArea: gridArea,
+        marginTop: marginTop
+      };
+    }
     const updatedSize = {
       width: delta?.width + d.width,
-      height: delta?.height + d.height
+      height: delta?.height + d.height,
+      ...updatedPosition
     };
     onChange({
       ...updatedSize
@@ -505,7 +522,10 @@ const RnD = props => {
       ref: c => {
         positionRef.current = c;
       },
-      className: `${className || ""} ${dragInfoOpen ? "active-drag" : "inactive-drag"} enable-${enable} type_${childType} section_type_${type || "parent"}`,
+      className: `${className || ""} ${dragInfoOpen ? "active-drag" : "inactive-drag"} enable-${enable} type_${childType} section_type_${type || "parent"} ${Object.keys(absPosition)?.length ? "" : "remove-resize-styles"
+      // Fix rerender issue (remove-resize-styles): After resizing, click close button on a free grid-selected element
+      // doesn't remove the default `transform` style from react-rnd. Removing it manually.
+      }`,
       "data-path": str_path,
       style: {
         position: "relative",

package/dist/Editor/common/Section/index.js

@@ -2,36 +2,34 @@ import React, { useRef, useState } from "react";
 import { useTheme } from "@mui/material";
 import { Transforms } from "slate";
 import { ReactEditor, useSlateStatic } from "slate-react";
-import { Box, IconButton, Popper, Tooltip } from "@mui/material";
+import { Box, IconButton, Tooltip } from "@mui/material";
 import SectionPopup from "../../Elements/Grid/SectionPopup";
 import { getBreakPointsValue, getTRBLBreakPoints, groupByBreakpoint } from "../../helper/theme";
-import DragHandle from "../DnD/DragHandleButton";
-import { useEditorSelection } from "../../hooks/useMouseMove";
+// import DragHandle from "../DnD/DragHandleButton";
+// import { useEditorSelection } from "../../hooks/useMouseMove";
 import SectionStyle from "./styles";
 import useWindowResize from "../../hooks/useWindowResize";
 import { SectionSettingIcon } from "../iconListV2";
+
+// const list_types = ["orderedList", "unorderedList"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 const Toolbar = ({
-  fromPopper,
   readOnly,
   showTool,
-  onSettings
+  onSettings,
+  isSectionFullWidth
 }) => {
   return !readOnly && !showTool ? /*#__PURE__*/_jsx(Box, {
     component: "div",
     className: `element-toolbar no-border-button hr section-tw sectionIcon`,
     contentEditable: false,
-    style: fromPopper ? {
-      position: "unset",
-      marginLeft: "28px",
-      paddingTop: "4px",
-      marginRight: "10px",
-      height: "100%"
-    } : {
-      left: "-28px",
-      top: "1px"
+    sx: {
+      left: isSectionFullWidth ? "0px" : "-28px",
+      top: isSectionFullWidth ? "-28px" : "1px",
+      "&:hover": {
+        backgroundColor: "rgba(0,0,0,0.5)"
+      }
     },
     children: /*#__PURE__*/_jsx(Tooltip, {
       title: "Section Settings",
@@ -42,7 +40,6 @@ const Toolbar = ({
     })
   }) : null;
 };
-const list_types = ["orderedList", "unorderedList"];
 const Section = props => {
   const themeReact = useTheme();
   const theme = props?.theme;
@@ -56,7 +53,8 @@ const Section = props => {
     readOnly
   } = customProps;
   const editor = useSlateStatic();
-  const [showTool] = useEditorSelection(editor);
+  // const [isHovering, setIsHovering] = useState(false);
+  const [size] = useWindowResize();
   const [openSetttings, setOpenSettings] = useState(false);
   const {
     sectionBgColor,
@@ -73,41 +71,11 @@ const Section = props => {
   } = sectionAlignment || {};
   const path = ReactEditor.findPath(editor, element);
   const anchorEl = useRef(null);
-  const popperEl = useRef(null);
-  const [size] = useWindowResize();
+  // const popperEl = useRef(null);
+  // const [showTool] = useEditorSelection(editor);
   const isSectionFullWidth = sectionGridSize && sectionGridSize[size?.device] >= 12;
-  const [isHovering, setIsHovering] = useState(false);
-  const onMouseEnter = () => {
-    setIsHovering(true);
-  };
-  const onMouseLeave = () => {
-    setIsHovering(false);
-  };
-  const onSettings = () => {
-    setOpenSettings(true);
-  };
-  const onSave = data => {
-    const updateData = {
-      ...data
-    };
-    delete updateData.children;
-    Transforms.setNodes(editor, {
-      ...updateData
-    }, {
-      at: path
-    });
-    onClose();
-  };
-  const onClose = () => {
-    setOpenSettings(false);
-  };
-  const onDelete = () => {
-    Transforms.removeNodes(editor, {
-      at: path
-    });
-  };
-  const isFreeGrid = element?.children?.find(f => f.type === "freegrid");
-  const needHover = element?.children?.find(f => f.type === "grid" && !list_types.includes(element.type)) ? "" : "";
+  const isFreeGrid = element?.children[0]?.type === "freegrid";
+  const needHover = false;
   let tempProps = {};
   if (element?.type === "temp") {
     tempProps = {
@@ -131,6 +99,38 @@ const Section = props => {
       ...getBreakPointsValue(sectionGridSize || 8, null, "overrideGridSize", true)
     }
   }, themeReact);
+
+  // const onMouseEnter = () => {
+  //   setIsHovering(true);
+  // };
+
+  // const onMouseLeave = () => {
+  //   setIsHovering(false);
+  // };
+
+  const onSettings = () => {
+    setOpenSettings(true);
+  };
+  const onSave = data => {
+    const updateData = {
+      ...data
+    };
+    delete updateData.children;
+    Transforms.setNodes(editor, {
+      ...updateData
+    }, {
+      at: path
+    });
+    onClose();
+  };
+  const onClose = () => {
+    setOpenSettings(false);
+  };
+  const onDelete = () => {
+    Transforms.removeNodes(editor, {
+      at: path
+    });
+  };
   return path.length === 1 && !isFreeGrid ? /*#__PURE__*/_jsxs(Box, {
     component: "div",
     className: `ed-section-wrapper ${readOnly ? "" : "hselect"} ${needHover} is-${element?.type}`,
@@ -145,9 +145,10 @@ const Section = props => {
       flexDirection: flexDirection || "column",
       alignItems: horizantal,
       justifyContent: vertical
-    },
-    onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave,
+    }
+    // onMouseEnter={onMouseEnter}
+    // onMouseLeave={onMouseLeave}
+    ,
     children: [/*#__PURE__*/_jsxs(Box, {
       className: "ed-section-inner",
       sx: {
@@ -155,41 +156,11 @@ const Section = props => {
         ...edInnerSp
       },
       ref: anchorEl,
-      children: [isHovering && isSectionFullWidth ? /*#__PURE__*/_jsx(Popper, {
-        open: isHovering && isSectionFullWidth,
-        anchorEl: anchorEl?.current,
-        placement: "top-start",
-        sx: {
-          zIndex: 9999
-        },
-        disablePortal: true,
-        ref: popperEl,
-        className: "sectionPopper",
-        children: /*#__PURE__*/_jsxs(Box, {
-          sx: {
-            bgcolor: "background.paper",
-            height: "30px",
-            position: "relative",
-            background: theme?.palette?.type === "dark" ? theme?.palette?.editor?.miniToolBarBackground : "#F6F6F6"
-          },
-          children: [!readOnly && !showTool ? /*#__PURE__*/_jsx(DragHandle, {
-            ...props,
-            fromPopper: true
-          }) : null, /*#__PURE__*/_jsx(Toolbar, {
-            fromPopper: true,
-            readOnly: readOnly,
-            showTool: showTool,
-            onSettings: onSettings
-          })]
-        })
-      }) : /*#__PURE__*/_jsxs(_Fragment, {
-        children: [!readOnly && !showTool ? /*#__PURE__*/_jsx(DragHandle, {
-          ...props
-        }) : null, /*#__PURE__*/_jsx(Toolbar, {
-          readOnly: readOnly,
-          showTool: showTool,
-          onSettings: onSettings
-        })]
+      children: [/*#__PURE__*/_jsx(Toolbar, {
+        isSectionFullWidth: isSectionFullWidth,
+        readOnly: readOnly,
+        showTool: false,
+        onSettings: onSettings
       }), children]
     }), openSetttings ? /*#__PURE__*/_jsx(SectionPopup, {
       element: {

package/dist/Editor/common/Shorthands/elements.js

@@ -43,6 +43,60 @@ const ELEMENTS_LIST = [{
     icon: "headingThree"
   }),
   onInsert: editor => toggleBlock(editor, "headingThree", false)
+}, {
+  name: "Heading 4",
+  desc: "",
+  group: "Text",
+  type: "headingFour",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "headingFour"
+  }),
+  onInsert: editor => toggleBlock(editor, "headingFour", false)
+}, {
+  name: "Heading 5",
+  desc: "",
+  group: "Text",
+  type: "headingFive",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "headingFive"
+  }),
+  onInsert: editor => toggleBlock(editor, "headingFive", false)
+}, {
+  name: "Heading 6",
+  desc: "",
+  group: "Text",
+  type: "headingSix",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "headingSix"
+  }),
+  onInsert: editor => toggleBlock(editor, "headingSix", false)
+}, {
+  name: "Paragraph 1",
+  desc: "",
+  group: "Text",
+  type: "paragraphOne",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "paragraphOne"
+  }),
+  onInsert: editor => toggleBlock(editor, "paragraphOne", false)
+}, {
+  name: "Paragraph 2",
+  desc: "",
+  group: "Text",
+  type: "paragraphTwo",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "paragraphTwo"
+  }),
+  onInsert: editor => toggleBlock(editor, "paragraphTwo", false)
+}, {
+  name: "Paragraph 3",
+  desc: "",
+  group: "Text",
+  type: "paragraphThree",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "paragraphThree"
+  }),
+  onInsert: editor => toggleBlock(editor, "paragraphThree", false)
 }, {
   name: "Quote",
   desc: "",

package/dist/Editor/common/StyleBuilder/buttonStyle.js

@@ -21,7 +21,8 @@ const buttonStyle = [{
         },
         children: option.text
       });
-    }
+    },
+    themeEnabled: true
   }, {
     label: "Font Size",
     key: "textSize",
@@ -45,7 +46,8 @@ const buttonStyle = [{
   }, {
     label: "Button Color",
     key: "bgColor",
-    type: "color"
+    type: "color",
+    themeEnabled: true
   }, {
     label: "Border Color",
     key: "borderColor",

package/dist/Editor/common/StyleBuilder/fieldTypes/backgroundImage.js

@@ -73,6 +73,11 @@ const BackgroundImage = props => {
             children: "REMOVE"
           }) : /*#__PURE__*/_jsx(Grid, {
             className: "uploadImageText",
+            sx: {
+              padding: 0,
+              background: `${theme?.palette?.editor?.inputFieldBgColor}`,
+              border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`
+            },
             children: /*#__PURE__*/_jsxs(Button, {
               component: "label",
               variant: "text",

package/dist/Editor/common/StyleBuilder/fieldTypes/bannerSpacing.js

@@ -3,13 +3,13 @@ import { Checkbox, FormControlLabel, Grid, Slider, Typography, Box, IconButton }
 import { squreStyle } from "./radiusStyle";
 import { getBreakPointsValue } from "../../../helper/theme";
 import useWindowResize from "../../../hooks/useWindowResize";
+import { useEditorTheme } from "../../../hooks/useEditorTheme";
 import { CheckedBoxCheckIcon } from "../../iconListV2";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const BANNER_SPACING_KEYS = ["top", "left", "right", "bottom"];
 const BannerSpacing = props => {
   const {
-    value: val,
     data,
     onChange,
     elementProps,
@@ -19,7 +19,17 @@ const BannerSpacing = props => {
     key
   } = data;
   const lockKeyVal = `lock${key}`;
-  let lockSpacing = elementProps[lockKeyVal];
+  const {
+    selectedTheme
+  } = useEditorTheme();
+  const {
+    bannerSpacing,
+    lockbannerSpacing
+  } = selectedTheme?.elementProps?.button || {};
+  const isUserValue = Object.keys(props?.value || {})?.length;
+  const isUserLockedSpacing = typeof elementProps[lockKeyVal] === "boolean";
+  const val = isUserValue ? props?.value : bannerSpacing;
+  let lockSpacing = isUserLockedSpacing ? elementProps[lockKeyVal] : lockbannerSpacing;
   if (lockSpacing === undefined) {
     lockSpacing = true;
   }