@flozy/editor 10.2.3 → 10.2.5

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

@@ -34,12 +34,12 @@ import SimpleText from "../Elements/SimpleText";
 import CheckList from "../Elements/List/CheckList";
 import { getTextColor, isEmptyTextNode } from "../helper";
 import Attachments from "../Elements/Attachments/Attachments";
-import { getBreakpointLineSpacing, getBreakPointsValue, getDevice, getElementProperty, textThemeFields } from "../helper/theme";
+import { getBreakPointsValue, groupByBreakpoint } from "../helper/theme";
 import Variables from "../Elements/Variables/Variable";
+import insertNewLine from "./insertNewLine";
 import Divider from "../Elements/Divider/Divider";
 import { getBorderColor, getSlateDom } from "./helper";
 import Code from "../Elements/EmbedScript/Code";
-import { ReactEditor } from "slate-react";
 import FreeGrid from "../Elements/FreeGrid/FreeGrid";
 import FreeGridItem from "../Elements/FreeGrid/FreeGridItem";
 import FreeGridBox from "../Elements/FreeGrid/FreeGridBox";
@@ -47,7 +47,7 @@ import DataView from "../Elements/DataView/DataView";
 import ViewData from "../Elements/DataView/Layouts/ViewData";
 import ColumnView from "../Elements/DataView/Layouts/ColumnView";
 import SearchAttachment from "../Elements/Search/SearchAttachment";
-import { wrapThemeBreakpoints } from "../Elements/FreeGrid/breakpointConstants";
+// import { wrapThemeBreakpoints } from "../Elements/FreeGrid/breakpointConstants";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const alignment = ["alignLeft", "alignRight", "alignCenter", "alignJustify"];
@@ -56,17 +56,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", "headingFour", "headingFive", "headingSix"];
 export const toggleBlock = (editor, format, selection = true, attr = {}) => {
   const isActive = isBlockActive(editor, format);
   const isList = list_types.includes(format);
@@ -99,9 +89,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) {
@@ -110,12 +99,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);
@@ -124,14 +111,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);
   }
@@ -145,58 +127,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, format) => {
-  try {
-    if (!editor.selection) {
-      return "";
-    }
-    if (Range.isCollapsed(editor.selection)) {
-      return "";
-    }
-    if (format) {
-      const value = activeMark(editor, format, true);
-      if (value) {
-        return value;
-      }
-    }
-    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) {
-      return getElementProperty(selectedElement, 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
@@ -222,7 +152,7 @@ export const upateBlockActive = (editor, format, attr = {}) => {
     });
   }
 };
-export const activeMark = (editor, format, noDefaultValue) => {
+export const activeMark = (editor, format) => {
   const defaultMarkData = {
     color: "#000000",
     bgColor: "#FFFFFF",
@@ -232,7 +162,7 @@ export const activeMark = (editor, format, noDefaultValue) => {
   };
   try {
     const marks = Editor.marks(editor);
-    let defaultValue = noDefaultValue ? "" : defaultMarkData[format];
+    let defaultValue = defaultMarkData[format];
     const {
       selection
     } = editor || {};
@@ -249,36 +179,8 @@ export const activeMark = (editor, format, noDefaultValue) => {
     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, theme) => {
   const className = leaf?.doublequote ? "doublequote" : "";
-  const lineH = leaf?.lineHeight;
-  const breakpoint = getDevice(window.innerWidth);
-  const lineHeight = getBreakpointLineSpacing(lineH, breakpoint);
   if (leaf.highlight) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -303,7 +205,6 @@ export const getMarked = (leaf, children, theme) => {
       children: children
     });
   }
-  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -328,18 +229,9 @@ export const getMarked = (leaf, children, theme) => {
     });
   }
   // cover under single span
-  if (leaf.color || leaf.bgColor || leaf.fontSize || leaf.fontFamily || leaf.fontWeight || lineHeight || className) {
+  if (leaf.color || leaf.bgColor || leaf.fontSize || leaf.fontFamily || leaf.fontWeight || className) {
     const family = leaf?.fontFamily;
     const textStyles = getTextColor(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`;
-    });
-    const fontSizeWithBreakpoints = wrapThemeBreakpoints(fontSizesImportant, "fontSize", theme);
     children = /*#__PURE__*/_jsx("span", {
       style: {
         background: leaf.bgColor
@@ -348,13 +240,12 @@ export const getMarked = (leaf, children, theme) => {
         className: `${className} leaf-item`,
         component: "span",
         sx: {
-          "& span": {
-            // fontSize: fontSizesImportant,
-            // ...groupByBreakpoint(fontSizesImportant, theme),
-            background: leaf.bgColor,
-            ...fontSizeWithBreakpoints
-          },
-          ...fontSizeWithBreakpoints,
+          ...groupByBreakpoint({
+            fontSize: {
+              lg: sizeMap[leaf.fontSize] || leaf.fontSize,
+              ...getBreakPointsValue(leaf.fontSize, null, "overrideText")
+            }
+          }, theme),
           // ...wrapThemeBreakpoints(
           //   {
           //     lg: sizeMap[leaf.fontSize] || leaf.fontSize,
@@ -406,23 +297,12 @@ export const getBlock = props => {
   const {
     translation
   } = customProps;
-  const commonHeadingProps = () => ({
-    ...attributes,
-    ...element.attr,
-    className: `edt-headings content-editable ${isEmpty ? "empty" : ""} theme-element`
-  });
-  const commonParaProps = paraType => ({
-    ...attributes,
-    ...element.attr,
-    className: `edt-paragraphs content-editable ${isEmpty ? "empty" : ""} theme-element ${paraType}`
-  });
-  const breakpoint = getDevice(window.innerWidth);
-  const lineH = element?.children[0]?.lineHeight;
-  const selectedLineHeight = getBreakpointLineSpacing(lineH, breakpoint);
   switch (element.type) {
     case "headingOne":
       return /*#__PURE__*/_jsxs("h1", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("Heading 1"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -430,7 +310,9 @@ export const getBlock = props => {
       });
     case "headingTwo":
       return /*#__PURE__*/_jsxs("h2", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("Heading 2"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -438,7 +320,9 @@ export const getBlock = props => {
       });
     case "headingThree":
       return /*#__PURE__*/_jsxs("h3", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("Heading 3"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -446,7 +330,9 @@ export const getBlock = props => {
       });
     case "headingFour":
       return /*#__PURE__*/_jsxs("h4", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("Heading 4"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -454,7 +340,9 @@ export const getBlock = props => {
       });
     case "headingFive":
       return /*#__PURE__*/_jsxs("h5", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("Heading 5"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -462,30 +350,14 @@ export const getBlock = props => {
       });
     case "headingSix":
       return /*#__PURE__*/_jsxs("h6", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("Heading 6"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
         })]
       });
-    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,
@@ -499,7 +371,7 @@ export const getBlock = props => {
           margin: `${element?.bgColor ? "16px" : "0px"} 0px`,
           width: element?.bgColor ? "calc(100% - 16px)" : "100%",
           borderWidth: element?.color ? "0px 0px 0px 3px" : "0px",
-          lineHeight: `${selectedLineHeight} !important`
+          lineHeight: 1.43
         },
         children: children
       });
@@ -553,13 +425,15 @@ export const getBlock = props => {
         className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("List"),
         style: {
-          color: firstChildren?.color,
-          lineHeight: `${selectedLineHeight}`
+          color: firstChildren?.color
         },
         children: children
       });
     case "orderedList":
       return /*#__PURE__*/_jsx("ol", {
+        style: {
+          lineHeight: 1.43
+        },
         className: "listItemMargin",
         type: "1",
         ...attributes,
@@ -567,6 +441,9 @@ export const getBlock = props => {
       });
     case "unorderedList":
       return /*#__PURE__*/_jsx("ul", {
+        style: {
+          lineHeight: 1.43
+        },
         className: "listItemMargin",
         ...attributes,
         children: children
@@ -574,7 +451,6 @@ export const getBlock = props => {
     case "check-list-item":
       return /*#__PURE__*/_jsx(CheckList, {
         ...props,
-        selectedLineHeight: selectedLineHeight,
         isEmpty: isEmpty
       });
     case "link":

package/dist/Editor/utils/accordion.js

@@ -1,13 +1,6 @@
 import { Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
 import { getSelectedText } from "./helper";
-import { isMobileWindow } from "../helper";
-const focusAccordion = (editor, upPath) => {
-  Transforms.select(editor, {
-    path: upPath,
-    offset: 0
-  });
-};
 export const insertAccordion = (editor, path) => {
   try {
     const selectedText = getSelectedText(editor);
@@ -43,14 +36,11 @@ export const insertAccordion = (editor, path) => {
     // get title index
     const summaryIndex = upPath.length - 3;
     upPath[summaryIndex] = upPath[summaryIndex] === 0 ? 0 : upPath[summaryIndex] - 1;
-
     // select accordion title by default
-    if (isMobileWindow()) {
-      // timeout to resolve focus issue in mobile
-      setTimeout(() => focusAccordion(editor, upPath), 0);
-    } else {
-      focusAccordion(editor, upPath);
-    }
+    Transforms.select(editor, {
+      path: upPath,
+      offset: 0
+    });
     insertNewLine(editor);
   } catch (err) {
     console.log(err);

package/dist/Editor/utils/button.js

@@ -1,5 +1,6 @@
 import { Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
+import { windowVar } from "./helper";
 import { getCurrentElementText } from "../plugins/withHTML";
 export const insertButton = editor => {
   const button = {
@@ -10,7 +11,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 || {})
   };
   const hasText = getCurrentElementText(editor);
   const insertPath = hasText ? Path.next(Path.parent(editor?.selection.focus.path)) : editor?.selection.focus.path;