@flozy/editor 11.2.1 → 11.2.2

package/dist/Editor/common/ImageSelector/Options/Upload.js

@@ -1,6 +1,5 @@
 import React from "react";
 import { Grid } from "@mui/material";
-import UploaderWithProgress from "../../UploaderWithProgress";
 import Uploader from "../../Uploader";
 import { jsx as _jsx } from "react/jsx-runtime";
 const Upload = props => {
@@ -10,31 +9,11 @@ const Upload = props => {
     onUploaded,
     customProps,
     disableUpload = false,
-    title,
-    setS3UploadProp,
-    s3UploadProp,
-    disableProgress,
-    setUniqueId,
-    uniqueId
+    title
   } = props;
   const onDone = img => {
     onUploaded(img);
   };
-  const commonProps = {
-    classes,
-    value,
-    data: {
-      key: "url"
-    },
-    customProps,
-    onUploaded: onDone,
-    disableUpload,
-    title,
-    setS3UploadProp,
-    s3UploadProp,
-    setUniqueId,
-    uniqueId
-  };
   return /*#__PURE__*/_jsx(Grid, {
     item: true,
     xs: 12,
@@ -43,10 +22,16 @@ const Upload = props => {
       height: '100%'
     },
     className: "ims-right",
-    children: disableProgress ? /*#__PURE__*/_jsx(Uploader, {
-      ...commonProps
-    }) : /*#__PURE__*/_jsx(UploaderWithProgress, {
-      ...commonProps
+    children: /*#__PURE__*/_jsx(Uploader, {
+      classes: classes,
+      value: value,
+      data: {
+        key: "url"
+      },
+      customProps: customProps,
+      onUploaded: onDone,
+      disableUpload: disableUpload,
+      title: title
     })
   });
 };

package/dist/Editor/common/ImageSelector/Styles.js

@@ -76,7 +76,7 @@ const ImageSelectorStyles = theme => ({
       background: theme?.palette?.editor?.deviderBgColor,
       "@media only screen and (min-width: 899px)": {
         margin: "0px 24px",
-        width: "calc(100% - 48px)"
+        width: 'calc(100% - 48px)'
       }
     },
     "& .primaryBtn": {
@@ -104,6 +104,12 @@ const ImageSelectorStyles = theme => ({
       marginRight: "8px !important"
     },
     "& .MuiGrid-root": {
+      "&::-webkit-scrollbar-thumb": {
+        background: `none !important`
+      },
+      "&::-webkit-scrollbar-track": {
+        visibility: "hidden"
+      },
       "&::-webkit-scrollbar-thumb": {
         background: `${theme?.palette?.editor?.brainPopupScroll} !important`
       },
@@ -112,10 +118,10 @@ const ImageSelectorStyles = theme => ({
       }
     },
     "& .MuiImageList-root": {
-      margin: "0px"
+      margin: '0px'
     },
     "& .MuiDialogContent-root": {
-      padding: "20px 24px 5px 24px"
+      padding: '20px 24px 5px 24px'
     }
   },
   titleTypo: {

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

@@ -68,8 +68,7 @@ const Settings = props => {
             editor: editor,
             path: path,
             customProps: customProps,
-            theme: theme,
-            onClose: onClose
+            theme: theme
           }) : null
         })]
       })

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

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

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

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

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

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

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

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

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

@@ -12,8 +12,7 @@ const FormSettings = props => {
   const {
     editor,
     path,
-    customProps,
-    onClose
+    customProps
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path];
@@ -57,7 +56,7 @@ const FormSettings = props => {
     }
   };
   const handleClose = () => {
-    onClose();
+    console.log("close");
   };
   const muiTheme = createTheme({
     components: {

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

@@ -8,30 +8,17 @@ const ImageSettings = props => {
   const {
     editor,
     path,
-    customProps,
-    onClose
+    customProps
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
   const element = Node.get(editor, element_path);
   const onChange = data => {
-    let updated_props = {};
-    if (data?.url?.embedURL) {
-      updated_props = {
-        url: data?.url?.embedURL
-      };
-    } else if (data?.url?.file) {
-      updated_props = {
-        fromFreeGrid: true,
-        isUpload: true,
-        file: data?.url?.file,
-        url: ""
-      };
-    } else {
-      updated_props = {
-        ...data
-      };
-    }
+    const updated_props = {
+      ...element,
+      ...data,
+      field_type: data?.element
+    };
     delete updated_props.children;
     Transforms.setNodes(editor, {
       ...updated_props
@@ -40,7 +27,7 @@ const ImageSettings = props => {
     });
   };
   const handleClose = () => {
-    onClose();
+    console.log("close");
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

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

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

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

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

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

@@ -8,31 +8,18 @@ const VideoSettings = props => {
   const {
     editor,
     path,
-    customProps,
-    onClose
+    customProps
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
   const element = Node.get(editor, element_path);
   const styleMaps = embedVideoStyle?.filter(f => !f?.hideOnFGS);
   const onChange = data => {
-    let updated_props = {};
-    if (data?.url?.embedURL) {
-      updated_props = {
-        url: data?.url?.embedURL
-      };
-    } else if (data?.url?.file) {
-      updated_props = {
-        isUpload: true,
-        fromFreeGrid: true,
-        file: data?.url?.file,
-        url: ""
-      };
-    } else {
-      updated_props = {
-        ...data
-      };
-    }
+    const updated_props = {
+      ...element,
+      ...data,
+      field_type: data?.element
+    };
     delete updated_props.children;
     Transforms.setNodes(editor, {
       ...updated_props
@@ -41,7 +28,7 @@ const VideoSettings = props => {
     });
   };
   const handleClose = () => {
-    onClose();
+    console.log("close");
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

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

@@ -45,7 +45,7 @@ const useGuideLineStyle = ({
         position: "absolute",
         width: "calc(50% - 162px)",
         height: "calc(100% - 2px)",
-        backgroundColor: "rgba(255,255,255,0)",
+        backgroundColor: "rgba(255,255,255,1)",
         pointerEvents: "none",
         top: 2,
         "&.w_left": {

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 {
@@ -258,15 +244,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,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) {
@@ -47,8 +71,7 @@ function VirtualTextElement(props) {
     dataSets,
     getCurrentEle,
     path,
-    editor,
-    breakpoint
+    editor
   } = props;
   const currElement = getCurrentEle();
   const textRef = useRef(null);
@@ -60,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, breakpoint);
+          updateTextHeight(editor, path, height);
         }
         prevTextRef.current = currentText;
       }
@@ -78,12 +101,11 @@ function VirtualTextElement(props) {
       }
       observer.disconnect();
     };
-  }, [currElement?.innerText, breakpoint]);
-  const fontSize = `var(--fontSize_${breakpoint}) !important`;
+  }, [currElement?.innerText]);
   return /*#__PURE__*/_jsx(Box, {
     style: {
       position: "fixed",
-      width: dataSets[`data-width-${breakpoint}`],
+      width: dataSets["data-width-xs"],
       minHeight: "fit-content",
       visibility: "hidden",
       pointerEvents: "none",
@@ -93,24 +115,13 @@ function VirtualTextElement(props) {
     ref: textRef,
     sx: {
       "& .leaf-item": {
-        fontSize: fontSize,
+        fontSize: "var(--fontSize_xs) !important",
         "& span": {
-          fontSize: fontSize
+          fontSize: "var(--fontSize_xs) !important"
         }
       },
       "& .editor-blocker": {
         display: "none"
-      },
-      "& .fgi_type_text": {
-        "& .edt-headings": {
-          margin: "0px"
-        },
-        "& .edt-paragraphs": {
-          margin: "0px"
-        },
-        "& blockquote": {
-          margin: "0px !important"
-        }
       }
     },
     dangerouslySetInnerHTML: {