@flozy/editor 10.1.1 → 10.1.3

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

@@ -10,12 +10,15 @@ 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";
 import { useEditorContext } from "../../hooks/useMouseMove";
-// import LineSpacing from "../../common/StyleBuilder/fieldTypes/lineSpacing";
-// import { getPageSettings } from "../../utils/pageSettings";
+import LineSpacing from "../../common/StyleBuilder/fieldTypes/lineSpacing";
+import { getPageSettings } from "../../utils/pageSettings";
+import { getDevice } from "../../helper/theme";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const allTools = toolbarGroups.flat();
@@ -36,15 +39,15 @@ const TextFormat = props => {
   const {
     translation
   } = customProps;
-
-  // const { element: pageSt } = getPageSettings(editor) || {};
-  // const pageSettingLine = pageSt?.pageProps?.lineHeight;
+  const {
+    element: pageSt
+  } = getPageSettings(editor) || {};
+  const pageSettingLine = pageSt?.pageProps?.lineHeight;
   const {
     fontFamilies,
-    theme
+    theme: appTheme
   } = useEditorContext();
-  // const { activeBreakPoint } = useEditorContext();
-  // const breakpoint = activeBreakPoint === "" ? "lg" : activeBreakPoint;
+  const breakpoint = getDevice(window.innerWidth);
   const fontWeight = allTools.find(f => f.format === "fontWeight");
   const fontStyle = allTools.filter(f => f.type === "mark" && f.format !== "strikethrough" && f.format !== "superscript" && f.format !== "subscript");
   const fontAlign = allTools.filter(f => f.format?.indexOf("align") >= 0);
@@ -61,12 +64,13 @@ const TextFormat = props => {
     color: "",
     bgColor: ""
   };
-
-  // let lineSpacingValue = activeMark(editor, "lineHeight");
-  // lineSpacingValue =
-  //   lineSpacingValue?.[breakpoint] !== undefined
-  //     ? lineSpacingValue
-  //     : pageSettingLine;
+  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);
     setAnchorEl(e.currentTarget);
@@ -107,16 +111,63 @@ const TextFormat = props => {
       value
     });
   };
-
-  // const handleLineSpacing = (data) => {
-  //   const [[format, value]] = Object.entries(data);
-  //   addMarkData(editor, { format, value });
-  // };
+  const handleLineSpacing = data => {
+    const [[format, value]] = Object.entries(data);
+    addMarkData(editor, {
+      format,
+      value
+    });
+  };
   return /*#__PURE__*/_jsxs(Grid, {
     container: true,
     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: closeMainPopup,
+          type: "fullWidth",
+          customProps: customProps
+        })
+      })]
+    }), /*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
       children: [/*#__PURE__*/_jsxs(Grid, {
@@ -243,7 +294,8 @@ const TextFormat = props => {
           rounded: true,
           title: translation("textColor"),
           id: "11_cc",
-          classes: classes
+          classes: classes,
+          type: "textColor"
         }, "11_cc")
       })]
     }), /*#__PURE__*/_jsxs(Grid, {
@@ -269,7 +321,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"
@@ -359,12 +411,7 @@ const TextFormat = props => {
         xs: 12,
         className: "typo-icons",
         sx: classes.evenSpace,
-        children: [/*#__PURE__*/_jsx(SelectTypography, {
-          classes: classes,
-          editor: editor,
-          closeMainPopup: closeMainPopup || onClose,
-          customProps: customProps
-        }), fontStyle?.map((m, i) => {
+        children: [fontStyle?.map((m, i) => {
           return /*#__PURE__*/_jsx(MarkButton, {
             editor: editor,
             ...m,
@@ -386,6 +433,32 @@ const TextFormat = props => {
       xs: 12,
       sx: classes.dividerGrid,
       children: /*#__PURE__*/_jsx(Divider, {})
+    }), /*#__PURE__*/_jsxs(Grid, {
+      item: true,
+      xs: 12,
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body1",
+        color: "primary",
+        sx: classes.typoLabel,
+        children: "Line Spacing"
+      }), /*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        className: "typo-icons",
+        sx: classes.evenSpace,
+        children: /*#__PURE__*/_jsx(LineSpacing, {
+          value: lineSpacingValue,
+          onChange: handleLineSpacing,
+          data: {
+            key: "lineHeight"
+          }
+        })
+      })]
+    }), /*#__PURE__*/_jsx(Grid, {
+      item: true,
+      xs: 12,
+      sx: classes.dividerGrid,
+      children: /*#__PURE__*/_jsx(Divider, {})
     }), /*#__PURE__*/_jsx(Grid, {
       item: true,
       xs: 12,

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

@@ -0,0 +1,439 @@
+import { Box, Button, Divider, 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 { ColorResetIcon, TextDefaultStyleIcon } from "../../common/iconListV2";
+import { fontFamilyMap } from "../../utils/font";
+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(Box, {
+    sx: classes.textFormatContainer,
+    children: [/*#__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.defaultBtn1,
+              startIcon: /*#__PURE__*/_jsx(TextDefaultStyleIcon, {}),
+              onClick: () => updateSettings({
+                fontFamily: Object.values(fontFamilyMap)[0]
+              }),
+              className: "npr-0",
+              children: "Default Text"
+            })
+          })]
+        }), /*#__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__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        sx: classes.dividerGrid,
+        children: /*#__PURE__*/_jsx(Divider, {})
+      }), /*#__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: "Text Color"
+            })
+          }), /*#__PURE__*/_jsx(Grid, {
+            item: true,
+            children: /*#__PURE__*/_jsx(Button, {
+              sx: classes.defaultBtn1,
+              startIcon: /*#__PURE__*/_jsx(ColorResetIcon, {}),
+              onClick: () => updateSettings({
+                color: "#ddd"
+              }),
+              children: "Default Color"
+            })
+          })]
+        }), /*#__PURE__*/_jsx(Grid, {
+          sx: classes.textFormatColorWrpr,
+          children: /*#__PURE__*/_jsx(ColorPicker, {
+            classes: classes,
+            pickerStyles: pickerStyles,
+            onChange: color => updateSettings({
+              color
+            }),
+            color: settings?.color,
+            disableEditTheme: true
+          })
+        })]
+      }), /*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        sx: classes.dividerGrid,
+        children: /*#__PURE__*/_jsx(Divider, {})
+      }), /*#__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__*/_jsxs("div", {
+      className: "saveThemeBtnsWrapper",
+      children: [/*#__PURE__*/_jsx(Button, {
+        onClick: onClose,
+        className: "closeBtn",
+        style: {
+          background: "none"
+        },
+        children: "Cancel"
+      }), /*#__PURE__*/_jsx(Button, {
+        onClick: onSaveTextSettings,
+        className: "confirmBtn",
+        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

@@ -95,9 +95,9 @@ const PopupTool = props => {
     const isFreeGridEnabled = enable === 1 && isFreeGridElement;
     if (!selection || Range.isCollapsed(selection) || Editor.string(editor, selection) === "" || isFreeGridEnabled) {
       setAnchorEl(null);
+      hideSlateSelection(); // removes slate selection background, when there is no selection
     } else {
       updateAnchorEl();
-      hideSlateSelection(); // removes slate selection background, when there is no selection
     }
   }, [selection, event, selectedElement?.enable]);
   const handleClose = () => {