@flozy/editor 10.6.8 → 10.7.0

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

@@ -22,7 +22,6 @@ import { DEFAULT_TABLE_NODE } from "../../utils/table";
 import itemOptions from "./Options/sectionItemOptions";
 import { getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
 import { useDebouncedCallback } from "use-debounce";
-import { getNewElementXsValues } from "./helper";
 import updateFormName from "../../utils/updateFormName";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -184,10 +183,6 @@ const FreeGrid = props => {
   const handleAddElementClick = type => () => {
     const isEmpty = isEmptySection();
     const insertAt = isEmpty ? [...path, 0] : [...path, childrenCountRef.current];
-    const {
-      xsVal,
-      sectionHeightXs
-    } = getNewElementXsValues(type, element?.children);
     switch (type) {
       case "addText":
         Transforms.insertNodes(editor, [{
@@ -204,8 +199,7 @@ const FreeGrid = props => {
           marginTop: 0,
           top: 0,
           width: 170,
-          height: 30,
-          ...(xsVal || {})
+          height: 30
         }], {
           at: [...insertAt]
         });
@@ -223,6 +217,20 @@ 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"
           }],
@@ -231,8 +239,7 @@ const FreeGrid = props => {
           marginTop: 0,
           top: 0,
           width: 143,
-          height: 50,
-          ...(xsVal || {})
+          height: 50
         }], {
           at: [...insertAt]
         });
@@ -258,9 +265,8 @@ const FreeGrid = props => {
           top: 0,
           width: 217,
           height: 173,
-          // width_xs: 217,
-          // height_xs: 173,
-          ...(xsVal || {})
+          width_xs: 217,
+          height_xs: 173
         }], {
           at: [...insertAt]
         });
@@ -283,8 +289,7 @@ const FreeGrid = props => {
           marginTop: 0,
           top: 0,
           width: 170,
-          height: 80,
-          ...(xsVal || {})
+          height: 80
         }], {
           at: [...insertAt]
         });
@@ -297,8 +302,7 @@ const FreeGrid = props => {
             images: []
           }), {
             height: 370,
-            width: 650,
-            ...(xsVal || {})
+            width: 650
           })
         }], {
           at: [...insertAt]
@@ -310,8 +314,7 @@ const FreeGrid = props => {
             ...DEFAULT_TABLE_NODE()
           }, {
             height: 150,
-            width: 400,
-            ...(xsVal || {})
+            width: 400
           })
         }], {
           at: [...insertAt]
@@ -335,8 +338,7 @@ const FreeGrid = props => {
           marginTop: 0,
           top: 0,
           width: 400,
-          height: 300,
-          ...(xsVal || {})
+          height: 300
         }], {
           at: [...insertAt]
         });
@@ -348,9 +350,7 @@ const FreeGrid = props => {
             children: [{
               text: ""
             }]
-          }, {
-            ...(xsVal || {})
-          }, "freegridBox")
+          }, {}, "freegridBox")
         }], {
           at: [...insertAt]
         });
@@ -361,8 +361,7 @@ const FreeGrid = props => {
             ...FORM_NODE()
           }, {
             height: 92,
-            width: 400,
-            ...(xsVal || {})
+            width: 400
           })
         }], {
           at: [...insertAt]
@@ -376,8 +375,7 @@ const FreeGrid = props => {
             })
           }, {
             height: 60,
-            width: 400,
-            ...(xsVal || {})
+            width: 400
           })
         }], {
           at: [...insertAt]
@@ -398,18 +396,19 @@ const FreeGrid = props => {
           marginTop: 0,
           top: 0,
           width: 170,
-          height: 30,
-          ...(xsVal || {})
+          height: 30
         }], {
           at: [...insertAt]
         });
         break;
       default:
     }
-    if (xsVal) {
+    if (breakpoint === "lg") {
       setSelectedElement({});
+
+      // auto align in mobile
       Transforms.setNodes(editor, {
-        height_xs: sectionHeightXs,
+        xs_updatedOn: null,
         updated_at: new Date().getTime()
       }, {
         at: path

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, groupByBreakpoint } from "../../helper/theme";
+import { getBreakPointsValue } from "../../helper/theme";
 import focusOnNewItem from "../../helper/RnD/focusOnNewItem";
 import { bringItemToFB } from "../../helper";
 import itemOptions from "./Options/sectionItemOptions";
@@ -160,11 +160,6 @@ const FreeGridBox = props => {
   const isBoxHeader = useMemo(() => {
     return element?.children?.some(c => c.childType === "appHeader" && !c.xs_updatedOn);
   }, [element]);
-  const boxSp = groupByBreakpoint({
-    borderRadius: {
-      ...getBreakPointsValue(sectionBorderRadius || {}, null, "overrideBorderRadius", true)
-    }
-  }, theme);
   return /*#__PURE__*/_jsx(RnD, {
     id: `freegrid_box_item_${path.join("|")}_${updated_at}_${breakpoint}`,
     className: `freegrid-item path-${path.length} breakpoint-${breakpoint} freegrid-box_${path.join("_")}`,
@@ -231,7 +226,9 @@ const FreeGridBox = props => {
         "--rows": `repeat(${repeatTimes}, ${ROW_HEIGHT}px)`
       },
       sx: {
-        ...boxSp,
+        borderRadius: {
+          ...getBreakPointsValue(sectionBorderRadius || {}, null, "overrideBorderRadius", true)
+        },
         background: sectionBgColor,
         backgroundImage: sectionBackgroundImage ? `url('${sectionBackgroundImage}')` : "",
         borderColor: borderColor || "transparent",

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

@@ -5,8 +5,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 const More = props => {
   const {
     handleClick,
-    translation,
-    breakpoint
+    breakpoint,
+    translation
   } = props;
   return /*#__PURE__*/_jsx(Box, {
     children: /*#__PURE__*/_jsxs(List, {
@@ -19,15 +19,15 @@ const More = props => {
         className: "item-wrapper",
         onClick: handleClick("duplicateSection"),
         children: translation?.translation("Duplicate Section")
+      }), /*#__PURE__*/_jsx(ListItemButton, {
+        className: "item-wrapper",
+        onClick: handleClick("deleteSection"),
+        children: "Delete Section"
       }), 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"
-      })]
+      }) : null]
     })
   });
 };

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

@@ -247,9 +247,6 @@ const useFreeGridStyles = ({
           },
           "& > .simple-text": {
             display: "none"
-          },
-          "& > .edt-paragraphs": {
-            display: "none"
           }
         },
         "& .fgi_type_form": {
@@ -353,12 +350,6 @@ 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,
+      background: bgColor || "transparent",
       borderColor: getBorderColor(),
       borderWidth: borderWidth || "1px",
       borderStyle: borderStyle || "solid",

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

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

@@ -3,12 +3,6 @@ import { Editor, Text } from "slate";
 import { useSlate } from "slate-react";
 import { getNodeText } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
-const isEmptyTextNode = node => {
-  if (Text.isText(node)) {
-    return !node.text.trim();
-  }
-  return false;
-};
 const Title = props => {
   const {
     attributes,
@@ -53,4 +47,10 @@ 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,8 +34,7 @@ const VariableButton = props => {
       PaperProps: {
         style: {
           maxHeight: 300,
-          overflowY: "auto",
-          transformOrigin: 'top left'
+          overflowY: "auto"
         },
         sx: {
           "&::-webkit-scrollbar-track": {
@@ -45,14 +44,6 @@ 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,13 +45,12 @@ const MiniEditor = props => {
   const {
     translationMock
   } = otherProps;
-  const dummyTranslation = () => {};
   const customProps = {
     ...(otherProps || {}),
     readOnly: isReadOnly,
     editorPlaceholder: miniEditorPlaceholder,
     page_id: id,
-    translation: translation || translationMock || dummyTranslation
+    translation: translation || translationMock
   };
   const [mentions, setMentions] = useMentions({
     editor,

package/dist/Editor/Styles/EditorStyles.js

@@ -133,11 +133,7 @@ const editorStyles = ({
       },
       "& .accordion-summary-collapse-btn": {
         padding: "4px",
-        width: "5px",
-        "& svg:hover": {
-          background: theme?.palette?.editor?.tv_hover_bg,
-          borderRadius: "4px"
-        }
+        width: '5px'
       },
       "& .workflow-icon-btn": {
         pointerEvents: "none",
@@ -246,7 +242,7 @@ const editorStyles = ({
         }
       },
       "& .section-tw": {
-        background: "transparent !important",
+        background: 'transparent !important',
         "& button": {
           padding: "2px",
           borderRadius: "0px",
@@ -295,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": {
@@ -306,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,32 +1,8 @@
 import React from "react";
 import { Select, MenuItem } from "@mui/material";
-import { addMarkData, activeMark, getSelectedElementStyle } from "../../utils/SlateUtilityFunctions.js";
-import { toolbarGroups } from "../toolbarGroups.js";
+import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.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,
@@ -34,7 +10,7 @@ const Dropdown = ({
   options,
   width
 }) => {
-  const value = activeMark(editor, format, true) || getValue(editor, format);
+  const value = activeMark(editor, format);
   const changeMarkData = (event, format) => {
     event.preventDefault();
     const value = event.target.value;
@@ -44,7 +20,7 @@ const Dropdown = ({
     });
   };
   return /*#__PURE__*/_jsx(Select, {
-    value: value || options?.[0]?.value,
+    value: value,
     className: "editor-dd",
     onChange: e => changeMarkData(e, format),
     MenuProps: {

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

@@ -1,10 +1,9 @@
 import React from "react";
 import { Autocomplete, TextField } from "@mui/material";
-import { addMarkData } from "../../utils/SlateUtilityFunctions.js";
+import { activeMark, addMarkData } from "../../utils/SlateUtilityFunctions.js";
 import usePopupStyle from "../PopupTool/PopupToolStyle.js";
 import { useEditorContext } from "../../hooks/useMouseMove.js";
-import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
-import { getValue } from "./Dropdown.js";
+import KeyboardArrowDownRoundedIcon from '@mui/icons-material/KeyboardArrowDownRounded';
 import { jsx as _jsx } from "react/jsx-runtime";
 const FontFamilyAutocomplete = ({
   editor,
@@ -15,7 +14,7 @@ const FontFamilyAutocomplete = ({
   val = "",
   webFont = false
 }) => {
-  const markValue = getValue(editor, format);
+  const markValue = activeMark(editor, format);
   const value = !webFont ? markValue : val;
   const changeMarkData = (event, newValue, format) => {
     if (!webFont) {

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

@@ -1,7 +1,7 @@
 import React from "react";
 import Icon from "../../common/Icon";
 import Button from "../../common/Button";
-import { toggleMark, isMarkBtnActive } from "../../utils/SlateUtilityFunctions.js";
+import { toggleMark, isMarkActive } from "../../utils/SlateUtilityFunctions.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const MarkButton = ({
   editor,
@@ -13,7 +13,7 @@ const MarkButton = ({
     translation
   } = customProps;
   return /*#__PURE__*/_jsx(Button, {
-    active: isMarkBtnActive(editor, format),
+    active: isMarkActive(editor, format),
     format: format,
     onMouseDown: e => {
       e.preventDefault();

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

@@ -1,7 +1,8 @@
 import React, { useEffect, useRef, useState } from "react";
 import { TextField, IconButton } from "@mui/material";
-import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
-import { getBreakPointsValue, getTextSizeVal } from "../../helper/theme.js";
+import { addMarkData, activeMark, isBlockActive } from "../../utils/SlateUtilityFunctions.js";
+import { headingMap, sizeMap } from "../../utils/font.js";
+import { getBreakPointsValue } from "../../helper/theme.js";
 import useWindowResize from "../../hooks/useWindowResize.js";
 import { BREAKPOINTS_DEVICES } from "../../helper/theme.js";
 import { TextSizeDownArrow, TextSizeUpArrow } from "../../common/iconListV2.js";
@@ -14,15 +15,11 @@ const TextSize = ({
   format,
   fullWidth
 }) => {
-  const [fontSize, setFontSize] = useState();
-  const timerRef = useRef();
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-
-  // const noFontSize =
-  //   val === "normal" || (typeof val === "object" && !Object.keys(val)?.length);
-
-  const value = getTextSizeVal(editor);
+  const value = getBreakPointsValue(val, size?.device);
+  const [fontSize, setFontSize] = useState();
+  const timerRef = useRef();
   useEffect(() => {
     setFontSize(getSizeVal());
   }, [value]);
@@ -58,7 +55,13 @@ const TextSize = ({
   };
   const getSizeVal = () => {
     try {
-      return parseInt(value);
+      let size = `${value}`?.indexOf("px") >= 0 ? value : sizeMap[value] || value;
+      Object.entries(headingMap).forEach(([format, value]) => {
+        if (isBlockActive(editor, format) && isNaN(parseInt(size))) {
+          size = value;
+        }
+      });
+      return parseInt(size);
     } catch (err) {
       return "";
     }

package/dist/Editor/Toolbar/Mini/MiniToolbar.js

@@ -215,8 +215,7 @@ const MiniToolbar = props => {
           setPopper: setPopper,
           onClose: onClose,
           search: search,
-          onSearch: onSearch,
-          closeMainPopup: onClose
+          onSearch: onSearch
         })]
       }) : null
     })]

package/dist/Editor/Toolbar/PopupTool/MiniTextFormat/MiniColorPicker.js

@@ -12,8 +12,7 @@ function MiniColorPicker(props) {
     classes,
     id,
     editor,
-    customProps,
-    type
+    customProps
   } = props;
   const [openColorTool, setOpenColorTool] = useState(null);
   const {
@@ -39,8 +38,7 @@ function MiniColorPicker(props) {
       classes: classes,
       forMiniTool: true,
       openColorTool: openColorTool,
-      closeColorTool: () => setOpenColorTool(null),
-      type: type
+      closeColorTool: () => setOpenColorTool(null)
     }, id)]
   });
 }

package/dist/Editor/Toolbar/PopupTool/MiniTextFormat/SelectFontSize.js

@@ -1,9 +1,10 @@
 import { useEffect, useRef, useState } from "react";
-import { activeMark, addMarkData } from "../../../utils/SlateUtilityFunctions";
+import { activeMark, addMarkData, isBlockActive } from "../../../utils/SlateUtilityFunctions";
 import { Button, IconButton, Popover, TextField } from "@mui/material";
 import DownArrowIcon from "../../../assets/svg/DownArrowIcon";
 import useWindowResize from "../../../hooks/useWindowResize";
-import { BREAKPOINTS_DEVICES, getBreakPointsValue, getTextSizeVal } from "../../../helper/theme";
+import { BREAKPOINTS_DEVICES, getBreakPointsValue } from "../../../helper/theme";
+import { headingMap, sizeMap } from "../../../utils/font";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const fontSizeOptions = [8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 26, 32, 36, 40, 48, 64, 96, 128];
@@ -18,7 +19,7 @@ function SelectFontSize({
   const containerRef = useRef();
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-  const value = getTextSizeVal(editor);
+  const value = getBreakPointsValue(val, size?.device);
   const timerRef = useRef();
   const updateMarkData = newVal => {
     let upData = {
@@ -52,7 +53,13 @@ function SelectFontSize({
   };
   const getSizeVal = () => {
     try {
-      return parseInt(value);
+      let size = `${value}`?.indexOf("px") >= 0 ? value : sizeMap[value] || value;
+      Object.entries(headingMap).forEach(([format, value]) => {
+        if (isBlockActive(editor, format) && isNaN(parseInt(size))) {
+          size = value;
+        }
+      });
+      return isNaN(parseInt(size)) ? 14 : parseInt(size);
     } catch (err) {
       return "";
     }
@@ -90,8 +97,8 @@ function SelectFontSize({
       anchorEl: anchorEl,
       onClose: () => setAnchorEl(null),
       anchorOrigin: {
-        vertical: "bottom",
-        horizontal: "left"
+        vertical: 'bottom',
+        horizontal: 'left'
       },
       sx: classes.customSelectPopoverWrapper,
       children: fontSizeOptions.map((s, i) => {

package/dist/Editor/Toolbar/PopupTool/MiniTextFormat/SelectList.js

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { isBlockActive, isListActive, toggleBlock } from "../../../utils/SlateUtilityFunctions";
+import { isBlockActive, toggleBlock } from "../../../utils/SlateUtilityFunctions";
 import CustomSelectTool from "./CustomSelectTool";
 import Icon from "../../../common/Icon";
 import { insertAccordion } from "../../../utils/accordion";
@@ -79,9 +79,7 @@ function SelectList({
   } = customProps;
   const listOptions = getListOptions(translation);
   const selectedList = useMemo(() => {
-    const listActive = isListActive(editor);
-    let selected = listOptions.find(t => listActive === t.value);
-    return selected;
+    return listOptions.find(t => isBlockActive(editor, t.value));
   }, [listOptions, isBlockActive, editor]);
   const onChange = (format, option) => {
     if (option.type === "block") {