@flozy/editor 11.0.2 → 11.0.3

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 { getBreakpointLineSpacing, getBreakPointsValue, getDevice, 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,27 +47,17 @@ 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"];
-export const list_types = ["orderedList", "unorderedList"];
+const list_types = ["orderedList", "unorderedList"];
 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 = {}) => {
-  let isActive = isBlockActive(editor, format);
+  const isActive = isBlockActive(editor, format);
   const isList = list_types.includes(format);
   const isIndent = alignment.includes(format);
   const isAligned = alignment.some(alignmentType => isBlockActive(editor, alignmentType));
@@ -98,9 +88,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) {
@@ -109,12 +98,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);
@@ -123,14 +110,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);
   }
@@ -144,91 +126,12 @@ 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 getListType = editor => {
-  const [accordionSummary] = Editor.nodes(editor, {
-    match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && n.type === "accordion-summary"
-  });
-  if (accordionSummary) {
-    return "accordion-summary";
-  }
-  const listItems = ["list-item", "check-list-item"];
-  const [listItem] = Editor.nodes(editor, {
-    match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && listItems.includes(n.type)
-  });
-  if (listItem) {
-    return "list-item";
-  }
-};
 export const getBlockActive = (editor, format) => {
   const [match] = Editor.nodes(editor, {
     match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && n.type === format
@@ -248,7 +151,7 @@ export const upateBlockActive = (editor, format, attr = {}) => {
     });
   }
 };
-export const activeMark = (editor, format, noDefaultValue) => {
+export const activeMark = (editor, format) => {
   const defaultMarkData = {
     color: "#000000",
     bgColor: "#FFFFFF",
@@ -258,7 +161,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 || {};
@@ -275,31 +178,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" : "";
   const lineH = leaf?.lineHeight;
@@ -329,7 +207,6 @@ export const getMarked = (leaf, children, theme) => {
       children: children
     });
   }
-  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -357,15 +234,6 @@ 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
@@ -374,13 +242,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,
@@ -401,8 +268,7 @@ export const getMarked = (leaf, children, theme) => {
           WebkitTextFillColor: "unset !important"
         },
         style: {
-          "--fontSize_xs": leaf?.fontSize?.xs || "auto",
-          "--fontSize_lg": leaf?.fontSize?.lg || "auto"
+          "--fontSize_xs": leaf?.fontSize?.xs || "auto"
         },
         children: children
       })
@@ -433,78 +299,63 @@ export const getBlock = props => {
   const {
     translation
   } = customProps;
-  const commonHeadingProps = () => ({
-    ...attributes,
-    ...element.attr,
-    className: `edt-headings content-editable ${isEmpty ? "empty" : ""} theme-element disablePointerEvent`
-  });
-  const commonParaProps = paraType => ({
-    ...attributes,
-    ...element.attr,
-    className: `edt-paragraphs content-editable ${isEmpty ? "empty" : ""} theme-element disablePointerEvent ${paraType}`
-  });
   const breakpoint = getDevice(window.innerWidth);
   const lineH = element?.children[0]?.lineHeight;
   const selectedLineHeight = getBreakpointLineSpacing(lineH, breakpoint);
   switch (element.type) {
     case "headingOne":
       return /*#__PURE__*/_jsx("h1", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""} disablePointerEvent`,
         placeholder: translation("Heading 1"),
         children: children
       });
     case "headingTwo":
       return /*#__PURE__*/_jsx("h2", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""} disablePointerEvent`,
         placeholder: translation("Heading 2"),
         children: children
       });
     case "headingThree":
       return /*#__PURE__*/_jsx("h3", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""} disablePointerEvent`,
         placeholder: translation("Heading 3"),
         children: children
       });
     case "headingFour":
       return /*#__PURE__*/_jsx("h4", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""} disablePointerEvent`,
         placeholder: translation("Heading 4"),
         children: children
       });
     case "headingFive":
       return /*#__PURE__*/_jsx("h5", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""} disablePointerEvent`,
         placeholder: translation("Heading 5"),
         children: children
       });
     case "headingSix":
       return /*#__PURE__*/_jsx("h6", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""} disablePointerEvent`,
         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,
         ...element.attr,
+        className: "blockQuoteComp",
         style: {
           // borderColor: element?.color || "transparent",
           ...getBorderColor(element?.color || "transparent", 3),
@@ -734,8 +585,7 @@ export const getBlock = props => {
     case "docs":
     case "pdf":
     case "xls":
-    case "doc":
-    case "ppt":
+    case "csv":
       return /*#__PURE__*/_jsx(Attachments, {
         ...props
       });

package/dist/Editor/utils/accordion.js

@@ -1,5 +1,7 @@
 import { Editor, Element, Path, Transforms } from "slate";
-import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType } from "./helper";
+import insertNewLine from "./insertNewLine";
+import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType, getSelectedText } from "./helper";
+import { isMobileWindow } from "../helper";
 import { removeAccordion } from "./events";
 import { ReactEditor } from "slate-react";
 const focusAccordion = (editor, upPath) => {
@@ -7,74 +9,51 @@ const focusAccordion = (editor, upPath) => {
     path: upPath,
     offset: 0
   });
-  ReactEditor.focus(editor);
 };
-const getAccordionNode = summaryNode => {
-  return {
-    type: "accordion",
-    children: [{
-      type: "accordion-summary",
-      children: summaryNode
-    }, {
-      type: "accordion-details",
+export const insertAccordion = (editor, path) => {
+  try {
+    const selectedText = getSelectedText(editor);
+    const accordion = {
+      type: "accordion",
       children: [{
-        type: "paragraph",
+        type: "accordion-summary",
         children: [{
-          text: ""
+          type: "paragraph",
+          children: [{
+            text: selectedText || ""
+          }]
         }]
-      }]
-    }]
-  };
-};
-export const insertAccordion = (editor, path) => {
-  try {
-    const {
-      selection
-    } = editor;
-    let accordionPath;
-    if (path) {
-      const summaryNode = {
-        type: "paragraph",
+      }, {
+        type: "accordion-details",
         children: [{
-          text: ""
+          type: "paragraph",
+          children: [{
+            text: ""
+          }]
         }]
-      };
-      const accordion = getAccordionNode([summaryNode]);
-      Transforms.insertNodes(editor, accordion, {
-        at: path
-      });
-      accordionPath = path;
-    } else if (selection) {
-      const selectedNodes = Array.from(Editor.nodes(editor, {
-        match: n => Element.isElement(n),
-        mode: "lowest" // use 'lowest' to get individual blocks
-      }));
-
-      for (const [node, path] of selectedNodes) {
-        let currNode = node;
-        // const isListItem = node.type === "list-item";
-        // if (isListItem) {
-        //   currNode = {
-        //     type: "paragraph",
-        //     children: node.children,
-        //   };
-        // }
+      }]
+    };
+    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;
 
-        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;
+    // select accordion title by default
+    if (isMobileWindow()) {
+      // timeout to resolve focus issue in mobile
+      setTimeout(() => focusAccordion(editor, upPath), 0);
+    } else {
+      focusAccordion(editor, upPath);
     }
-    const focusPath = [...accordionPath, 0, 0, 0];
-    focusAccordion(editor, focusPath);
+    insertNewLine(editor);
   } catch (err) {
     console.log(err);
   }
@@ -154,11 +133,4 @@ export const onDeleteBackwardAccordion = editor => {
   } catch (err) {
     console.log(err);
   }
-};
-export const toggleAccordion = editor => {
-  const parentAccordion = Editor.above(editor, {
-    match: node => Element.isElement(node) && node.type === "accordion"
-  });
-  const [, accordionPath] = parentAccordion;
-  removeAccordion(editor, accordionPath);
 };

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;

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: ""
       }]