@flozy/editor 9.8.3 → 9.8.4

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,21 +1,25 @@
 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,
   format,
-  title
+  title,
+  customProps
 }) => {
+  const {
+    translation
+  } = customProps;
   return /*#__PURE__*/_jsx(Button, {
-    active: isMarkActive(editor, format),
+    active: isMarkBtnActive(editor, format),
     format: format,
     onMouseDown: e => {
       e.preventDefault();
       toggleMark(editor, format);
     },
-    title: title,
+    title: translation(title),
     style: {
       color: "#64748B"
     },

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

@@ -10,6 +10,7 @@ import usePopupStyle from "../PopupTool/PopupToolStyle";
 import PopperHeader from "../PopupTool/PopperHeader";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import PageSettingsButton from "../../Elements/PageSettings/PageSettingsButton";
+import { isFreeGrid } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -31,6 +32,16 @@ const POPUP_TITLE = {
   addElement: "Add Elements",
   addTemplate: "Templates"
 };
+const disableAddElementBtn = editor => {
+  if (isFreeGrid(editor?.children || [])) {
+    return true;
+  }
+  const isFocused = !!editor?.selection?.anchor?.path;
+  if (!isFocused) {
+    return true;
+  }
+  return false;
+};
 const MiniToolbar = props => {
   const {
     customProps,
@@ -49,7 +60,8 @@ const MiniToolbar = props => {
   const open = Boolean(PopupComponent);
   const DialogComp = !fullScreen ? Popper : Dialog;
   const {
-    hideTools
+    hideTools,
+    translation
   } = customProps;
   const boxRef = useRef(null); // Add ref to get the Box element
   const UPDATED_MENU_OPTIONS = MENU_OPTIONS.filter(f => (hideTools || [])?.indexOf(f.type) === -1);
@@ -140,11 +152,10 @@ const MiniToolbar = props => {
         icon: Icon
       }) => {
         const isDisabled = popupType === type || type === "undo" ? !canUndo : type === "redo" ? !canRedo : false;
-        const isFocussed = editor?.selection?.anchor?.path;
-        const disableAddElement = type === "addElement" && !isFocussed;
+        const disableAddElement = type === "addElement" && disableAddElementBtn(editor);
         return /*#__PURE__*/_jsxs(Tooltip, {
           arrow: true,
-          title: label,
+          title: translation(label),
           disableHoverListener: toolTip,
           children: [type !== "page-settings" && /*#__PURE__*/_jsx(IconButton, {
             className: `${type === popper ? "active" : ""} ${type === "undo" && !canUndo || type === "redo" && !canRedo ? "disabled" : ""} ${type === "undo" ? canUndo ? "activeUndo" : "disabledUndo" : type === "redo" ? canRedo ? "activeRedo" : "disabledRedo" : ""} ${disableAddElement ? "disableAddElement" : ""}
@@ -194,7 +205,8 @@ const MiniToolbar = props => {
           fullScreen: fullScreen,
           toggleFullscreen: toggleFullscreen,
           search: search,
-          onSearch: onSearch
+          onSearch: onSearch,
+          customProps: customProps
         }), /*#__PURE__*/_jsx(PopupComponent, {
           classes: popupStyles,
           editor: editor,

package/dist/Editor/Toolbar/PopupTool/AddTemplates.js

@@ -135,14 +135,16 @@ const AddTemplates = props => {
           classes: classes,
           onSelectTemplate: onSelectTemplate,
           m: mapData,
-          fullScreen: fullScreen
+          fullScreen: fullScreen,
+          customProps: customProps
         }, `template_Card_${mapData.id}_popup`);
       case "Buttons":
         return /*#__PURE__*/_jsx(ButtonTemplateCard, {
           classes: classes,
           onSelectTemplate: onSelectTemplate,
           m: mapData,
-          fullScreen: fullScreen
+          fullScreen: fullScreen,
+          customProps: customProps
         }, `template_Card_${mapData.id}_popup`);
       case "Banners":
       case "Tables":
@@ -151,7 +153,8 @@ const AddTemplates = props => {
           onSelectTemplate: onSelectTemplate,
           m: mapData,
           fullScreen: fullScreen,
-          height: "smallCard"
+          height: "smallCard",
+          customProps: customProps
         }, `template_Card_${mapData.id}_popup`);
       case "404 Page":
         return /*#__PURE__*/_jsx(FullViewCard, {
@@ -159,14 +162,16 @@ const AddTemplates = props => {
           onSelectTemplate: onSelectTemplate,
           m: mapData,
           fullScreen: fullScreen,
-          height: "mediumCard"
+          height: "mediumCard",
+          customProps: customProps
         }, `template_Card_${mapData.id}_popup`);
       default:
         return /*#__PURE__*/_jsx(TemplateCard, {
           classes: classes,
           onSelectTemplate: onSelectTemplate,
           m: mapData,
-          fullScreen: fullScreen
+          fullScreen: fullScreen,
+          customProps: customProps
         }, `template_Card_${mapData.id}_popup`);
     }
   };

package/dist/Editor/Toolbar/PopupTool/ButtonTemplatesCard.js

@@ -6,7 +6,8 @@ const Select = props => {
   const {
     classes,
     data,
-    onSelectTemplate
+    onSelectTemplate,
+    translation
   } = props;
   return /*#__PURE__*/_jsx(Box, {
     className: "template-card-action",
@@ -19,7 +20,7 @@ const Select = props => {
     children: /*#__PURE__*/_jsx(Button, {
       className: "blueBtn",
       onClick: onSelectTemplate(data),
-      children: "Select"
+      children: translation("Select")
     })
   });
 };
@@ -27,8 +28,12 @@ const ButtonTemplateCard = props => {
   const {
     classes,
     m,
-    onSelectTemplate
+    onSelectTemplate,
+    customProps
   } = props;
+  const {
+    translation
+  } = customProps;
   return /*#__PURE__*/_jsx(Grid, {
     item: true,
     xs: 3,
@@ -45,7 +50,8 @@ const ButtonTemplateCard = props => {
         }), /*#__PURE__*/_jsx(Select, {
           classes: classes,
           onSelectTemplate: onSelectTemplate,
-          data: m
+          data: m,
+          translation: translation
         })]
       })
     })

package/dist/Editor/Toolbar/PopupTool/FullViewCard.js

@@ -6,7 +6,8 @@ const Select = props => {
   const {
     classes,
     data,
-    onSelectTemplate
+    onSelectTemplate,
+    translation
   } = props;
   return /*#__PURE__*/_jsx(Box, {
     className: "template-card-action",
@@ -18,7 +19,7 @@ const Select = props => {
     children: /*#__PURE__*/_jsx(Button, {
       className: "blueBtn",
       onClick: onSelectTemplate(data),
-      children: "Select"
+      children: translation("Select")
     })
   });
 };
@@ -27,8 +28,12 @@ const FullViewCard = props => {
     classes,
     m,
     onSelectTemplate,
-    height = 'smallCard'
+    height = 'smallCard',
+    customProps
   } = props;
+  const {
+    translation
+  } = customProps;
   return /*#__PURE__*/_jsx(Grid, {
     item: true,
     xs: 12,
@@ -46,7 +51,8 @@ const FullViewCard = props => {
         }), /*#__PURE__*/_jsx(Select, {
           classes: classes,
           onSelectTemplate: onSelectTemplate,
-          data: m
+          data: m,
+          translation: translation
         })]
       })
     })

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

@@ -11,9 +11,14 @@ function MiniColorPicker(props) {
     format,
     classes,
     id,
-    editor
+    editor,
+    customProps,
+    type
   } = props;
   const [openColorTool, setOpenColorTool] = useState(null);
+  const {
+    translation
+  } = customProps;
   return /*#__PURE__*/_jsxs("div", {
     children: [/*#__PURE__*/_jsxs(Button, {
       className: "fontColorBtn",
@@ -29,12 +34,13 @@ function MiniColorPicker(props) {
       activeMark: activeMark,
       editor: editor,
       showHex: false,
-      title: "Text Color",
+      title: translation("Text Color"),
       id: id,
       classes: classes,
       forMiniTool: true,
       openColorTool: openColorTool,
-      closeColorTool: () => setOpenColorTool(null)
+      closeColorTool: () => setOpenColorTool(null),
+      type: type
     }, id)]
   });
 }

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

@@ -15,45 +15,52 @@ function Label({
     }), " ", label]
   });
 }
-const alignmentOptions = [{
-  id: 17,
-  value: "alignLeft",
-  type: "block",
-  title: /*#__PURE__*/_jsx(Label, {
-    icon: "alignLeft",
-    label: "Left Align"
-  }),
-  label: /*#__PURE__*/_jsx(Icon, {
-    icon: "alignLeft"
-  })
-}, {
-  id: 18,
-  value: "alignCenter",
-  type: "block",
-  title: /*#__PURE__*/_jsx(Label, {
-    icon: "alignCenter",
-    label: "Center Align"
-  }),
-  label: /*#__PURE__*/_jsx(Icon, {
-    icon: "alignCenter"
-  })
-}, {
-  id: 19,
-  value: "alignRight",
-  type: "block",
-  title: /*#__PURE__*/_jsx(Label, {
-    icon: "alignRight",
-    label: "Right Align"
-  }),
-  label: /*#__PURE__*/_jsx(Icon, {
-    icon: "alignRight"
-  })
-}];
+function getAlignmentOptions(translation) {
+  return [{
+    id: 17,
+    value: "alignLeft",
+    type: "block",
+    title: /*#__PURE__*/_jsx(Label, {
+      icon: "alignLeft",
+      label: translation("Left Align")
+    }),
+    label: /*#__PURE__*/_jsx(Icon, {
+      icon: "alignLeft"
+    })
+  }, {
+    id: 18,
+    value: "alignCenter",
+    type: "block",
+    title: /*#__PURE__*/_jsx(Label, {
+      icon: "alignCenter",
+      label: translation("Center Align")
+    }),
+    label: /*#__PURE__*/_jsx(Icon, {
+      icon: "alignCenter"
+    })
+  }, {
+    id: 19,
+    value: "alignRight",
+    type: "block",
+    title: /*#__PURE__*/_jsx(Label, {
+      icon: "alignRight",
+      label: translation("Right Align")
+    }),
+    label: /*#__PURE__*/_jsx(Icon, {
+      icon: "alignRight"
+    })
+  }];
+}
 function SelectAlignment({
   editor,
   classes,
-  closeMainPopup
+  closeMainPopup,
+  customProps
 }) {
+  const {
+    translation
+  } = customProps;
+  const alignmentOptions = getAlignmentOptions(translation);
   const selected = useMemo(() => {
     return alignmentOptions.find(t => isBlockActive(editor, t.value));
   }, [alignmentOptions, isBlockActive, editor]);

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

@@ -16,61 +16,68 @@ function Label({
     }), " ", label]
   });
 }
-const listOptions = [{
-  id: 15,
-  value: "orderedList",
-  type: "block",
-  title: /*#__PURE__*/_jsx(Label, {
-    icon: "orderedList",
-    label: "Ordered List"
-  }),
-  label: /*#__PURE__*/_jsx(Icon, {
-    icon: "orderedList"
-  }),
-  group: "list"
-}, {
-  id: 16,
-  value: "unorderedList",
-  type: "block",
-  title: /*#__PURE__*/_jsx(Label, {
-    icon: "unorderedList",
-    label: "Bulleted List"
-  }),
-  label: /*#__PURE__*/_jsx(Icon, {
-    icon: "unorderedList"
-  }),
-  group: "list"
-}, {
-  id: 43,
-  value: "check-list-item",
-  type: "block",
-  title: /*#__PURE__*/_jsx(Label, {
-    icon: "check-list-item",
-    label: "Check List"
-  }),
-  label: /*#__PURE__*/_jsx(Icon, {
-    icon: "check-list-item"
-  }),
-  group: "list"
-}, {
-  id: 30,
-  value: "accordion",
-  type: "accordion",
-  group: "list",
-  component: "AccordionButton",
-  title: /*#__PURE__*/_jsx(Label, {
-    icon: "accordion",
-    label: "Accordion"
-  }),
-  label: /*#__PURE__*/_jsx(Icon, {
-    icon: "accordion"
-  })
-}];
+function getListOptions(translation) {
+  return [{
+    id: 15,
+    value: "orderedList",
+    type: "block",
+    title: /*#__PURE__*/_jsx(Label, {
+      icon: "orderedList",
+      label: translation("Ordered List")
+    }),
+    label: /*#__PURE__*/_jsx(Icon, {
+      icon: "orderedList"
+    }),
+    group: "list"
+  }, {
+    id: 16,
+    value: "unorderedList",
+    type: "block",
+    title: /*#__PURE__*/_jsx(Label, {
+      icon: "unorderedList",
+      label: translation("Bulleted List")
+    }),
+    label: /*#__PURE__*/_jsx(Icon, {
+      icon: "unorderedList"
+    }),
+    group: "list"
+  }, {
+    id: 43,
+    value: "check-list-item",
+    type: "block",
+    title: /*#__PURE__*/_jsx(Label, {
+      icon: "check-list-item",
+      label: translation("Check List")
+    }),
+    label: /*#__PURE__*/_jsx(Icon, {
+      icon: "check-list-item"
+    }),
+    group: "list"
+  }, {
+    id: 30,
+    value: "accordion",
+    type: "accordion",
+    group: "list",
+    component: "AccordionButton",
+    title: /*#__PURE__*/_jsx(Label, {
+      icon: "accordion",
+      label: translation("Accordion")
+    }),
+    label: /*#__PURE__*/_jsx(Icon, {
+      icon: "accordion"
+    })
+  }];
+}
 function SelectList({
   editor,
   classes,
-  closeMainPopup
+  closeMainPopup,
+  customProps
 }) {
+  const {
+    translation
+  } = customProps;
+  const listOptions = getListOptions(translation);
   const selectedList = useMemo(() => {
     return listOptions.find(t => isBlockActive(editor, t.value));
   }, [listOptions, isBlockActive, editor]);