@flozy/editor 9.3.7 → 9.3.8

package/dist/Editor/utils/divider.js

@@ -1,12 +1,28 @@
-import { Transforms } from "slate";
+import { Editor, Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
+import { getCurrentEntry, getCurrentNodeText } from "./helper";
 export const insertDivider = editor => {
+  Transforms.delete(editor, editor.selection);
+  const blockText = getCurrentNodeText(editor);
+  const {
+    currentPath
+  } = getCurrentEntry(editor) || {};
   const divider = {
     type: "divider",
     children: [{
       text: ""
     }]
   };
-  Transforms.insertNodes(editor, divider);
+  if (!blockText) {
+    Transforms.removeNodes(editor, {
+      at: editor?.selection
+    });
+  }
+  const insertPath = blockText ? Path.next(currentPath) : currentPath;
+  Transforms.insertNodes(editor, divider, {
+    at: insertPath
+  });
   insertNewLine(editor);
+  const newLinePath = Path.next(insertPath);
+  Transforms.select(editor, Editor.start(editor, newLinePath));
 };

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

package/dist/Editor/utils/freegrid.js

@@ -22,8 +22,8 @@ export const insertFreeGridItem = (childType, childTypeNode, extProps = {}, type
     top_xs: 24,
     marginTop_xs: 12,
     width_xs: 250,
-    height_xs: 300,
-    gridArea_xs: "1 / 1 / 2 / 2",
+    // height_xs: 300,
+    // gridArea_xs: "1 / 1 / 2 / 2",
     sectionBgColor: "rgb(240, 108, 131)",
     ...(extProps || {})
   };

package/dist/Editor/utils/helper.js

@@ -261,7 +261,15 @@ export const customInsertNode = (editor, insertNode, defaultInsertOptions = {})
   if (isListItem) {
     insertOptions.at = editor.selection.focus;
   }
-  Transforms.insertNodes(editor, insertNode, insertOptions);
+  const hasText = getCurrentNodeText(editor);
+  if (hasText) {
+    Transforms.insertNodes(editor, insertNode, {
+      at: Path.next(Path.parent(editor?.selection.focus.path)),
+      select: true
+    });
+  } else {
+    Transforms.insertNodes(editor, insertNode, insertOptions);
+  }
   insertNewLine(editor);
 };
 export const decodeAndParseBase64 = encodedString => {
@@ -472,6 +480,34 @@ 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
 }) => {
@@ -588,20 +624,38 @@ export const getNextNode = editor => {
     return;
   }
 };
-export const getPreviousNode = editor => {
+export const getPreviousEntry = editor => {
   try {
-    const parentPath = Path.parent(editor?.selection?.anchor?.path);
-    const previousPath = Path.previous(parentPath);
-    const previousNode = Node.get(editor, previousPath);
+    const prevEntry = Editor.previous(editor, {
+      at: editor.selection,
+      match: n => Element.isElement(n)
+    });
+    if (!prevEntry) return null;
+    const [previousNode, previousPath] = prevEntry;
     return {
       previousNode,
       previousPath
     };
-  } catch (err) {
+  } catch (error) {
+    return;
+  }
+};
+export const getCurrentEntry = editor => {
+  try {
+    const currentEntry = Editor.node(editor, editor.selection, {
+      depth: 1
+    });
+    if (!currentEntry) return null;
+    const [currentNode, currentPath] = currentEntry;
+    return {
+      currentNode,
+      currentPath
+    };
+  } catch (error) {
     return;
   }
 };
-const isRestricted = node => node?.type === "page-settings" || node?.type === "site-settings" || node?.children?.some(child => child.type === "dataView");
+const isRestricted = node => node?.type === "page-settings" || node?.type === "site-settings" || node?.type === "viewData" || node?.children?.some(child => child.type === "dataView");
 export const isRestrictedNode = (event, editor) => {
   let isNodeRestricted = false;
   try {
@@ -615,15 +669,50 @@ export const isRestrictedNode = (event, editor) => {
       const {
         previousNode,
         previousPath
-      } = getPreviousNode(editor) || {};
-      if (isRestricted(previousNode)) {
+      } = getPreviousEntry(editor) || {};
+      const {
+        currentNode
+      } = getCurrentEntry(editor) || {};
+      if (currentNode?.type === "orderedList" || currentNode?.type === "unorderedList") {
+        event.preventDefault();
+        const path = selection?.anchor?.path;
+        if (!path) return;
+
+        // Lift the selected list-item out of the list
+        Transforms.liftNodes(editor, {
+          match: n => n.type === "list-item"
+        });
+
+        // Convert the lifted list-item into a paragraph
+        Transforms.setNodes(editor, {
+          type: "paragraph"
+        }, {
+          match: n => n.type === "list-item"
+        });
+
+        // Move focus to the modified paragraph (same path)
+        Transforms.select(editor, path);
+      } else if (isRestricted(previousNode)) {
         event.preventDefault(); // stops deleting backward
 
         // move the cursor to node which is before page-settings node
-        const pathBeforePageSettings = Path.previous(previousPath);
+        const pathBeforePageSettings = Path.previous([previousPath[0]]);
         const endPath = Editor.end(editor, pathBeforePageSettings);
         Transforms.select(editor, endPath);
         isNodeRestricted = true;
+      } else if (previousNode?.type === "divider") {
+        event.preventDefault();
+        Transforms.removeNodes(editor, {
+          at: previousPath
+        });
+        Transforms.insertNodes(editor, {
+          type: "paragraph",
+          children: [{
+            text: " "
+          }]
+        }, {
+          at: previousPath
+        });
       }
     }
     return isNodeRestricted;
@@ -633,6 +722,10 @@ 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
@@ -651,6 +744,13 @@ 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) {
@@ -681,20 +781,17 @@ 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 = {
@@ -708,11 +805,6 @@ 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);
@@ -762,9 +854,6 @@ export const hideSlateSelection = () => {
   const root = document.documentElement;
   root.style.setProperty("--slate-highlight-bg", "none");
 };
-export function handleNegativeInteger(val) {
-  return val < 0 ? 0 : val;
-}
 export const isEverythingSelected = editor => {
   const {
     selection
@@ -776,4 +865,22 @@ export const isEverythingSelected = editor => {
       return false;
     }
   }
+};
+export const getCurrentNodeText = editor => {
+  try {
+    const {
+      selection
+    } = editor;
+    if (selection) {
+      const [block] = Editor.node(editor, selection, {
+        match: n => Editor.isBlock(editor, n)
+      });
+      const blockText = block?.text;
+      return blockText;
+    } else {
+      return;
+    }
+  } catch (error) {
+    console.log("Error:", error);
+  }
 };

package/dist/Editor/utils/signature.js

@@ -1,6 +1,9 @@
-import { Transforms } from "slate";
+import { Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
+import { getCurrentElementText } from "../plugins/withHTML";
 export const insertSignature = editor => {
+  const hasText = getCurrentElementText(editor);
+  const insertPath = hasText ? Path.next(Path.parent(editor?.selection.focus.path)) : editor.selection.anchor.path;
   const signature = {
     type: "signature",
     alignment: "center",
@@ -15,7 +18,7 @@ export const insertSignature = editor => {
     }]
   };
   Transforms.insertNodes(editor, signature, {
-    at: editor.selection.anchor.path
+    at: insertPath
   });
   insertNewLine(editor);
 };

package/dist/Editor/utils/table.js

@@ -174,6 +174,14 @@ export class TableUtil {
       Transforms.removeNodes(this.editor, {
         match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table"
       });
+      if (this.editor.children.length === 0) {
+        Transforms.insertNodes(this.editor, {
+          type: "paragraph",
+          children: [{
+            text: ""
+          }]
+        });
+      }
     }
   };
   duplicateTable = () => {
@@ -442,51 +450,53 @@ export class TableUtil {
           at: currentTablePath
         });
         Transforms.setNodes(this.editor, {
-          ...rowProps,
-          tableBorder: tableProps?.borderColor
+          ...rowProps
         }, {
           at: currentRowPath
         });
         Transforms.setNodes(this.editor, {
-          ...cellProps,
-          rowBorder: rowProps?.borderColor,
-          tableBorder: tableProps?.borderColor
+          ...cellProps
         }, {
           at: currentCellPath
         });
         applyColumnStyle(this.editor, currentCellPath, currentTablePath, cellProps, tableProps?.rows);
 
         // cell bg entire
-        if (cellProps?.entireBgColor || tableProps?.borderColor || rowProps?.borderColor) {
-          const {
-            rows
-          } = tableProps;
-          for (let r = 0; r < rows; r++) {
-            Transforms.setNodes(this.editor, {
-              entireBgColor: cellProps?.entireBgColor
-            }, {
-              at: [currentCellPath[0], r, currentCellPath[2]]
-            });
-          }
-        }
+        // if (
+        //   cellProps?.entireBgColor ||
+        //   tableProps?.borderColor ||
+        //   rowProps?.borderColor
+        // ) {
+        //   const { rows } = tableProps;
+
+        //   for (let r = 0; r < rows; r++) {
+        //     Transforms.setNodes(
+        //       this.editor,
+        //       {
+        //         entireBgColor: cellProps?.entireBgColor,
+        //       },
+        //       { at: [currentCellPath[0], r, currentCellPath[2]] }
+        //     );
+        //   }
+        // }
 
         // cell border all
-        if (tableProps?.borderColor || rowProps?.borderColor) {
-          const {
-            rows,
-            columns
-          } = tableProps;
-          for (let r = 0; r < rows; r++) {
-            for (let c = 0; c < columns; c++) {
-              Transforms.setNodes(this.editor, {
-                entireBorderColor: tableProps?.borderColor,
-                rowBorder: rowProps?.borderColor
-              }, {
-                at: [currentCellPath[0], r, c]
-              });
-            }
-          }
-        }
+        // if (tableProps?.borderColor || rowProps?.borderColor) {
+        //   const { rows, columns } = tableProps;
+
+        //   for (let r = 0; r < rows; r++) {
+        //     for (let c = 0; c < columns; c++) {
+        //       Transforms.setNodes(
+        //         this.editor,
+        //         {
+        //           entireBorderColor: tableProps?.borderColor,
+        //           rowBorder: rowProps?.borderColor,
+        //         },
+        //         { at: [currentCellPath[0], r, c] }
+        //       );
+        //     }
+        //   }
+        // }
       }
     } catch (err) {
       console.log(err);
@@ -500,19 +510,25 @@ export class TableUtil {
       at: path
     });
   };
-  getTableProps = () => {
+  getTableProps = otherOptions => {
     const {
       selection
     } = this.editor;
+    const options = {
+      ...(otherOptions || {})
+    };
     if (!!selection && Range.isCollapsed(selection)) {
       const [tableNode] = Editor.nodes(this.editor, {
-        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table"
+        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table",
+        ...options
       });
       const [tableCellNode] = Editor.nodes(this.editor, {
-        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-cell"
+        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-cell",
+        ...options
       });
       const [tableRowNode] = Editor.nodes(this.editor, {
-        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-row"
+        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-row",
+        ...options
       });
       if (tableNode && tableCellNode && tableRowNode) {
         const [currentTable, currentTablePath] = tableNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "9.3.7",
+  "version": "9.3.8",
   "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",