@flozy/editor 9.3.2 → 9.3.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 { getBreakPointsValue, groupByBreakpoint } from "../helper/theme";
+import { getBreakPointsValue, textThemeFields, getElementProperty } 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";
 const alignment = ["alignLeft", "alignRight", "alignCenter", "alignJustify"];
 const list_types = ["orderedList", "unorderedList"];
@@ -55,7 +55,17 @@ const LIST_FORMAT_TYPE = {
   orderedList: "list-item",
   unorderedList: "list-item"
 };
-const NEWLINESAFTER = ["headingOne", "headingTwo", "headingThree"];
+
+// const NEWLINESAFTER = [
+//   "headingOne",
+//   "headingTwo",
+//   "headingThree",
+//   "headingFour",
+//   "headingFive",
+//   "headingSix",
+// ];
+
+const THEME_BLOCK_FIELDS = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree"];
 export const toggleBlock = (editor, format, selection = true, attr = {}) => {
   const isActive = isBlockActive(editor, format);
   const isList = list_types.includes(format);
@@ -88,8 +98,9 @@ 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 ? "paragraph" : isList ? LIST_FORMAT_TYPE[format] : format,
+    type: isActive ? forActiveType : isList ? LIST_FORMAT_TYPE[format] : format,
     ...attr
   });
   if (isList && !isActive) {
@@ -98,10 +109,12 @@ 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);
@@ -110,9 +123,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,6 +144,58 @@ 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
@@ -151,7 +221,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 +231,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 +248,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" : "";
   if (leaf.highlight) {
@@ -204,6 +299,7 @@ export const getMarked = (leaf, children, theme) => {
       children: children
     });
   }
+  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -231,20 +327,27 @@ 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,
         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,
@@ -274,6 +377,7 @@ export const getMarked = (leaf, children, theme) => {
       rel: "noreferrer",
       target: "_blank",
       href: leaf.text,
+      className: "hyperLink",
       children: children
     });
   }
@@ -282,57 +386,77 @@ export const getMarked = (leaf, children, theme) => {
 export const getBlock = props => {
   const {
     element,
-    children
+    children,
+    customProps
   } = 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: `content-editable ${isEmpty ? "empty" : ""} theme-element ${paraType}`
+  });
   switch (element.type) {
     case "headingOne":
       return /*#__PURE__*/_jsx("h1", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: "Heading 1",
+        ...commonHeadingProps(),
+        placeholder: translation("Heading 1"),
         children: children
       });
     case "headingTwo":
       return /*#__PURE__*/_jsx("h2", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: "Heading 2",
+        ...commonHeadingProps(),
+        placeholder: translation("Heading 2"),
         children: children
       });
     case "headingThree":
       return /*#__PURE__*/_jsx("h3", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: "Heading 3",
+        ...commonHeadingProps(),
+        placeholder: translation("Heading 3"),
         children: children
       });
     case "headingFour":
       return /*#__PURE__*/_jsx("h4", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: "Heading 4",
+        ...commonHeadingProps(),
+        placeholder: translation("Heading 4"),
         children: children
       });
     case "headingFive":
       return /*#__PURE__*/_jsx("h5", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: "Heading 5",
+        ...commonHeadingProps(),
+        placeholder: translation("Heading 5"),
         children: children
       });
     case "headingSix":
       return /*#__PURE__*/_jsx("h6", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: "Heading 6",
+        ...commonHeadingProps(),
+        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":
@@ -400,7 +524,7 @@ export const getBlock = props => {
         ...attributes,
         ...element.attr,
         className: `content-editable ${isEmpty ? "empty" : ""}`,
-        placeholder: "List",
+        placeholder: translation("List"),
         style: {
           color: firstChildren?.color
         },

package/dist/Editor/utils/button.js

@@ -11,20 +11,6 @@ export const insertButton = editor => {
       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 || {})
   };
   Transforms.insertNodes(editor, button);

package/dist/Editor/utils/chatEditor/SlateUtilityFunctions.js

@@ -8,6 +8,9 @@ import { isEmptyTextNode } from "../../helper";
 import { getBreakPointsValue } from "../../helper/theme";
 import insertNewLine from "../insertNewLine";
 import { getBorderColor } from "../helper";
+import Table from "../../Elements/Table/Table";
+import TableRow from "../../Elements/Table/TableRow";
+import TableCell from "../../Elements/Table/TableCell";
 import { jsx as _jsx } from "react/jsx-runtime";
 const alignment = ["alignLeft", "alignRight", "alignCenter"];
 const list_types = ["orderedList", "unorderedList"];
@@ -406,6 +409,26 @@ export const getBlock = props => {
       return /*#__PURE__*/_jsx(Mentions, {
         ...props
       });
+    case "table":
+      return /*#__PURE__*/_jsx(Table, {
+        ...props
+      });
+    case "table-head":
+      return /*#__PURE__*/_jsx("thead", {
+        children: children
+      });
+    case "table-body":
+      return /*#__PURE__*/_jsx("tbody", {
+        children: children
+      });
+    case "table-row":
+      return /*#__PURE__*/_jsx(TableRow, {
+        ...props
+      });
+    case "table-cell":
+      return /*#__PURE__*/_jsx(TableCell, {
+        ...props
+      });
     default:
       return /*#__PURE__*/_jsx(SimpleText, {
         ...props,

package/dist/Editor/utils/divider.js

@@ -1,12 +1,20 @@
 import { Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
+import { getCurrentNodeText } from "./helper";
 export const insertDivider = editor => {
+  Transforms.delete(editor, editor.selection);
+  const blockText = getCurrentNodeText(editor);
   const divider = {
     type: "divider",
     children: [{
       text: ""
     }]
   };
+  if (!blockText) {
+    Transforms.removeNodes(editor, {
+      at: editor?.selection
+    });
+  }
   Transforms.insertNodes(editor, divider);
   insertNewLine(editor);
 };

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/embed.js

@@ -1,5 +1,6 @@
 import { Transforms } from "slate";
 import insertNewLine, { insertNewLineAfterCurrentPath } from "./insertNewLine";
+import { getCurrentNodeText } from "./helper";
 export const insertDefaultEmbed = (editor, type, defaultURL = "", extProps = {}) => {
   try {
     const url = defaultURL ? defaultURL : type === "image" ? "" : "";
@@ -51,11 +52,15 @@ export const createEmbedNode = (type, {
 });
 export const insertEmbed = (editor, embedData, format) => {
   try {
+    const blockText = getCurrentNodeText(editor);
     const embed = createEmbedNode(format, embedData);
-    Transforms.insertNodes(editor, embed, {
-      at: editor.selection.anchor.path
-    });
-    insertNewLine(editor);
+    if (!blockText) {
+      Transforms.removeNodes(editor, {
+        at: editor?.selection
+      });
+      insertNewLine(editor);
+    }
+    Transforms.insertNodes(editor, embed);
     insertNewLineAfterCurrentPath(editor);
   } catch (err) {
     console.log(err);

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",