@flozy/editor 3.9.1 → 3.9.4

package/dist/Editor/theme/ThemeList.js

@@ -1,58 +1,181 @@
-import { Box, MenuItem, Select } from "@mui/material";
-import { defaultTheme } from ".";
-import { useEditorTheme } from "../hooks/useEditorTheme";
-import { useEffect, useState } from "react";
+import { MenuItem, Select, useTheme } from "@mui/material";
+import { fontOptions } from "../utils/font";
+import { toolbarGroups } from "../Toolbar/toolbarGroups";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-function ThemeList({
-  editor,
-  services = () => {}
-}) {
-  const [themes, setThemes] = useState([]);
-  const [loading, setLoading] = useState(false);
-  console.log("loading", loading);
-  const getThemesList = async () => {
-    setLoading(true);
-    try {
-      const result = await services("getThemes", {});
-      setThemes(result?.data || []);
-    } catch (err) {
-      console.log(err);
-    }
-    setLoading(false);
-  };
+const themes = [{
+  label: "Theme 1",
+  colors: ["#c90c1f", "#ff5d05"]
+}, {
+  label: "Theme 2",
+  colors: ["#4c0be3", "#43f7ee"]
+}, {
+  label: "Theme 3",
+  colors: ["#22f20f", "#fff705"]
+}];
+const allTools = toolbarGroups.flat();
+function ThemeList(props) {
   const {
-    updateTheme
-  } = useEditorTheme();
-  useEffect(() => {
-    getThemesList();
-  }, []);
-  const handleThemeChange = e => {
-    const {
-      value
-    } = e.target;
-    const selectedTheme = themes.find(t => t.id === value) || defaultTheme;
-    updateTheme(selectedTheme, "THEME_CHANGE");
+    selectedTheme,
+    setSelectedTheme
+  } = props;
+  const fontWeight = allTools.find(f => f.format === "fontWeight");
+  const fontStyles = [{
+    text: "Bold",
+    value: "bold",
+    styleField: "fontWeight"
+  }, {
+    text: "Italic",
+    value: "italic",
+    styleField: "fontStyle"
+  }
+  // {
+  //   text: "Underline",
+  //   value: "underline",
+  //   styleField: "textDecoration",
+  // },
+  // {
+  //   text: "Line through",
+  //   value: "line-through",
+  //   styleField: "textDecoration",
+  // },
+  ];
+
+  const theme = useTheme();
+  const colorVars = theme?.vars?.colors || {};
+  const handleTypographyTheme = (key, value, elementType) => {
+    setSelectedTheme(prev => {
+      const newValue = {
+        ...prev,
+        typography: {
+          ...(prev.typography || {}),
+          [elementType]: {
+            ...(prev?.typography?.[elementType] || {}),
+            [key]: value
+          }
+        }
+      };
+      if (!value) {
+        delete newValue?.typography?.[elementType]?.[key];
+      }
+      return newValue;
+    });
   };
-  return /*#__PURE__*/_jsx(Box, {
-    sx: {
-      padding: "10px",
-      background: "#efefef",
-      borderRadius: "6px"
-    },
-    children: /*#__PURE__*/_jsxs(Select, {
-      onChange: handleThemeChange,
-      defaultValue: 0,
-      children: [/*#__PURE__*/_jsx(MenuItem, {
-        value: 0,
-        children: "Default Theme"
-      }), themes.map((theme, i) => {
-        return /*#__PURE__*/_jsx(MenuItem, {
-          value: theme?.id,
-          children: theme?.name
-        }, i);
+  return /*#__PURE__*/_jsxs("div", {
+    children: [themes.map((theme, i) => {
+      return /*#__PURE__*/_jsxs("button", {
+        style: {
+          margin: "10px"
+        },
+        onClick: () => setSelectedTheme(prev => ({
+          ...prev,
+          colors: theme.colors
+        })),
+        children: [theme.label, /*#__PURE__*/_jsx("div", {
+          children: theme.colors.map((c, j) => {
+            return /*#__PURE__*/_jsx("div", {
+              style: {
+                width: "20px",
+                height: "20px",
+                background: c,
+                margin: "10px"
+              }
+            }, j);
+          })
+        })]
+      }, i);
+    }), /*#__PURE__*/_jsxs("div", {
+      children: ["Heading 1 Font Family", /*#__PURE__*/_jsx(Select
+      // value={""}
+      , {
+        label: "Font Family",
+        onChange: e => {
+          handleTypographyTheme("fontFamily", e.target.value, "h1");
+        },
+        children: fontOptions.map((font, i) => {
+          const {
+            text,
+            value
+          } = font;
+          return /*#__PURE__*/_jsx(MenuItem, {
+            value: value,
+            children: text
+          }, i);
+        })
+      }), "Font Weight", /*#__PURE__*/_jsx(Select
+      // value={""}
+      , {
+        label: "Font Weight",
+        onChange: e => {
+          handleTypographyTheme("fontWeight", e.target.value, "h1");
+        },
+        children: fontWeight.options.map((option, i) => {
+          const {
+            text,
+            value
+          } = option;
+          return /*#__PURE__*/_jsx(MenuItem, {
+            value: value,
+            children: text
+          }, i);
+        })
+      }), /*#__PURE__*/_jsx("input", {
+        type: "number",
+        placeholder: "font size",
+        onChange: e => {
+          handleTypographyTheme("fontSize", e.target.value, "h1");
+        }
+      }), /*#__PURE__*/_jsxs("div", {
+        children: ["Text", /*#__PURE__*/_jsx("br", {}), "Theme color", Object.values(colorVars).map((colorVar, i) => {
+          return /*#__PURE__*/_jsx("button", {
+            style: {
+              width: "20px",
+              height: "20px",
+              background: colorVar,
+              margin: "10px",
+              outline: "none"
+            },
+            onClick: () => handleTypographyTheme("color", colorVar, "h1")
+          }, i);
+        }), "normal color", /*#__PURE__*/_jsx("button", {
+          style: {
+            width: "20px",
+            height: "20px",
+            background: "#ff00e1",
+            margin: "10px",
+            outline: "none"
+          },
+          onClick: () => handleTypographyTheme("color", "#ff00e1", "h1")
+        })]
+      }), /*#__PURE__*/_jsxs("div", {
+        children: ["Font styles", fontStyles.map((option, i) => {
+          const styles = selectedTheme?.typography?.h1 || {};
+          const {
+            text,
+            value,
+            styleField
+          } = option;
+          return /*#__PURE__*/_jsxs("button", {
+            onClick: () => {
+              handleTypographyTheme(styleField, styles[styleField] === value ? null : value, "h1");
+            },
+            children: [text, " ", styles[styleField] === value]
+          }, i);
+        })]
+      }), /*#__PURE__*/_jsx("input", {
+        type: "number",
+        placeholder: "Margin text Spacing",
+        onChange: e => {
+          handleTypographyTheme("letterSpacing", e.target.value, "h1");
+        }
+      }), /*#__PURE__*/_jsx("input", {
+        type: "number",
+        placeholder: "Line spacing",
+        onChange: e => {
+          handleTypographyTheme("lineHeight", e.target.value, "h1");
+        }
       })]
-    })
+    })]
   });
 }
 export default ThemeList;

package/dist/Editor/utils/SlateUtilityFunctions.js

@@ -1,4 +1,4 @@
-import { Editor, Transforms, Element as SlateElement, Range } from "slate";
+import { Editor, Transforms, Element as SlateElement } from "slate";
 import { Box } from "@mui/material";
 import { fontFamilyMap, sizeMap } from "./font";
 import Link from "../Elements/Link/Link";
@@ -34,12 +34,12 @@ import SimpleText from "../Elements/SimpleText";
 import CheckList from "../Elements/List/CheckList";
 import { isEmptyTextNode } from "../helper";
 import Attachments from "../Elements/Attachments/Attachments";
-import { getBreakPointsValue, textThemeFields } from "../helper/theme";
+import { getBreakPointsValue } from "../helper/theme";
 import Variables from "../Elements/Variables/Variable";
+import insertNewLine from "./insertNewLine";
 import Divider from "../Elements/Divider/Divider";
 import { getBorderColor } from "./helper";
 import Code from "../Elements/EmbedScript/Code";
-import { ReactEditor } from "slate-react";
 import { jsx as _jsx } from "react/jsx-runtime";
 const alignment = ["alignLeft", "alignRight", "alignCenter"];
 const list_types = ["orderedList", "unorderedList"];
@@ -47,17 +47,7 @@ const LIST_FORMAT_TYPE = {
   orderedList: "list-item",
   unorderedList: "list-item"
 };
-
-// const NEWLINESAFTER = [
-//   "headingOne",
-//   "headingTwo",
-//   "headingThree",
-//   "headingFour",
-//   "headingFive",
-//   "headingSix",
-// ];
-
-const THEME_BLOCK_FIELDS = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree"];
+const NEWLINESAFTER = ["headingOne", "headingTwo", "headingThree"];
 export const toggleBlock = (editor, format, selection = true, attr = {}) => {
   const isActive = isBlockActive(editor, format);
   const isList = list_types.includes(format);
@@ -90,9 +80,8 @@ export const toggleBlock = (editor, format, selection = true, attr = {}) => {
   if (!selection) {
     Transforms.insertText(editor, "");
   }
-  const forActiveType = THEME_BLOCK_FIELDS.some(f => f === format) ? format : "paragraph";
   Transforms.setNodes(editor, {
-    type: isActive ? forActiveType : isList ? LIST_FORMAT_TYPE[format] : format,
+    type: isActive ? "paragraph" : isList ? LIST_FORMAT_TYPE[format] : format,
     ...attr
   });
   if (isList && !isActive) {
@@ -101,12 +90,10 @@ export const toggleBlock = (editor, format, selection = true, attr = {}) => {
       children: []
     });
   }
-
-  // if (NEWLINESAFTER.indexOf(format) > -1) {
-  //   insertNewLine(editor);
-  // }
+  if (NEWLINESAFTER.indexOf(format) > -1) {
+    insertNewLine(editor);
+  }
 };
-
 export const addMarkData = (editor, data) => {
   try {
     Editor.addMark(editor, data.format, data.value);
@@ -115,14 +102,9 @@ export const addMarkData = (editor, data) => {
   }
 };
 export const toggleMark = (editor, format) => {
-  const isActive = isMarkBtnActive(editor, format);
+  const isActive = isMarkActive(editor, format);
   if (isActive) {
-    const isThemeSupportedMark = textThemeFields.some(f => f === format);
-    if (isThemeSupportedMark) {
-      Editor.addMark(editor, format, false);
-    } else {
-      Editor.removeMark(editor, format);
-    }
+    Editor.removeMark(editor, format);
   } else {
     Editor.addMark(editor, format, true);
   }
@@ -136,53 +118,6 @@ export const isMarkActive = (editor, format) => {
     return null;
   }
 };
-export const isMarkBtnActive = (editor, format) => {
-  switch (format) {
-    case "bold":
-      {
-        const style = getSelectedElementStyle("font-weight", editor);
-        return style === "700";
-      }
-    case "italic":
-      {
-        const style = getSelectedElementStyle("font-style", editor);
-        return style === format;
-      }
-    // case "underline": {
-    //   const style = getSelectedElementStyle("text-decoration");
-
-    //   return style?.includes(format);
-    // }
-    // case "strikethrough": {
-    //   const style = getSelectedElementStyle("text-decoration");
-
-    //   return style?.includes("line-through");
-    // }
-    default:
-      return isMarkActive(editor, format);
-  }
-};
-export const getSelectedElementStyle = (styleProperty, editor) => {
-  try {
-    if (!editor.selection) {
-      return "";
-    }
-    if (Range.isCollapsed(editor.selection)) {
-      return "";
-    }
-    const domRange = ReactEditor.toDOMRange(editor, editor.selection);
-    const selectedDomNode = domRange.commonAncestorContainer;
-
-    // If it's a text node, get its parent element
-    const selectedElement = selectedDomNode.nodeType === 3 ? selectedDomNode.parentElement : selectedDomNode;
-    if (selectedElement) {
-      const computedStyle = window.getComputedStyle(selectedElement);
-      return computedStyle.getPropertyValue(styleProperty) || "";
-    }
-  } catch (err) {
-    console.log(err);
-  }
-};
 export const isBlockActive = (editor, format) => {
   const [match] = Editor.nodes(editor, {
     match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && n.type === format
@@ -225,31 +160,6 @@ export const activeMark = (editor, format) => {
     return null;
   }
 };
-
-// to avoid the styles, that automatically assign from themes
-const getThemeMarkedLeaf = (leaf, children) => {
-  const {
-    italic,
-    bold
-  } = leaf || {};
-  const style = {};
-  if (italic === false) {
-    style.fontStyle = "normal";
-  }
-  if (bold === false) {
-    style.fontWeight = "normal";
-  }
-  if (Object.keys(style).length) {
-    children = /*#__PURE__*/_jsx(Box, {
-      component: "span",
-      sx: {
-        "& span": style
-      },
-      children: children
-    });
-  }
-  return children;
-};
 export const getMarked = (leaf, children) => {
   const className = leaf?.doublequote ? "doublequote" : "";
   if (leaf.bold) {
@@ -267,7 +177,6 @@ export const getMarked = (leaf, children) => {
       children: children
     });
   }
-  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -301,22 +210,17 @@ export const getMarked = (leaf, children) => {
     } : {
       color: leaf.color
     };
-    const fontSize = {
-      lg: sizeMap[leaf.fontSize] || leaf.fontSize,
-      ...getBreakPointsValue(leaf.fontSize, null, "overrideText")
-    };
-    const fontSizesImportant = {};
-    Object.entries(fontSize).forEach(([key, value]) => {
-      fontSizesImportant[key] = `${value} !important`;
-    });
     children = /*#__PURE__*/_jsx("span", {
+      style: {
+        background: leaf.bgColor
+      },
       children: /*#__PURE__*/_jsx(Box, {
         className: className,
         component: "span",
         sx: {
-          "& span": {
-            fontSize: fontSizesImportant,
-            background: leaf.bgColor
+          fontSize: {
+            lg: sizeMap[leaf.fontSize] || leaf.fontSize,
+            ...getBreakPointsValue(leaf.fontSize, null, "overrideText")
           },
           ...textStyles,
           fontFamily: family,
@@ -346,71 +250,31 @@ export const getBlock = props => {
   } = props;
   const attributes = props.attributes ?? {};
   const isEmpty = isEmptyTextNode(element);
-  const commonHeadingProps = () => ({
-    ...attributes,
-    ...element.attr,
-    className: `content-editable ${isEmpty ? "empty" : ""} theme-element`
-  });
-  const commonParaProps = paraType => ({
-    ...attributes,
-    ...element.attr,
-    className: `content-editable ${isEmpty ? "empty" : ""} theme-element ${paraType}`
-  });
   switch (element.type) {
     case "headingOne":
       return /*#__PURE__*/_jsx("h1", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 1",
         children: children
       });
     case "headingTwo":
       return /*#__PURE__*/_jsx("h2", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 2",
         children: children
       });
     case "headingThree":
       return /*#__PURE__*/_jsx("h3", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 3",
         children: children
       });
-    case "headingFour":
-      return /*#__PURE__*/_jsx("h4", {
-        ...commonHeadingProps(),
-        placeholder: "Heading 4",
-        children: children
-      });
-    case "headingFive":
-      return /*#__PURE__*/_jsx("h5", {
-        ...commonHeadingProps(),
-        placeholder: "Heading 5",
-        children: children
-      });
-    case "headingSix":
-      return /*#__PURE__*/_jsx("h6", {
-        ...commonHeadingProps(),
-        placeholder: "Heading 6",
-        children: children
-      });
-    case "paragraphOne":
-      return /*#__PURE__*/_jsx("p", {
-        ...commonParaProps("para1"),
-        placeholder: "Paragraph 1",
-        children: children
-      });
-    case "paragraphTwo":
-      return /*#__PURE__*/_jsx("p", {
-        ...commonParaProps("para2"),
-        placeholder: "Paragraph 2",
-        children: children
-      });
-    case "paragraphThree":
-      return /*#__PURE__*/_jsx("p", {
-        ...commonParaProps("para3"),
-        placeholder: "Paragraph 3",
-        children: children
-      });
     case "blockquote":
       return /*#__PURE__*/_jsx("blockquote", {
         ...attributes,

package/dist/Editor/utils/button.js

@@ -1,5 +1,6 @@
 import { Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
+import { windowVar } from "./helper";
 export const insertButton = editor => {
   const button = {
     type: "button",
@@ -9,7 +10,22 @@ export const insertButton = editor => {
     buttonLink: {
       linkType: "webAddress"
     },
-    iconPosition: "start"
+    iconPosition: "start",
+    bgColor: "#2563EB",
+    textColor: "#FFF",
+    borderRadius: {
+      topLeft: 30,
+      topRight: 30,
+      bottomLeft: 30,
+      bottomRight: 30
+    },
+    bannerSpacing: {
+      left: 16,
+      top: 8,
+      right: 16,
+      bottom: 8
+    },
+    ...(windowVar.lastButtonProps || {})
   };
   Transforms.insertNodes(editor, button);
   Transforms.move(editor);

package/dist/Editor/utils/draftToSlate.js

@@ -100,7 +100,7 @@ export const draftToSlate = props => {
       return a;
     }, []);
     return converted;
-  } else if (data?.length > 0) {
+  } else if (data?.length) {
     return data;
   } else {
     return [{

package/dist/Editor/utils/events.js

@@ -1,9 +1,8 @@
-import { Editor, Transforms, Element, Node, Path, Range } from "slate";
+import { Editor, Transforms, Element, Node, Path } from "slate";
 import { toggleBlock } from "./SlateUtilityFunctions";
 import insertNewLine from "./insertNewLine";
 import { insertAccordion } from "./accordion";
 import { isListItem } from "./helper";
-import EDITORCMDS from "../common/EditorCmds";
 const HOTKEYS = {
   b: "bold",
   i: "italic",
@@ -64,8 +63,7 @@ export const commands = props => {
   try {
     const {
       event,
-      editor,
-      needLayout
+      editor
     } = props;
     if (HOTKEYS[event.key]) {
       event.preventDefault();
@@ -75,11 +73,6 @@ export const commands = props => {
       } else {
         Editor.addMark(editor, HOTKEYS[event.key], true);
       }
-    } else if (EDITORCMDS[event.key]) {
-      EDITORCMDS[event.key](event, {
-        editor,
-        needLayout
-      });
     }
   } catch (err) {
     console.log(err);
@@ -103,7 +96,7 @@ export const indentation = props => {
           Transforms.wrapNodes(editor, {
             type: listItem.type,
             children: [{
-              text: ""
+              text: ''
             }]
           });
         } else {
@@ -160,7 +153,7 @@ const checkListEnterEvent = (editor, type) => {
     Transforms.insertNodes(editor, {
       type: "check-list-item",
       children: [{
-        text: ""
+        text: ''
       }]
     }, {
       at: newPath
@@ -169,7 +162,7 @@ const checkListEnterEvent = (editor, type) => {
     // focus on the end of the line
     Transforms.move(editor, {
       distance: 1,
-      unit: "line"
+      unit: 'line'
     });
   } else {
     toggleBlock(editor, type);
@@ -179,6 +172,7 @@ const checkListEnterEvent = (editor, type) => {
 export const enterEvent = (e, editor, isMobile) => {
   try {
     const ele = isListItem(editor);
+
     // on shift enter break line in same node
     if (e.shiftKey && !isMobile) {
       e.preventDefault();
@@ -187,7 +181,6 @@ export const enterEvent = (e, editor, isMobile) => {
       const {
         type
       } = ele[0];
-      const path = ele[1];
       const text = Node.string(ele[0]);
       switch (type) {
         case "list-item":
@@ -219,58 +212,6 @@ export const enterEvent = (e, editor, isMobile) => {
             insertAccordion(editor, nextPath);
           }
           break;
-        case "headingOne":
-        case "headingTwo":
-        case "headingThree":
-          const {
-            selection
-          } = editor;
-          if (selection && Range.isCollapsed(selection)) {
-            const isAtEnd = Editor.isEnd(editor, selection.anchor, path);
-            const isAtStart = Editor.isStart(editor, selection.anchor, path);
-            if (isAtEnd) {
-              e.preventDefault();
-              Transforms.insertNodes(editor, {
-                type: 'paragraph',
-                children: [{
-                  text: ''
-                }]
-              });
-              const newLocation = Editor.after(editor, selection);
-              if (newLocation) {
-                Transforms.select(editor, newLocation);
-              }
-            } else if (!isAtStart) {
-              e.preventDefault();
-              Transforms.splitNodes(editor);
-              Transforms.setNodes(editor, {
-                type: 'paragraph'
-              }, {
-                at: Editor.after(editor, selection)
-              });
-              const newLocation = Editor.after(editor, selection);
-              if (newLocation) {
-                Transforms.select(editor, newLocation);
-              }
-            } else if (isAtStart) {
-              e.preventDefault();
-              Transforms.insertNodes(editor, {
-                type: 'paragraph',
-                children: [{
-                  text: ''
-                }]
-              }, {
-                at: Editor.before(editor, selection)
-              });
-              Transforms.select(editor, Editor.before(editor, selection));
-              const newLocation = Editor.before(editor, selection);
-              if (newLocation) {
-                Transforms.select(editor, newLocation);
-              }
-            }
-            return;
-          }
-          break;
         default:
       }
     }