@flozy/editor 9.2.8 → 9.3.0

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

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

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,14 +12,16 @@ const FormSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path];
   const element = Node.get(editor, element_path);
   const styleMaps = formStyle;
   const {
-    hideTools
+    hideTools,
+    translation
   } = customProps || {};
   const {
     theme
@@ -55,13 +57,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": {
@@ -107,7 +110,7 @@ const FormSettings = props => {
                   fontSize: "14px !important",
                   fontWeight: "400"
                 },
-                children: m?.tab
+                children: translation(m?.tab)
               })
             }), /*#__PURE__*/_jsx(AccordionDetails, {
               sx: {

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/TextSettings.js

@@ -8,7 +8,8 @@ const TextSettings = props => {
   const {
     editor,
     path,
-    theme
+    theme,
+    customProps
   } = props;
   const item_path = path.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
@@ -25,7 +26,8 @@ const TextSettings = props => {
   }, []);
   return /*#__PURE__*/_jsx(TextFormat, {
     classes: classes,
-    editor: editor
+    editor: editor,
+    customProps: customProps
   });
 };
 export default TextSettings;

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/OptionsPopup/index.js

@@ -17,7 +17,8 @@ const OptionsPopup = props => {
     open,
     anchorEl,
     placement,
-    handleClose
+    handleClose,
+    translation
   } = props;
   return anchorEl ? /*#__PURE__*/_jsx(Popper, {
     sx: classes.root,
@@ -30,10 +31,10 @@ const OptionsPopup = props => {
       children: [/*#__PURE__*/_jsxs(Typography, {
         variant: "div",
         className: "item-wrapper title",
-        children: [title, /*#__PURE__*/_jsx(Box, {
+        children: [translation(title), /*#__PURE__*/_jsx(Box, {
           component: "div",
           children: /*#__PURE__*/_jsx(Tooltip, {
-            title: "Close",
+            title: translation("Close"),
             arrow: true,
             children: /*#__PURE__*/_jsx(IconButton, {
               onClick: handleClose,

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

@@ -9,19 +9,26 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 const SwitchViewport = props => {
   const {
     breakpoint,
-    onChange
+    onChange,
+    translation,
+    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",
+      title: translation("Desktop View"),
       children: /*#__PURE__*/_jsx(IconButton, {
         className: `${!breakpoint || breakpoint === "lg" ? "active" : ""}`,
         onClick: () => {
@@ -31,7 +38,7 @@ const SwitchViewport = props => {
         children: /*#__PURE__*/_jsx(PersonalVideoIcon, {})
       })
     }), /*#__PURE__*/_jsx(Tooltip, {
-      title: "Mobile View",
+      title: translation("Mobile View"),
       children: /*#__PURE__*/_jsx(IconButton, {
         className: `${breakpoint === "xs" ? "active" : ""}`,
         onClick: () => {

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,9 +1,20 @@
 import React from "react";
-import { useTheme, ThemeProvider, createTheme, useMediaQuery } from "@mui/material";
+import { useTheme, createTheme } from "@mui/material";
 import { isStimulator, STIMULATOR_MOCK } from "../../../hooks/useBreakpoints";
+import MainThemeProvider from "./MainThemeProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
+const isPdf = () => {
+  try {
+    const hash = window.location.hash;
+    const queryString = hash.split("?")[1]; // Get part after "?"
+    const params = new URLSearchParams(queryString);
+    return params.get("isPdf");
+  } catch (err) {
+    console.log(err);
+  }
+};
 
 // Custom breakpoints functions
-import { jsx as _jsx } from "react/jsx-runtime";
 const customUp = (key, breakpoints) => {
   const MOCK_BREAKPOINT = isStimulator();
   if (key === "xs") {
@@ -49,9 +60,9 @@ const getBreakPoints = prevTheme => {
 };
 
 // Extend the existing theme with custom breakpoint functions
-const extendedTheme = (prevTheme, isPrintMode) => createTheme({
+const extendedTheme = prevTheme => createTheme({
   ...prevTheme,
-  breakpoints: isPrintMode ? {
+  breakpoints: isPdf() ? {
     values: {
       ...prevTheme.breakpoints.values,
       md: 400 // To resolve, while taking pdf on A4 size, it is getting mobile view because of breakpoint
@@ -59,13 +70,14 @@ const extendedTheme = (prevTheme, isPrintMode) => createTheme({
   } : getBreakPoints(prevTheme)
 });
 const ViewportStimulator = ({
-  children
+  children,
+  selectedTheme
 }) => {
   const theme = useTheme();
-  const isPrintMode = useMediaQuery("print");
-  const viewportTheme = extendedTheme(theme, isPrintMode);
-  return /*#__PURE__*/_jsx(ThemeProvider, {
+  const viewportTheme = extendedTheme(theme);
+  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/VirtualElement/index.js

@@ -75,13 +75,12 @@ const VirtualElement = props => {
   const virtualRef = useRef();
   useEffect(() => {
     if (virtualRef?.current) {
-      const timeoutId = setTimeout(() => {
+      setTimeout(() => {
         const allData = calculateProps(path, virtualRef?.current, ROOT_ITEM_CLASS, []);
         const groupData = groupByPathAndCalculateHeight(allData);
         // it should trigger by auto alignment or on clicking mobile view change
         updateAutoProps(editor, allData, "xs", groupData);
       }, 100);
-      return () => clearTimeout(timeoutId);
     }
   }, [updated_at, virtualRef?.current]);
   const calculateProps = (curPath, dom, domClass, allData) => {

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";
@@ -64,7 +64,8 @@ const RnD = props => {
     editor,
     breakpoint = "",
     handleContextMenuClick = () => {},
-    itemData = {}
+    itemData = {},
+    customProps
   } = props;
   const {
     isSelectedElement,
@@ -106,6 +107,9 @@ const RnD = props => {
     y: 0
   });
   const parentSectionPath = str_path?.split("|").slice(0, 2).join("_");
+  const {
+    translation
+  } = customProps;
   useEffect(() => {
     if (ITEM_TYPES.includes(type)) {
       if (enable === 1) {
@@ -425,9 +429,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
@@ -500,12 +521,15 @@ const RnD = props => {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs(Box, {
       component: Rnd,
-      placeholder: ItemTypes[childType] || "Item",
+      placeholder: translation(ItemTypes[childType]) || translation("Item"),
       id: eId || "",
       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",
@@ -564,7 +588,9 @@ const RnD = props => {
       optionsProps: optionsProps,
       selectedAction: currentAction,
       path: str_path,
-      theme: theme
+      theme: theme,
+      translation: translation,
+      customProps: customProps
     }) : null, /*#__PURE__*/_jsx(ElementSettings, {
       open: Boolean(currentAction),
       currentAction: currentAction,
@@ -598,7 +624,8 @@ const RnD = props => {
       open: openContextMenu,
       contextMenu: contextMenu,
       handleClose: handleClose,
-      theme: theme
+      theme: theme,
+      translation: translation
     }), type === "parent" && breakpoint === "lg" && !readOnly ? /*#__PURE__*/_jsx(VirtualElement, {
       parentEle: positionRef?.current?.resizableElement?.current,
       updated_at: updated_at,

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

@@ -18,7 +18,8 @@ const Toolbar = ({
   readOnly,
   showTool,
   onSettings,
-  isSectionFullWidth
+  isSectionFullWidth,
+  translation
 }) => {
   return !readOnly && !showTool ? /*#__PURE__*/_jsx(Box, {
     component: "div",
@@ -32,7 +33,7 @@ const Toolbar = ({
       }
     },
     children: /*#__PURE__*/_jsx(Tooltip, {
-      title: "Section Settings",
+      title: translation("Section Settings"),
       children: /*#__PURE__*/_jsx(IconButton, {
         onClick: onSettings,
         children: /*#__PURE__*/_jsx(SectionSettingIcon, {})
@@ -50,7 +51,8 @@ const Section = props => {
     customProps
   } = props;
   const {
-    readOnly
+    readOnly,
+    translation
   } = customProps;
   const editor = useSlateStatic();
   // const [isHovering, setIsHovering] = useState(false);
@@ -160,7 +162,8 @@ const Section = props => {
         isSectionFullWidth: isSectionFullWidth,
         readOnly: readOnly,
         showTool: false,
-        onSettings: onSettings
+        onSettings: onSettings,
+        translation: translation
       }), children]
     }), openSetttings ? /*#__PURE__*/_jsx(SectionPopup, {
       element: {