@flozy/editor 6.0.8 → 7.0.0

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, 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 } from "./helper";
+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,17 +55,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);
@@ -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,52 +126,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) => {
-  try {
-    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) {
-      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
@@ -225,38 +161,23 @@ export const activeMark = (editor, format) => {
   };
   try {
     const marks = Editor.marks(editor);
-    const defaultValue = defaultMarkData[format];
+    let defaultValue = defaultMarkData[format];
+    const {
+      selection
+    } = editor || {};
+    if (format === "fontSize" && selection && !Range.isCollapsed(selection)) {
+      const slateDom = getSlateDom(editor, editor?.selection);
+      if (slateDom) {
+        const parentElement = slateDom.commonAncestorContainer.parentElement;
+        defaultValue = window.getComputedStyle(parentElement).fontSize;
+      }
+    }
     return marks?.[format] ?? defaultValue;
   } catch (err) {
     console.log(err);
     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) {
@@ -283,7 +204,6 @@ export const getMarked = (leaf, children, theme) => {
       children: children
     });
   }
-  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -311,27 +231,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,
         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,
@@ -373,71 +286,55 @@ export const getBlock = props => {
   } = props;
   const attributes = props.attributes ?? {};
   const isEmpty = isEmptyTextNode(element);
-  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", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 1",
         children: children
       });
     case "headingTwo":
       return /*#__PURE__*/_jsx("h2", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 2",
         children: children
       });
     case "headingThree":
       return /*#__PURE__*/_jsx("h3", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 3",
         children: children
       });
     case "headingFour":
       return /*#__PURE__*/_jsx("h4", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 4",
         children: children
       });
     case "headingFive":
       return /*#__PURE__*/_jsx("h5", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: "Heading 5",
         children: children
       });
     case "headingSix":
       return /*#__PURE__*/_jsx("h6", {
-        ...commonHeadingProps(),
+        ...attributes,
+        ...element.attr,
+        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
         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,
@@ -733,11 +630,6 @@ export const getBlock = props => {
         children: children
       });
     default:
-      // return (
-      //   <span {...attributes} {...element.attr}>
-      //     {children}
-      //   </span>
-      // );
       return /*#__PURE__*/_jsx(SimpleText, {
         ...props,
         isEmpty: isEmpty

package/dist/Editor/utils/button.js

@@ -11,6 +11,20 @@ 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/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/helper.js

@@ -464,34 +464,6 @@ export const decodeString = str => {
     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";
-};
 export const onDeleteKey = (event, {
   editor
 }) => {
@@ -653,10 +625,6 @@ export const isRestrictedNode = (event, editor) => {
     return isNodeRestricted;
   }
 };
-export function capitalizeFirstLetter(str) {
-  if (!str) return str;
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
 export const insertLineBreakAtEndOfPath = (editor, path) => {
   try {
     const [node, nodePath] = Editor.node(editor, path); // Get the node at the specified path
@@ -675,13 +643,6 @@ export const insertLineBreakAtEndOfPath = (editor, path) => {
     console.log(err);
   }
 };
-export function isHavingSelection(editor) {
-  try {
-    return editor?.selection && !Range.isCollapsed(editor.selection);
-  } catch (err) {
-    console.log(err);
-  }
-}
 const omitNodes = ["site-settings", "page-settings"];
 export function getInitialValue(value = [], readOnly) {
   if (readOnly === "readonly" && value?.length) {
@@ -712,17 +673,20 @@ export function getInitialValue(value = [], readOnly) {
   }
   return value;
 }
+export function capitalizeFirstLetter(str) {
+  if (!str) return str;
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+export function isHavingSelection(editor) {
+  try {
+    return editor?.selection && !Range.isCollapsed(editor.selection);
+  } catch (err) {
+    console.log(err);
+  }
+}
 export function getSelectedCls(defaultCls = "", selected, selectedClsName = "selected") {
   return `${defaultCls} ${selected ? selectedClsName : ""}`;
 }
-export function handleNegativeInteger(val) {
-  return val < 0 ? 0 : val;
-}
-export const containsSurrogatePair = text => {
-  // Match surrogate pairs (high and low surrogate)
-  const surrogatePairRegex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/;
-  return surrogatePairRegex.test(text);
-};
 export const getNodeWithType = (editor, nodeType = "", otherOptions) => {
   try {
     const options = {
@@ -736,6 +700,11 @@ export const getNodeWithType = (editor, nodeType = "", otherOptions) => {
     return [];
   }
 };
+export const containsSurrogatePair = text => {
+  // Match surrogate pairs (high and low surrogate)
+  const surrogatePairRegex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/;
+  return surrogatePairRegex.test(text);
+};
 export const getSlateDom = (editor, range) => {
   try {
     const slateDom = ReactEditor.toDOMRange(editor, range);
@@ -784,4 +753,7 @@ export const viewSlateSelection = () => {
 export const hideSlateSelection = () => {
   const root = document.documentElement;
   root.style.setProperty("--slate-highlight-bg", "none");
-};
+};
+export function handleNegativeInteger(val) {
+  return val < 0 ? 0 : val;
+}

package/dist/Editor/utils/link.js

@@ -3,7 +3,7 @@ import { isBlockActive } from "./SlateUtilityFunctions";
 export const createLinkNode = (href, showInNewTab, text, linkType) => ({
   type: "link",
   href,
-  target: showInNewTab === "_blank" ? "_blank" : "_self",
+  target: showInNewTab ? "_blank" : "_self",
   linkType,
   children: [{
     text

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "6.0.8",
+  "version": "7.0.0",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"
@@ -61,7 +61,7 @@
   "scripts": {
     "prepare": "husky install .husky",
     "analyze": "source-map-explorer build/static/js/*.js",
-    "lint": "./node_modules/.bin/eslint --ignore-path .gitignore .",
+    "lint": "./node_modules/. bin/eslint --ignore-path .gitignore .",
     "start": "craco start",
     "build": "NODE_OPTIONS='--max_old_space_size=4096' craco build",
     "test": "craco test --passWithNoTests",
@@ -69,10 +69,7 @@
     "storybook": "storybook dev -p 6006",
     "build-storybook": "NODE_OPTIONS='--max_old_space_size=4096' storybook build",
     "publish:npm": "rm -rf dist && mkdir dist &&  babel src/components -d dist --copy-files",
-    "publish:local": "rm -rf /Users/agmac03/flozy/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agmac03/flozy/client/node_modules/@flozy/editor/dist --copy-files",
-    "publish:flozy": "./publish-flozy.sh",
-    "publish:flozy2": "./publish-flozy2.sh",
-    "publish:permission": "chmod +x publish-flozy.sh && chmod +x publish-flozy2.sh"
+    "publish:local": "rm -rf /Users/agmac30/Documents/CODE_BASE/flozy/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agmac30/Documents/CODE_BASE/flozy/client/node_modules/@flozy/editor/dist --copy-files"
   },
   "eslintConfig": {
     "extends": [