@flozy/editor 10.4.0 → 10.4.1

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, groupByBreakpoint } from "../helper/theme";
+import { getBreakpointLineSpacing, getBreakPointsValue, getDevice, getElementProperty, textThemeFields } from "../helper/theme";
 import Variables from "../Elements/Variables/Variable";
-import insertNewLine from "./insertNewLine";
 import Divider from "../Elements/Divider/Divider";
 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";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const alignment = ["alignLeft", "alignRight", "alignCenter", "alignJustify"];
@@ -56,7 +56,17 @@ const LIST_FORMAT_TYPE = {
   orderedList: "list-item",
   unorderedList: "list-item"
 };
-const NEWLINESAFTER = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix"];
+
+// const NEWLINESAFTER = [
+//   "headingOne",
+//   "headingTwo",
+//   "headingThree",
+//   "headingFour",
+//   "headingFive",
+//   "headingSix",
+// ];
+
+const THEME_BLOCK_FIELDS = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree"];
 export const toggleBlock = (editor, format, selection = true, attr = {}) => {
   const isActive = isBlockActive(editor, format);
   const isList = list_types.includes(format);
@@ -89,8 +99,9 @@ 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 ? "paragraph" : isList ? LIST_FORMAT_TYPE[format] : format,
+    type: isActive ? forActiveType : isList ? LIST_FORMAT_TYPE[format] : format,
     ...attr
   });
   if (isList && !isActive) {
@@ -99,10 +110,12 @@ 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);
@@ -111,9 +124,14 @@ export const addMarkData = (editor, data) => {
   }
 };
 export const toggleMark = (editor, format) => {
-  const isActive = isMarkActive(editor, format);
+  const isActive = isMarkBtnActive(editor, format);
   if (isActive) {
-    Editor.removeMark(editor, format);
+    const isThemeSupportedMark = textThemeFields.some(f => f === format);
+    if (isThemeSupportedMark) {
+      Editor.addMark(editor, format, false);
+    } else {
+      Editor.removeMark(editor, format);
+    }
   } else {
     Editor.addMark(editor, format, true);
   }
@@ -127,6 +145,58 @@ 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, format) => {
+  try {
+    if (!editor.selection) {
+      return "";
+    }
+    if (Range.isCollapsed(editor.selection)) {
+      return "";
+    }
+    if (format) {
+      const value = activeMark(editor, format, true);
+      if (value) {
+        return value;
+      }
+    }
+    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
@@ -152,7 +222,7 @@ export const upateBlockActive = (editor, format, attr = {}) => {
     });
   }
 };
-export const activeMark = (editor, format) => {
+export const activeMark = (editor, format, noDefaultValue) => {
   const defaultMarkData = {
     color: "#000000",
     bgColor: "#FFFFFF",
@@ -162,7 +232,7 @@ export const activeMark = (editor, format) => {
   };
   try {
     const marks = Editor.marks(editor);
-    let defaultValue = defaultMarkData[format];
+    let defaultValue = noDefaultValue ? "" : defaultMarkData[format];
     const {
       selection
     } = editor || {};
@@ -179,8 +249,36 @@ export const activeMark = (editor, format) => {
     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" : "";
+  const lineH = leaf?.lineHeight;
+  const breakpoint = getDevice(window.innerWidth);
+  const lineHeight = getBreakpointLineSpacing(lineH, breakpoint);
   if (leaf.highlight) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -205,6 +303,7 @@ export const getMarked = (leaf, children, theme) => {
       children: children
     });
   }
+  children = getThemeMarkedLeaf(leaf, children);
   if (leaf.strikethrough) {
     children = /*#__PURE__*/_jsx("span", {
       style: {
@@ -229,9 +328,18 @@ export const getMarked = (leaf, children, theme) => {
     });
   }
   // cover under single span
-  if (leaf.color || leaf.bgColor || leaf.fontSize || leaf.fontFamily || leaf.fontWeight || className) {
+  if (leaf.color || leaf.bgColor || leaf.fontSize || leaf.fontFamily || leaf.fontWeight || lineHeight || 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
@@ -240,12 +348,13 @@ export const getMarked = (leaf, children, theme) => {
         className: `${className} leaf-item`,
         component: "span",
         sx: {
-          ...groupByBreakpoint({
-            fontSize: {
-              lg: sizeMap[leaf.fontSize] || leaf.fontSize,
-              ...getBreakPointsValue(leaf.fontSize, null, "overrideText")
-            }
-          }, theme),
+          "& span": {
+            // fontSize: fontSizesImportant,
+            // ...groupByBreakpoint(fontSizesImportant, theme),
+            background: leaf.bgColor,
+            ...fontSizeWithBreakpoints
+          },
+          ...fontSizeWithBreakpoints,
           // ...wrapThemeBreakpoints(
           //   {
           //     lg: sizeMap[leaf.fontSize] || leaf.fontSize,
@@ -297,12 +406,23 @@ export const getBlock = props => {
   const {
     translation
   } = customProps;
+  const commonHeadingProps = () => ({
+    ...attributes,
+    ...element.attr,
+    className: `edt-headings content-editable ${isEmpty ? "empty" : ""} theme-element`
+  });
+  const commonParaProps = paraType => ({
+    ...attributes,
+    ...element.attr,
+    className: `edt-paragraphs content-editable ${isEmpty ? "empty" : ""} theme-element ${paraType}`
+  });
+  const breakpoint = getDevice(window.innerWidth);
+  const lineH = element?.children[0]?.lineHeight;
+  const selectedLineHeight = getBreakpointLineSpacing(lineH, breakpoint);
   switch (element.type) {
     case "headingOne":
       return /*#__PURE__*/_jsxs("h1", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        ...commonHeadingProps(),
         placeholder: translation("Heading 1"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -310,9 +430,7 @@ export const getBlock = props => {
       });
     case "headingTwo":
       return /*#__PURE__*/_jsxs("h2", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        ...commonHeadingProps(),
         placeholder: translation("Heading 2"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -320,9 +438,7 @@ export const getBlock = props => {
       });
     case "headingThree":
       return /*#__PURE__*/_jsxs("h3", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        ...commonHeadingProps(),
         placeholder: translation("Heading 3"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -330,9 +446,7 @@ export const getBlock = props => {
       });
     case "headingFour":
       return /*#__PURE__*/_jsxs("h4", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        ...commonHeadingProps(),
         placeholder: translation("Heading 4"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -340,9 +454,7 @@ export const getBlock = props => {
       });
     case "headingFive":
       return /*#__PURE__*/_jsxs("h5", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        ...commonHeadingProps(),
         placeholder: translation("Heading 5"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
@@ -350,14 +462,30 @@ export const getBlock = props => {
       });
     case "headingSix":
       return /*#__PURE__*/_jsxs("h6", {
-        ...attributes,
-        ...element.attr,
-        className: `edt-headings content-editable ${isEmpty ? "empty" : ""}`,
+        ...commonHeadingProps(),
         placeholder: translation("Heading 6"),
         children: [children, /*#__PURE__*/_jsx("span", {
           contentEditable: false
         })]
       });
+    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,
@@ -371,7 +499,7 @@ export const getBlock = props => {
           margin: `${element?.bgColor ? "16px" : "0px"} 0px`,
           width: element?.bgColor ? "calc(100% - 16px)" : "100%",
           borderWidth: element?.color ? "0px 0px 0px 3px" : "0px",
-          lineHeight: 1.43
+          lineHeight: `${selectedLineHeight} !important`
         },
         children: children
       });
@@ -425,15 +553,13 @@ export const getBlock = props => {
         className: `content-editable ${isEmpty ? "empty" : ""}`,
         placeholder: translation("List"),
         style: {
-          color: firstChildren?.color
+          color: firstChildren?.color,
+          lineHeight: `${selectedLineHeight}`
         },
         children: children
       });
     case "orderedList":
       return /*#__PURE__*/_jsx("ol", {
-        style: {
-          lineHeight: 1.43
-        },
         className: "listItemMargin",
         type: "1",
         ...attributes,
@@ -441,9 +567,6 @@ export const getBlock = props => {
       });
     case "unorderedList":
       return /*#__PURE__*/_jsx("ul", {
-        style: {
-          lineHeight: 1.43
-        },
         className: "listItemMargin",
         ...attributes,
         children: children
@@ -451,6 +574,7 @@ export const getBlock = props => {
     case "check-list-item":
       return /*#__PURE__*/_jsx(CheckList, {
         ...props,
+        selectedLineHeight: selectedLineHeight,
         isEmpty: isEmpty
       });
     case "link":
@@ -670,8 +794,10 @@ export const getQueryStrings = urlString => {
       const newUrl = new URL(urlString);
       var youCode = newUrl.searchParams.get("v");
       if (!youCode) {
-        youCode = newUrl.pathname.replace("/", "");
+        const parts = newUrl.pathname.split("/");
+        youCode = parts[parts.length - 1]; // video ID
       }
+
       return `https://www.youtube.com/embed/${youCode}`;
     } else {
       return urlString;

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