@flozy/editor 9.8.2 → 9.8.3

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, Range, Text, Element } from "slate";
 import { Box } from "@mui/material";
 import { 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 { getTextColor, isEmptyTextNode } from "../helper";
 import Attachments from "../Elements/Attachments/Attachments";
-import { getBreakPointsValue, textThemeFields, getElementProperty } 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,31 +179,6 @@ 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" : "";
   if (leaf.highlight) {
@@ -300,7 +205,6 @@ export const getMarked = (leaf, children, theme) => {
       children: children
     });
   }
-  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -328,27 +232,20 @@ export const getMarked = (leaf, children, theme) => {
   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
+      },
       children: /*#__PURE__*/_jsx(Box, {
-        className: `${className} leaf-item`,
+        className: className,
         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,
@@ -361,16 +258,11 @@ export const getMarked = (leaf, children, theme) => {
           //   lg: sizeMap[leaf.fontSize] || leaf.fontSize,
           //   ...getBreakPointsValue(leaf.fontSize, null, "overrideText"),
           // },
-          '& span[data-slate-string="true"]': {
-            ...textStyles
-          },
+          ...textStyles,
           fontFamily: family,
           fontWeight: leaf.fontWeight,
           WebkitTextFillColor: "unset !important"
         },
-        style: {
-          "--fontSize_xs": leaf?.fontSize?.xs || "auto"
-        },
         children: children
       })
     });
@@ -392,91 +284,71 @@ export const getMarked = (leaf, children, theme) => {
 export const getBlock = props => {
   const {
     element,
-    children,
-    customProps
+    children
   } = props;
   const attributes = props.attributes ?? {};
   const isEmpty = isEmptyTextNode(element);
-  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}`
-  });
   switch (element.type) {
     case "headingOne":
       return /*#__PURE__*/_jsxs("h1", {
-        ...commonHeadingProps(),
-        placeholder: translation("Heading 1"),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        placeholder: "Heading 1",
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
         })]
       });
     case "headingTwo":
       return /*#__PURE__*/_jsxs("h2", {
-        ...commonHeadingProps(),
-        placeholder: translation("Heading 2"),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        placeholder: "Heading 2",
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
         })]
       });
     case "headingThree":
       return /*#__PURE__*/_jsxs("h3", {
-        ...commonHeadingProps(),
-        placeholder: translation("Heading 3"),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        placeholder: "Heading 3",
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
         })]
       });
     case "headingFour":
       return /*#__PURE__*/_jsxs("h4", {
-        ...commonHeadingProps(),
-        placeholder: translation("Heading 4"),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        placeholder: "Heading 4",
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
         })]
       });
     case "headingFive":
       return /*#__PURE__*/_jsxs("h5", {
-        ...commonHeadingProps(),
-        placeholder: translation("Heading 5"),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        placeholder: "Heading 5",
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
         })]
       });
     case "headingSix":
       return /*#__PURE__*/_jsxs("h6", {
-        ...commonHeadingProps(),
-        placeholder: translation("Heading 6"),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        placeholder: "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,
@@ -542,7 +414,7 @@ export const getBlock = props => {
         ...attributes,
         ...element.attr,
         className: `content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: translation("List"),
+        placeholder: "List",
         style: {
           color: firstChildren?.color
         },

package/dist/Editor/utils/draftToSlate.js

@@ -82,8 +82,7 @@ const splitInlineStyleRanges = (text, inlineStyleRanges, data) => {
 };
 export const draftToSlate = props => {
   const {
-    data,
-    needLayout
+    data
   } = props;
   if (data?.blocks && data?.blocks?.length > 0) {
     const converted = data?.blocks?.reduce((a, b) => {
@@ -105,7 +104,7 @@ export const draftToSlate = props => {
     return data;
   } else {
     return [{
-      type: needLayout ? "title" : "paragraph",
+      type: "paragraph",
       children: [{
         text: ""
       }]

package/dist/Editor/utils/font.js

@@ -7,43 +7,43 @@ export const sizeMap = {
 export const fontFamilyMap = {
   PoppinsRegular: "PoppinsRegular",
   PoppinsBold: "PoppinsBold",
-  sans: 'Helvetica, Arial, "sans serif"',
-  serif: 'Georgia, "Times New Roaman", serif',
-  monospace: 'Monaco, "Courier New", monospace',
-  roboto: "Roboto, sans-serif",
-  qwitcher: '"Qwitcher Grypen", cursive',
-  garamond: '"EB Garamond", serif',
-  anton: "Anton, sans-serif",
-  dmserif: '"DM Serif Text", serif',
-  inter: "Inter, sans-serif",
-  libre: '"Libre Baskerville", serif',
-  montserrat: "Montserrat, sans-serif",
-  opensans: '"Open Sans", sans-serif',
-  publicsans: '"Public Sans", sans-serif',
-  raleway: "Raleway, sans-serif",
-  spacemono: '"Space Mono", sans-serif',
-  bulgarian: '"Bulgarian Garamond", monospace',
-  impact: "Impact, serif",
-  redacted: '"Redacted Script", cursive',
-  greatVibes: '"Great Vibes", cursive',
-  zeyada: "Zeyada, cursive",
-  allura: "Allura, cursive",
-  pinyon: '"Pinyon Script", cursive',
-  muellerhoff: '"Herr Von Muellerhoff", cursive',
-  dawning: '"Dawning of a New Day", cursive',
+  sans: "Helvetica,Arial, sans serif",
+  serif: "Georgia, Times New Roaman,serif",
+  monospace: "Monaco, Courier New,monospace",
+  roboto: "'Roboto', sans-serif",
+  qwitcher: "'Qwitcher Grypen', cursive",
+  garamond: "'EB Garamond', serif",
+  anton: "'Anton', sans-serif",
+  dmserif: "'DM Serif Text', serif",
+  inter: "'Inter', sans-serif",
+  libre: "'Libre Baskerville', serif",
+  montserrat: "'Montserrat', sans-serif",
+  opensans: "'Open Sans', sans-serif",
+  publicsans: "'Public Sans', sans-serif",
+  raleway: "'Raleway', sans-serif",
+  spacemono: "'Space Mono', sans-serif",
+  bulgarian: "'Bulgarian Garamond', monospace",
+  impact: "'Impact', serif",
+  redacted: "'Redacted Script', cursive",
+  greatVibes: "'Great Vibes', cursive",
+  zeyada: "'Zeyada', cursive",
+  allura: "'Allura', cursive",
+  pinyon: "'Pinyon Script', cursive",
+  muellerhoff: "'Herr Von Muellerhoff', cursive",
+  dawning: "'Dawning of a New Day', cursive",
   // New Font Added for Type Signature
-  comingsoon: '"Coming Soon", cursive',
-  dancingScript: '"Dancing Script", cursive',
-  engagement: "Engagement, cursive",
-  gaegu: "Gaegu, cursive",
-  ingridDarling: '"Ingrid Darling", cursive',
-  kitaOne: "Times",
-  laBelleAurore: '"La Belle Aurore", cursive',
-  lobster: "Lobster, cursive",
-  meaCulpa: '"Mea Culpa", cursive',
-  meddon: "Meddon, cursive",
-  merriWeather: "Merriweather, serif",
-  theGirlNextDoor: '"The Girl Next Door", cursive'
+  comingsoon: "'Coming Soon', cursive",
+  dancingScript: "'Dancing Script', cursive",
+  engagement: "'Engagement', cursive",
+  gaegu: "'Gaegu', cursive",
+  ingridDarling: "'Ingrid Darling', cursive",
+  kitaOne: "'Kite One', sans - serif",
+  laBelleAurore: "'La Belle Aurore', cursive",
+  lobster: "'Lobster', cursive",
+  meaCulpa: "'Mea Culpa', cursive",
+  meddon: "'Meddon', cursive",
+  merriWeather: "'Merriweather', serif",
+  theGirlNextDoor: "'The Girl Next Door', cursive"
 };
 export const fontOptions = Object.keys(fontFamilyMap).map(m => {
   return {
@@ -62,10 +62,7 @@ export const signedTextFonts = Object.keys(fontFamilyMap).slice(-12).map(m => {
 export const headingMap = {
   headingOne: "32px",
   headingTwo: "24px",
-  headingThree: "19px",
-  headingFour: "16px",
-  headingFive: "13px",
-  headingSix: "11px"
+  headingThree: "19px"
 };
 export const fontWeightOptions = [{
   text: "Bold",

package/dist/Editor/utils/freegrid.js

@@ -22,8 +22,8 @@ export const insertFreeGridItem = (childType, childTypeNode, extProps = {}, type
     top_xs: 24,
     marginTop_xs: 12,
     width_xs: 250,
-    // height_xs: 300,
-    // gridArea_xs: "1 / 1 / 2 / 2",
+    height_xs: 300,
+    gridArea_xs: "1 / 1 / 2 / 2",
     sectionBgColor: "rgb(240, 108, 131)",
     ...(extProps || {})
   };
@@ -166,5 +166,5 @@ export const insertFreeGrid = (editor, path, extProps) => {
     at: newPath
   });
   scrollToNewSection(editor, newPath, extProps);
-  // insertNewLine(editor);
+  insertNewLine(editor);
 };