@flozy/editor 11.0.3 → 11.0.5

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
     })]
   });
 };

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

@@ -136,7 +136,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",
@@ -218,6 +222,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": {
@@ -245,7 +260,7 @@ const editorStyles = ({
         }
       },
       "& .section-tw": {
-        background: 'transparent !important',
+        background: "transparent !important",
         "& button": {
           padding: "2px",
           borderRadius: "0px",
@@ -295,7 +310,7 @@ const editorStyles = ({
       },
       "& ::selection": {
         // background: 'rgba(35, 131, 226, 0.35)!important',
-        color: 'inherit'
+        color: "inherit"
       },
       "&.readOnlyContainer": {
         "& .max-content": {
@@ -305,7 +320,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,27 +1,36 @@
 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";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-const TextSize = ({
-  classes,
-  editor,
-  format,
-  fullWidth
-}) => {
-  const [size] = useWindowResize();
-  const val = activeMark(editor, format);
-  const value = getBreakPointsValue(val, size?.device);
+const TextSize = props => {
+  const {
+    classes,
+    editor,
+    format,
+    fullWidth,
+    fromMiniTextFormat,
+    setResizedSize,
+    resizedSize
+  } = props;
   const [fontSize, setFontSize] = useState();
+  const sizeValue = fromMiniTextFormat ? resizedSize : fontSize;
+  const setSizeValue = fromMiniTextFormat ? setResizedSize : setFontSize;
   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());
+    setSizeValue(getSizeVal());
   }, [value]);
   const updateMarkData = newVal => {
     let upData = {
@@ -48,38 +57,33 @@ const TextSize = ({
     if (value) {
       let inc = parseInt(value);
       inc = inc > 200 ? 200 : inc;
+      setSizeValue(inc);
       updateMarkData(inc);
     } else {
-      setFontSize(null);
+      setSizeValue(null);
     }
   };
   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 "";
     }
   };
-  const combinedOldVal = getSizeVal();
   const onIncreaseSize = () => {
-    let inc = (combinedOldVal || 0) + 1;
-    inc = inc > 200 ? 200 : inc;
-    updateMarkData(inc);
+    const newValue = Math.min((sizeValue || 16) + 1, 200);
+    setSizeValue(newValue);
+    updateMarkData(newValue);
   };
   const onDecreaseSize = () => {
-    const newVal = combinedOldVal - 1 < 0 ? 0 : combinedOldVal - 1;
-    updateMarkData(newVal);
+    const newValue = sizeValue ? Math.max(sizeValue - 1, 1) : 16;
+    setSizeValue(newValue);
+    updateMarkData(newValue);
   };
   const onChange = e => {
     clearTimeout(timerRef.current);
     const value = e.target.value;
-    setFontSize(value);
+    setSizeValue(value);
     timerRef.current = setTimeout(() => {
       onChangeSize(value);
     }, 500);
@@ -87,7 +91,7 @@ const TextSize = ({
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(TextField, {
       sx: classes?.textSize,
-      value: fontSize,
+      value: sizeValue || 16,
       onChange: onChange,
       size: "small",
       inputProps: {

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,25 +1,30 @@
 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];
-function SelectFontSize({
-  editor,
-  classes
-}) {
+function SelectFontSize(props) {
+  const {
+    editor,
+    classes,
+    fromMiniTextFormat,
+    setResizedSize,
+    resizedSize
+  } = props;
   const format = "fontSize";
   const [fontSize, setFontSize] = useState();
+  const sizeValue = fromMiniTextFormat ? resizedSize : fontSize;
+  const setSizeValue = fromMiniTextFormat ? setResizedSize : setFontSize;
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   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 = {
@@ -46,31 +51,28 @@ function SelectFontSize({
     if (value) {
       let inc = parseInt(value);
       inc = inc > 200 ? 200 : inc;
+      setSizeValue(inc);
       updateMarkData(inc);
     } else {
-      setFontSize(null);
+      setSizeValue(null);
     }
   };
   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 "";
     }
   };
   useEffect(() => {
-    setFontSize(getSizeVal());
+    if (value) {
+      setSizeValue(getSizeVal());
+    }
   }, [value]);
   const onChange = e => {
     clearTimeout(timerRef.current);
     const value = e.target.value;
-    setFontSize(value);
+    setSizeValue(value);
     timerRef.current = setTimeout(() => {
       onChangeSize(value);
     }, 500);
@@ -83,7 +85,7 @@ function SelectFontSize({
     },
     children: [/*#__PURE__*/_jsx(TextField, {
       sx: classes?.miniFontSizeInput,
-      value: fontSize,
+      value: sizeValue,
       onChange: onChange,
       size: "small"
     }), /*#__PURE__*/_jsx(IconButton, {
@@ -97,16 +99,16 @@ function SelectFontSize({
       anchorEl: anchorEl,
       onClose: () => setAnchorEl(null),
       anchorOrigin: {
-        vertical: 'bottom',
-        horizontal: 'left'
+        vertical: "bottom",
+        horizontal: "left"
       },
       sx: classes.customSelectPopoverWrapper,
       children: fontSizeOptions.map((s, i) => {
         return /*#__PURE__*/_jsx("div", {
           children: /*#__PURE__*/_jsx(Button, {
-            className: `customSelectOptionLabel ${fontSize === s ? "selected" : ""}`,
+            className: `customSelectOptionLabel ${sizeValue === s ? "selected" : ""}`,
             onClick: () => {
-              setFontSize(s);
+              setSizeValue(s);
               onChangeSize(s);
             },
             children: s

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

@@ -2,7 +2,7 @@ import { useMemo } from "react";
 import { isBlockActive, toggleBlock } from "../../../utils/SlateUtilityFunctions";
 import CustomSelectTool from "./CustomSelectTool";
 import Icon from "../../../common/Icon";
-import { insertAccordion } from "../../../utils/accordion";
+import { insertAccordion, toggleAccordion } from "../../../utils/accordion";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function Label({
@@ -16,8 +16,8 @@ function Label({
     }), " ", label]
   });
 }
-function getListOptions(translation) {
-  return [{
+function getListOptions(translation, listType) {
+  const list = [{
     id: 15,
     value: "orderedList",
     type: "block",
@@ -53,7 +53,8 @@ function getListOptions(translation) {
       icon: "check-list-item"
     }),
     group: "list"
-  }, {
+  }];
+  const accordion = [{
     id: 30,
     value: "accordion",
     type: "accordion",
@@ -67,17 +68,30 @@ function getListOptions(translation) {
       icon: "accordion"
     })
   }];
+  let options = [];
+  if (listType === "accordion-summary") {
+    options = [...accordion];
+  } else if (listType === "list-item") {
+    options = [...list];
+  } else {
+    options = [...list, ...accordion];
+  }
+  return options;
 }
 function SelectList({
   editor,
   classes,
   closeMainPopup,
-  customProps
+  customProps,
+  commonProps
 }) {
   const {
     translation
   } = customProps;
-  const listOptions = getListOptions(translation);
+  const {
+    listType
+  } = commonProps || {};
+  const listOptions = getListOptions(translation, listType);
   const selectedList = useMemo(() => {
     return listOptions.find(t => isBlockActive(editor, t.value));
   }, [listOptions, isBlockActive, editor]);
@@ -85,7 +99,11 @@ function SelectList({
     if (option.type === "block") {
       toggleBlock(editor, format);
     } else if (option.type === "accordion") {
-      insertAccordion(editor);
+      if (listType === "accordion-summary") {
+        toggleAccordion(editor);
+      } else {
+        insertAccordion(editor);
+      }
     }
     closeMainPopup();
   };