@flozy/editor 10.1.4 → 10.1.6

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

@@ -1,71 +1,57 @@
 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, handleTextAlignment } 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 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
+    height_xs,
+    gridArea_xs,
+    type
   } = 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
-    });
+  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);
+  }
+  // else if (heightDiff < 0) {
+  //   Transforms.setNodes(
+  //     editor,
+  //     {
+  //       height_xs: newHeight,
+  //     },
+  //     { at: path }
+  //   );
+  // }
 };
+
 function VirtualTextElement(props) {
   const {
     dataSets,
@@ -75,7 +61,6 @@ function VirtualTextElement(props) {
   } = props;
   const currElement = getCurrentEle();
   const textRef = useRef(null);
-  const prevTextRef = useRef(currElement?.innerText);
   useEffect(() => {
     const observer = new ResizeObserver(([entry]) => {
       if (entry) {
@@ -83,11 +68,9 @@ function VirtualTextElement(props) {
           height
         } = entry.contentRect;
         const currentText = currElement?.innerText;
-        const prevText = prevTextRef.current;
-        if (currentText && currentText !== prevText) {
+        if (currentText && height) {
           updateTextHeight(editor, path, height);
         }
-        prevTextRef.current = currentText;
       }
     });
     const elementRef = textRef?.current;
@@ -122,6 +105,14 @@ function VirtualTextElement(props) {
       },
       "& .editor-blocker": {
         display: "none"
+      },
+      "& .fgi_type_text": {
+        "& .edt-headings": {
+          margin: "0px"
+        },
+        "& .edt-paragraphs": {
+          margin: "0px"
+        }
       }
     },
     dangerouslySetInnerHTML: {

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

@@ -1,5 +1,6 @@
 import { ROW_HEIGHT, calculateGridArea } from "../Utils/gridDropItem";
 import { Transforms, Editor } from "slate";
+import { getElementOffset } from "./VirtualTextElement";
 const isBulletOrTickIcon = (width, itemStartRow, startRow) => {
   return width <= 40 && itemStartRow === startRow;
 };
@@ -39,106 +40,83 @@ export const getGridArea = gridArea => {
 const getBoxToAutoAlign = (editor, sectionPath) => {
   const [boxData] = Editor.nodes(editor, {
     at: sectionPath,
-    match: node => node.type === "freegridBox" && node.autoAlign
+    match: node => ["freegridBox", "freegrid"].includes(node.type) && node.autoAlign
   });
   return boxData || [];
 };
-const handleGridItems = (gridItems, lastRow) => {
-  // to find the previously occupied rows
-  gridItems.forEach(item => {
-    const {
-      gridArea_xs: gridArea,
-      marginTop_xs,
-      height_xs,
-      type
-    } = item;
-    if (type === "paragraph") {
-      // non-freegridItem,
-      // some "paragraph" node is defaulty coming inside in box's children
-      return;
-    }
-    const [startRow] = getGridArea(gridArea);
-    const marginTop = marginTop_xs ? Number(marginTop_xs) : 0;
-    const fullHeight = Number(height_xs) + marginTop;
-    const endRow = startRow + Math.floor(fullHeight / ROW_HEIGHT) + 1;
-    lastRow = Math.max(endRow, lastRow);
-  });
-  return {
-    lastRow
-  };
-};
-const handleNonGridItems = (nonGridItems, lastRow, editor, boxPath) => {
-  let containerHeight = (lastRow - 1) * ROW_HEIGHT;
-  let newlyAddedHeight = 0;
 
-  //place it on the next rows that are available
-  nonGridItems.forEach((item, index) => {
-    const {
-      height_xs,
-      type,
-      itemIndex
-    } = item;
-    if (type === "paragraph") {
-      // non-freegridItem
-      return;
-    }
-    const startRow = lastRow || 1;
-    const DEFAULT_NEW_ELEMENT_MARGIN_TOP = 12;
-    let fullHeight = height_xs + DEFAULT_NEW_ELEMENT_MARGIN_TOP;
-    const endRow = startRow + Math.floor(fullHeight / ROW_HEIGHT) + 1;
-    const newGridArea = `${startRow} / 1 / ${startRow + 1} / 2`;
-    const currentElementPath = [...boxPath, itemIndex];
-    Transforms.setNodes(editor, {
-      gridArea_xs: newGridArea,
-      marginTop_xs: 12,
-      left_xs: 12,
-      xs_updatedOn: new Date().getTime()
-    }, {
-      at: currentElementPath
-    });
-    lastRow = Math.max(endRow, lastRow);
-    containerHeight += fullHeight;
-    newlyAddedHeight += fullHeight;
-  });
-  return {
-    lastRow,
-    containerHeight,
-    newlyAddedHeight
-  };
-};
-const alignNewElementInContainer = (editor, boxPath, containerItems) => {
-  let lastRow = 1;
-  const gridItems = [];
-  const nonGridItems = [];
-  containerItems.forEach((item, index) => {
-    if (item?.gridArea_xs) {
-      gridItems.push({
-        ...item,
-        itemIndex: index
-      });
-    } else {
-      nonGridItems.push({
-        ...item,
-        itemIndex: index
-      });
-    }
-  });
-  const {
-    lastRow: lastRowOccupied
-  } = handleGridItems(gridItems, lastRow);
-  lastRow = lastRowOccupied;
-  const {
-    lastRow: lastRowTaken,
-    containerHeight,
-    newlyAddedHeight
-  } = handleNonGridItems(nonGridItems, lastRow, editor, boxPath);
-  lastRow = lastRowTaken;
-  return {
-    lastRow,
-    containerHeight,
-    newlyAddedHeight
-  };
-};
+// const handleGridItems = (gridItems, lastRow) => {
+//   // to find the previously occupied rows
+//   gridItems.forEach((item) => {
+//     const { gridArea_xs: gridArea, marginTop_xs, height_xs, type } = item;
+
+//     if (type === "paragraph") {
+//       // non-freegridItem,
+//       // some "paragraph" node is defaulty coming inside in box's children
+//       return;
+//     }
+
+//     const [startRow] = getGridArea(gridArea);
+//     const marginTop = marginTop_xs ? Number(marginTop_xs) : 0;
+//     const fullHeight = Number(height_xs) + marginTop;
+
+//     const endRow = startRow + Math.floor(fullHeight / ROW_HEIGHT) + 1;
+
+//     lastRow = Math.max(endRow, lastRow);
+//   });
+
+//   return { lastRow };
+// };
+
+// const handleNonGridItems = (nonGridItems, lastRow, editor, boxPath) => {
+//   let containerHeight = (lastRow - 1) * ROW_HEIGHT;
+
+//   let newlyAddedHeight = 0;
+
+//   //place it on the next rows that are available
+//   nonGridItems.forEach((item, index) => {
+//     const { height_xs, type, itemIndex } = item;
+
+//     if (type === "paragraph") {
+//       // non-freegridItem
+//       return;
+//     }
+
+//     const startRow = lastRow || 1;
+
+//     const DEFAULT_NEW_ELEMENT_MARGIN_TOP = 12;
+//     let fullHeight = height_xs + DEFAULT_NEW_ELEMENT_MARGIN_TOP;
+
+//     const endRow = startRow + Math.floor(fullHeight / ROW_HEIGHT) + 1;
+
+//     const newGridArea = `${startRow} / 1 / ${startRow + 1} / 2`;
+
+//     const currentElementPath = [...boxPath, itemIndex];
+
+//     Transforms.setNodes(
+//       editor,
+//       {
+//         gridArea_xs: newGridArea,
+//         marginTop_xs: 12,
+//         left_xs: 12,
+//         xs_updatedOn: new Date().getTime(),
+//       },
+//       { at: currentElementPath }
+//     );
+
+//     lastRow = Math.max(endRow, lastRow);
+
+//     containerHeight += fullHeight;
+//     newlyAddedHeight += fullHeight;
+//   });
+
+//   return {
+//     lastRow,
+//     containerHeight,
+//     newlyAddedHeight,
+//   };
+// };
+
 const getAncestorFreeGridContainers = (editor, path) => {
   const containers = [...Editor.nodes(editor, {
     at: path,
@@ -151,6 +129,12 @@ const getAncestorFreeGridContainers = (editor, path) => {
   })].filter(([node, nodePath]) => nodePath.length <= path.length);
   return containers;
 };
+export const handleTextAlignment = (editor, textNode, heightDiff) => {
+  const [, textPath] = textNode;
+  let containers = getAncestorFreeGridContainers(editor, textPath);
+  containers = [...containers, textNode];
+  handleContainersAlignment(editor, containers, heightDiff, 0);
+};
 export const handleContainers = (editor, boxPath, extraHeight) => {
   const containers = getAncestorFreeGridContainers(editor, boxPath);
   let lastChildStartRow;
@@ -213,6 +197,7 @@ export const moveOverlappedItems = (editor, moveRows, containerItems, containerP
       return;
     }
     if (gridItem.type === "paragraph") {
+      // some empty paragraph node is inserted default'ly inside box, to avoid that
       return;
     }
     const {
@@ -235,7 +220,61 @@ export const moveOverlappedItems = (editor, moveRows, containerItems, containerP
     }
   });
 };
-export const handleBoxAlignment = (editor, sectionNode, sectionPath) => {
+export const handleContainersAlignment = (editor, containers, heightDiff, bufferSpace = 0) => {
+  for (let i = containers.length - 1; i >= 0; i--) {
+    const container = containers[i];
+    const childContainer = containers[i + 1];
+    const [containerNode, containerPath] = container;
+    const [childContainerNode, childContainerPath] = childContainer || [];
+    if (childContainer) {
+      const {
+        bottom
+      } = getElementOffset(childContainerNode);
+      containerNode.children.forEach((item, index) => {
+        const currPath = [...containerPath, index];
+        if (currPath.toString() === childContainerPath.toString()) {
+          return;
+        }
+        if (item.type === "paragraph") {
+          return;
+        }
+        const {
+          top: itemTop
+        } = getElementOffset(item);
+        if (itemTop >= bottom) {
+          const {
+            gridArea_xs,
+            marginTop_xs
+          } = item;
+          const [startRow] = getGridArea(gridArea_xs);
+          const y = (startRow - 1) * ROW_HEIGHT + marginTop_xs + heightDiff;
+
+          // Calculate grid position
+          const row = Math.floor(y / ROW_HEIGHT) + 1;
+
+          // to calculate difference inside the grid
+          const marginTop = Math.abs((row - 1) * ROW_HEIGHT - y);
+
+          // Update grid area
+          const gridArea = `${row} / 1 / ${row + 1} / 2`;
+          Transforms.setNodes(editor, {
+            gridArea_xs: gridArea,
+            marginTop_xs: marginTop + bufferSpace
+          }, {
+            at: currPath
+          });
+        }
+      });
+    }
+    Transforms.setNodes(editor, {
+      height_xs: containerNode?.height_xs + heightDiff + bufferSpace,
+      xs_updatedOn: new Date().getTime()
+    }, {
+      at: containerPath
+    });
+  }
+};
+export const handleBoxAlignment = (editor, sectionPath, heightDiff) => {
   const [boxNode, boxPath] = getBoxToAutoAlign(editor, sectionPath);
   Transforms.setNodes(editor, {
     autoAlign: false
@@ -245,39 +284,11 @@ export const handleBoxAlignment = (editor, sectionNode, sectionPath) => {
   if (!boxNode) {
     return;
   }
-  const containerItems = boxNode?.children || [];
-  const {
-    containerHeight
-  } = alignNewElementInContainer(editor, boxPath, containerItems);
-  const bufferHeight = 12;
-  const newHeight = containerHeight + bufferHeight;
-  const {
-    height_xs
-  } = boxNode;
-  const oldHeight = Number(height_xs);
-  const extraHeight = newHeight - oldHeight;
-  if (extraHeight > 0) {
-    const containerData = handleContainers(editor, boxPath, extraHeight);
-    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
-      });
-    });
+  if (heightDiff <= 0) {
+    return;
   }
+  let containers = getAncestorFreeGridContainers(editor, boxPath);
+  handleContainersAlignment(editor, containers, heightDiff, 12);
 };
 export const getMarginTop = y => {
   const calcMargin = y % ROW_HEIGHT;
@@ -295,7 +306,7 @@ export const calculateProps = (curPath, dom, domClass, allData, parentDom, isBox
   const itemsData = [];
   const items = dom.querySelectorAll(domClass);
   const nextItemPathLength = curPath?.split("|").length + 2;
-  let sectionHeight = 12;
+  // let sectionHeight = 12;
   for (let i = 0; i < items.length; i++) {
     const itemRect = items[i]?.getBoundingClientRect();
     if (items[i]?.classList.contains("type_box")) {
@@ -315,9 +326,10 @@ export const calculateProps = (curPath, dom, domClass, allData, parentDom, isBox
           gridArea: calculateGridArea(y)
         }
       });
-      sectionHeight += itemRect?.height;
+      // sectionHeight += itemRect?.height;
     }
   }
+
   if (dom?.classList.contains("type_box") && parentDom) {
     const parentDomRect = parentDom?.getBoundingClientRect();
     const isAppHeader = isBoxHeader || dom?.classList.contains("appHeaderBox");

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

@@ -18,6 +18,14 @@ const useVirtualElementStyles = () => ({
     "& .editor-blocker": {
       display: "none"
     },
+    "& .fgi_type_text": {
+      "& .edt-headings": {
+        margin: "0px"
+      },
+      "& .edt-paragraphs": {
+        margin: "0px"
+      }
+    },
     "& .freegrid-item": {
       position: "relative !important",
       top: "0 !important",
@@ -97,6 +105,14 @@ export const useAutoAlignStyles = () => ({
       "&.type_text": {
         height: "auto !important"
       },
+      "& .fgi_type_text": {
+        "& .edt-headings": {
+          margin: "0px"
+        },
+        "& .edt-paragraphs": {
+          margin: "0px"
+        }
+      },
       // start - default signature classes on free-grid
       "& .fgi_type_signature": {
         height: "100%",

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

@@ -12,7 +12,7 @@ import GuideLines from "./GuideLines";
 import ShadowElement from "./ShadowElement";
 import BoundaryLine from "./GuideLines/BoundaryLine";
 import ContextMenu from "./ContextMenu";
-import VirtualElement from "./VirtualElement";
+// import VirtualElement from "./VirtualElement";
 import { ItemTypes } from "./ElementSettings/settingsConstants";
 import { selectText } from "../../utils/helper";
 import { removeSign } from "./ElementSettings/OtherSettings";
@@ -499,7 +499,9 @@ const RnD = props => {
       ref
     }, ".freegrid-container-parent");
     const formatParentPath = parentPath?.split("|")?.map(m => parseInt(m));
-    reRenderChildNodes(editor, formatParentPath);
+    if (formatParentPath) {
+      reRenderChildNodes(editor, formatParentPath);
+    }
   };
   const onCloseSettings = () => {
     setSelectedElement({
@@ -681,14 +683,7 @@ const RnD = props => {
       handleClose: handleClose,
       theme: theme,
       translation: translation
-    }), type === "parent" && breakpoint === "lg" && !readOnly ? /*#__PURE__*/_jsx(VirtualElement, {
-      updated_at: updated_at,
-      path: str_path,
-      editor: editor,
-      sectionElement: sectionElement,
-      sectionCls: `.freegrid-section_${path.join("_")}`,
-      dataSets: dataSets
-    }) : null, childType === "text" && breakpoint === "lg" && !readOnly && enable ? /*#__PURE__*/_jsx(VirtualTextElement, {
+    }), childType === "text" && breakpoint === "lg" && !readOnly && enable ? /*#__PURE__*/_jsx(VirtualTextElement, {
       editor: editor,
       dataSets: dataSets,
       getCurrentEle: getCurrentEle,

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

@@ -1,6 +1,7 @@
 import { Select as Core } from "@mui/material";
 import SelectStyles from "./styles";
 import { useEditorContext } from "../../hooks/useMouseMove";
+import KeyboardArrowDownRoundedIcon from '@mui/icons-material/KeyboardArrowDownRounded';
 import { jsx as _jsx } from "react/jsx-runtime";
 function Select(props) {
   const {
@@ -13,6 +14,7 @@ function Select(props) {
   const classes = SelectStyles(theme);
   return /*#__PURE__*/_jsx(Core, {
     MenuProps: classes.MenuProps,
+    IconComponent: KeyboardArrowDownRoundedIcon,
     ...rest,
     children: children
   });

package/dist/Editor/common/Shorthands/elements.js

@@ -44,6 +44,60 @@ const ELEMENTS_LIST = [{
     icon: "headingThree"
   }),
   onInsert: editor => toggleBlock(editor, "headingThree", false)
+}, {
+  name: "Heading 4",
+  desc: "",
+  group: "Text",
+  type: "headingFour",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "headingFour"
+  }),
+  onInsert: editor => toggleBlock(editor, "headingFour", false)
+}, {
+  name: "Heading 5",
+  desc: "",
+  group: "Text",
+  type: "headingFive",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "headingFive"
+  }),
+  onInsert: editor => toggleBlock(editor, "headingFive", false)
+}, {
+  name: "Heading 6",
+  desc: "",
+  group: "Text",
+  type: "headingSix",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "headingSix"
+  }),
+  onInsert: editor => toggleBlock(editor, "headingSix", false)
+}, {
+  name: "Paragraph 1",
+  desc: "",
+  group: "Text",
+  type: "paragraphOne",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "paragraphOne"
+  }),
+  onInsert: editor => toggleBlock(editor, "paragraphOne", false)
+}, {
+  name: "Paragraph 2",
+  desc: "",
+  group: "Text",
+  type: "paragraphTwo",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "paragraphTwo"
+  }),
+  onInsert: editor => toggleBlock(editor, "paragraphTwo", false)
+}, {
+  name: "Paragraph 3",
+  desc: "",
+  group: "Text",
+  type: "paragraphThree",
+  icon: /*#__PURE__*/_jsx(Icon, {
+    icon: "paragraphThree"
+  }),
+  onInsert: editor => toggleBlock(editor, "paragraphThree", false)
 }, {
   name: "Quote",
   desc: "",

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

@@ -0,0 +1,43 @@
+import Snackbar from "@mui/material/Snackbar";
+import Alert from "@mui/material/Alert";
+import { useState } from "react";
+import { useEditorContext } from "../../hooks/useMouseMove";
+import { jsx as _jsx } from "react/jsx-runtime";
+const SnackbarAlert = ({
+  message,
+  setShowSnackBar,
+  severity = "info"
+}) => {
+  const [open, setOpen] = useState(!!message);
+  const {
+    theme
+  } = useEditorContext();
+  return /*#__PURE__*/_jsx(Snackbar, {
+    open: open,
+    autoHideDuration: 3000,
+    onClose: () => {
+      setOpen(false);
+      setShowSnackBar(false);
+    },
+    anchorOrigin: {
+      vertical: "top",
+      horizontal: "right"
+    },
+    children: /*#__PURE__*/_jsx(Alert, {
+      severity: severity,
+      onClose: () => {
+        setOpen(false);
+        setShowSnackBar(false);
+      },
+      sx: {
+        background: theme?.palette?.primary?.gradientBtn,
+        color: "#FFFFFF",
+        "& .MuiAlert-icon": {
+          color: "#FFFFFF"
+        }
+      },
+      children: message
+    })
+  });
+};
+export default SnackbarAlert;

package/dist/Editor/common/StyleBuilder/buttonStyle.js

@@ -21,7 +21,8 @@ const buttonStyle = [{
         },
         children: option.text
       });
-    }
+    },
+    themeEnabled: true
   }, {
     label: "Font Size",
     key: "textSize",
@@ -45,7 +46,8 @@ const buttonStyle = [{
   }, {
     label: "Button Color",
     key: "bgColor",
-    type: "color"
+    type: "color",
+    themeEnabled: true
   }, {
     label: "Border Color",
     key: "borderColor",