@flozy/editor 9.8.5 → 9.8.7

package/dist/Editor/Elements/Form/Workflow/Styles.js

@@ -9,20 +9,20 @@ const FormStyles = theme => ({
     color: "#94A3B8"
   },
   bodyTextArea: {
-    '& .mini-editor-cls': {
-      padding: '12px',
-      '&:focus-visible': {
-        outline: 'none',
-        border: 'none'
+    "& .mini-editor-cls": {
+      padding: "12px",
+      "&:focus-visible": {
+        outline: "none",
+        border: "none"
       }
     },
     "& .editorWorkflow": {
-      minHeight: '130px',
-      padding: '12px',
+      minHeight: "130px",
+      padding: "12px",
       paddingBottom: 0,
-      '&:focus-visible': {
-        outline: 'none',
-        border: 'none'
+      "&:focus-visible": {
+        outline: "none",
+        border: "none"
       }
     }
   },
@@ -105,7 +105,7 @@ const FormStyles = theme => ({
     padding: "4px 22px",
     textTransform: "none",
     border: "1px solid #D8DDE1",
-    minWidth: '126px',
+    minWidth: "126px",
     "& svg": {
       "& path": {
         stroke: "#64748B"
@@ -169,17 +169,19 @@ const FormStyles = theme => ({
     }
   },
   colorButtonSingle: {
+    border: "1.5px solid #DCE4EC !important",
     "&.active": {
-      "&:before": {
-        content: '" "',
-        position: "absolute",
-        top: "-5px",
-        left: "-5px",
-        width: "calc(100% + 4px)",
-        height: "calc(100% + 4px)",
-        border: "3px solid blue",
-        borderRadius: "50%"
-      }
+      // "&:before": {
+      //   content: '" "',
+      //   position: "absolute",
+      //   top: "-5px",
+      //   left: "-5px",
+      //   width: "calc(100% + 4px)",
+      //   height: "calc(100% + 4px)",
+      //   border: "3px solid blue",
+      //   borderRadius: "50%",
+      // },
+      outline: "2px solid #2563EB"
     }
   },
   colorButtonsInner: {
@@ -249,7 +251,7 @@ const FormStyles = theme => ({
     }
   },
   root: {
-    padding: '10px'
+    padding: "10px"
   }
 });
 export default FormStyles;

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { Path, Transforms, Node } from "slate";
 import { ReactEditor, useSlateStatic } from "slate-react";
 import { Box, useTheme } from "@mui/material";
@@ -43,7 +43,8 @@ const FreeGrid = props => {
   } = props;
   const {
     sectionName,
-    sectionBorderRadius
+    sectionBorderRadius,
+    height_xs
   } = element;
   const {
     readOnly,
@@ -64,11 +65,14 @@ const FreeGrid = props => {
   const {
     setSelectedElement
   } = useEditorContext();
+  const [autoAlign, setAutoAlign] = useState(false);
+  const count = useRef(2);
+  const childrenCountRef = useRef(element?.children?.length);
   const onChange = data => {
     const append = breakpoint === "lg" ? "" : `_${breakpoint}`;
     const updateData = {
       ...data,
-      [`height${append}`]: height + data.height
+      [`height${append}`]: data.height
     };
     if (append !== "") {
       delete updateData.height;
@@ -130,6 +134,10 @@ const FreeGrid = props => {
             setSelectedElement
           });
           break;
+        case "forceAutoAlignment":
+          setAutoAlign(true);
+          setSelectedElement({});
+          break;
         case "deleteSection":
           if (Node.has(editor, cur_root_path)) {
             Transforms.removeNodes(editor, {
@@ -151,9 +159,12 @@ const FreeGrid = props => {
       console.log(err);
     }
   };
+  useEffect(() => {
+    childrenCountRef.current = element?.children?.length;
+  }, [element?.children?.length]);
   const handleAddElementClick = type => () => {
     const isEmpty = isEmptySection();
-    const insertAt = isEmpty ? [...path, 0] : [...path, element?.children?.length];
+    const insertAt = isEmpty ? [...path, 0] : [...path, childrenCountRef.current];
     switch (type) {
       case "addText":
         Transforms.insertNodes(editor, [{
@@ -188,20 +199,6 @@ 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"
           }],
@@ -374,6 +371,19 @@ const FreeGrid = props => {
         break;
       default:
     }
+    if (breakpoint === "lg") {
+      setSelectedElement({});
+
+      // auto align in mobile
+      Transforms.setNodes(editor, {
+        xs_updatedOn: null,
+        updated_at: new Date().getTime()
+      }, {
+        at: path
+      });
+    }
+    count.current = count.current + 1;
+
     // focus on newly added element
     focusOnNewItem(editor, insertAt, {
       setSelectedElement
@@ -445,6 +455,17 @@ const FreeGrid = props => {
     }
   }, theme);
   const sectionTypeOptions = (itemOptions?.section || []).filter(f => (hideTools || []).indexOf(f) === -1);
+
+  // const id = useMemo(() => {
+  //   let eleId = `freegrid_container_${path.join("|")}_${breakpoint}`;
+
+  //   if (autoAlign) {
+  //     eleId += `_${updated_at}`; // re-render component on force auto align
+  //   }
+
+  //   return eleId;
+  // }, [autoAlign, updated_at, breakpoint, path]);
+
   return /*#__PURE__*/_jsx(RnD, {
     id: `freegrid_container_${path.join("|")}_${updated_at}_${breakpoint}`,
     className: `
@@ -458,6 +479,9 @@ const FreeGrid = props => {
       position: "relative",
       "--height": `${height}px`
     },
+    dataSets: {
+      "data-height-xs": height_xs
+    },
     defaultStyle: {
       width: "100%",
       height: height ? `${height}px` : "auto"
@@ -514,7 +538,8 @@ const FreeGrid = props => {
           },
           customProps: {
             customProps
-          }
+          },
+          breakpoint
         }
       },
       settings: {
@@ -525,9 +550,7 @@ const FreeGrid = props => {
           editor,
           path,
           classes,
-          customProps,
-          translation,
-          customProps
+          translation
         }
       }
     },
@@ -537,6 +560,9 @@ const FreeGrid = props => {
     handleContextMenuClick: handleContextMenuClick,
     translation: translation,
     customProps: customProps,
+    sectionElement: element,
+    autoAlign: autoAlign,
+    setAutoAlign: setAutoAlign,
     children: /*#__PURE__*/_jsxs(Box, {
       ...attributes,
       id: sectionName,

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { Transforms, Node, Path } from "slate";
 import { useSlateStatic } from "slate-react";
 import { ReactEditor } from "slate-react";
@@ -37,7 +37,12 @@ const FreeGridBox = props => {
     sectionBorderRadius,
     borderWidth,
     borderColor,
-    borderStyle
+    borderStyle,
+    height_xs,
+    marginTop_xs,
+    gridArea_xs,
+    width_xs,
+    left_xs
   } = element;
   // get values based on breakpoint size
   const {
@@ -152,9 +157,12 @@ const FreeGridBox = props => {
   };
   const repeatTimes = Math.floor(height / ROW_HEIGHT);
   const sectionTypeOptions = (itemOptions?.box || []).filter(f => (hideTools || []).indexOf(f) === -1);
+  const isBoxHeader = useMemo(() => {
+    return element?.children?.some(c => c.childType === "appHeader" && !c.xs_updatedOn);
+  }, [element]);
   return /*#__PURE__*/_jsx(RnD, {
     id: `freegrid_box_item_${path.join("|")}_${updated_at}_${breakpoint}`,
-    className: `freegrid-item path-${path.length} breakpoint-${breakpoint}`,
+    className: `freegrid-item path-${path.length} breakpoint-${breakpoint} freegrid-box_${path.join("_")}`,
     editor: editor,
     path: path,
     actions: sectionTypeOptions,
@@ -169,12 +177,23 @@ const FreeGridBox = props => {
       "--gridArea": `${gridArea}`,
       "--width": `${width}px`,
       "--height": `${height}px`,
-      "--zIndex": 100 + arrangeIndex
+      "--zIndex": 100 + arrangeIndex,
+      "--height_xs": height_xs ? `${height_xs}px` : "auto",
+      "--marginTop_xs": marginTop_xs ? `${marginTop_xs}px` : "24px"
+      // "--gridArea_xs": gridArea_xs ? gridArea_xs : "unset",
     },
+
     defaultStyle: {
       height: `${height}px`,
       width: `${width}px`
     },
+    dataSets: {
+      "data-grid-area-xs": gridArea_xs,
+      "data-margin-top-xs": marginTop_xs,
+      "data-height-xs": height_xs,
+      "data-width-xs": width_xs,
+      "data-left-xs": left_xs
+    },
     gridArea: gridArea,
     onChange: onChange,
     delta: {
@@ -192,6 +211,8 @@ const FreeGridBox = props => {
     type: "parent-container",
     customProps: customProps,
     translation: translation,
+    breakpoint: breakpoint,
+    isBoxHeader: isBoxHeader,
     children: /*#__PURE__*/_jsx(Box, {
       component: "div",
       ...attributes,

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

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
 import { Transforms, Node, Path } from "slate";
 import { useSlateStatic } from "slate-react";
 import { ReactEditor } from "slate-react";
@@ -35,7 +35,12 @@ const FreeGridItem = props => {
   const {
     updated_at,
     childType,
-    zIndex
+    zIndex,
+    height_xs,
+    width_xs,
+    marginTop_xs,
+    gridArea_xs,
+    left_xs
   } = element;
   // get values based on breakpoint size
   const {
@@ -54,6 +59,9 @@ const FreeGridItem = props => {
   arrangeIndex = Math.max(1, arrangeIndex);
   const [popup, setPopup] = useState(null);
   const onChangeSettings = () => {};
+  // const refInput = useRef();
+  // const [virtualHeight, setVirtualHeight] = useState(height || 0);
+
   const onChange = data => {
     let updateData = {
       ...data
@@ -109,6 +117,13 @@ const FreeGridItem = props => {
       Transforms.removeNodes(editor, {
         at: path
       });
+      const parentPath = Path.parent(path);
+      Transforms.setNodes(editor, {
+        xs_updatedOn: null,
+        updated_at: new Date().getTime()
+      }, {
+        at: parentPath
+      });
     } catch (err) {
       console.log(err);
     }
@@ -235,6 +250,22 @@ const FreeGridItem = props => {
     }
   };
   const itemTypeOptions = (itemOptions[childType] || itemOptions?.default).filter(f => (hideTools || []).indexOf(f) === -1);
+  const variableStyle = useMemo(() => {
+    const {
+      width,
+      height
+    } = element || {};
+    let widthVar = width_xs;
+    let heightVar = height_xs;
+    if (element?.childType === "image") {
+      widthVar = width_xs || width;
+      heightVar = height_xs || height;
+    }
+    return {
+      "--width_xs": widthVar ? `${widthVar}px` : "auto",
+      "--height_xs": heightVar ? `${heightVar}px` : "auto"
+    };
+  }, [element]);
   return /*#__PURE__*/_jsx(RnD, {
     id: `freegrid_item_${path.join("|")}_${updated_at}_${breakpoint}`,
     className: `freegrid-item path-${path.length} breakpoint-${breakpoint}`,
@@ -254,7 +285,18 @@ const FreeGridItem = props => {
       "--gridArea": `${gridArea}`,
       "--width": `${width}px`,
       "--height": `${height}px`,
-      "--zIndex": 100 + arrangeIndex
+      "--zIndex": 100 + arrangeIndex,
+      "--marginTop_xs": marginTop_xs ? `${marginTop_xs}px` : "0px",
+      ...variableStyle
+      // "--gridArea_xs": gridArea_xs ? gridArea_xs : "unset",
+    },
+
+    dataSets: {
+      "data-grid-area-xs": gridArea_xs,
+      "data-margin-top-xs": marginTop_xs,
+      "data-height-xs": height_xs,
+      "data-width-xs": width_xs,
+      "data-left-xs": left_xs
     },
     defaultStyle: {
       height: `${height}px`,
@@ -277,6 +319,7 @@ const FreeGridItem = props => {
     },
     customProps: customProps,
     translation: translation,
+    breakpoint: breakpoint,
     children: /*#__PURE__*/_jsxs(Box, {
       component: "div",
       ...attributes,

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

@@ -5,7 +5,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 const More = props => {
   const {
     handleClick,
-    translation
+    translation,
+    breakpoint
   } = props;
   return /*#__PURE__*/_jsx(Box, {
     children: /*#__PURE__*/_jsxs(List, {
@@ -18,7 +19,11 @@ const More = props => {
         className: "item-wrapper",
         onClick: handleClick("duplicateSection"),
         children: translation?.translation("Duplicate Section")
-      }), /*#__PURE__*/_jsx(ListItemButton, {
+      }), breakpoint === "xs" ? /*#__PURE__*/_jsx(ListItemButton, {
+        className: "item-wrapper",
+        onClick: handleClick("forceAutoAlignment"),
+        children: "Force Auto Alignment"
+      }) : null, /*#__PURE__*/_jsx(ListItemButton, {
         className: "item-wrapper",
         onClick: handleClick("deleteSection"),
         children: "Delete Section"

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

@@ -316,6 +316,9 @@ const useFreeGridStyles = ({
         "& .fgi_type_text": {
           "& .edt-headings": {
             margin: "0px"
+          },
+          "& .edt-paragraphs": {
+            margin: "0px"
           }
         },
         /** 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/List/CheckList.js

@@ -27,6 +27,9 @@ const CheckList = props => {
     checked
   } = element;
   const path = ReactEditor.findPath(editor, element);
+  const {
+    customLineHeight
+  } = customProps || {};
   const handleCheck = e => {
     Transforms.setNodes(editor, {
       checked: e.target.checked
@@ -45,7 +48,7 @@ const CheckList = props => {
         justifyContent: "center",
         alignItems: "center",
         ...(style || {}),
-        lineHeight: 1.43
+        lineHeight: `${customLineHeight} !important`
       },
       children: [/*#__PURE__*/_jsxs("div", {
         contentEditable: false,

package/dist/Editor/Elements/SimpleText/index.js

@@ -5,6 +5,7 @@ import { Box } from "@mui/material";
 import { isTextSelected } from "../../utils/helper";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import SimpleTextStyle from "./style";
+import { getBreakpointLineSpacing } from "../../helper/theme";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -27,10 +28,17 @@ const SimpleText = props => {
     editorPlaceholder,
     translation
   } = customProps;
+  const {
+    activeBreakPoint
+  } = useEditorContext();
   // const { element: pageSt } = getPageSettings(editor) || {};
   // const { pageColor } = pageSt?.pageProps || {};
+  const isMobile = window.matchMedia("(max-width: 899px)")?.matches || false;
+  const lineH = element?.children[0]?.lineHeight;
+  const lineHeight = getBreakpointLineSpacing(lineH, activeBreakPoint || (isMobile ? "xs" : "lg"));
   const classes = SimpleTextStyle({
-    pageColor: "#FFFFFF"
+    pageColor: "#FFFFFF",
+    lineHeight
   });
   const selected = useSelected();
   const path = ReactEditor.findPath(editor, element);

package/dist/Editor/Elements/SimpleText/style.js

@@ -35,8 +35,8 @@ const SimpleTextStyle = ({
       height: "24px",
       overflow: "hidden",
       fontSize: "14px",
-      display: 'inline-flex',
-      alignItems: 'center',
+      display: "inline-flex",
+      alignItems: "center",
       "& .bg-pad-sl": {
         padding: "2px 4px 2px 4px",
         background: "transparent",

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

@@ -307,7 +307,7 @@ const Table = props => {
       onScroll: handleScroll,
       onMouseOver: onMouseOver,
       onMouseLeave: onMouseLeave,
-      className: !hideTools.includes("add_column") ? "custom-scroll" : '',
+      className: "custom-scroll",
       children: [/*#__PURE__*/_jsx(TableComp, {
         className: readOnly ? "readOnly" : "",
         sx: {
@@ -345,8 +345,8 @@ const Table = props => {
       handleAction: handleAction,
       exandTools: exandTools,
       openSetttings: openSetttings,
-      translation: translation,
-      hideTools: hideTools
+      hideTools: hideTools,
+      translation: translation
     }), /*#__PURE__*/_jsx(MoreTableSettings, {
       exandTools: exandTools,
       handleAction: handleAction,

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

@@ -4,6 +4,12 @@ import { useSlate } from "slate-react";
 import { getNodeText } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+const isEmptyTextNode = node => {
+  if (Text.isText(node)) {
+    return !node.text.trim();
+  }
+  return false;
+};
 const Title = props => {
   const {
     attributes,
@@ -50,10 +56,4 @@ const useDetectExitFromTitle = (titleNode, onSaveTitle) => {
     }
   }, [editor.selection]);
   return null;
-};
-const isEmptyTextNode = node => {
-  if (Text.isText(node)) {
-    return !node.text.trim();
-  }
-  return false;
 };

package/dist/Editor/Elements/Variables/VariableButton.js

@@ -34,7 +34,8 @@ const VariableButton = props => {
       PaperProps: {
         style: {
           maxHeight: 300,
-          overflowY: "auto"
+          overflowY: "auto",
+          transformOrigin: 'top left'
         },
         sx: {
           "&::-webkit-scrollbar-track": {
@@ -44,6 +45,14 @@ const VariableButton = props => {
             borderRadius: "16px"
           }
         }
+      },
+      anchorOrigin: {
+        vertical: 'bottom',
+        horizontal: 'right'
+      },
+      transformOrigin: {
+        vertical: 'top',
+        horizontal: 'right'
       }
     },
     children: [/*#__PURE__*/_jsx(MenuItem, {

package/dist/Editor/MiniEditor.js

@@ -45,12 +45,13 @@ const MiniEditor = props => {
   const {
     translationMock
   } = otherProps;
+  const dummyTranslation = () => {};
   const customProps = {
     ...(otherProps || {}),
     readOnly: isReadOnly,
     editorPlaceholder: miniEditorPlaceholder,
     page_id: id,
-    translation: translation || translationMock
+    translation: translation || translationMock || dummyTranslation
   };
   const [mentions, setMentions] = useMentions({
     editor,

package/dist/Editor/Styles/EditorStyles.js

@@ -133,7 +133,7 @@ const editorStyles = ({
       },
       "& .accordion-summary-collapse-btn": {
         padding: "4px",
-        width: '5px'
+        width: "5px"
       },
       "& .workflow-icon-btn": {
         pointerEvents: "none",
@@ -242,7 +242,7 @@ const editorStyles = ({
         }
       },
       "& .section-tw": {
-        background: 'transparent !important',
+        background: "transparent !important",
         "& button": {
           padding: "2px",
           borderRadius: "0px",
@@ -291,8 +291,8 @@ const editorStyles = ({
         }
       },
       "& ::selection": {
-        background: 'rgba(35, 131, 226, 0.35)!important',
-        color: 'inherit'
+        background: "rgba(35, 131, 226, 0.35)!important",
+        color: "inherit"
       },
       "&.readOnlyContainer": {
         "& .max-content": {
@@ -302,7 +302,7 @@ const editorStyles = ({
     },
     fullScreenWrapper: {
       "& .editor-wrapper": {
-        paddingTop: '20px'
+        paddingTop: "20px"
       },
       "& .MuiDialog-paper, & .MuiPopover-paper": {
         background: `${theme?.palette?.editor?.background} !important`

package/dist/Editor/Toolbar/FormatTools/Dropdown.js

@@ -1,8 +1,32 @@
 import React from "react";
 import { Select, MenuItem } from "@mui/material";
-import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
+import { addMarkData, activeMark, getSelectedElementStyle } from "../../utils/SlateUtilityFunctions.js";
+import { toolbarGroups } from "../toolbarGroups.js";
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
+import { googleFontList as defaultFonts } from "../../common/FontLoader/FontList.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+const allTools = toolbarGroups.flat();
+const fontWeight = allTools.find(f => f.format === "fontWeight");
+export const getValue = (editor, format) => {
+  switch (format) {
+    case "fontFamily":
+      {
+        const style = getSelectedElementStyle("font-family", editor, format);
+        return style || defaultFonts[0];
+      }
+    case "fontWeight":
+      {
+        const {
+          options
+        } = fontWeight || {};
+        const fontWeightStyle = getSelectedElementStyle("font-weight", editor, format);
+        const selected = options?.find(o => o.value === fontWeightStyle || o.numVal === fontWeightStyle);
+        return selected?.value;
+      }
+    default:
+      return activeMark(editor, format);
+  }
+};
 const Dropdown = ({
   classes,
   editor,
@@ -10,7 +34,7 @@ const Dropdown = ({
   options,
   width
 }) => {
-  const value = activeMark(editor, format);
+  const value = activeMark(editor, format, true) || getValue(editor, format);
   const changeMarkData = (event, format) => {
     event.preventDefault();
     const value = event.target.value;
@@ -20,7 +44,7 @@ const Dropdown = ({
     });
   };
   return /*#__PURE__*/_jsx(Select, {
-    value: value,
+    value: value || options?.[0]?.value,
     className: "editor-dd",
     onChange: e => changeMarkData(e, format),
     MenuProps: {