@flozy/editor 7.0.9 → 8.0.1

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

@@ -10,6 +10,8 @@ import { AllColors } from "../../Elements/Color Picker/ColorButtons";
 import { fontFamilyMap } from "../../utils/font";
 import { getBorderColor } from "../../utils/helper";
 import SelectTypography from "./MiniTextFormat/SelectTypography";
+import { isTextCustomized, saveToTheme } from "../../helper/theme";
+import { useEditorTheme } from "../../hooks/useEditorTheme";
 import SelectSuperSubscript from "./MiniTextFormat/SelectSuperSubscript";
 import { ColorResetIcon, TextDefaultStyleIcon } from "../../common/iconListV2";
 import FontFamilyAutocomplete from "../FormatTools/FontFamilyAutocomplete";
@@ -39,7 +41,7 @@ const TextFormat = props => {
   const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
-    theme
+    theme: appTheme
   } = useEditorContext();
   const {
     activeBreakPoint
@@ -61,7 +63,12 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-  let lineSpacingValue = activeMark(editor, 'lineHeight');
+  const {
+    theme,
+    updateTheme
+  } = useEditorTheme();
+  const customized = isTextCustomized(editor);
+  let lineSpacingValue = activeMark(editor, "lineHeight");
   lineSpacingValue = lineSpacingValue?.[breakpoint] !== undefined ? lineSpacingValue : pageSettingLine;
   const handleColorPicker = type => e => {
     setType(type);
@@ -115,6 +122,50 @@ const TextFormat = props => {
     sx: classes.textFormatWrapper,
     className: "text-formatter-popup",
     children: [/*#__PURE__*/_jsxs(Grid, {
+      item: true,
+      xs: 12,
+      children: [/*#__PURE__*/_jsxs(Grid, {
+        container: true,
+        justifyContent: "space-between",
+        alignItems: "center",
+        children: [/*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: /*#__PURE__*/_jsx(Typography, {
+            variant: "body1",
+            color: "primary",
+            sx: classes.typoLabel,
+            children: "Style"
+          })
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: theme?.id ? /*#__PURE__*/_jsx(Button, {
+            sx: classes.defaultBtn,
+            onClick: () => {
+              const {
+                field,
+                theme
+              } = saveToTheme(editor) || {};
+              updateTheme(theme, {
+                action: "ELEMENT_PROPS_CHANGE",
+                fieldName: field
+              });
+            },
+            disabled: !customized,
+            children: "Save to theme"
+          }) : null
+        })]
+      }), /*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        sx: classes.textFormatField,
+        children: /*#__PURE__*/_jsx(SelectTypography, {
+          editor: editor,
+          classes: classes,
+          closeMainPopup: () => {},
+          type: "fullWidth"
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -267,7 +318,7 @@ const TextFormat = props => {
             children: /*#__PURE__*/_jsx(Button, {
               sx: classes.defaultBtn2,
               startIcon: /*#__PURE__*/_jsx(ColorResetIcon, {
-                stroke: theme?.palette?.type === "dark" ? "#505359" : "#A2B0B9"
+                stroke: appTheme?.palette?.type === "dark" ? "#505359" : "#A2B0B9"
               }),
               onClick: handleDefault({
                 format: "bgColor"
@@ -355,11 +406,7 @@ const TextFormat = props => {
         xs: 12,
         className: "typo-icons",
         sx: classes.evenSpace,
-        children: [/*#__PURE__*/_jsx(SelectTypography, {
-          classes: classes,
-          editor: editor,
-          closeMainPopup: closeMainPopup || onClose
-        }), fontStyle?.map((m, i) => {
+        children: [fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
             ...m
@@ -396,7 +443,7 @@ const TextFormat = props => {
           value: lineSpacingValue,
           onChange: handleLineSpacing,
           data: {
-            key: 'lineHeight'
+            key: "lineHeight"
           }
         })
       })]

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

@@ -0,0 +1,438 @@
+import { Button, Grid, IconButton, Popover, TextField, Tooltip, Typography } from "@mui/material";
+import { useEditorContext } from "../../hooks/useMouseMove";
+import FormatClearIcon from "@mui/icons-material/FormatClear";
+import usePopupStyles from "../PopupTool/PopupToolStyle";
+import { TextMinusIcon, TextPlusIcon } from "../../common/iconslist";
+import { BREAKPOINTS_DEVICES, getBreakPointsValue, getVariableValue } from "../../helper/theme";
+import useWindowResize from "../../hooks/useWindowResize";
+import { toolbarGroups } from "../toolbarGroups";
+import Icon from "../../common/Icon";
+import { useMemo, useState } from "react";
+import CommonButton from "../../common/Button";
+import CustomSelect from "../../common/CustomSelect";
+import ColorButtons from "../../Elements/Color Picker/ColorButtons";
+import FormatColorResetIcon from "@mui/icons-material/FormatColorReset";
+import ColorPickerStyles from "../../Elements/Color Picker/Styles";
+import colorWheel from "../../Elements/Color Picker/colorWheel.png";
+import CustomColorPicker from "../../common/CustomColorPicker";
+import FontFamilyAutocomplete from "../FormatTools/FontFamilyAutocomplete";
+import { googleFontList as defaultFonts } from "../../common/FontLoader/FontList";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+function getFontStyleProps(settings = {}, format) {
+  const {
+    fontWeight,
+    fontStyle
+  } = settings;
+  let isActive;
+  let onClick;
+  switch (format) {
+    case "bold":
+      isActive = fontWeight === "bold" || fontWeight === "700";
+      onClick = () => {
+        return {
+          fontWeight: isActive ? "normal" : "bold"
+        };
+      };
+      break;
+    case "italic":
+      isActive = fontStyle === "italic";
+      onClick = () => {
+        return {
+          fontStyle: isActive ? "unset" : "italic"
+        };
+      };
+      break;
+
+    // case "underline":
+    //   isActive = textDecoration.includes("underline");
+    //   onClick = () => {
+    //     let otherTextDecoration = textDecoration?.includes("line-through")
+    //       ? "line-through"
+    //       : "";
+
+    //     otherTextDecoration += isActive ? "" : " underline";
+
+    //     return { textDecoration: otherTextDecoration };
+    //   };
+    //   break;
+    // case "strikethrough":
+    //   isActive = textDecoration.includes("line-through");
+    //   onClick = () => {
+    //     let otherTextDecoration = textDecoration?.includes("underline")
+    //       ? "underline"
+    //       : "";
+
+    //     otherTextDecoration += isActive ? "" : " line-through";
+
+    //     return { textDecoration: otherTextDecoration };
+    //   };
+    //   break;
+
+    default:
+      isActive = false;
+      onClick = () => {};
+      break;
+  }
+  return {
+    isActive,
+    onClick
+  };
+}
+const allTools = toolbarGroups.flat();
+function ThemeTextFormat(props) {
+  const {
+    settings,
+    updateSettings,
+    onSaveTextSettings,
+    onClose
+  } = props;
+  const {
+    theme,
+    fontFamilies
+  } = useEditorContext();
+  const classes = usePopupStyles(theme);
+  const pickerStyles = ColorPickerStyles(theme);
+  const fontStyle = allTools.filter(f => f.type === "mark" && f.themeEnabled);
+  const fontWeight = allTools.find(f => f.format === "fontWeight");
+  const fontFamilyVal = useMemo(() => {
+    const {
+      fontFamily = ""
+    } = settings;
+    let font = fontFamily.startsWith("var") ? getVariableValue(fontFamily) : fontFamily;
+    return font;
+  }, [settings]);
+  const fontWeightVal = useMemo(() => {
+    const {
+      options
+    } = fontWeight || {};
+    const selected = options?.find(o => o.value === settings?.fontWeight || o.numVal === settings?.fontWeight);
+    return selected?.value;
+  }, [settings?.fontWeight]);
+  return /*#__PURE__*/_jsxs(Grid, {
+    container: true,
+    sx: classes.textFormatWrapper,
+    children: [/*#__PURE__*/_jsxs(Grid, {
+      item: true,
+      xs: 12,
+      children: [/*#__PURE__*/_jsxs(Grid, {
+        container: true,
+        justifyContent: "space-between",
+        alignItems: "center",
+        children: [/*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: /*#__PURE__*/_jsx(Typography, {
+            variant: "body1",
+            color: "primary",
+            sx: classes.typoLabel,
+            children: "Font Family"
+          })
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: /*#__PURE__*/_jsx(Button, {
+            sx: classes.defaultBtn,
+            startIcon: /*#__PURE__*/_jsx(FormatClearIcon, {}),
+            onClick: () => updateSettings({
+              fontFamily: defaultFonts[0]
+            }),
+            children: "Default"
+          })
+        })]
+      }), /*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        sx: classes.textFormatField,
+        children: /*#__PURE__*/_jsx(FontFamilyAutocomplete, {
+          editor: {},
+          format: "fontFamily",
+          options: fontFamilies?.options,
+          width: "100%",
+          onChange: updateSettings,
+          val: fontFamilyVal || defaultFonts[0],
+          webFont: true
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
+      container: true,
+      spacing: 2,
+      children: [/*#__PURE__*/_jsxs(Grid, {
+        item: true,
+        xs: 6,
+        children: [/*#__PURE__*/_jsx(Typography, {
+          variant: "body1",
+          color: "primary",
+          sx: classes.typoLabel,
+          children: "Font Weight"
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          xs: 12,
+          sx: classes.textFormatField,
+          children: /*#__PURE__*/_jsx(CustomSelect, {
+            options: fontWeight?.options || [],
+            classes: classes,
+            onChange: e => {
+              updateSettings({
+                fontWeight: e.target.value
+              });
+            },
+            value: fontWeightVal
+          })
+        })]
+      }), /*#__PURE__*/_jsxs(Grid, {
+        item: true,
+        xs: 6,
+        children: [/*#__PURE__*/_jsx(Typography, {
+          variant: "body1",
+          color: "primary",
+          sx: classes.typoLabel,
+          children: "Font Size"
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          xs: 12,
+          sx: classes.textFormatCG,
+          children: /*#__PURE__*/_jsx(TextSize, {
+            classes: classes,
+            value: settings?.fontSize || 16,
+            onChange: fontSize => updateSettings({
+              fontSize
+            }),
+            fullWidth: true
+          })
+        })]
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
+      item: true,
+      xs: 12,
+      sx: classes.textFormatField,
+      style: {
+        marginTop: "14px"
+      },
+      children: [/*#__PURE__*/_jsxs(Grid, {
+        container: true,
+        justifyContent: "space-between",
+        alignItems: "center",
+        children: [/*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: /*#__PURE__*/_jsx(Typography, {
+            variant: "body1",
+            color: "primary",
+            sx: classes.typoLabel,
+            children: "Text Color"
+          })
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          children: /*#__PURE__*/_jsx(Button, {
+            sx: classes.defaultBtn,
+            startIcon: /*#__PURE__*/_jsx(FormatColorResetIcon, {}),
+            onClick: () => updateSettings({
+              color: "#ddd"
+            }),
+            children: "Default"
+          })
+        })]
+      }), /*#__PURE__*/_jsx(Grid, {
+        sx: classes.textFormatColorWrpr,
+        children: /*#__PURE__*/_jsx(ColorPicker, {
+          classes: classes,
+          pickerStyles: pickerStyles,
+          onChange: color => updateSettings({
+            color
+          }),
+          color: settings?.color,
+          disableEditTheme: true
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
+      item: true,
+      xs: 12,
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body1",
+        color: "primary",
+        sx: classes.typoLabel,
+        children: "Typography"
+      }), /*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        className: "typo-icons",
+        sx: classes.evenSpace,
+        children: fontStyle?.map((m, i) => {
+          const {
+            isActive,
+            onClick
+          } = getFontStyleProps(settings, m.format) || {};
+          return /*#__PURE__*/_jsx(CommonButton, {
+            active: isActive,
+            onClick: () => {
+              const style = onClick();
+              updateSettings(style);
+            },
+            children: /*#__PURE__*/_jsx(Icon, {
+              icon: m.format
+            })
+          }, i);
+        })
+      })]
+    }), /*#__PURE__*/_jsx(Grid, {
+      item: true,
+      xs: 12,
+      sx: {
+        mt: 2
+      },
+      children: /*#__PURE__*/_jsxs("div", {
+        style: {
+          display: "flex",
+          justifyContent: "end",
+          margin: "8px",
+          position: "absolute",
+          bottom: 0,
+          right: 0
+        },
+        children: [/*#__PURE__*/_jsx(Button, {
+          onClick: onClose,
+          className: "secondaryBtn",
+          children: "Cancel"
+        }), /*#__PURE__*/_jsx(Button, {
+          onClick: onSaveTextSettings,
+          className: "primaryBtn",
+          children: "Save"
+        })]
+      })
+    })]
+  });
+}
+export default ThemeTextFormat;
+function TextSize(props) {
+  const {
+    classes,
+    value: val,
+    onChange,
+    fullWidth
+  } = props;
+  const [size] = useWindowResize();
+  const value = getBreakPointsValue(val, size?.device);
+  const updateMarkData = newVal => {
+    let upData = {
+      ...getBreakPointsValue(val),
+      [size?.device]: `${newVal}px`
+    };
+
+    // if desktop update to all other devices
+    // to avoid default normal size
+    if (size?.device === "lg") {
+      upData = BREAKPOINTS_DEVICES.reduce((a, b) => {
+        a[b] = `${newVal}px`;
+        return a;
+      }, {});
+    }
+    onChange(upData);
+  };
+  const onChangeSize = e => {
+    let inc = parseInt(e.target.value) || 8;
+    inc = inc > 200 ? 200 : inc;
+    updateMarkData(inc || 8);
+  };
+  const getSizeVal = () => {
+    try {
+      return parseInt(value);
+    } catch (err) {
+      return "";
+    }
+  };
+  const combinedOldVal = getSizeVal();
+  const onIncreaseSize = () => {
+    let inc = (combinedOldVal || 0) + 1;
+    inc = inc > 200 ? 200 : inc;
+    updateMarkData(inc);
+  };
+  const onDecreaseSize = () => {
+    const newVal = combinedOldVal - 1 < 0 ? 0 : combinedOldVal - 1;
+    updateMarkData(newVal);
+  };
+  return /*#__PURE__*/_jsx(TextField, {
+    sx: classes?.textSize,
+    value: combinedOldVal,
+    onChange: onChangeSize,
+    size: "small",
+    inputProps: {
+      style: {
+        width: fullWidth ? "100%" : "30px",
+        textAlign: "center",
+        height: "19px",
+        fontSize: "14px"
+      }
+    },
+    fullWidth: fullWidth,
+    InputProps: {
+      style: {
+        borderRadius: "8px"
+      },
+      endAdornment: /*#__PURE__*/_jsxs("div", {
+        className: "textFontArrows",
+        children: [/*#__PURE__*/_jsx(IconButton, {
+          onClick: onIncreaseSize,
+          size: "small",
+          children: /*#__PURE__*/_jsx(TextPlusIcon, {})
+        }), /*#__PURE__*/_jsx(IconButton, {
+          onClick: onDecreaseSize,
+          size: "small",
+          children: /*#__PURE__*/_jsx(TextMinusIcon, {})
+        })]
+      })
+    }
+  });
+}
+function ColorPicker(props) {
+  const {
+    classes,
+    pickerStyles,
+    onChange,
+    color,
+    disableEditTheme
+  } = props;
+  const [anchorEl, setAnchorEl] = useState(null);
+  const open = Boolean(anchorEl);
+  const handleClose = () => {
+    setAnchorEl(null);
+  };
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Tooltip, {
+      title: "",
+      arrow: true,
+      children: /*#__PURE__*/_jsx(IconButton, {
+        sx: pickerStyles.colorPickerIcon,
+        onClick: e => {
+          setAnchorEl(e.currentTarget);
+        },
+        children: /*#__PURE__*/_jsx("img", {
+          src: colorWheel,
+          alt: "color wheel"
+        })
+      })
+    }), /*#__PURE__*/_jsx(ColorButtons, {
+      classes: pickerStyles,
+      onSelect: onChange,
+      activeColor: color,
+      disableEditTheme: disableEditTheme
+    }), /*#__PURE__*/_jsx(Popover, {
+      open: open,
+      anchorEl: anchorEl,
+      onClose: handleClose,
+      anchorOrigin: {
+        vertical: "top",
+        horizontal: "center"
+      },
+      transformOrigin: {
+        vertical: "bottom",
+        horizontal: "top"
+      },
+      sx: classes.colorPickerPopup,
+      children: /*#__PURE__*/_jsx(CustomColorPicker, {
+        gradient: true,
+        onChange: onChange,
+        color: color,
+        disableEditTheme: disableEditTheme
+      })
+    })]
+  });
+}

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

@@ -1,5 +1,5 @@
-import React, { useCallback, useEffect, useState } from "react";
-import { Popper, Fade, Paper, ClickAwayListener } from "@mui/material";
+import React, { useEffect, useState } from "react";
+import { Popper, Paper, ClickAwayListener } from "@mui/material";
 import { Editor, Range, Transforms } from "slate";
 import { ReactEditor, useSlate } from "slate-react";
 import useDrag from "../../hooks/useDrag";
@@ -21,7 +21,8 @@ const PopupTool = props => {
   const classes = usePopupStyles(theme);
   const {
     setPopupType,
-    openAI
+    openAI,
+    selectedElement
   } = useEditorContext();
   const [anchorEl, setAnchorEl] = useState(null);
   const [open, setOpen] = useState(false);
@@ -32,13 +33,11 @@ const PopupTool = props => {
   const [event] = useDrag(anchorEl);
   const id = open ? "popup-edit-tool" : "";
   const [size] = useWindowResize();
-  const {
-    selectedElement
-  } = useEditorContext();
-  const updateAnchorEl = useCallback(() => {
+  const isMobile = window.matchMedia("(max-width: 899px)")?.matches || false;
+  const updateAnchorEl = isScroll => {
     try {
       const isHavingSelection = selection && !Range.isCollapsed(selection);
-      if (isHavingSelection) {
+      if (isHavingSelection && event === "end") {
         const domRange = ReactEditor.toDOMRange(editor, editor.selection);
         const editorContainer = document.querySelector("#slate-wrapper-scroll-container")?.getBoundingClientRect();
         const rect = domRange.getBoundingClientRect();
@@ -47,16 +46,21 @@ const PopupTool = props => {
           rect.y = -500; // hide the popper
         }
 
-        setAnchorEl({
-          clientWidth: rect.width,
-          clientHeight: rect.height,
-          getBoundingClientRect: () => rect
-        });
+        // Create a dummy anchor element to match Popper's requirements
+        const anchor = document.createElement("div");
+        anchor.style.position = "absolute";
+        anchor.style.top = `${rect.top + window.scrollY}px`;
+        anchor.style.left = `${rect.left + window.scrollX}px`;
+        document.body.appendChild(anchor);
+        if (!anchorEl || isScroll === "scroll") {
+          setAnchorEl(anchor);
+          setOpen(true);
+        }
       }
     } catch (err) {
       console.log(err);
     }
-  }, [selection]);
+  };
   useEditorScroll(editorWrapper, updateAnchorEl);
   useEffect(() => {
     const userStoppedSelection = size?.device === "xs" ? true : event === "end"; // for mobile, when user starts the selection, we are gonna show the popup tool
@@ -80,18 +84,13 @@ const PopupTool = props => {
     }
   }, [event, anchorEl]);
   useEffect(() => {
-    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "") {
+    if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "" || selectedElement?.enable === 1) {
       setAnchorEl(null);
     } else {
       updateAnchorEl();
       hideSlateSelection(); // removes slate selection background, when there is no selection
     }
-  }, [selection]);
-  useEffect(() => {
-    if (selectedElement?.enable === 1) {
-      setAnchorEl(null);
-    }
-  }, [selection, selectedElement?.path, selectedElement?.enable]);
+  }, [selection, event, selectedElement?.enable]);
   const handleClose = () => {
     // setAnchorEl(null);
     setOpen(false);
@@ -100,7 +99,7 @@ const PopupTool = props => {
   return open && !openAI ? /*#__PURE__*/_jsx(ClickAwayListener, {
     onClickAway: e => {
       // close the mini toolbar, if user clicks outside the editor (in Flozy app.)
-      if (e.target !== document.body) {
+      if (e.target !== document.body && !isMobile) {
         // e.target returns body, if the user clicks material ui select popup inside the tool bar, on that time, we don't need to close
         handleClose();
       }
@@ -117,24 +116,18 @@ const PopupTool = props => {
       id: id,
       open: open,
       anchorEl: anchorEl,
-      transition: true,
       sx: classes.popupWrapper,
       placement: "top-start",
-      children: ({
-        TransitionProps
-      }) => /*#__PURE__*/_jsx(Fade, {
-        ...TransitionProps,
-        children: /*#__PURE__*/_jsx(Paper, {
-          style: {
-            borderRadius: "6px",
-            border: "1px solid #8360FD"
-          },
-          children: /*#__PURE__*/_jsx(MiniTextFormat, {
-            editor: editor,
-            classes: classes,
-            closeMainPopup: handleClose,
-            customProps: customProps
-          })
+      children: /*#__PURE__*/_jsx(Paper, {
+        style: {
+          borderRadius: "6px",
+          border: "1px solid #8360FD"
+        },
+        children: /*#__PURE__*/_jsx(MiniTextFormat, {
+          editor: editor,
+          classes: classes,
+          closeMainPopup: handleClose,
+          customProps: customProps
         })
       })
     })