@flozy/editor 9.3.6 → 9.3.7

package/dist/Editor/utils/helper.js

@@ -261,15 +261,7 @@ export const customInsertNode = (editor, insertNode, defaultInsertOptions = {})
   if (isListItem) {
     insertOptions.at = editor.selection.focus;
   }
-  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);
-  }
+  Transforms.insertNodes(editor, insertNode, insertOptions);
   insertNewLine(editor);
 };
 export const decodeAndParseBase64 = encodedString => {
@@ -480,34 +472,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
 }) => {
@@ -624,38 +588,20 @@ export const getNextNode = editor => {
     return;
   }
 };
-export const getPreviousEntry = editor => {
+export const getPreviousNode = editor => {
   try {
-    const prevEntry = Editor.previous(editor, {
-      at: editor.selection,
-      match: n => Element.isElement(n)
-    });
-    if (!prevEntry) return null;
-    const [previousNode, previousPath] = prevEntry;
+    const parentPath = Path.parent(editor?.selection?.anchor?.path);
+    const previousPath = Path.previous(parentPath);
+    const previousNode = Node.get(editor, previousPath);
     return {
       previousNode,
       previousPath
     };
-  } 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) {
+  } catch (err) {
     return;
   }
 };
-const isRestricted = node => node?.type === "page-settings" || node?.type === "site-settings" || node?.type === "viewData" || node?.children?.some(child => child.type === "dataView");
+const isRestricted = node => node?.type === "page-settings" || node?.type === "site-settings" || node?.children?.some(child => child.type === "dataView");
 export const isRestrictedNode = (event, editor) => {
   let isNodeRestricted = false;
   try {
@@ -669,50 +615,15 @@ export const isRestrictedNode = (event, editor) => {
       const {
         previousNode,
         previousPath
-      } = 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)) {
+      } = getPreviousNode(editor) || {};
+      if (isRestricted(previousNode)) {
         event.preventDefault(); // stops deleting backward
 
         // move the cursor to node which is before page-settings node
-        const pathBeforePageSettings = Path.previous([previousPath[0]]);
+        const pathBeforePageSettings = Path.previous(previousPath);
         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;
@@ -722,10 +633,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
@@ -744,13 +651,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) {
@@ -781,17 +681,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 = {
@@ -805,6 +708,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);
@@ -854,6 +762,9 @@ 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
@@ -865,22 +776,4 @@ 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,9 +1,6 @@
-import { Path, Transforms } from "slate";
+import { 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",
@@ -18,7 +15,7 @@ export const insertSignature = editor => {
     }]
   };
   Transforms.insertNodes(editor, signature, {
-    at: insertPath
+    at: editor.selection.anchor.path
   });
   insertNewLine(editor);
 };

package/dist/Editor/utils/table.js

@@ -174,14 +174,6 @@ 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 = () => {
@@ -450,53 +442,51 @@ export class TableUtil {
           at: currentTablePath
         });
         Transforms.setNodes(this.editor, {
-          ...rowProps
+          ...rowProps,
+          tableBorder: tableProps?.borderColor
         }, {
           at: currentRowPath
         });
         Transforms.setNodes(this.editor, {
-          ...cellProps
+          ...cellProps,
+          rowBorder: rowProps?.borderColor,
+          tableBorder: tableProps?.borderColor
         }, {
           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);
@@ -510,25 +500,19 @@ export class TableUtil {
       at: path
     });
   };
-  getTableProps = otherOptions => {
+  getTableProps = () => {
     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",
-        ...options
+        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table"
       });
       const [tableCellNode] = Editor.nodes(this.editor, {
-        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-cell",
-        ...options
+        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-cell"
       });
       const [tableRowNode] = Editor.nodes(this.editor, {
-        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-row",
-        ...options
+        match: n => !Editor.isEditor(n) && Element.isElement(n) && n.type === "table-row"
       });
       if (tableNode && tableCellNode && tableRowNode) {
         const [currentTable, currentTablePath] = tableNode;

package/package.json

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