@flozy/editor 10.2.3 → 10.2.5

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

@@ -3,139 +3,31 @@ const useOptionsPopupStyle = ({
 }) => ({
   root: {
     zIndex: 1200,
-    background: theme?.palette?.editor?.miniToolBarBackground,
-    border: `1px solid ${theme?.palette?.editor?.miniToolBarBorder}`,
-    borderRadius: "20px",
+    background: theme?.palette?.editor?.background,
+    borderRadius: "7px",
     overflow: "hidden",
-    boxShadow: "0px 0px 12px 4px #00000014",
+    boxShadow: "1px 1px 3px rgba(0,0,0,0.3)",
     marginRight: "4px !important",
-    padding: "0px 5px",
-    fontFamily: "'Inter',sans-serif",
-    "& .MuiPaper-root": {
-      background: theme?.palette?.editor?.miniToolBarBackground
-    },
-    "& .sectionOptionTitle": {
-      fontSize: "16px",
-      fontFamily: "'Inter',sans-serif",
-      fontWeight: "700",
-      fontSize: "16px",
-      lineHeight: "25px",
-      background: theme?.palette?.editor?.miniToolBarBackground,
-      "& button": {
-        background: theme?.palette?.editor?.closeButtonBackground,
-        borderRadius: "8px",
-        "& svg": {
-          fill: theme?.palette?.editor?.closeButtonSvgStroke
-        }
-      }
-    },
-    "& .sectionOptionChild": {
-      background: theme?.palette?.editor?.miniToolBarBackground,
-      "& .MuiBox-root": {
-        maxHeight: "unset"
-      },
-      "& .MuiInputBase-root, fieldset": {
-        background: theme?.palette?.editor?.inputFieldBgColor,
-        borderRadius: "8px",
-        "& fieldset": {
-          border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
-          background: "transparent",
-          borderRadius: "8px"
-        },
-        "& input": {
-          border: `1px solid transparent`,
-          background: theme?.palette?.editor?.inputFieldBgColor,
-          borderRadius: "8px",
-          fontSize: "12px",
-          color: theme?.palette?.editor?.textColor
-        }
-      },
-      "& p": {
-        color: theme?.palette?.editor?.textColor
-      },
-      "& .sliderInput": {
-        border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
-        background: theme?.palette?.editor?.inputFieldBgColor,
-        borderRadius: "10px"
-      },
-      "& .style-settings-wrpr": {
-        overflow: "hidden",
-        "&:hover": {
-          overflowY: "auto",
-          "&::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb": {
-            background: `${theme?.palette?.editor?.brainPopupScroll} !important`
-          },
-          "&::-webkit-scrollbar-track, ::-webkit-scrollbar-track": {
-            visibility: "hidden"
-          }
-        }
-      },
-      "& svg": {
-        width: "17.5px",
-        height: "17.5px"
-      }
-    },
-    "& .MuiList-root": {
-      "& .MuiButtonBase-root": {
-        padding: "8px 12px",
-        "& .MuiTypography-root": {
-          color: `${theme?.palette?.editor?.textColor} !important`,
-          fontSize: "14px",
-          fontWeight: "500",
-          fontFamily: "'Inter',sans-serif"
-        },
-        "&:hover": {
-          background: `${theme?.palette?.editor?.menuOptionHoverBackground} !important`,
-          "& .MuiTypography-root": {
-            color: `${theme?.palette?.editor?.textColor} !important`
-          },
-          "& .MuiListItemIcon-root": {
-            "& .signatureElementIcon, & .newLineElementIcon": {
-              "& path": {
-                fill: `${theme?.palette?.editor?.textColor}`
-              }
-            },
-            "& .commonSvgStyle, & .commonSvgStyle2": {
-              "& path": {
-                stroke: `${theme?.palette?.editor?.textColor}`
-              }
-            },
-            "& .colorBoxElementIcon": {
-              "& path": {
-                stroke: `${theme?.palette?.editor?.textColor}`,
-                fill: "none"
-              }
-            },
-            "& .gridElementIcon": {
-              "& path": {
-                stroke: `${theme?.palette?.editor?.textColor}`,
-                fill: `${theme?.palette?.editor?.textColor}`
-              }
-            }
-          }
-        }
-      }
-    },
-    "& .sectionMoreOption": {
-      "& .MuiButtonBase-root": {
-        padding: "12px 12px",
-        color: `${theme?.palette?.editor?.textColor} !important`,
-        fontSize: "14px",
-        fontWeight: "500",
-        fontFamily: "'Inter',sans-serif"
-      }
-    },
     "& .papper-root": {
       width: "344px",
       boxShadow: "none",
+      border: `1px solid ${theme?.palette?.editor?.borderColor}`,
       borderRadius: "7px",
       background: theme?.palette?.editor?.background,
       "& .MuiTypography-root, .MuiInputBase-root, input": {
         color: theme?.palette?.editor?.textColor
       },
+      "& .MuiInputBase-root, input": {
+        border: `1px solid ${theme?.palette?.editor?.borderColor}`
+      },
       "& .borderInput": {
         background: theme?.palette?.editor?.background,
         color: theme?.palette?.editor?.textColor
+      },
+      "& .MuiCheckbox-root": {
+        "& svg": {
+          fill: theme?.palette?.editor?.textColor
+        }
       }
     },
     "& .item-list-wrpr": {
@@ -145,7 +37,13 @@ const useOptionsPopupStyle = ({
       "& .MuiListItemButton-root": {
         borderRadius: "7px",
         color: theme?.palette?.editor?.textColor,
-        alignItems: "center"
+        "&:hover": {
+          color: theme?.palette?.editor?.activeColor,
+          background: "rgba(233, 243, 254, 1)",
+          "& .MuiTypography-root": {
+            color: theme?.palette?.editor?.activeColor
+          }
+        }
       }
     },
     "& .item-wrapper": {

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

@@ -10,27 +10,23 @@ const SwitchViewport = props => {
   const {
     breakpoint,
     onChange,
-    translation,
-    show
+    translation
   } = props;
   const classes = useSwitchViewport();
   const {
-    setSelectedElement
+    setActiveBreakPoint
   } = 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, {
         className: `${!breakpoint || breakpoint === "lg" ? "active" : ""}`,
         onClick: () => {
+          setActiveBreakPoint("");
           onChange("");
         },
         children: /*#__PURE__*/_jsx(PersonalVideoIcon, {})
@@ -40,6 +36,7 @@ const SwitchViewport = props => {
       children: /*#__PURE__*/_jsx(IconButton, {
         className: `${breakpoint === "xs" ? "active" : ""}`,
         onClick: () => {
+          setActiveBreakPoint("xs");
           onChange("xs");
         },
         children: /*#__PURE__*/_jsx(PhoneIphoneIcon, {})

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

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

@@ -1,57 +1,71 @@
 import { useEffect, useRef } from "react";
+import { Path, Transforms } from "slate";
 import { getNode } from "../../../utils/helper";
 import { ROW_HEIGHT } from "../Utils/gridDropItem";
-import { getGridArea, 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 => {
-  const {
-    marginTop_xs: marginTop,
-    gridArea_xs: gridArea,
-    height_xs: height
-  } = element;
-  const [startRow] = getGridArea(gridArea);
-  const top = (startRow - 1) * ROW_HEIGHT + marginTop;
-  const bottom = top + height;
-  return {
-    top,
-    bottom
-  };
-};
 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_xs,
-    gridArea_xs,
-    type
+    marginTop_xs: marginTop,
+    gridArea_xs: gridArea,
+    height_xs
   } = textItem;
-  if (!gridArea_xs && type !== "paragraph") {
-    return;
-  }
-  const oldHeight = height_xs;
-  const newHeight = height;
-  const heightDiff = newHeight - oldHeight;
-  if (heightDiff !== 0) {
-    const textNode = [textItem, path];
-    handleTextAlignment(editor, textNode, heightDiff);
+  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
+    });
   }
-  // else if (heightDiff < 0) {
-  //   Transforms.setNodes(
-  //     editor,
-  //     {
-  //       height_xs: newHeight,
-  //     },
-  //     { at: path }
-  //   );
-  // }
 };
-
 function VirtualTextElement(props) {
   const {
     dataSets,
@@ -69,7 +83,7 @@ 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);
         }
@@ -108,14 +122,6 @@ function VirtualTextElement(props) {
       },
       "& .editor-blocker": {
         display: "none"
-      },
-      "& .fgi_type_text": {
-        "& .edt-headings": {
-          margin: "0px"
-        },
-        "& .edt-paragraphs": {
-          margin: "0px"
-        }
       }
     },
     dangerouslySetInnerHTML: {