@flozy/editor 9.3.6 → 9.3.7

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

@@ -1,232 +1,150 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useRef } from "react";
 import { Box } from "@mui/material";
 import useVirtualElementStyles from "./styles";
 import updateAutoProps from "./updateAutoProps";
-import { ROW_HEIGHT, calculateGridArea } from "../Utils/gridDropItem";
+import { calculateGridArea } from "../Utils/gridDropItem";
 import { jsx as _jsx } from "react/jsx-runtime";
 const ROOT_ITEM_CLASS = ".freegrid-item.path-3";
-export function getStartRow(el) {
-  const gridArea = el.dataset.gridAreaXs;
-  if (gridArea) {
-    const [startRow] = gridArea.split("/").map(num => parseInt(num));
-    return startRow;
-  }
-}
-function appendGridOccupied(domItem, startRow, fullHeight, lastRow) {
-  const endRow = startRow + Math.floor(fullHeight / ROW_HEIGHT) + 1;
-  lastRow = Math.max(endRow, lastRow);
-  const gridArea = `${startRow}/1/${endRow}/2`;
-  domItem.style.setProperty("--gridArea_xs", gridArea);
-  domItem.dataset.gridAreaXs = gridArea;
-  domItem.classList.add("exclude-virtual");
-  return {
-    domItem,
-    updatedLastRow: lastRow,
-    gridArea
-  };
-}
 
 // Function to group items by path and calculate heights
-// function groupByPathAndCalculateHeight(allData) {
-//   const data = JSON.parse(JSON.stringify([...allData]));
-//   const root = {};
-//   const heightData = {};
-
-//   // Step 1: Group items based on their path
-//   data.forEach((item) => {
-//     const segments = item.path.split("|");
-//     let current = root;
-
-//     segments.forEach((segment, index) => {
-//       if (!current[segment]) {
-//         current[segment] = { children: {}, props: { height: 0 } };
-//       }
-
-//       if (index === segments.length - 1) {
-//         // Assign the properties of the item including height
-//         current[segment] = { ...item, children: current[segment].children };
-//       }
-
-//       current = current[segment].children;
-//     });
-//   });
-
-//   // Step 2: Recursively calculate the height of each parent based on children
-//   const calculateHeight = (node) => {
-//     if (!node.children || Object.keys(node.children).length === 0) {
-//       // Base case: If there are no children, return the node's height
-//       return node.props.height;
-//     }
-
-//     // Calculate the height by summing the heights of all children
-//     let totalHeight = 0;
-//     Object.values(node.children).forEach((child) => {
-//       totalHeight += calculateHeight(child);
-//     });
+function groupByPathAndCalculateHeight(data) {
+  const root = {};
+  const heightData = {};
+
+  // Step 1: Group items based on their path
+  data.forEach(item => {
+    const segments = item.path.split("|");
+    let current = root;
+    segments.forEach((segment, index) => {
+      if (!current[segment]) {
+        current[segment] = {
+          children: {},
+          props: {
+            height: 0
+          }
+        };
+      }
+      if (index === segments.length - 1) {
+        // Assign the properties of the item including height
+        current[segment] = {
+          ...item,
+          children: current[segment].children
+        };
+      }
+      current = current[segment].children;
+    });
+  });
 
-//     // Update the parent's height to be the total height of its children
-//     node.props.height = totalHeight;
-//     if (node?.path) {
-//       heightData[node.path] = totalHeight;
-//     }
-//     return totalHeight;
-//   };
+  // Step 2: Recursively calculate the height of each parent based on children
+  const calculateHeight = node => {
+    if (!node.children || Object.keys(node.children).length === 0) {
+      // Base case: If there are no children, return the node's height
+      return node.props.height;
+    }
 
-//   // Start calculation from the root
-//   Object.values(root).forEach((node) => calculateHeight(node));
+    // Calculate the height by summing the heights of all children
+    let totalHeight = 0;
+    Object.values(node.children).forEach(child => {
+      totalHeight += calculateHeight(child);
+    });
 
-//   return { root, heightData };
-// }
+    // Update the parent's height to be the total height of its children
+    node.props.height = totalHeight;
+    if (node?.path) {
+      heightData[node.path] = totalHeight;
+    }
+    return totalHeight;
+  };
 
-const handleGridItem = (dom, lastRow) => {
-  const startRow = getStartRow(dom);
-  const {
-    marginTopXs,
-    heightXs
-  } = dom.dataset;
-  const marginTop = marginTopXs ? Number(marginTopXs) : 0;
-  const fullHeight = Number(heightXs) + marginTop;
-  return appendGridOccupied(dom, startRow, fullHeight, lastRow);
-};
-const handleNonGridItem = (dom, lastRow) => {
-  const rect = dom.getBoundingClientRect();
-  dom.style.setProperty("--height_xs", rect.height + "px"); // assign the auto height that taken
-  const startRow = lastRow || 1;
-  const DEFAULT_NEW_ELEMENT_MARGIN_TOP = 12;
-  let fullHeight = rect.height + DEFAULT_NEW_ELEMENT_MARGIN_TOP;
-  const gridOccupiedData = appendGridOccupied(dom, startRow, fullHeight, lastRow);
+  // Start calculation from the root
+  Object.values(root).forEach(node => calculateHeight(node));
   return {
-    ...gridOccupiedData,
-    fullHeight
+    root,
+    heightData
   };
-};
-const appendContainerItems = async (sectionCls, virtualRef, dataSets) => {
-  const cloneNode = document.querySelector(sectionCls)?.cloneNode(true);
-  const items = cloneNode?.querySelectorAll(ROOT_ITEM_CLASS) || [];
-  if (!cloneNode || !items?.length || !virtualRef.current) {
-    return;
-  }
-
-  // Remove all existing elements inside virtualRef.current
-  virtualRef.current.innerHTML = "";
-  virtualRef.current.style.height = `auto`;
-  virtualRef.current.style.gridTemplateRows = `unset`;
-
-  // temporary append section items to get the dom styles
-  virtualRef.current.append(...items);
-  let itemsHTML = "";
-  let lastRow = 0;
-  const gridItems = [];
-  const nonGridItems = [];
-  items.forEach(item => {
-    if (getStartRow(item)) {
-      gridItems.push(item);
-    } else {
-      nonGridItems.push(item);
-    }
-  });
-
-  // to find the previously occupied rows
-  gridItems.forEach(item => {
-    const {
-      updatedLastRow,
-      domItem
-    } = handleGridItem(item, lastRow);
-    lastRow = updatedLastRow;
-    itemsHTML += domItem.outerHTML;
-  });
-  let containerHeight = lastRow ? (lastRow - 1) * ROW_HEIGHT : 0;
-
-  //place it on the next rows that are available
-  nonGridItems.forEach(item => {
-    const {
-      domItem,
-      updatedLastRow,
-      fullHeight
-    } = handleNonGridItem(item, lastRow);
-    lastRow = updatedLastRow;
-    itemsHTML += domItem.outerHTML;
-    containerHeight += fullHeight;
-  });
-  const oldSectionHeight = dataSets["data-height-xs"];
-  const newHeight = oldSectionHeight && oldSectionHeight > containerHeight ? oldSectionHeight : containerHeight;
-  virtualRef.current.style.height = `${newHeight}px`;
-  virtualRef.current.style.gridTemplateRows = `repeat(${lastRow - 1}, ${ROW_HEIGHT}px)`;
-  virtualRef.current.innerHTML = itemsHTML;
-};
+}
 const VirtualElement = props => {
   const classes = useVirtualElementStyles();
   const {
     editor,
     path,
-    updated_at,
-    sectionCls,
-    dataSets
+    parentEle,
+    updated_at
   } = props;
+  const cloneNode = parentEle?.cloneNode(true);
   const virtualRef = useRef();
-  const [toggleUpdate, setToggleUpdate] = useState(false);
   useEffect(() => {
     if (virtualRef?.current) {
-      setTimeout(() => {
+      const timeoutId = setTimeout(() => {
         const allData = calculateProps(path, virtualRef?.current, ROOT_ITEM_CLASS, []);
-        // const groupData = groupByPathAndCalculateHeight(allData);
-        // console.log("allData", allData);
+        const groupData = groupByPathAndCalculateHeight(allData);
         // it should trigger by auto alignment or on clicking mobile view change
-        updateAutoProps(editor, allData, "xs");
+        updateAutoProps(editor, allData, "xs", groupData);
       }, 100);
-      setToggleUpdate(prev => !prev);
+      return () => clearTimeout(timeoutId);
     }
   }, [updated_at, virtualRef?.current]);
   const calculateProps = (curPath, dom, domClass, allData) => {
     const rect = dom?.getBoundingClientRect();
-
-    // const sectionRect = virtualRef?.current?.getBoundingClientRect();
-
-    const bufferHeight = 12; // for spacing
-
+    const sectionRect = virtualRef?.current?.getBoundingClientRect();
     const sectionProps = {
       path: curPath,
       props: {
-        height: rect?.height + bufferHeight
+        height: rect?.height
       }
     };
     const itemsData = [];
-    const items = dom ? dom.querySelectorAll(domClass) : [];
+    const items = dom.querySelectorAll(domClass);
+    const nextItemPathLength = curPath?.split("|").length + 2;
+    let sectionHeight = 12;
     for (let i = 0; i < items.length; i++) {
-      const item = items[i];
-      const itemRect = item?.getBoundingClientRect();
-      const {
-        path
-      } = item?.dataset;
-      const y = Math.abs(rect.top - itemRect?.top);
-      itemsData.push({
-        path,
-        props: {
-          top: y,
-          left: 24,
-          marginTop: 12,
-          width: itemRect?.width,
-          height: itemRect?.height,
-          gridArea: calculateGridArea(y)
-        }
-      });
+      const itemRect = items[i]?.getBoundingClientRect();
+      if (items[i]?.classList.contains("type_box")) {
+        allData = calculateProps(items[i]?.dataset.path, items[i], `.freegrid-item.path-${nextItemPathLength}`, allData);
+      } else {
+        const y = Math.abs(rect.top - itemRect?.top);
+        itemsData.push({
+          path: items[i]?.dataset.path,
+          props: {
+            top: y,
+            left: 24,
+            marginTop: 12,
+            width: itemRect?.width,
+            height: itemRect?.height,
+            gridArea: calculateGridArea(y)
+          }
+        });
+        sectionHeight += itemRect?.height;
+      }
+    }
+    if (dom?.classList.contains("type_box")) {
+      const y = Math.abs(sectionRect.top - rect?.top);
+      sectionProps.props.gridArea = calculateGridArea(y);
+    }
+    if (sectionHeight > sectionProps?.props?.height) {
+      sectionProps.props.height = sectionHeight;
     }
     allData = [sectionProps, [...allData, ...itemsData]]?.flat();
     return allData;
   };
-  useMemo(() => {
-    return appendContainerItems(sectionCls, virtualRef, dataSets);
-  }, [toggleUpdate]);
+  const getItems = () => {
+    const items = cloneNode?.querySelectorAll(ROOT_ITEM_CLASS) || [];
+    let itemsHTML = "";
+    for (let i = 0; i < items?.length; i++) {
+      items[i].classList.add("exclude-virtual");
+      itemsHTML += items[i].outerHTML;
+    }
+    return itemsHTML;
+  };
   return /*#__PURE__*/_jsx(Box, {
     className: "mobile-virtual-mode",
     ref: virtualRef,
-    sx: {
-      display: "grid",
-      gridTemplateColumns: "100%",
-      visibility: "hidden",
-      // height: `${containerHeight}px !important`,
-      // gridTemplateRows: `repeat(${lastRow - 1}, ${ROW_HEIGHT}px)`,
-      ...classes.root
+    sx: classes.root,
+    dangerouslySetInnerHTML: {
+      __html: getItems()
+    },
+    style: {
+      visibility: "hidden"
     },
     "aria-hidden": "true"
   });

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

@@ -2,108 +2,20 @@ const useVirtualElementStyles = () => ({
   root: {
     width: "320px",
     position: "fixed",
-    // backgroundColor: "red",
-    // height: "fit-content",
+    backgroundColor: "red",
+    height: "auto",
     overflow: "visible",
-    // pointerEvents: "none",
-    opacity: 1,
+    pointerEvents: "none",
+    opacity: 0,
     right: 0,
     top: 0,
     "& .freegrid-item": {
       position: "relative !important",
-      top: "0 !important",
-      gridArea: "var(--gridArea_xs) !important",
-      width: "calc(100% - 48px) !important",
-      height: "var(--height_xs) !important",
-      left: "24px !important",
-      marginTop: "var(--marginTop_xs) !important",
-      outline: "1px solid gray !important",
-      // "&.type_box": {
-      //   // display: "grid !important",
-      //   // gridTemplateRows: "repeat(auto-fill, 50px) !important",
-      //   // height: "min-content !important",
-      // },
-
-      "& .debug-info, & .editor-blocker": {
-        display: "none"
-      },
-      "& .embed": {
-        minHeight: "300px"
-      }
-    }
-  }
-});
-export default useVirtualElementStyles;
-export const useAutoAlignStyles = () => ({
-  root: {
-    width: "320px",
-    position: "fixed",
-    overflow: "visible",
-    opacity: 1,
-    right: 0,
-    top: 0,
-    height: "auto !important",
-    zIndex: 99999999,
-    "& .freegrid-item": {
-      position: "relative !important",
-      top: "0 !important",
       gridArea: "none !important",
       width: "calc(100% - 48px) !important",
-      height: "var(--height_xs) !important",
+      height: "auto !important",
       left: "24px !important",
-      marginTop: "12px !important",
-      minHeight: "auto",
-      "&.type_box": {
-        height: "auto !important"
-      },
-      // start - default signature classes on free-grid
-      "& .fgi_type_signature": {
-        height: "100%",
-        "& .signature-container": {
-          height: "100%",
-          LineHeight: 1.43,
-          "& .signature-btn-container": {
-            height: "100%",
-            display: "flex",
-            flexDirection: "column",
-            "& .sign-placeholder": {
-              display: "flex",
-              // remove hidden sign placeholder
-              width: "100%",
-              flexGrow: 1
-            },
-            "& button": {
-              margin: "6px 0px"
-            }
-          }
-        }
-      },
-      "& .fgi_type_sign": {
-        width: "100%",
-        height: "100%",
-        "& .signature-signed-wrapper": {
-          width: "100%",
-          height: "100%",
-          "& .signature-signed-span": {
-            width: "100%",
-            height: "100%",
-            "& .signed-btn": {
-              width: "100%",
-              height: "100%",
-              display: "flex",
-              flexDirection: "column",
-              "& img": {
-                width: "100% !important",
-                maxWidth: "none !important",
-                height: "70% !important",
-                flexGrow: 1
-              }
-            }
-          }
-        }
-      },
-      // end - default signature classes on free-grid
-
+      marginTop: "24px !important",
       "& .debug-info, & .editor-blocker": {
         display: "none"
       },
@@ -112,4 +24,5 @@ export const useAutoAlignStyles = () => ({
       }
     }
   }
-});
+});
+export default useVirtualElementStyles;

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

@@ -1,5 +1,5 @@
 import { Node, Transforms } from "slate";
-const updateAutoProps = (editor, datas = [], breakpoint = "", updateAll) => {
+const updateAutoProps = (editor, datas = [], breakpoint = "", groupData) => {
   try {
     // const { heightData } = groupData;
     for (let i = 0; i < datas.length; i++) {
@@ -14,11 +14,9 @@ const updateAutoProps = (editor, datas = [], breakpoint = "", updateAll) => {
         return a;
       }, {});
       const oldProps = Node.get(editor, int_path);
-      const updateNode = !oldProps?.xs_updatedOn || updateAll;
-      if (updateNode) {
+      if (!oldProps?.xs_updatedOn) {
         Transforms.setNodes(editor, {
-          ...updatedProps,
-          xs_updatedOn: new Date().getTime()
+          ...updatedProps
         }, {
           at: int_path
         });

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

@@ -6,7 +6,7 @@ import Handles from "./TransformHandles";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import ElementOptions from "./ElementOptions";
 import ElementSettings from "./ElementSettings";
-import { getAbsolutePositionX, getAbsolutePositionY, getClosestDraggable, getParentSectionPath } from "./Utils";
+import { getClosestDraggable, getParentSectionPath } from "./Utils";
 import DragInfo from "./DragInfo";
 import GuideLines from "./GuideLines";
 import ShadowElement from "./ShadowElement";
@@ -19,10 +19,6 @@ import { removeSign } from "./ElementSettings/OtherSettings";
 import useDragging from "../../hooks/useDragging";
 import { dragOverOn } from "../../helper/RnD/focusNode";
 import { focusSelection, clearSelection, clearSelectionOnly } from "../../helper";
-import { reRenderChildNodes } from "./Utils/gridDropItem";
-import VirtualTextElement from "./VirtualElement/VirtualTextElement";
-import useAutoScroll from "../../hooks/useAutoScroll";
-import ForceAutoAlignment from "./VirtualElement/ForceAutoAlignment";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -68,10 +64,7 @@ const RnD = props => {
     editor,
     breakpoint = "",
     handleContextMenuClick = () => {},
-    itemData = {},
-    customProps,
-    sectionElement,
-    dataSets
+    itemData = {}
   } = props;
   const {
     isSelectedElement,
@@ -79,9 +72,7 @@ const RnD = props => {
     updateDragging,
     contextMenu,
     setContextMenu,
-    theme,
-    autoAlign,
-    setAutoAlign
+    theme
   } = useEditorContext();
   const str_path = path.join("|");
   const selectedElementProps = isSelectedElement(str_path, type);
@@ -115,13 +106,6 @@ const RnD = props => {
     y: 0
   });
   const parentSectionPath = str_path?.split("|").slice(0, 2).join("_");
-  const {
-    translation
-  } = customProps;
-  const {
-    startAutoScroll,
-    stopAutoScroll
-  } = useAutoScroll(10, "slate-wrapper-scroll-container");
   useEffect(() => {
     if (ITEM_TYPES.includes(type)) {
       if (enable === 1) {
@@ -357,16 +341,6 @@ const RnD = props => {
   };
   const onDrag = e => {
     e.preventDefault();
-    const {
-      clientY
-    } = e;
-    if (clientY < 50) {
-      startAutoScroll("up");
-    } else if (window.innerHeight - clientY < 50) {
-      startAutoScroll("down");
-    } else {
-      stopAutoScroll();
-    }
     const lines = getClosestDraggable(e.clientX, e.clientY, `.freegrid-section_${parentSectionPath} .freegrid-container .freegrid-item.inactive-drag`.replace(/\|/g, "\\|"), ".freegrid-item.active-drag:not(.exclude-virtual)");
     setAbsPosition({
       ...absPosition,
@@ -409,7 +383,6 @@ const RnD = props => {
   const onDragStop = (e, d) => {
     e.preventDefault();
     e.stopPropagation();
-    stopAutoScroll();
     if (dragging?.isDragging === 2 && dragging?.position?.strXY && dragging?.dragOver) {
       d.x = e.x;
       d.y = e.y;
@@ -452,36 +425,14 @@ const RnD = props => {
   };
   const onResizeStop = (e, direction, ref, d, position) => {
     e.preventDefault();
-    let updatedPosition = {};
-    if (type !== "parent") {
-      // update element position while resizing, (for free grid box and item)
-      const {
-        absolutePositionX
-      } = getAbsolutePositionX(ref);
-      const {
-        gridArea,
-        marginTop
-      } = getAbsolutePositionY(ref);
-      updatedPosition = {
-        left: absolutePositionX,
-        gridArea: gridArea,
-        marginTop: marginTop
-      };
-    }
     const updatedSize = {
       width: delta?.width + d.width,
-      height: ref.offsetHeight,
-      ...updatedPosition
+      height: delta?.height + d.height
     };
     onChange({
       ...updatedSize
     });
     handleResizeEvent("stop");
-    const parentPath = getParentSectionPath({
-      ref
-    }, ".freegrid-container-parent");
-    const formatParentPath = parentPath?.split("|")?.map(m => parseInt(m));
-    reRenderChildNodes(editor, formatParentPath);
   };
   const onCloseSettings = () => {
     setSelectedElement({
@@ -549,15 +500,12 @@ const RnD = props => {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs(Box, {
       component: Rnd,
-      placeholder: translation(ItemTypes[childType]) || translation("Item"),
+      placeholder: ItemTypes[childType] || "Item",
       id: eId || "",
       ref: c => {
         positionRef.current = c;
       },
-      className: `${className || ""} ${dragInfoOpen ? "active-drag" : "inactive-drag"} enable-${enable} type_${childType} section_type_${type || "parent"} ${Object.keys(absPosition)?.length ? "" : "remove-resize-styles"
-      // Fix rerender issue (remove-resize-styles): After resizing, click close button on a free grid-selected element
-      // doesn't remove the default `transform` style from react-rnd. Removing it manually.
-      }`,
+      className: `${className || ""} ${dragInfoOpen ? "active-drag" : "inactive-drag"} enable-${enable} type_${childType} section_type_${type || "parent"}`,
       "data-path": str_path,
       style: {
         position: "relative",
@@ -583,7 +531,6 @@ const RnD = props => {
         ...DISABLE_RESIZING
       },
       ...getEventProps(),
-      ...(dataSets || {}),
       children: [/*#__PURE__*/_jsx("div", {
         id: `opt_ref_${str_path}`,
         style: {
@@ -617,9 +564,7 @@ const RnD = props => {
       optionsProps: optionsProps,
       selectedAction: currentAction,
       path: str_path,
-      theme: theme,
-      translation: translation,
-      customProps: customProps
+      theme: theme
     }) : null, /*#__PURE__*/_jsx(ElementSettings, {
       open: Boolean(currentAction),
       currentAction: currentAction,
@@ -653,29 +598,12 @@ const RnD = props => {
       open: openContextMenu,
       contextMenu: contextMenu,
       handleClose: handleClose,
-      theme: theme,
-      translation: translation
+      theme: theme
     }), type === "parent" && breakpoint === "lg" && !readOnly ? /*#__PURE__*/_jsx(VirtualElement, {
+      parentEle: positionRef?.current?.resizableElement?.current,
       updated_at: updated_at,
       path: str_path,
-      editor: editor,
-      sectionElement: sectionElement,
-      sectionCls: `.freegrid-section_${path.join("_")}`,
-      dataSets: dataSets
-    }) : null, childType === "text" && breakpoint === "lg" && !readOnly ? /*#__PURE__*/_jsx(VirtualTextElement, {
-      editor: editor,
-      dataSets: dataSets,
-      getCurrentEle: getCurrentEle,
-      path: path
-    }) : null, type === "parent" && breakpoint === "xs" && !readOnly && autoAlign ? /*#__PURE__*/_jsx(ForceAutoAlignment, {
-      updated_at: updated_at,
-      path: str_path,
-      editor: editor,
-      sectionElement: sectionElement,
-      sectionCls: `.freegrid-section_${path.join("_")}`,
-      dataSets: dataSets,
-      autoAlign: autoAlign,
-      setAutoAlign: setAutoAlign
+      editor: editor
     }) : null]
   });
 };