@flozy/editor 10.7.0 → 10.7.1

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, Path } 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 { getBreakpointLineSpacing, getBreakPointsValue, getDevice, groupByBreakpoint } from "../helper/theme";
+import { getBreakpointLineSpacing, getBreakPointsValue, getDevice, getElementProperty, textThemeFields } 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,17 +47,70 @@ 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";
 const alignment = ["alignLeft", "alignRight", "alignCenter", "alignJustify"];
-const list_types = ["orderedList", "unorderedList"];
+const list_types = ["orderedList", "unorderedList", "accordion-details"];
 const LIST_FORMAT_TYPE = {
   orderedList: "list-item",
   unorderedList: "list-item"
 };
-const NEWLINESAFTER = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix"];
+
+// const NEWLINESAFTER = [
+//   "headingOne",
+//   "headingTwo",
+//   "headingThree",
+//   "headingFour",
+//   "headingFive",
+//   "headingSix",
+// ];
+
+const THEME_BLOCK_FIELDS = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree"];
+const convertAccordionToListItem = (editor, format) => {
+  const accordionLists = Array.from(Editor.nodes(editor, {
+    match: n => {
+      let accordionList = false;
+      if (n.type === "accordion") {
+        const [summary] = n.children;
+        accordionList = [format, "paragraph"].includes(summary.children?.[0]?.type);
+      }
+      return accordionList;
+    }
+  }));
+  accordionLists?.forEach(accordionList => {
+    const [node, path] = accordionList;
+    const [summary, details] = node.children;
+    const listItem = {
+      ...(summary.children[0] || {})
+    };
+    const isPara = listItem.type === "paragraph";
+    if (isPara) {
+      listItem.type = "list-item";
+    }
+
+    // Replace the accordion with the format
+    Transforms.removeNodes(editor, {
+      at: path
+    });
+    Transforms.insertNodes(editor, listItem, {
+      at: path
+    });
+    if (isPara) {
+      Transforms.wrapNodes(editor, {
+        type: format,
+        children: []
+      }, {
+        at: path
+      });
+    }
+    const nextPath = Path.next(path);
+    Transforms.insertNodes(editor, details.children, {
+      at: nextPath
+    });
+  });
+};
 export const toggleBlock = (editor, format, selection = true, attr = {}) => {
-  const isActive = isBlockActive(editor, format);
+  let isActive = isBlockActive(editor, format);
   const isList = list_types.includes(format);
   const isIndent = alignment.includes(format);
   const isAligned = alignment.some(alignmentType => isBlockActive(editor, alignmentType));
@@ -79,17 +132,33 @@ export const toggleBlock = (editor, format, selection = true, attr = {}) => {
     });
     return;
   }
-  Transforms.unwrapNodes(editor, {
-    match: n => list_types.includes(!Editor.isEditor(n) && SlateElement.isElement(n) && n.type),
-    split: true
+  const [match] = Editor.nodes(editor, {
+    match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && list_types.includes(n.type),
+    mode: "lowest" // To ensure it's the closest parent
   });
 
+  if (match) {
+    const [matchNode, matchPath] = match;
+    if (matchNode.type !== "accordion-details") {
+      Transforms.unwrapNodes(editor, {
+        match: (n, n2) => {
+          const isList = !Editor.isEditor(n) && SlateElement.isElement(n) && list_types.includes(n.type);
+          return isList && n2.toString() === matchPath.toString();
+        },
+        split: true
+      });
+    } else {
+      isActive = false;
+    }
+  }
+
   // inserting blocks from "/"" commands remove searched word
   if (!selection) {
     Transforms.insertText(editor, "");
   }
+  const forActiveType = THEME_BLOCK_FIELDS.some(f => f === format) ? format : "paragraph";
   Transforms.setNodes(editor, {
-    type: isActive ? "paragraph" : isList ? LIST_FORMAT_TYPE[format] : format,
+    type: isActive ? forActiveType : isList ? LIST_FORMAT_TYPE[format] : format,
     ...attr
   });
   if (isList && !isActive) {
@@ -98,9 +167,12 @@ export const toggleBlock = (editor, format, selection = true, attr = {}) => {
       children: []
     });
   }
-  if (NEWLINESAFTER.indexOf(format) > -1) {
-    insertNewLine(editor);
-  }
+
+  // if (NEWLINESAFTER.indexOf(format) > -1) {
+  //   insertNewLine(editor);
+  // }
+
+  convertAccordionToListItem(editor, format);
 };
 export const addMarkData = (editor, data) => {
   try {
@@ -110,9 +182,14 @@ export const addMarkData = (editor, data) => {
   }
 };
 export const toggleMark = (editor, format) => {
-  const isActive = isMarkActive(editor, format);
+  const isActive = isMarkBtnActive(editor, format);
   if (isActive) {
-    Editor.removeMark(editor, format);
+    const isThemeSupportedMark = textThemeFields.some(f => f === format);
+    if (isThemeSupportedMark) {
+      Editor.addMark(editor, format, false);
+    } else {
+      Editor.removeMark(editor, format);
+    }
   } else {
     Editor.addMark(editor, format, true);
   }
@@ -126,12 +203,76 @@ 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
   });
   return !!match;
 };
+export const isListActive = editor => {
+  const list_types = ["orderedList", "unorderedList", "check-list-item", "accordion"];
+  const [match] = Editor.nodes(editor, {
+    match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && list_types.includes(n.type),
+    mode: "lowest" // To ensure it's the closest parent
+  });
+
+  if (match) {
+    const [matchNode] = match;
+    return matchNode.type;
+  }
+};
 export const getBlockActive = (editor, format) => {
   const [match] = Editor.nodes(editor, {
     match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && n.type === format
@@ -151,7 +292,7 @@ export const upateBlockActive = (editor, format, attr = {}) => {
     });
   }
 };
-export const activeMark = (editor, format) => {
+export const activeMark = (editor, format, noDefaultValue) => {
   const defaultMarkData = {
     color: "#000000",
     bgColor: "#FFFFFF",
@@ -161,7 +302,7 @@ export const activeMark = (editor, format) => {
   };
   try {
     const marks = Editor.marks(editor);
-    let defaultValue = defaultMarkData[format];
+    let defaultValue = noDefaultValue ? "" : defaultMarkData[format];
     const {
       selection
     } = editor || {};
@@ -178,6 +319,31 @@ 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, theme) => {
   const className = leaf?.doublequote ? "doublequote" : "";
   const lineH = leaf?.lineHeight;
@@ -207,6 +373,7 @@ export const getMarked = (leaf, children, theme) => {
       children: children
     });
   }
+  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -234,6 +401,15 @@ export const getMarked = (leaf, children, theme) => {
   if (leaf.color || leaf.bgColor || leaf.fontSize || leaf.fontFamily || leaf.fontWeight || lineHeight || 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
@@ -242,12 +418,13 @@ export const getMarked = (leaf, children, theme) => {
         className: `${className} leaf-item`,
         component: "span",
         sx: {
-          ...groupByBreakpoint({
-            fontSize: {
-              lg: sizeMap[leaf.fontSize] || leaf.fontSize,
-              ...getBreakPointsValue(leaf.fontSize, null, "overrideText")
-            }
-          }, theme),
+          "& span": {
+            // fontSize: fontSizesImportant,
+            // ...groupByBreakpoint(fontSizesImportant, theme),
+            background: leaf.bgColor,
+            ...fontSizeWithBreakpoints
+          },
+          ...fontSizeWithBreakpoints,
           // ...wrapThemeBreakpoints(
           //   {
           //     lg: sizeMap[leaf.fontSize] || leaf.fontSize,
@@ -299,6 +476,16 @@ 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);
@@ -351,6 +538,24 @@ export const getBlock = props => {
         placeholder: translation("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,
@@ -584,7 +789,8 @@ export const getBlock = props => {
     case "docs":
     case "pdf":
     case "xls":
-    case "csv":
+    case "doc":
+    case "ppt":
       return /*#__PURE__*/_jsx(Attachments, {
         ...props
       });

package/dist/Editor/utils/accordion.js

@@ -1,6 +1,6 @@
 import { Editor, Element, Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
-import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType, getSelectedText } from "./helper";
+import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType } from "./helper";
 import { isMobileWindow } from "../helper";
 import { removeAccordion } from "./events";
 import { ReactEditor } from "slate-react";
@@ -10,48 +10,76 @@ const focusAccordion = (editor, upPath) => {
     offset: 0
   });
 };
-export const insertAccordion = (editor, path) => {
-  try {
-    const selectedText = getSelectedText(editor);
-    const accordion = {
-      type: "accordion",
+const getAccordionNode = summaryNode => {
+  return {
+    type: "accordion",
+    children: [{
+      type: "accordion-summary",
+      children: summaryNode
+    }, {
+      type: "accordion-details",
       children: [{
-        type: "accordion-summary",
+        type: "paragraph",
         children: [{
-          type: "paragraph",
-          children: [{
-            text: selectedText || ""
-          }]
+          text: ""
         }]
-      }, {
-        type: "accordion-details",
+      }]
+    }]
+  };
+};
+export const insertAccordion = (editor, path) => {
+  try {
+    const {
+      selection
+    } = editor;
+    let accordionPath;
+    if (path) {
+      const summaryNode = {
+        type: "paragraph",
         children: [{
-          type: "paragraph",
-          children: [{
-            text: ""
-          }]
+          text: ""
         }]
-      }]
-    };
-    const props = path ? {
-      at: path,
-      select: true
-    } : {
-      select: true
-    };
-    Transforms.insertNodes(editor, accordion, props);
-    const curPath = [...editor?.selection?.anchor?.path];
-    const upPath = [...curPath];
-    // get title index
-    const summaryIndex = upPath.length - 3;
-    upPath[summaryIndex] = upPath[summaryIndex] === 0 ? 0 : upPath[summaryIndex] - 1;
+      };
+      const accordion = getAccordionNode([summaryNode]);
+      Transforms.insertNodes(editor, accordion, {
+        at: path
+      });
+      accordionPath = path;
+    } else if (selection) {
+      const selectedNodes = Array.from(Editor.nodes(editor, {
+        at: selection,
+        match: n => Element.isElement(n),
+        mode: "lowest" // use 'lowest' to get individual blocks
+      }));
 
-    // select accordion title by default
+      for (const [node, path] of selectedNodes) {
+        let currNode = node;
+        const isListItem = node.type === "list-item";
+        if (isListItem) {
+          currNode = {
+            type: "paragraph",
+            children: node.children
+          };
+        }
+        let accordion = getAccordionNode([currNode]);
+        Transforms.removeNodes(editor, {
+          at: path
+        });
+        Transforms.insertNodes(editor, accordion, {
+          at: path
+        });
+        accordionPath = path;
+      }
+      const lastNode = selectedNodes[selectedNodes.length - 1];
+      const lastNodePath = lastNode[1];
+      accordionPath = lastNodePath;
+    }
+    const focusPath = [...accordionPath, 0, 0, 0];
     if (isMobileWindow()) {
       // timeout to resolve focus issue in mobile
-      setTimeout(() => focusAccordion(editor, upPath), 0);
+      setTimeout(() => focusAccordion(editor, focusPath), 0);
     } else {
-      focusAccordion(editor, upPath);
+      focusAccordion(editor, focusPath);
     }
     insertNewLine(editor);
   } catch (err) {

package/dist/Editor/utils/button.js

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

package/dist/Editor/utils/draftToSlate.js

@@ -82,7 +82,8 @@ const splitInlineStyleRanges = (text, inlineStyleRanges, data) => {
 };
 export const draftToSlate = props => {
   const {
-    data
+    data,
+    needLayout
   } = props;
   if (data?.blocks && data?.blocks?.length > 0) {
     const converted = data?.blocks?.reduce((a, b) => {
@@ -104,7 +105,7 @@ export const draftToSlate = props => {
     return data;
   } else {
     return [{
-      type: "paragraph",
+      type: needLayout ? "title" : "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: "'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"
+  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'
 };
 export const fontOptions = Object.keys(fontFamilyMap).map(m => {
   return {
@@ -62,7 +62,10 @@ export const signedTextFonts = Object.keys(fontFamilyMap).slice(-12).map(m => {
 export const headingMap = {
   headingOne: "32px",
   headingTwo: "24px",
-  headingThree: "19px"
+  headingThree: "19px",
+  headingFour: "16px",
+  headingFive: "13px",
+  headingSix: "11px"
 };
 export const fontWeightOptions = [{
   text: "Bold",