@flozy/editor 10.6.5 → 10.6.6

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

@@ -9,6 +9,7 @@ const TextSettings = props => {
     editor,
     path,
     theme,
+    onClose,
     customProps
   } = props;
   const item_path = path.split("|").map(m => parseInt(m));
@@ -27,7 +28,8 @@ const TextSettings = props => {
   return /*#__PURE__*/_jsx(TextFormat, {
     classes: classes,
     editor: editor,
-    customProps: customProps
+    customProps: customProps,
+    closeMainPopup: onClose
   });
 };
 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/ElementSettings/styles.js

@@ -140,7 +140,6 @@ const useElementSettingsStyle = theme => ({
         }
       },
       "& .popUpHeader": {
-        fontSize: "16px",
         fontFamily: "'Inter',sans-serif",
         fontWeight: "700",
         fontSize: "16px",

package/dist/Editor/common/RnD/OptionsPopup/style.js

@@ -15,7 +15,6 @@ const useOptionsPopupStyle = ({
       background: theme?.palette?.editor?.miniToolBarBackground
     },
     "& .sectionOptionTitle": {
-      fontSize: "16px",
       fontFamily: "'Inter',sans-serif",
       fontWeight: "700",
       fontSize: "16px",

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

@@ -3,20 +3,29 @@ import PersonalVideoIcon from "@mui/icons-material/PersonalVideo";
 import PhoneIphoneIcon from "@mui/icons-material/PhoneIphone";
 import useSwitchViewport from "./styles";
 import { useEffect } from "react";
+import { useEditorContext } from "../../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const SwitchViewport = props => {
   const {
     breakpoint,
     onChange,
-    translation
+    translation,
+    show
   } = props;
   const classes = useSwitchViewport();
+  const {
+    setSelectedElement
+  } = 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: translation("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, useMediaQuery } from "@mui/material";
+import { useTheme, createTheme, useMediaQuery } 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";
@@ -59,13 +60,15 @@ 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, {
+  return /*#__PURE__*/_jsx(MainThemeProvider, {
     theme: viewportTheme,
+    userSelectedTheme: selectedTheme,
     children: children
   });
 };

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

@@ -2,6 +2,7 @@ import { Transforms, Node, Path, Editor } from "slate";
 import { ReactEditor } from "slate-react";
 import { getNode, handleNegativeInteger } from "../../../utils/helper";
 import { handleBoxAlignment } from "../VirtualElement/helper";
+import { convertToGridArea, findMaxYValue } from "../../../Elements/FreeGrid/helper";
 export const ROW_HEIGHT = 50;
 
 // const MARGIN_OF = {
@@ -22,18 +23,27 @@ export function updateRows() {}
 export function updateCols() {}
 const handleMoveNode = (editor, path, newPath, {
   isEmpty
-}, autoAlign) => {
+}, autoAlign, moveToNode) => {
   try {
     let replaceNode = Node.get(editor, path);
+    let heightDiff = 0;
     if (autoAlign) {
-      // reset node for auto alignment in mobile
+      const y = findMaxYValue(moveToNode?.children);
+      const {
+        gridArea,
+        marginTop
+      } = convertToGridArea(y);
       replaceNode = {
         ...replaceNode,
-        gridArea_xs: null,
-        xs_updatedOn: null,
-        marginTop_xs: null
+        gridArea_xs: gridArea,
+        marginTop_xs: marginTop + 12,
+        xs_updatedOn: new Date().getTime()
       };
+      const newHeight = y + replaceNode?.height_xs + 12;
+      const diffH = newHeight - moveToNode?.height_xs;
+      heightDiff = diffH >= 0 ? diffH : 0;
     }
+    let rPath;
     if (isEmpty) {
       const toPath = [...newPath, 0];
       Transforms.insertNodes(editor, [{
@@ -44,7 +54,7 @@ const handleMoveNode = (editor, path, newPath, {
       Transforms.removeNodes(editor, {
         at: path
       });
-      return toPath;
+      rPath = toPath;
     } else {
       Transforms.insertNodes(editor, [{
         ...replaceNode
@@ -54,8 +64,12 @@ const handleMoveNode = (editor, path, newPath, {
       Transforms.removeNodes(editor, {
         at: path
       });
-      return newPath;
+      rPath = newPath;
     }
+    return {
+      rPath,
+      heightDiff
+    };
   } catch (err) {
     console.log(err);
     console.log("Drop Node error");
@@ -210,7 +224,7 @@ export function onDropItem(props, parentClass) {
       at: moveTo,
       match: n => n.type === "freegrid"
     });
-    const [sectionNode, sectionPath] = sectionData || [];
+    const [, sectionPath] = sectionData || [];
     if (needMove && isInsidePath(from, moveTo)) {
       reRenderSectionPath = sectionPath;
     } else {
@@ -229,14 +243,6 @@ export function onDropItem(props, parentClass) {
       const isBoxHeader = currentNode?.childType === "appHeader" && moveTo?.length > 2;
       if (isBoxHeader) {
         // will handle on <BoxHeaderAutoAlignment />
-      } else if (moveTo?.length === 2 && autoAlign) {
-        // auto align in mobile
-        Transforms.setNodes(editor, {
-          xs_updatedOn: null,
-          xs_updatedOn: new Date().getTime()
-        }, {
-          at: moveTo
-        });
       } else if (autoAlign) {
         Transforms.setNodes(editor, {
           autoAlign: true,
@@ -245,12 +251,15 @@ export function onDropItem(props, parentClass) {
           at: moveTo
         });
       }
-      const rPath = handleMoveNode(editor, path, newPath, {
+      const {
+        rPath,
+        heightDiff
+      } = handleMoveNode(editor, path, newPath, {
         isEmpty
-      }, autoAlign);
+      }, autoAlign, toSectionNode) || {};
       reRenderChildNodes(editor, reRenderSectionPath || moveTo);
       if (autoAlign && !isBoxHeader) {
-        handleBoxAlignment(editor, sectionNode, sectionPath);
+        handleBoxAlignment(editor, sectionPath, heightDiff);
       }
       return {
         updated_at: rPath

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

@@ -87,7 +87,9 @@ export function updatePositions(props, closestClass) {
         newPath = [...newPath, toSectionNode?.children?.length];
       }
       newPath = newPath.map(m => parseInt(m));
-      const rPath = handleMoveNode(editor, path, newPath, {
+      const {
+        rPath
+      } = handleMoveNode(editor, path, newPath, {
         isEmpty
       });
       // to update path index need to re-render items in parent sections
@@ -122,14 +124,39 @@ const isOverLapLine = ({
 export function getClosestDraggable(x, y, className, activeClassName) {
   const draggables = document.querySelectorAll(className);
   const activeDragEle = document.querySelectorAll(activeClassName)[0];
+  const container = document.querySelector("#slate-wrapper-scroll-container");
+  if (!activeDragEle || !container) return [];
+  const containerRect = container.getBoundingClientRect();
   const {
     left: aLeft,
     top: aTop,
     width: aWidth,
     height: aHeight
   } = activeDragEle?.getBoundingClientRect() || {};
-  let lines = [];
+  const lines = [];
+  const clampLine = ({
+    x,
+    y,
+    width,
+    height
+  }) => {
+    if (width > 1) {
+      if (x < containerRect.left) x = containerRect.left;
+      if (x + width > containerRect.right) width = containerRect.right - x;
+    }
+    if (height > 1) {
+      if (y < containerRect.top) y = containerRect.top;
+      if (y + height > containerRect.bottom) height = containerRect.bottom - y;
+    }
+    return {
+      x,
+      y,
+      width,
+      height
+    };
+  };
   draggables.forEach(draggable => {
+    if (draggable === activeDragEle) return;
     const {
       left,
       top,
@@ -146,42 +173,45 @@ export function getClosestDraggable(x, y, className, activeClassName) {
       x: xVal,
       y: yVal
     }, lines)) {
-      lines.push({
-        y: top,
+      const line = {
         x: xVal,
+        y: yVal,
         width: x > left ? Math.abs(aLeft + aWidth - left) : Math.abs(aLeft - (left + width)),
         height: 1
-      });
+      };
+      lines.push(clampLine(line));
     }
 
     // bottom match
     xVal = x < left ? aLeft : left;
     yVal = top + height;
-    if (Math.abs(top + height - (aTop + aHeight)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
+    if (Math.abs(yVal - (aTop + aHeight)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
       x: xVal,
       y: yVal
     }, lines)) {
-      lines.push({
-        y: yVal,
+      const line = {
         x: xVal,
+        y: yVal,
         width: x > left ? Math.abs(aLeft + aWidth - left) : Math.abs(aLeft - (left + width)),
         height: 1
-      });
+      };
+      lines.push(clampLine(line));
     }
 
-    // center match
+    // center match (horizontal)
     xVal = x < left ? aLeft : left;
     yVal = top + height / 2;
-    if (Math.abs(top + height / 2 - (aTop + aHeight / 2)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
+    if (Math.abs(yVal - (aTop + aHeight / 2)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
       x: xVal,
       y: yVal
     }, lines, "y")) {
-      lines.push({
-        y: yVal,
+      const line = {
         x: xVal,
+        y: yVal,
         width: x > left ? Math.abs(aLeft + aWidth - left) : Math.abs(aLeft - (left + width)),
         height: 1
-      });
+      };
+      lines.push(clampLine(line));
     }
 
     // right match
@@ -191,12 +221,13 @@ export function getClosestDraggable(x, y, className, activeClassName) {
       x: xVal,
       y: yVal
     }, lines)) {
-      lines.push({
-        y: yVal,
+      const line = {
         x: xVal,
+        y: yVal,
         width: 1,
         height: Math.abs(aTop - top)
-      });
+      };
+      lines.push(clampLine(line));
     }
 
     // left match
@@ -206,27 +237,29 @@ export function getClosestDraggable(x, y, className, activeClassName) {
       x: xVal,
       y: yVal
     }, lines)) {
-      lines.push({
-        y: yVal,
+      const line = {
         x: xVal,
+        y: yVal,
         width: 1,
         height: Math.abs(aTop - top)
-      });
+      };
+      lines.push(clampLine(line));
     }
 
-    // middle match
+    // middle match (vertical)
     xVal = left + width / 2;
     yVal = top < aTop ? top : aTop;
-    if (Math.abs(aLeft + aWidth / 2 - (left + width / 2)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
+    if (Math.abs(aLeft + aWidth / 2 - xVal) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
       x: xVal,
       y: yVal
     }, lines)) {
-      lines.push({
-        y: yVal,
+      const line = {
         x: xVal,
+        y: yVal,
         width: 1,
         height: Math.abs(aTop - top)
-      });
+      };
+      lines.push(clampLine(line));
     }
   });
   return lines;

package/dist/Editor/common/RnD/VirtualElement/VirtualTextElement.js

@@ -1,69 +1,45 @@
 import { useEffect, useRef } from "react";
-import { Path, Transforms } from "slate";
 import { getNode } from "../../../utils/helper";
 import { ROW_HEIGHT } from "../Utils/gridDropItem";
-import { findFirstRowOverlap, getGridArea, handleContainers, moveOverlappedItems } from "./helper";
+import { getGridArea, getNodeValues, handleTextAlignment } from "./helper";
 import { Box } from "@mui/material";
 import { jsx as _jsx } from "react/jsx-runtime";
-const updateTextHeight = (editor, path, height) => {
-  if (!height) {
+export const getElementOffset = (element, breakpoint) => {
+  const {
+    height,
+    gridArea,
+    marginTop
+  } = getNodeValues(element, breakpoint);
+  const [startRow] = getGridArea(gridArea);
+  const top = (startRow - 1) * ROW_HEIGHT + marginTop;
+  const bottom = top + height;
+  return {
+    top,
+    bottom
+  };
+};
+export const updateTextHeight = (editor, path, currHeight, updateBreakpoint) => {
+  if (!currHeight) {
     return;
   }
-  const parentPath = Path.parent(path);
-  const currentNode = getNode(editor, parentPath);
-  const gridItems = currentNode?.children || [];
-  const isNewlyAddedElement = gridItems.some(gridItem => !gridItem.gridArea_xs && gridItem.type !== "paragraph");
-  if (isNewlyAddedElement) {
+  const textItem = getNode(editor, path);
+  if (!textItem) {
     return;
   }
-  const textItemIndex = path[parentPath.length];
-  const textItem = gridItems.find((_, index) => textItemIndex === index);
   const {
-    marginTop_xs: marginTop,
-    gridArea_xs: gridArea,
-    height_xs
-  } = textItem;
-  const oldHeight = height_xs + marginTop;
-  const newHeight = height + marginTop;
-  const extraHeight = newHeight - oldHeight;
-  let containerExtraHeight = extraHeight;
-  if (extraHeight > 0) {
-    const [startRow] = getGridArea(gridArea);
-    const newRows = Math.floor(newHeight / ROW_HEIGHT) + 1;
-    const endRow = startRow + newRows;
-    const firstOverlappedRow = findFirstRowOverlap(gridItems, startRow, endRow, textItemIndex);
-    if (firstOverlappedRow) {
-      const moveRows = endRow - firstOverlappedRow;
-      moveOverlappedItems(editor, moveRows, gridItems, parentPath, textItemIndex, startRow);
-      containerExtraHeight += moveRows * ROW_HEIGHT;
-    }
-
-    // handle containers (box and section)
-    const containerData = handleContainers(editor, parentPath, containerExtraHeight);
-    containerData.forEach(container => {
-      const {
-        moveRows,
-        containerNode,
-        containerPath,
-        newHeight,
-        childIndex,
-        lastChildStartRow
-      } = container;
-      if (moveRows) {
-        moveOverlappedItems(editor, moveRows, containerNode?.children, containerPath, childIndex, lastChildStartRow);
-      }
-      Transforms.setNodes(editor, {
-        height_xs: newHeight,
-        xs_updatedOn: new Date().getTime()
-      }, {
-        at: containerPath
-      });
-    });
-    Transforms.setNodes(editor, {
-      height_xs: height
-    }, {
-      at: path
-    });
+    height,
+    gridArea,
+    type
+  } = getNodeValues(textItem, updateBreakpoint);
+  if (!gridArea && type !== "paragraph") {
+    return;
+  }
+  const oldHeight = height;
+  const newHeight = currHeight;
+  const heightDiff = newHeight - oldHeight;
+  if (heightDiff !== 0) {
+    const textNode = [textItem, path];
+    handleTextAlignment(editor, textNode, heightDiff, updateBreakpoint);
   }
 };
 function VirtualTextElement(props) {
@@ -83,9 +59,9 @@ function VirtualTextElement(props) {
           height
         } = entry.contentRect;
         const currentText = currElement?.innerText;
-        const prevText = prevTextRef.current;
+        const prevText = prevTextRef?.current;
         if (currentText && currentText !== prevText) {
-          updateTextHeight(editor, path, height);
+          updateTextHeight(editor, path, height, "xs");
         }
         prevTextRef.current = currentText;
       }
@@ -122,6 +98,17 @@ function VirtualTextElement(props) {
       },
       "& .editor-blocker": {
         display: "none"
+      },
+      "& .fgi_type_text": {
+        "& .edt-headings": {
+          margin: "0px"
+        },
+        "& .edt-paragraphs": {
+          margin: "0px"
+        },
+        "& blockquote": {
+          margin: "0px !important"
+        }
       }
     },
     dangerouslySetInnerHTML: {