@flozy/editor 10.7.0 → 10.7.1

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,
-    breakpoint,
-    translation
+    translation,
+    breakpoint
   } = 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]
+      }) : null, /*#__PURE__*/_jsx(ListItemButton, {
+        className: "item-wrapper",
+        onClick: handleClick("deleteSection"),
+        children: "Delete Section"
+      })]
     })
   });
 };

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

@@ -0,0 +1,115 @@
+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 elementXsValues = {
+  [ELEMENT_CASE.ADD_TEXT]: {
+    ...commonXsValues,
+    height_xs: 50
+  },
+  [ELEMENT_CASE.ADD_BUTTON]: {
+    ...commonXsValues,
+    height_xs: 50
+  },
+  [ELEMENT_CASE.ADD_SIGNATURE]: {
+    ...commonXsValues,
+    height_xs: 173
+  },
+  [ELEMENT_CASE.ADD_IMAGE]: {
+    ...commonXsValues,
+    height_xs: 80
+  },
+  [ELEMENT_CASE.ADD_VIDEO]: {
+    ...commonXsValues,
+    height_xs: 300
+  },
+  [ELEMENT_CASE.ADD_TABLE]: {
+    ...commonXsValues,
+    height_xs: 165
+  },
+  [ELEMENT_CASE.ADD_CODE]: {
+    ...commonXsValues,
+    height: 300
+  },
+  [ELEMENT_CASE.ADD_BOX]: {
+    ...commonXsValues,
+    height_xs: 300
+  },
+  [ELEMENT_CASE.ADD_FORM]: {
+    ...commonXsValues,
+    height_xs: 80
+  },
+  [ELEMENT_CASE.ADD_APP_HEADER]: {
+    ...commonXsValues,
+    height_xs: 80
+  },
+  [ELEMENT_CASE.ADD_DIVIDER]: {
+    ...commonXsValues,
+    height_xs: 24
+  }
+};
+export const findMaxYValue = (sectionItems, breakpoint) => {
+  let maxY = 0;
+  sectionItems.forEach(item => {
+    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
+  };
+};
+export const getNewElementXsValues = (type, sectionItems) => {
+  const values = elementXsValues[type] || {};
+  const y = sectionItems?.length ? findMaxYValue(sectionItems) : 0;
+  const {
+    gridArea,
+    marginTop
+  } = convertToGridArea(y);
+  const BUFFER_MARGIN_TOP = 12;
+  const xsVal = {
+    ...values,
+    gridArea_xs: gridArea,
+    marginTop_xs: marginTop + BUFFER_MARGIN_TOP
+  };
+  const sectionHeightXs = y + values?.height_xs + BUFFER_MARGIN_TOP + 12;
+  return {
+    xsVal,
+    sectionHeightXs
+  };
+};

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

@@ -247,6 +247,9 @@ const useFreeGridStyles = ({
           },
           "& > .simple-text": {
             display: "none"
+          },
+          "& > .edt-paragraphs": {
+            display: "none"
           }
         },
         "& .fgi_type_form": {
@@ -350,6 +353,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/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

@@ -3,6 +3,12 @@ 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,
@@ -47,10 +53,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,11 @@ const editorStyles = ({
       },
       "& .accordion-summary-collapse-btn": {
         padding: "4px",
-        width: '5px'
+        width: "5px",
+        "& svg:hover": {
+          background: theme?.palette?.editor?.tv_hover_bg,
+          borderRadius: "4px"
+        }
       },
       "& .workflow-icon-btn": {
         pointerEvents: "none",
@@ -215,6 +219,17 @@ const editorStyles = ({
         borderRadius: "12px",
         "& svg": {
           marginRight: "8px"
+        },
+        "& .circularProgress-cls": {
+          "& svg": {
+            width: "15px !important",
+            height: "15px !important"
+          }
+        },
+        "& .uploadCancel": {
+          color: theme?.palette?.editor?.closeButtonSvgStroke,
+          width: "25px !important",
+          height: "25px !important"
         }
       },
       "& .content-editable.empty": {
@@ -242,7 +257,7 @@ const editorStyles = ({
         }
       },
       "& .section-tw": {
-        background: 'transparent !important',
+        background: "transparent !important",
         "& button": {
           padding: "2px",
           borderRadius: "0px",
@@ -291,8 +306,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 +317,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: {

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

@@ -1,9 +1,10 @@
 import React from "react";
 import { Autocomplete, TextField } from "@mui/material";
-import { activeMark, addMarkData } from "../../utils/SlateUtilityFunctions.js";
+import { 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 KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
+import { getValue } from "./Dropdown.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const FontFamilyAutocomplete = ({
   editor,
@@ -14,7 +15,7 @@ const FontFamilyAutocomplete = ({
   val = "",
   webFont = false
 }) => {
-  const markValue = activeMark(editor, format);
+  const markValue = getValue(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, isMarkActive } from "../../utils/SlateUtilityFunctions.js";
+import { toggleMark, isMarkBtnActive } 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: isMarkActive(editor, format),
+    active: isMarkBtnActive(editor, format),
     format: format,
     onMouseDown: e => {
       e.preventDefault();

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

@@ -1,8 +1,7 @@
 import React, { useEffect, useRef, useState } from "react";
 import { TextField, IconButton } from "@mui/material";
-import { addMarkData, activeMark, isBlockActive } from "../../utils/SlateUtilityFunctions.js";
-import { headingMap, sizeMap } from "../../utils/font.js";
-import { getBreakPointsValue } from "../../helper/theme.js";
+import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions.js";
+import { getBreakPointsValue, getTextSizeVal } from "../../helper/theme.js";
 import useWindowResize from "../../hooks/useWindowResize.js";
 import { BREAKPOINTS_DEVICES } from "../../helper/theme.js";
 import { TextSizeDownArrow, TextSizeUpArrow } from "../../common/iconListV2.js";
@@ -15,11 +14,15 @@ const TextSize = ({
   format,
   fullWidth
 }) => {
-  const [size] = useWindowResize();
-  const val = activeMark(editor, format);
-  const value = getBreakPointsValue(val, size?.device);
   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);
   useEffect(() => {
     setFontSize(getSizeVal());
   }, [value]);
@@ -55,13 +58,7 @@ const TextSize = ({
   };
   const getSizeVal = () => {
     try {
-      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);
+      return parseInt(value);
     } catch (err) {
       return "";
     }

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

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

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

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

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

@@ -1,10 +1,9 @@
 import { useEffect, useRef, useState } from "react";
-import { activeMark, addMarkData, isBlockActive } from "../../../utils/SlateUtilityFunctions";
+import { activeMark, addMarkData } 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 } from "../../../helper/theme";
-import { headingMap, sizeMap } from "../../../utils/font";
+import { BREAKPOINTS_DEVICES, getBreakPointsValue, getTextSizeVal } from "../../../helper/theme";
 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];
@@ -19,7 +18,7 @@ function SelectFontSize({
   const containerRef = useRef();
   const [size] = useWindowResize();
   const val = activeMark(editor, format);
-  const value = getBreakPointsValue(val, size?.device);
+  const value = getTextSizeVal(editor);
   const timerRef = useRef();
   const updateMarkData = newVal => {
     let upData = {
@@ -53,13 +52,7 @@ function SelectFontSize({
   };
   const getSizeVal = () => {
     try {
-      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);
+      return parseInt(value);
     } catch (err) {
       return "";
     }
@@ -97,8 +90,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, toggleBlock } from "../../../utils/SlateUtilityFunctions";
+import { isBlockActive, isListActive, toggleBlock } from "../../../utils/SlateUtilityFunctions";
 import CustomSelectTool from "./CustomSelectTool";
 import Icon from "../../../common/Icon";
 import { insertAccordion } from "../../../utils/accordion";
@@ -79,7 +79,9 @@ function SelectList({
   } = customProps;
   const listOptions = getListOptions(translation);
   const selectedList = useMemo(() => {
-    return listOptions.find(t => isBlockActive(editor, t.value));
+    const listActive = isListActive(editor);
+    let selected = listOptions.find(t => listActive === t.value);
+    return selected;
   }, [listOptions, isBlockActive, editor]);
   const onChange = (format, option) => {
     if (option.type === "block") {