@flozy/editor 10.1.4 → 10.1.5

package/dist/Editor/utils/accordion.js

@@ -1,6 +1,13 @@
 import { Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
 import { getSelectedText } from "./helper";
+import { isMobileWindow } from "../helper";
+const focusAccordion = (editor, upPath) => {
+  Transforms.select(editor, {
+    path: upPath,
+    offset: 0
+  });
+};
 export const insertAccordion = (editor, path) => {
   try {
     const selectedText = getSelectedText(editor);
@@ -36,11 +43,14 @@ export const insertAccordion = (editor, path) => {
     // get title index
     const summaryIndex = upPath.length - 3;
     upPath[summaryIndex] = upPath[summaryIndex] === 0 ? 0 : upPath[summaryIndex] - 1;
+
     // select accordion title by default
-    Transforms.select(editor, {
-      path: upPath,
-      offset: 0
-    });
+    if (isMobileWindow()) {
+      // timeout to resolve focus issue in mobile
+      setTimeout(() => focusAccordion(editor, upPath), 0);
+    } else {
+      focusAccordion(editor, upPath);
+    }
     insertNewLine(editor);
   } catch (err) {
     console.log(err);

package/dist/Editor/utils/button.js

@@ -1,6 +1,5 @@
 import { Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
-import { windowVar } from "./helper";
 import { getCurrentElementText } from "../plugins/withHTML";
 export const insertButton = editor => {
   const button = {
@@ -11,22 +10,7 @@ export const insertButton = editor => {
     buttonLink: {
       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 || {})
+    iconPosition: "start"
   };
   const hasText = getCurrentElementText(editor);
   const insertPath = hasText ? Path.next(Path.parent(editor?.selection.focus.path)) : editor?.selection.focus.path;

package/dist/Editor/utils/customHooks/useTableResize.js

@@ -1,9 +1,10 @@
-import { useState } from "react";
+import { useRef, useState } from "react";
 const useTableResize = ({
   parentDOM,
   size: defaultSize,
   onDone,
-  minMaxProps = {}
+  minMaxProps = {},
+  isMobile
 }) => {
   const {
     width
@@ -18,6 +19,10 @@ const useTableResize = ({
   });
   const [resizing, setResizing] = useState(false);
   const [isDone, setIsDone] = useState(0);
+  const lastTouch = useRef({
+    x: 0,
+    y: 0
+  });
   const onLoad = defaultSize => {
     setSize({
       widthInPercent: 100,
@@ -25,29 +30,64 @@ const useTableResize = ({
       ...defaultSize
     });
   };
+  const handleEventListeners = type => {
+    const listener = type === "add" ? document.addEventListener : document.removeEventListener;
+    const onMoveListener = isMobile ? "touchmove" : "pointermove";
+    const onEndListener = isMobile ? "touchend" : "pointerup";
+    listener(onMoveListener, onMouseMove);
+    listener(onEndListener, onMouseUp);
+  };
+  const updateLastTouch = ({
+    clientX,
+    clientY
+  }) => {
+    lastTouch.current.x = clientX;
+    lastTouch.current.y = clientY;
+  };
   const onMouseDown = e => {
-    e.preventDefault();
-    document.addEventListener("pointermove", onMouseMove);
-    document.addEventListener("pointerup", onMouseUp);
+    if (isMobile) {
+      updateLastTouch(e.touches[0]);
+    } else {
+      e.preventDefault();
+    }
+    handleEventListeners("add");
     setResizing(true);
     setIsDone(0);
   };
   const onMouseUp = () => {
-    document.removeEventListener("pointermove", onMouseMove);
-    document.removeEventListener("pointerup", onMouseUp);
+    handleEventListeners("remove");
     setResizing(false);
     setIsDone(1);
   };
   const onMouseMove = e => {
+    let {
+      movementX,
+      movementY
+    } = e || {};
+    if (e.type === "touchmove") {
+      // for mobile
+      const {
+        x,
+        y
+      } = lastTouch.current || {};
+      const touches = e.touches[0];
+      const {
+        clientX,
+        clientY
+      } = touches;
+      movementX = clientX - x;
+      movementY = clientY - y;
+      updateLastTouch(touches);
+    }
     const {
       minWidth
     } = minMaxProps || {};
     setSize(currentSize => {
       const width = currentSize?.width || parentDOM?.clientWidth;
-      const calcWidth = width + e.movementX;
+      const calcWidth = width + movementX;
       return {
         width: minWidth && calcWidth < minWidth ? minWidth : calcWidth,
-        height: currentSize.height + e.movementY,
+        height: currentSize.height + movementY,
         widthInPercent: calcWidth / width * 100
       };
     });

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/events.js

@@ -1,10 +1,11 @@
-import { Editor, Transforms, Element, Node, Path, Range } from "slate";
+import { Editor, Transforms, Element, Node, Path, Range, Point } from "slate";
 import { toggleBlock } from "./SlateUtilityFunctions";
 import insertNewLine from "./insertNewLine";
 import { insertAccordion } from "./accordion";
-import { isListItem } from "./helper";
+import { getNodeWithType, isListItem } from "./helper";
 import RnDCtrlCmds from "./RnD/RnDCtrlCmds";
 import EDITORCMDS from "../common/EditorCmds";
+import { ReactEditor } from "slate-react";
 const HOTKEYS = {
   b: "bold",
   i: "italic",
@@ -183,6 +184,20 @@ const checkListEnterEvent = (editor, type) => {
     insertNewLine(editor);
   }
 };
+const removeAccordion = (editor, accordionPath) => {
+  Transforms.removeNodes(editor, {
+    at: accordionPath
+  });
+  Transforms.insertNodes(editor, {
+    type: "paragraph",
+    children: [{
+      text: ""
+    }]
+  }, {
+    at: accordionPath,
+    select: true
+  });
+};
 export const enterEvent = (e, editor, isMobile) => {
   try {
     const ele = isListItem(editor);
@@ -225,9 +240,7 @@ export const enterEvent = (e, editor, isMobile) => {
           e.preventDefault();
           if (!text) {
             const accordionIndex = ele[1].slice(0, Math.max(ele[1].length - 1));
-            Transforms.removeNodes(editor, {
-              at: accordionIndex
-            });
+            removeAccordion(editor, accordionIndex);
           } else {
             const nextPath = Path.next(Path.parent(ele[1]));
             insertAccordion(editor, nextPath);
@@ -329,6 +342,37 @@ export const enterEvent = (e, editor, isMobile) => {
     console.log(err);
   }
 };
+export const handleAccordionOnBackspace = (e, editor) => {
+  try {
+    let isAccordion = false;
+    const [accordionDetails] = getNodeWithType(editor, "accordion-details");
+    const [accordionDetailsNode] = accordionDetails || [];
+    if (accordionDetailsNode) {
+      const dom = ReactEditor.toDOMNode(editor, accordionDetailsNode);
+      if (dom?.parentElement) {
+        dom.parentElement.style.display = "block";
+      }
+    }
+    const [accordionSummary] = getNodeWithType(editor, "accordion-summary");
+    const [accordionTitle, accordionTitlePath] = accordionSummary || [];
+    if (accordionTitle) {
+      // no selection
+      if (Range.isCollapsed(editor.selection)) {
+        const start = Editor.start(editor, accordionTitlePath);
+        const isCursorAtStart = Point.equals(editor.selection.focus, start);
+        if (isCursorAtStart) {
+          e.preventDefault();
+          const parentPath = Path.parent(accordionTitlePath);
+          removeAccordion(editor, parentPath);
+          isAccordion = true;
+        }
+      }
+    }
+    return isAccordion;
+  } catch (err) {
+    console.log(err);
+  }
+};
 export const upDownArrowKeyEvents = (e, editor) => {
   try {
     const {
@@ -348,7 +392,7 @@ export const upDownArrowKeyEvents = (e, editor) => {
     }
     Transforms.move(editor, {
       distance: 0,
-      unit: 'offset',
+      unit: "offset",
       reverse: false
     });
     Transforms.select(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: "'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/form.js

@@ -12,10 +12,10 @@ export const FORM_NODE = () => {
     },
     buttonProps: {
       bannerSpacing: {
-        left: 12,
-        right: 12,
-        top: 12,
-        bottom: 12
+        left: 24,
+        right: 24,
+        top: 4,
+        bottom: 4
       }
     },
     workflow: [],

package/dist/Editor/utils/formfield.js

@@ -22,8 +22,14 @@ export const formField = data => {
     },
     fontFamily: data?.fontFamily ? data?.fontFamily : "",
     textSize: data?.textSize ? data?.textSize : "",
-    textColor: data?.textColor ? data?.textColor : "",
-    fontWeight: data?.fontWeight ? data?.fontWeight : "500"
+    textColor: data?.textColor && `${data?.textColor} !important`,
+    fontWeight: data?.fontWeight ? data?.fontWeight : "500",
+    borderRadius: {
+      topLeft: 8,
+      topRight: 8,
+      bottomLeft: 8,
+      bottomRight: 8
+    }
   };
 };
 export const insertGridItem = editor => {

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"];
@@ -480,6 +482,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
 }) => {
@@ -697,6 +727,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
@@ -715,6 +749,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) {
@@ -745,20 +786,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 = {
@@ -772,11 +810,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);
@@ -826,9 +859,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
@@ -858,4 +906,46 @@ export const getCurrentNodeText = editor => {
   } catch (error) {
     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);
 };

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/package.json

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