@flozy/editor 11.2.2 → 11.2.4

package/dist/Editor/Elements/FreeGrid/FreeGrid.js

@@ -22,7 +22,9 @@ import { DEFAULT_TABLE_NODE } from "../../utils/table";
 import itemOptions from "./Options/sectionItemOptions";
 import { getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
 import { useDebouncedCallback } from "use-debounce";
+import { getElementValues } from "./helper";
 import updateFormName from "../../utils/updateFormName";
+import { GetsectionBgImage } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const MAX_DEVICE_WIDTH = {
@@ -183,6 +185,11 @@ const FreeGrid = props => {
   const handleAddElementClick = type => () => {
     const isEmpty = isEmptySection();
     const insertAt = isEmpty ? [...path, 0] : [...path, childrenCountRef.current];
+    const id = crypto?.randomUUID();
+    const {
+      elValues,
+      sectionVal
+    } = getElementValues(type, element?.children, breakpoint);
     switch (type) {
       case "addText":
         Transforms.insertNodes(editor, [{
@@ -194,12 +201,7 @@ const FreeGrid = props => {
               text: "Text"
             }]
           }],
-          gridArea: "3 / 1 / 4 / 2",
-          left: 50,
-          marginTop: 0,
-          top: 0,
-          width: 170,
-          height: 30
+          ...(elValues || {})
         }], {
           at: [...insertAt]
         });
@@ -217,29 +219,10 @@ const FreeGrid = props => {
               linkType: "webAddress"
             },
             iconPosition: "start",
-            bgColor: "#2563EB",
-            textColor: "#FFF",
-            borderRadius: {
-              topLeft: 30,
-              topRight: 30,
-              bottomLeft: 30,
-              bottomRight: 30
-            },
-            bannerSpacing: {
-              left: 12,
-              top: 12,
-              right: 12,
-              bottom: 12
-            },
             textAlign: "center",
             label: "Get Started"
           }],
-          gridArea: "3 / 1 / 4 / 2",
-          left: 50,
-          marginTop: 0,
-          top: 0,
-          width: 143,
-          height: 50
+          ...(elValues || {})
         }], {
           at: [...insertAt]
         });
@@ -259,14 +242,7 @@ const FreeGrid = props => {
               date: ""
             }
           }],
-          gridArea: "3 / 1 / 4 / 2",
-          left: 50,
-          marginTop: 0,
-          top: 0,
-          width: 217,
-          height: 173,
-          width_xs: 217,
-          height_xs: 173
+          ...(elValues || {})
         }], {
           at: [...insertAt]
         });
@@ -282,14 +258,11 @@ const FreeGrid = props => {
             images: [],
             children: [{
               text: ""
-            }]
+            }],
+            fromFreeGrid: true,
+            uniqueId: id
           }],
-          gridArea: "3 / 1 / 4 / 2",
-          left: 50,
-          marginTop: 0,
-          top: 0,
-          width: 170,
-          height: 80
+          ...(elValues || {})
         }], {
           at: [...insertAt]
         });
@@ -299,10 +272,11 @@ const FreeGrid = props => {
           ...insertFreeGridItem("video", createEmbedNode("video", {
             url: "",
             alt: "",
-            images: []
+            images: [],
+            fromFreeGrid: true,
+            uniqueId: id
           }), {
-            height: 370,
-            width: 650
+            ...(elValues || {})
           })
         }], {
           at: [...insertAt]
@@ -313,8 +287,7 @@ const FreeGrid = props => {
           ...insertFreeGridItem("table", {
             ...DEFAULT_TABLE_NODE()
           }, {
-            height: 150,
-            width: 400
+            ...(elValues || {})
           })
         }], {
           at: [...insertAt]
@@ -333,12 +306,7 @@ const FreeGrid = props => {
             isEncoded: true,
             isSanitized: true
           }],
-          gridArea: "3 / 1 / 4 / 2",
-          left: 50,
-          marginTop: 0,
-          top: 0,
-          width: 400,
-          height: 300
+          ...(elValues || {})
         }], {
           at: [...insertAt]
         });
@@ -350,7 +318,9 @@ const FreeGrid = props => {
             children: [{
               text: ""
             }]
-          }, {}, "freegridBox")
+          }, {
+            ...(elValues || {})
+          }, "freegridBox")
         }], {
           at: [...insertAt]
         });
@@ -360,8 +330,7 @@ const FreeGrid = props => {
           ...insertFreeGridItem("form", {
             ...FORM_NODE()
           }, {
-            height: 92,
-            width: 400
+            ...(elValues || {})
           })
         }], {
           at: [...insertAt]
@@ -374,8 +343,7 @@ const FreeGrid = props => {
               menus: null
             })
           }, {
-            height: 60,
-            width: 400
+            ...(elValues || {})
           })
         }], {
           at: [...insertAt]
@@ -391,29 +359,21 @@ const FreeGrid = props => {
               text: ""
             }]
           }],
-          gridArea: "3 / 1 / 4 / 2",
-          left: 50,
-          marginTop: 0,
-          top: 0,
-          width: 170,
-          height: 30
+          ...(elValues || {})
         }], {
           at: [...insertAt]
         });
         break;
       default:
     }
-    if (breakpoint === "lg") {
-      setSelectedElement({});
-
-      // auto align in mobile
-      Transforms.setNodes(editor, {
-        xs_updatedOn: null,
-        updated_at: new Date().getTime()
-      }, {
-        at: path
-      });
-    }
+    setSelectedElement({});
+    // increase the section height if new element is inserted based on auto align
+    Transforms.setNodes(editor, {
+      ...sectionVal,
+      updated_at: new Date().getTime()
+    }, {
+      at: path
+    });
     count.current = count.current + 1;
 
     // focus on newly added element
@@ -498,6 +458,7 @@ const FreeGrid = props => {
   //   return eleId;
   // }, [autoAlign, updated_at, breakpoint, path]);
 
+  const sectionBgImage = GetsectionBgImage(sectionBackgroundImage);
   return /*#__PURE__*/_jsx(FreeGridContext.Provider, {
     value: {
       isInteracting,
@@ -519,7 +480,7 @@ const FreeGrid = props => {
       style: {
         position: "relative",
         "--height": `${height}px`,
-        display: 'block' //for test purpose
+        display: "block" //for test purpose
       },
 
       dataSets: {
@@ -616,7 +577,7 @@ const FreeGrid = props => {
           ...classes.root,
           ...freegridSX,
           background: sectionBgColor || "rgba(255,255,255,1)",
-          backgroundImage: sectionBackgroundImage ? `url('${sectionBackgroundImage}')` : "",
+          ...sectionBgImage,
           backgroundSize: "cover"
         },
         "data-path": path.join("|"),

package/dist/Editor/Elements/FreeGrid/FreeGridBox.js

@@ -8,7 +8,7 @@ import { onDropItem, ROW_HEIGHT } from "../../common/RnD/Utils/gridDropItem";
 import useBreakpoints from "../../hooks/useBreakpoints";
 import { breakpointValues, formatBreakpointValues } from "./breakpointConstants";
 import { useEditorContext } from "../../hooks/useMouseMove";
-import { getBreakPointsValue } from "../../helper/theme";
+import { getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
 import focusOnNewItem from "../../helper/RnD/focusOnNewItem";
 import { bringItemToFB } from "../../helper";
 import itemOptions from "./Options/sectionItemOptions";
@@ -157,6 +157,11 @@ const FreeGridBox = props => {
   };
   const repeatTimes = Math.floor(height / ROW_HEIGHT);
   const sectionTypeOptions = (itemOptions?.box || []).filter(f => (hideTools || []).indexOf(f) === -1);
+  const boxSp = groupByBreakpoint({
+    borderRadius: {
+      ...getBreakPointsValue(sectionBorderRadius || {}, null, "overrideBorderRadius", true)
+    }
+  }, theme);
   const isBoxHeader = useMemo(() => {
     return element?.children?.some(c => c.childType === "appHeader" && !c.xs_updatedOn);
   }, [element]);
@@ -192,7 +197,8 @@ const FreeGridBox = props => {
       "data-margin-top-xs": marginTop_xs,
       "data-height-xs": height_xs,
       "data-width-xs": width_xs,
-      "data-left-xs": left_xs
+      "data-left-xs": left_xs,
+      "data-width-lg": width
     },
     gridArea: gridArea,
     onChange: onChange,
@@ -226,9 +232,7 @@ const FreeGridBox = props => {
         "--rows": `repeat(${repeatTimes}, ${ROW_HEIGHT}px)`
       },
       sx: {
-        borderRadius: {
-          ...getBreakPointsValue(sectionBorderRadius || {}, null, "overrideBorderRadius", true)
-        },
+        ...boxSp,
         background: sectionBgColor,
         backgroundImage: sectionBackgroundImage ? `url('${sectionBackgroundImage}')` : "",
         borderColor: borderColor || "transparent",

package/dist/Editor/Elements/FreeGrid/FreeGridItem.js

@@ -296,7 +296,8 @@ const FreeGridItem = props => {
       "data-margin-top-xs": marginTop_xs,
       "data-height-xs": height_xs,
       "data-width-xs": width_xs,
-      "data-left-xs": left_xs
+      "data-left-xs": left_xs,
+      "data-width-lg": width
     },
     defaultStyle: {
       height: `${height}px`,
@@ -321,6 +322,7 @@ const FreeGridItem = props => {
     customProps: customProps,
     translation: translation,
     xsHidden: xsHidden,
+    disableClick: element?.children?.[0]?.isUploading && (element?.childType === "image" || element?.childType === "video"),
     children: /*#__PURE__*/_jsxs(Box, {
       component: "div",
       ...attributes,

package/dist/Editor/Elements/FreeGrid/helper.js

@@ -0,0 +1,194 @@
+import { ROW_HEIGHT } from "../../common/RnD/Utils/gridDropItem";
+import { getElementOffset } from "../../common/RnD/VirtualElement/VirtualTextElement";
+import { RND_ITEMS } from "../../helper";
+export const ELEMENT_CASE = {
+  ADD_TEXT: "addText",
+  ADD_BUTTON: "addButton",
+  ADD_SIGNATURE: "addSignature",
+  ADD_IMAGE: "addImage",
+  ADD_VIDEO: "addVideo",
+  ADD_TABLE: "addTable",
+  ADD_CODE: "addCode",
+  ADD_BOX: "addBox",
+  ADD_FORM: "addForm",
+  ADD_APP_HEADER: "addAppHeader",
+  ADD_DIVIDER: "addDivider"
+};
+const commonXsValues = {
+  top_xs: 0,
+  marginTop_xs: 12,
+  left_xs: 24,
+  width_xs: 272,
+  xs_updatedOn: new Date().getTime()
+};
+const elementValues = {
+  [ELEMENT_CASE.ADD_TEXT]: {
+    gridArea: "3 / 1 / 4 / 2",
+    left: 50,
+    marginTop: 0,
+    top: 0,
+    width: 170,
+    height: 30,
+    height_xs: 50,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_BUTTON]: {
+    gridArea: "3 / 1 / 4 / 2",
+    left: 50,
+    marginTop: 0,
+    top: 0,
+    width: 143,
+    height: 50,
+    height_xs: 50,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_SIGNATURE]: {
+    left: 50,
+    marginTop: 0,
+    top: 0,
+    width: 217,
+    height: 173,
+    height_xs: 173,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_IMAGE]: {
+    gridArea: "3 / 1 / 4 / 2",
+    left: 50,
+    marginTop: 0,
+    top: 0,
+    width: 170,
+    height: 80,
+    height_xs: 80,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_VIDEO]: {
+    height: 370,
+    width: 650,
+    height_xs: 300,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_TABLE]: {
+    height: 150,
+    width: 400,
+    height_xs: 165,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_CODE]: {
+    gridArea: "3 / 1 / 4 / 2",
+    left: 50,
+    marginTop: 0,
+    top: 0,
+    width: 400,
+    height: 300,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_BOX]: {
+    height_xs: 300,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_FORM]: {
+    height: 92,
+    width: 400,
+    height_xs: 80,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_APP_HEADER]: {
+    height: 60,
+    width: 400,
+    height_xs: 80,
+    ...commonXsValues
+  },
+  [ELEMENT_CASE.ADD_DIVIDER]: {
+    gridArea: "3 / 1 / 4 / 2",
+    left: 50,
+    marginTop: 0,
+    top: 0,
+    width: 170,
+    height: 30,
+    height_xs: 24,
+    ...commonXsValues
+  }
+};
+export const findMaxYValue = (sectionItems, breakpoint) => {
+  let maxY = 0;
+  sectionItems.forEach(item => {
+    if (!item?.type) {
+      return;
+    }
+    const isHidden = breakpoint === "xs" && item.children.some(c => c.xsHidden);
+    if (item?.type && RND_ITEMS.includes(item.type) && !isHidden) {
+      const {
+        bottom
+      } = getElementOffset(item, breakpoint === "lg" ? "lg" : "xs");
+      maxY = Math.max(maxY, bottom);
+    }
+  });
+  return maxY;
+};
+export const convertToGridArea = y => {
+  // 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`;
+  return {
+    gridArea,
+    marginTop
+  };
+};
+const BUFFER_MARGIN_TOP = 12;
+const getInsertValues = (sectionItems, breakpoint, elValues) => {
+  const y_xs = sectionItems?.length ? findMaxYValue(sectionItems, breakpoint) : 0;
+  const {
+    gridArea,
+    marginTop
+  } = convertToGridArea(y_xs);
+  const appendBp = breakpoint === "lg" ? "" : "_xs";
+  const insertPos = {
+    [`gridArea${appendBp}`]: gridArea,
+    [`marginTop${appendBp}`]: marginTop + BUFFER_MARGIN_TOP
+  };
+  const sectionHeight = y_xs + elValues[`height${appendBp}`] + BUFFER_MARGIN_TOP + 12;
+  return {
+    insertPos,
+    sectionHeight
+  };
+};
+export const getElementValues = (type, sectionItems, breakpoint) => {
+  const elValues = elementValues[type] || {};
+  let elInsertPos = {};
+  let sectionVal = {};
+
+  // insert element on xs
+  const {
+    insertPos: insertPos_xs,
+    sectionHeight: sectionHeight_xs
+  } = getInsertValues(sectionItems, "xs", elValues);
+  elInsertPos = {
+    ...insertPos_xs
+  };
+  sectionVal.height_xs = sectionHeight_xs;
+
+  // if user in xs, auto-align lg
+  if (breakpoint === "xs") {
+    const {
+      insertPos: insertPos_lg,
+      sectionHeight
+    } = getInsertValues(sectionItems, "lg", elValues);
+    elInsertPos = {
+      ...elInsertPos,
+      ...insertPos_lg
+    };
+    sectionVal.height = sectionHeight;
+  }
+  return {
+    elValues: {
+      ...elValues,
+      ...elInsertPos
+    },
+    sectionVal
+  };
+};

package/dist/Editor/Elements/FreeGrid/styles.js

@@ -247,6 +247,9 @@ const useFreeGridStyles = ({
           },
           "& > .simple-text": {
             display: "none"
+          },
+          "& > .edt-paragraphs": {
+            display: "none"
           }
         },
         "& .fgi_type_form": {
@@ -309,6 +312,12 @@ const useFreeGridStyles = ({
             "& .toolbtn.remove": {
               display: "none"
             }
+          },
+          "& .edt-headings": {
+            margin: "0px"
+          },
+          "& .edt-paragraphs": {
+            margin: "0px"
           }
         },
         "& .fgi_type_embedScript": {
@@ -350,6 +359,12 @@ const useFreeGridStyles = ({
         "& .fgi_type_text": {
           "& .edt-headings": {
             margin: "0px"
+          },
+          "& .edt-paragraphs": {
+            margin: "0px"
+          },
+          "& blockquote": {
+            margin: "0px !important"
           }
         },
         /** element toolbar hide */

package/dist/Editor/Elements/Grid/GridItem.js

@@ -292,7 +292,7 @@ const GridItem = props => {
       ...getBRProps,
       display: "flex",
       flexDirection: flexDirection || "column",
-      background: bgColor || "transparent",
+      background: bgColor,
       borderColor: getBorderColor(),
       borderWidth: borderWidth || "1px",
       borderStyle: borderStyle || "solid",

package/dist/Editor/Elements/PageSettings/PageSettingsButton.js

@@ -46,7 +46,8 @@ const PageSettingsButton = props => {
   const onSave = data => {
     try {
       const updateData = {
-        ...data
+        ...data,
+        isUploading: false
       };
       delete updateData.children;
       updatePageSettings(editor, updateData);

package/dist/Editor/Elements/Table/Table.js

@@ -291,7 +291,8 @@ const Table = props => {
       dragRowBtnCls,
       tablePath: path,
       openSetttings,
-      exandTools
+      exandTools,
+      tableNode: element
     },
     children: [/*#__PURE__*/_jsxs("div", {
       style: {

package/dist/Editor/Elements/Table/TableCell.js

@@ -13,7 +13,7 @@ import { Droppable } from "./Droppable";
 import { useDndContext } from "@dnd-kit/core";
 import { getNodeWithType } from "../../utils/helper";
 import { ResizeIcon } from "../../common/iconListV2";
-import { isEmptyTextNode } from "../../helper";
+import { getTextColor, isEmptyTextNode } from "../../helper";
 import SimpleText from "../SimpleText";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -443,8 +443,10 @@ const TableCell = props => {
   };
   const showRowDragBtn = (showRowDrag || isRowDragging) && containerEle?.scrollLeft <= 0;
   const TableResizer = isMobile && hoverCol === column ? MobileResizer : Resizer;
+  const cellTextColor = entireTextColor || rowProps?.textColor || parentProps?.textColor;
+  const textStyles = cellTextColor ? getTextColor(cellTextColor) : "inherit";
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsxs("td", {
+    children: [/*#__PURE__*/_jsxs(Box, {
       ...element.attr,
       ...attributes,
       className: `editor-table-cell ${hasSelected ? "selection" : ""}`,
@@ -455,14 +457,19 @@ const TableCell = props => {
         fontFamily: entireFontFamily || "inherit",
         fontWeight: entireFontWeight || "inherit",
         fontSize: entireTextSize || "inherit",
-        color: entireTextColor || "inherit",
         cursor: "text",
         verticalAlign: "top",
         padding: "0px",
         ...(sizeProps || {})
       },
+      sx: {
+        '& span[data-slate-string="true"]': {
+          ...textStyles
+        }
+      },
       ...tbProps,
       "data-cell": path.toString(),
+      component: "td",
       children: [isFirstRow && currentDraggingType === "col" ? /*#__PURE__*/_jsx(Droppable, {
         ...dndProps,
         dragType: currentDraggingType,

package/dist/Editor/Elements/Title/title.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
-import { Editor, Text } from "slate";
+import { Text } from "slate";
 import { useSlate } from "slate-react";
-import { getNodeText } from "../../utils/helper";
+import { getNodeText, getNodeWithType } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 const Title = props => {
   const {
@@ -31,9 +31,8 @@ const useDetectExitFromTitle = (titleNode, onSaveTitle) => {
     if (!editor.selection) return;
 
     // Get the current node where the cursor is
-    const [nodeEntry] = Editor.nodes(editor, {
-      at: editor.selection,
-      match: n => n.type === "title"
+    const [nodeEntry] = getNodeWithType(editor, "title", {
+      at: editor.selection
     });
     if (nodeEntry) {
       setWasInsideTitle(true); // User was inside the title

package/dist/Editor/Elements/TopBanner/TopBanner.js

@@ -28,8 +28,9 @@ export const TopBannerToolbar = props => {
     }
   };
   const onSelectImage = img => {
+    const embedURL = typeof img === "string" ? img : img?.embedURL ? img?.embedURL : null;
     updateTopBanner(editor, {
-      url: img
+      url: embedURL
     });
     handleClose();
   };
@@ -56,7 +57,8 @@ export const TopBannerToolbar = props => {
       open: open,
       onClose: handleClose,
       customProps: customProps,
-      onSelectImage: onSelectImage
+      onSelectImage: onSelectImage,
+      disableProgress: true
     })]
   });
 };

package/dist/Editor/Elements/TopBanner/TopBannerButton.js

@@ -17,9 +17,10 @@ const TopBannerButton = props => {
     translation
   } = customProps;
   const onSelectImage = url => {
-    if (url) {
+    const embedURL = typeof url === "string" ? url : url?.embedURL ? url?.embedURL : null;
+    if (embedURL) {
       insertTopBanner(editor, {
-        url
+        url: embedURL
       });
     }
     setOpen(false);
@@ -42,7 +43,8 @@ const TopBannerButton = props => {
       open: open,
       onClose: handleClose,
       customProps: customProps,
-      onSelectImage: onSelectImage
+      onSelectImage: onSelectImage,
+      disableProgress: true
     })]
   });
 };