@flozy/editor 3.6.7 → 3.6.8

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 } from "slate";
 import { Box } from "@mui/material";
 import { fontFamilyMap, 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 { isEmptyTextNode } from "../helper";
 import Attachments from "../Elements/Attachments/Attachments";
-import { getBreakPointsValue, textThemeFields } from "../helper/theme";
+import { getBreakPointsValue } from "../helper/theme";
 import Variables from "../Elements/Variables/Variable";
+import insertNewLine from "./insertNewLine";
 import Divider from "../Elements/Divider/Divider";
 import { getBorderColor } from "./helper";
 import Code from "../Elements/EmbedScript/Code";
-import { ReactEditor } from "slate-react";
 import { jsx as _jsx } from "react/jsx-runtime";
 const alignment = ["alignLeft", "alignRight", "alignCenter"];
 const list_types = ["orderedList", "unorderedList"];
@@ -47,17 +47,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"];
 export const toggleBlock = (editor, format, selection = true, attr = {}) => {
   const isActive = isBlockActive(editor, format);
   const isList = list_types.includes(format);
@@ -90,9 +80,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) {
@@ -101,12 +90,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);
@@ -115,14 +102,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);
   }
@@ -136,49 +118,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) => {
-  if (!editor.selection) {
-    return "";
-  }
-  if (Range.isCollapsed(editor.selection)) {
-    return "";
-  }
-  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) {
-    const computedStyle = window.getComputedStyle(selectedElement);
-    return computedStyle.getPropertyValue(styleProperty) || "";
-  }
-};
 export const isBlockActive = (editor, format) => {
   const [match] = Editor.nodes(editor, {
     match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && n.type === format
@@ -221,31 +160,6 @@ 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) => {
   const className = leaf?.doublequote ? "doublequote" : "";
   if (leaf.bold) {
@@ -263,7 +177,6 @@ export const getMarked = (leaf, children) => {
       children: children
     });
   }
-  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -297,22 +210,17 @@ export const getMarked = (leaf, children) => {
     } : {
       color: 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`;
-    });
     children = /*#__PURE__*/_jsx("span", {
+      style: {
+        background: leaf.bgColor
+      },
       children: /*#__PURE__*/_jsx(Box, {
         className: className,
         component: "span",
         sx: {
-          "& span": {
-            fontSize: fontSizesImportant,
-            background: leaf.bgColor
+          fontSize: {
+            lg: sizeMap[leaf.fontSize] || leaf.fontSize,
+            ...getBreakPointsValue(leaf.fontSize, null, "overrideText")
           },
           ...textStyles,
           fontFamily: family,
@@ -342,71 +250,31 @@ export const getBlock = props => {
   } = props;
   const attributes = props.attributes ?? {};
   const isEmpty = isEmptyTextNode(element);
-  const commonHeadingProps = () => ({
-    ...attributes,
-    ...element.attr,
-    className: `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", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 1",
         children: children
       });
     case "headingTwo":
       return /*#__PURE__*/_jsx("h2", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 2",
         children: children
       });
     case "headingThree":
       return /*#__PURE__*/_jsx("h3", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 3",
         children: children
       });
-    case "headingFour":
-      return /*#__PURE__*/_jsx("h4", {
-        ...commonHeadingProps(),
-        placeholder: "Heading 4",
-        children: children
-      });
-    case "headingFive":
-      return /*#__PURE__*/_jsx("h5", {
-        ...commonHeadingProps(),
-        placeholder: "Heading 5",
-        children: children
-      });
-    case "headingSix":
-      return /*#__PURE__*/_jsx("h6", {
-        ...commonHeadingProps(),
-        placeholder: "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,

package/dist/Editor/utils/button.js

@@ -1,5 +1,6 @@
 import { Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
+import { windowVar } from "./helper";
 export const insertButton = editor => {
   const button = {
     type: "button",
@@ -9,7 +10,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 || {})
   };
   Transforms.insertNodes(editor, button);
   Transforms.move(editor);

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,8 +62,5 @@ 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"
 };

package/dist/Editor/utils/helper.js

@@ -216,17 +216,6 @@ const getScrollElement = () => {
   const scrollFrom = isSlateWrapperScroll ? slateWrapper : window;
   return scrollFrom;
 };
-const handleLinkBtnClick = (e, props) => {
-  if (e) {
-    e.preventDefault();
-    e.stopPropagation();
-  }
-  if (props.target) {
-    window.open(props.href);
-  } else {
-    window.location.href = props.href;
-  }
-};
 export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick = () => {}) => {
   const props = {};
   if (!readOnly) {
@@ -317,22 +306,23 @@ export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick =
 
   // for iphone fix
   if (props.component === "a" && props.href) {
-    const isMobile = getDevice(window.innerWidth) === "xs";
-    if (isMobile) {
+    if (getDevice(window.innerWidth) === "xs") {
       props.component = "button"; // iphone is opening two tabs, on open in new tab because of a tag.
     }
 
-    let touchEndClicked = false;
     props.onTouchEnd = e => {
-      touchEndClicked = true;
-      handleLinkBtnClick(e, props);
-    };
-    props.onClick = e => {
-      // This condition is used for mobile preview in the page editor.
-      // 'touchEnd' will not work in the mobile page preview.
-      if (!touchEndClicked && isMobile) {
-        handleLinkBtnClick(e, props);
+      if (e) {
+        // onTouchEnd will get triggered on web, only for image element, for that case event is getting undefined.
+        e.preventDefault();
+        e.stopPropagation();
+      }
+      if (props.target) {
+        window.open(props.href);
+      } else {
+        window.location.href = props.href;
       }
+    };
+    props.onClick = () => {
       return false;
     };
   }
@@ -377,32 +367,4 @@ export const decodeString = str => {
   } catch (err) {
     console.log(err);
   }
-};
-export const getContrastColor = color => {
-  let r, g, b;
-
-  // Check if the color is in hex format
-  if (color.startsWith("#")) {
-    r = parseInt(color.substring(1, 3), 16);
-    g = parseInt(color.substring(3, 5), 16);
-    b = parseInt(color.substring(5, 7), 16);
-  }
-  // Check if the color is in RGB/RGBA format
-  else if (color.startsWith("rgb")) {
-    const rgbValues = color.replace(/^rgba?\(|\s+|\)$/g, "") // Remove the rgb/rgba and spaces
-    .split(","); // Split the values into an array
-
-    r = parseInt(rgbValues[0]);
-    g = parseInt(rgbValues[1]);
-    b = parseInt(rgbValues[2]);
-  } else {
-    // If the format is not recognized, default to black text
-    return "#000000";
-  }
-
-  // Calculate relative luminance
-  const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
-
-  // Return black for light colors, white for dark colors
-  return luminance > 0.5 ? "#000000" : "#FFFFFF";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "3.6.7",
+  "version": "3.6.8",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"

package/dist/Editor/Elements/Link/LinkPopupStyles.js

@@ -1,28 +0,0 @@
-const LinkPopupStyles = theme => ({
-  addLinkField: {
-    "& .MuiOutlinedInput-input": {
-      fontSize: "12px",
-      fontWeight: 500,
-      color: `${theme?.palette?.editor?.textColor} !important`
-    },
-    "& .MuiFormHelperText-root": {
-      color: `${theme?.palette?.editor?.textColor} !important`
-    },
-    "& .MuiOutlinedInput-root": {
-      boxShadow: "0px 4px 10px rgba(0, 0, 0, 0.16)",
-      color: `${theme?.palette?.editor?.textColor} !important`,
-      borderRadius: "7px",
-      "& fieldset": {
-        borderColor: "#D8DDE1"
-      },
-      "&:hover fieldset": {
-        borderColor: "#64748B"
-      },
-      "&.Mui-focused fieldset": {
-        borderColor: "#2563EB"
-      },
-      "& .MuiFormLabel-root": {}
-    }
-  }
-});
-export default LinkPopupStyles;