@flozy/editor 10.6.4 → 10.6.5

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

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

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

@@ -15,6 +15,7 @@ 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,29 +3,20 @@ 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,
-    show
+    translation
   } = props;
   const classes = useSwitchViewport();
-  const {
-    setSelectedElement
-  } = useEditorContext();
   useEffect(() => {
-    // to reset selection on viewport changes - FS-6589
-    setSelectedElement({});
+    console.log(breakpoint);
   }, [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/ViewportStimulator.js

@@ -1,7 +1,6 @@
 import React from "react";
-import { useTheme, createTheme, useMediaQuery } from "@mui/material";
+import { useTheme, ThemeProvider, 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";
@@ -60,15 +59,13 @@ const extendedTheme = (prevTheme, isPrintMode) => createTheme({
   } : getBreakPoints(prevTheme)
 });
 const ViewportStimulator = ({
-  children,
-  selectedTheme
+  children
 }) => {
   const theme = useTheme();
   const isPrintMode = useMediaQuery("print");
   const viewportTheme = extendedTheme(theme, isPrintMode);
-  return /*#__PURE__*/_jsx(MainThemeProvider, {
+  return /*#__PURE__*/_jsx(ThemeProvider, {
     theme: viewportTheme,
-    userSelectedTheme: selectedTheme,
     children: children
   });
 };

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

@@ -2,7 +2,6 @@ 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 = {
@@ -23,27 +22,18 @@ export function updateRows() {}
 export function updateCols() {}
 const handleMoveNode = (editor, path, newPath, {
   isEmpty
-}, autoAlign, moveToNode) => {
+}, autoAlign) => {
   try {
     let replaceNode = Node.get(editor, path);
-    let heightDiff = 0;
     if (autoAlign) {
-      const y = findMaxYValue(moveToNode?.children);
-      const {
-        gridArea,
-        marginTop
-      } = convertToGridArea(y);
+      // reset node for auto alignment in mobile
       replaceNode = {
         ...replaceNode,
-        gridArea_xs: gridArea,
-        marginTop_xs: marginTop + 12,
-        xs_updatedOn: new Date().getTime()
+        gridArea_xs: null,
+        xs_updatedOn: null,
+        marginTop_xs: null
       };
-      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, [{
@@ -54,7 +44,7 @@ const handleMoveNode = (editor, path, newPath, {
       Transforms.removeNodes(editor, {
         at: path
       });
-      rPath = toPath;
+      return toPath;
     } else {
       Transforms.insertNodes(editor, [{
         ...replaceNode
@@ -64,12 +54,8 @@ const handleMoveNode = (editor, path, newPath, {
       Transforms.removeNodes(editor, {
         at: path
       });
-      rPath = newPath;
+      return newPath;
     }
-    return {
-      rPath,
-      heightDiff
-    };
   } catch (err) {
     console.log(err);
     console.log("Drop Node error");
@@ -224,7 +210,7 @@ export function onDropItem(props, parentClass) {
       at: moveTo,
       match: n => n.type === "freegrid"
     });
-    const [, sectionPath] = sectionData || [];
+    const [sectionNode, sectionPath] = sectionData || [];
     if (needMove && isInsidePath(from, moveTo)) {
       reRenderSectionPath = sectionPath;
     } else {
@@ -243,6 +229,14 @@ 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,
@@ -251,15 +245,12 @@ export function onDropItem(props, parentClass) {
           at: moveTo
         });
       }
-      const {
-        rPath,
-        heightDiff
-      } = handleMoveNode(editor, path, newPath, {
+      const rPath = handleMoveNode(editor, path, newPath, {
         isEmpty
-      }, autoAlign, toSectionNode) || {};
+      }, autoAlign);
       reRenderChildNodes(editor, reRenderSectionPath || moveTo);
       if (autoAlign && !isBoxHeader) {
-        handleBoxAlignment(editor, sectionPath, heightDiff);
+        handleBoxAlignment(editor, sectionNode, sectionPath);
       }
       return {
         updated_at: rPath

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

@@ -87,9 +87,7 @@ 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
@@ -124,39 +122,14 @@ 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() || {};
-  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
-    };
-  };
+  let lines = [];
   draggables.forEach(draggable => {
-    if (draggable === activeDragEle) return;
     const {
       left,
       top,
@@ -173,45 +146,42 @@ export function getClosestDraggable(x, y, className, activeClassName) {
       x: xVal,
       y: yVal
     }, lines)) {
-      const line = {
+      lines.push({
+        y: top,
         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(yVal - (aTop + aHeight)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
+    if (Math.abs(top + height - (aTop + aHeight)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
       x: xVal,
       y: yVal
     }, lines)) {
-      const line = {
-        x: xVal,
+      lines.push({
         y: yVal,
+        x: xVal,
         width: x > left ? Math.abs(aLeft + aWidth - left) : Math.abs(aLeft - (left + width)),
         height: 1
-      };
-      lines.push(clampLine(line));
+      });
     }
 
-    // center match (horizontal)
+    // center match
     xVal = x < left ? aLeft : left;
     yVal = top + height / 2;
-    if (Math.abs(yVal - (aTop + aHeight / 2)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
+    if (Math.abs(top + height / 2 - (aTop + aHeight / 2)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
       x: xVal,
       y: yVal
     }, lines, "y")) {
-      const line = {
-        x: xVal,
+      lines.push({
         y: yVal,
+        x: xVal,
         width: x > left ? Math.abs(aLeft + aWidth - left) : Math.abs(aLeft - (left + width)),
         height: 1
-      };
-      lines.push(clampLine(line));
+      });
     }
 
     // right match
@@ -221,13 +191,12 @@ export function getClosestDraggable(x, y, className, activeClassName) {
       x: xVal,
       y: yVal
     }, lines)) {
-      const line = {
-        x: xVal,
+      lines.push({
         y: yVal,
+        x: xVal,
         width: 1,
         height: Math.abs(aTop - top)
-      };
-      lines.push(clampLine(line));
+      });
     }
 
     // left match
@@ -237,29 +206,27 @@ export function getClosestDraggable(x, y, className, activeClassName) {
       x: xVal,
       y: yVal
     }, lines)) {
-      const line = {
-        x: xVal,
+      lines.push({
         y: yVal,
+        x: xVal,
         width: 1,
         height: Math.abs(aTop - top)
-      };
-      lines.push(clampLine(line));
+      });
     }
 
-    // middle match (vertical)
+    // middle match
     xVal = left + width / 2;
     yVal = top < aTop ? top : aTop;
-    if (Math.abs(aLeft + aWidth / 2 - xVal) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
+    if (Math.abs(aLeft + aWidth / 2 - (left + width / 2)) <= GUIDE_LINE_THRESHOLD && !isOverLapLine({
       x: xVal,
       y: yVal
     }, lines)) {
-      const line = {
-        x: xVal,
+      lines.push({
         y: yVal,
+        x: xVal,
         width: 1,
         height: Math.abs(aTop - top)
-      };
-      lines.push(clampLine(line));
+      });
     }
   });
   return lines;

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

@@ -1,45 +1,69 @@
 import { useEffect, useRef } from "react";
+import { Path, Transforms } from "slate";
 import { getNode } from "../../../utils/helper";
 import { ROW_HEIGHT } from "../Utils/gridDropItem";
-import { getGridArea, getNodeValues, handleTextAlignment } from "./helper";
+import { findFirstRowOverlap, getGridArea, handleContainers, moveOverlappedItems } from "./helper";
 import { Box } from "@mui/material";
 import { jsx as _jsx } from "react/jsx-runtime";
-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) {
+const updateTextHeight = (editor, path, height) => {
+  if (!height) {
     return;
   }
-  const textItem = getNode(editor, path);
-  if (!textItem) {
+  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) {
     return;
   }
+  const textItemIndex = path[parentPath.length];
+  const textItem = gridItems.find((_, index) => textItemIndex === index);
   const {
-    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);
+    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
+    });
   }
 };
 function VirtualTextElement(props) {
@@ -59,9 +83,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, "xs");
+          updateTextHeight(editor, path, height);
         }
         prevTextRef.current = currentText;
       }
@@ -98,14 +122,6 @@ function VirtualTextElement(props) {
       },
       "& .editor-blocker": {
         display: "none"
-      },
-      "& .fgi_type_text": {
-        "& .edt-headings": {
-          margin: "0px"
-        },
-        "& .edt-paragraphs": {
-          margin: "0px"
-        }
       }
     },
     dangerouslySetInnerHTML: {