@flozy/editor 10.6.5 → 10.6.6

package/dist/Editor/utils/helper.js

@@ -2,6 +2,8 @@ import { Editor, Node, Transforms, Element, Path, Range, Text } from "slate";
 import { ReactEditor } from "slate-react";
 import insertNewLine from "./insertNewLine";
 import { getDevice } from "../helper/theme";
+import { activeMark, getSelectedElementStyle } from "./SlateUtilityFunctions";
+import { getCurrentElementText } from "../plugins/withHTML";
 export const windowVar = {};
 let ST_TIMEOUT = null;
 const BLOCKS = ["grid", "dataView"];
@@ -216,9 +218,13 @@ export const handleInsertLastElement = (event, editor) => {
 };
 export const isListItem = editor => {
   const format = ["list-item", "check-list-item", "accordion-summary", "headingOne", "headingTwo", "headingThree"];
-  const [node] = Editor.nodes(editor, {
+  const [node1, node2] = Editor.nodes(editor, {
     match: n => !Editor.isEditor(n) && Element.isElement(n) && format.indexOf(n.type) > -1
   });
+  let node = node1;
+  if (node2 && node2[0] && node2[0].type === "accordion-summary") {
+    node = node2;
+  }
   return node;
 };
 export const getNode = (editor, path) => {
@@ -333,7 +339,8 @@ const handleLinkBtnClick = (e, props, isMobilePreview, metadata) => {
     }
   }
 };
-export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick = () => {}, metadata = {}) => {
+export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick = () => {}, metadata = {}, isEditMode, isCustomMobile // for drawer in App Header
+) => {
   const props = {};
   if (!readOnly) {
     return {
@@ -365,6 +372,9 @@ export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick =
     case "page":
       const [page = "", section] = url?.split("#") || [];
       const sec = section ? `#${section}` : "";
+      if (isEditMode) {
+        break;
+      }
       if (page === "_currentPage") {
         props.component = "button";
         props.onClick = () => {
@@ -385,11 +395,12 @@ export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick =
         const currentUserPage = getCurrentUserPage();
         props.href = isCurrentPage(page) ? `./${currentUserPage}${sec}` : `./${url}`;
         if (openInNewTab) {
-          if (isCurrentPage(page)) {
-            // temp fix, if user is presented in current page, open in new tab option is restricted, we will scroll to the element in current page
-          } else {
-            props.target = "_blank";
-          }
+          // if (isCurrentPage(page)) {
+          //   // temp fix, if user is presented in current page, open in new tab option is restricted, we will scroll to the element in current page
+          // } else {
+          //   props.target = "_blank";
+          // }
+          props.target = "_blank";
         }
       }
       break;
@@ -424,7 +435,7 @@ export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick =
 
   // for iphone fix
   if (props.component === "a" && props.href) {
-    const isMobile = getDevice(window.innerWidth) === "xs";
+    const isMobile = isCustomMobile || getDevice(window.innerWidth) === "xs";
     if (isMobile) {
       props.component = "button"; // iphone is opening two tabs, on open in new tab because of a tag.
     }
@@ -485,6 +496,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
 }) => {
@@ -702,6 +741,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
@@ -720,6 +763,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) {
@@ -750,20 +800,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 = {
@@ -777,11 +824,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);
@@ -822,7 +864,8 @@ export const clearWindowSelection = () => {
 
 export const viewSlateSelection = () => {
   // if ai is opened, remove the window selection class and open then slate selection, To resolve: focussing on the ai input removes window selection automatically
-  clearWindowSelection();
+  // clearWindowSelection();
+
   const selectionBg = "rgba(35, 131, 226, 0.35)";
   const root = document.documentElement;
   root.style.setProperty("--slate-highlight-bg", selectionBg);
@@ -831,9 +874,24 @@ 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 insertSlashNode = (editor, insertNode) => {
+  try {
+    // Delete the currently selected text
+    editor.deleteFragment();
+    const currentText = getCurrentElementText(editor);
+    const currentPath = editor?.selection?.anchor?.path;
+    let insertAt = currentPath;
+    if (currentText?.trim()) {
+      const parentPath = Path.parent(currentPath);
+      insertAt = Path.next(parentPath);
+    }
+    Transforms.insertNodes(editor, insertNode, {
+      at: insertAt
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
 export const isEverythingSelected = editor => {
   const {
     selection
@@ -864,6 +922,61 @@ export const getCurrentNodeText = editor => {
     console.log("Error:", error);
   }
 };
+function convertColorToRgb(color) {
+  if (color?.startsWith("#")) {
+    // HEX to RGB
+    let hex = color.replace("#", "");
+    let r, g, b;
+    if (hex.length === 3) {
+      hex = hex.split("").map(x => x + x).join("");
+    }
+    if (hex.length === 6) {
+      [r, g, b] = [hex.substring(0, 2), hex.substring(2, 4), hex.substring(4, 6)].map(val => parseInt(val, 16));
+      return `rgb(${r}, ${g}, ${b})`;
+    }
+  } else {
+    return color;
+  }
+}
+export const getSelectedColor = (selectedColor, theme, hideThemeColors) => {
+  const colorVars = hideThemeColors ? null : theme?.vars?.colors;
+  let selectedValue = selectedColor;
+  if (colorVars) {
+    const convertedColor = convertColorToRgb(selectedColor);
+    Object.entries(theme.colors).forEach(([key, value]) => {
+      const convertedThemeColor = convertColorToRgb(value);
+      if (convertedThemeColor === convertedColor) {
+        selectedValue = colorVars[key];
+      }
+    });
+  }
+  return selectedValue;
+};
+const themeTextFormats = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree"];
+export const getSelectedElementColor = (editor, format, theme) => {
+  const [isThemeText] = Editor.nodes(editor, {
+    at: editor.selection,
+    match: n => themeTextFormats.includes(n?.type)
+  });
+  if (!isThemeText) {
+    return activeMark(editor, "color") || "#000000";
+  }
+  const color = getSelectedElementStyle(format, editor, format);
+  return getSelectedColor(color, theme);
+};
+export const isHavingColor = color => {
+  if (!color) {
+    return false;
+  }
+  if (color.includes("rgba")) {
+    const match = color.match(/rgba?\((\d+),\s*(\d+),\s*(\d+),?\s*(\d*\.?\d+)?\)/);
+    if (!match) return false; // Invalid format
+
+    const alpha = match[4] !== undefined ? parseFloat(match[4]) : 1; // Default alpha = 1
+    return alpha !== 0;
+  }
+  return true;
+};
 const handleCopiedList = (el, domRange) => {
   // Ensure you're working with an Element, not a Text node
   const startEl = domRange.startContainer.nodeType === Node.ELEMENT_NODE ? domRange.startContainer : domRange.startContainer.parentElement;
@@ -883,11 +996,15 @@ const handleCopiedList = (el, domRange) => {
     el.insertAdjacentText("afterbegin", "- ");
   }
 };
+const cleanCopiedDOM = container => {
+  container.querySelectorAll('[style*="display: none"], [contenteditable="false"]').forEach(el => el.remove());
+  return container;
+};
 const getCopiedTextFormat = domRange => {
   const contents = domRange.cloneContents();
   const div = document.createElement("div");
   div.appendChild(contents);
-
+  cleanCopiedDOM(div);
   // Replace <br> with newlines
   div.querySelectorAll("br").forEach(br => br.replaceWith("\n"));
   const BLOCK_TAGS = ["DIV", "P", "LI", "H1", "H2", "H3", "H4", "H5", "H6"];
@@ -915,6 +1032,7 @@ const getCopiedHTMLFormat = domRange => {
   const htmlContents = domRange.cloneContents();
   const container = document.createElement("div");
   container.appendChild(htmlContents);
+  cleanCopiedDOM(container);
   const html = container.innerHTML;
   return html;
 };
@@ -939,4 +1057,5 @@ export const handleCopy = (event, editor) => {
   event.clipboardData?.setData("text/html", html);
   event.clipboardData?.setData("text/plain", text);
   event.clipboardData?.setData("application/x-slate-fragment", encodedFragment);
-};
+};
+export const ALLOWED_TEXT_NODES = ["paragraph", "title", "headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "blockquote"];

package/dist/Editor/utils/insertAppHeader.js

@@ -8,27 +8,31 @@ export const appHeaderNode = ({
     appLogo: "none",
     menus: menus || [{
       type: "menu",
-      url: "home",
+      url: "",
+      placeholder: "home",
       target: "",
       text: "Home",
       linkType: "page"
     }, {
       type: "menu",
-      url: "wireframe2",
+      url: "",
+      placeholder: "wireframe2",
       target: "",
       text: "Wireframe",
       linkType: "page"
     }, {
       type: "menu",
-      url: "https://www.google.com",
+      url: "",
       target: "",
+      placeholder: "Work",
       text: "Work",
       linkType: "webAddress"
     }, {
       type: "menu",
-      url: "https://www.google.com",
+      url: "",
       target: "",
       text: "Contact",
+      placeholder: "Contact",
       linkType: "webAddress"
     }],
     menuStyle: "stacked",
@@ -51,7 +55,7 @@ export const createAppHeaderNode = ({
   children: [{
     type: "grid-item",
     grid: 12,
-    children: [...appHeaderNode({
+    children: [appHeaderNode({
       menus
     })],
     bgColor: "rgba(255, 255, 255, 0)",

package/dist/Editor/utils/signature.js

@@ -1,9 +1,5 @@
-import { Path, Transforms } from "slate";
-import insertNewLine from "./insertNewLine";
-import { getCurrentElementText } from "../plugins/withHTML";
+import { insertSlashNode } from "./helper";
 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",
@@ -17,8 +13,5 @@ export const insertSignature = editor => {
       text: " "
     }]
   };
-  Transforms.insertNodes(editor, signature, {
-    at: insertPath
-  });
-  insertNewLine(editor);
+  insertSlashNode(editor, signature);
 };

package/dist/Editor/utils/updateFormName.js

@@ -0,0 +1,22 @@
+const updateFormName = node => {
+  try {
+    if (!node || typeof node !== "object") return node;
+    let updatedNode = {
+      ...node
+    };
+    if (updatedNode.type === "form") {
+      const timeStamp = Date.now();
+      const newFormName = `form_${timeStamp}`;
+      updatedNode.formName = newFormName;
+      updatedNode.uid = newFormName;
+    }
+    if (Array.isArray(updatedNode.children)) {
+      updatedNode.children = updatedNode.children.map(child => updateFormName(child));
+    }
+    return updatedNode;
+  } catch (err) {
+    console.warn("Error inside updateFormName", err);
+    return node;
+  }
+};
+export default updateFormName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "10.6.5",
+  "version": "10.6.6",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"
@@ -38,7 +38,6 @@
     "react-icons": "^4.10.1",
     "react-katex": "^3.0.1",
     "react-rnd": "^10.4.11",
-    "react-scripts": "5.0.1",
     "react-signature-canvas": "^1.0.6",
     "react-slick": "^0.29.0",
     "sanitize-html": "^2.13.0",
@@ -69,7 +68,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:local": "rm -rf /Users/agenciflow08/Documents/flozyapp/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agenciflow08/Documents/flozyapp/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"
@@ -122,7 +121,8 @@
     "prop-types": "^15.8.1",
     "source-map-explorer": "^2.5.3",
     "storybook": "^7.4.0",
-    "webpack": "^5.88.2"
+    "webpack": "^5.88.2",
+    "react-scripts": "5.0.1"
   },
   "overrides": {
     "react-refresh": "0.11.0"