@flozy/editor 10.6.5 → 10.6.6

package/dist/Editor/utils/accordion.js

@@ -1,48 +1,169 @@
-import { Transforms } from "slate";
+import { Editor, Element, Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
-import { getSelectedText } from "./helper";
-export const insertAccordion = (editor, path) => {
-  try {
-    const selectedText = getSelectedText(editor);
-    const accordion = {
-      type: "accordion",
+import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType } from "./helper";
+import { isMobileWindow } from "../helper";
+import { removeAccordion } from "./events";
+import { ReactEditor } from "slate-react";
+const focusAccordion = (editor, upPath) => {
+  Transforms.select(editor, {
+    path: upPath,
+    offset: 0
+  });
+};
+const getAccordionNode = summaryNode => {
+  return {
+    type: "accordion",
+    children: [{
+      type: "accordion-summary",
+      children: summaryNode
+    }, {
+      type: "accordion-details",
       children: [{
-        type: "accordion-summary",
+        type: "paragraph",
         children: [{
-          type: "paragraph",
-          children: [{
-            text: selectedText || ""
-          }]
+          text: ""
         }]
-      }, {
-        type: "accordion-details",
+      }]
+    }]
+  };
+};
+export const insertAccordion = (editor, path) => {
+  try {
+    const {
+      selection
+    } = editor;
+    let accordionPath;
+    if (path) {
+      const summaryNode = {
+        type: "paragraph",
         children: [{
-          type: "paragraph",
-          children: [{
-            text: ""
-          }]
+          text: ""
         }]
-      }]
-    };
-    const props = path ? {
-      at: path,
-      select: true
-    } : {
-      select: true
-    };
-    Transforms.insertNodes(editor, accordion, props);
-    const curPath = [...editor?.selection?.anchor?.path];
-    const upPath = [...curPath];
-    // 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
-    });
+      };
+      const accordion = getAccordionNode([summaryNode]);
+      Transforms.insertNodes(editor, accordion, {
+        at: path
+      });
+      accordionPath = path;
+    } else if (selection) {
+      const selectedNodes = Array.from(Editor.nodes(editor, {
+        at: selection,
+        match: n => Element.isElement(n),
+        mode: "lowest" // use 'lowest' to get individual blocks
+      }));
+
+      for (const [node, path] of selectedNodes) {
+        let currNode = node;
+        const isListItem = node.type === "list-item";
+        if (isListItem) {
+          currNode = {
+            type: "paragraph",
+            children: node.children
+          };
+        }
+        let accordion = getAccordionNode([currNode]);
+        if (isListItem) {
+          accordion = {
+            type: "list-item",
+            children: [accordion]
+          };
+        }
+        Transforms.removeNodes(editor, {
+          at: path
+        });
+        Transforms.insertNodes(editor, accordion, {
+          at: path
+        });
+      }
+      const lastNode = selectedNodes[selectedNodes.length - 1];
+      const lastNodePath = lastNode[1];
+      accordionPath = lastNodePath;
+    }
+    const focusPath = [...accordionPath, 0, 0, 0];
+    if (isMobileWindow()) {
+      // timeout to resolve focus issue in mobile
+      setTimeout(() => focusAccordion(editor, focusPath), 0);
+    } else {
+      focusAccordion(editor, focusPath);
+    }
     insertNewLine(editor);
   } catch (err) {
     console.log(err);
   }
+};
+export const onDeleteBackwardAccordion = editor => {
+  try {
+    let preventDefault = false;
+    const {
+      selection
+    } = editor;
+    const {
+      path: currentPath,
+      offset
+    } = selection.anchor || {};
+    const isCursorAtStart = offset === 0;
+    if (isCursorAtStart) {
+      // If the cursor is at the start of the accordion-summary and backspace is pressed,
+      // unwrap the accordion by removing both the summary and details,
+      // and insert their contents as regular nodes without the accordion wrapper.
+      const [accordionSummary] = getNodeWithType(editor, "accordion-summary");
+      const [accordionTitle, accordionTitlePath] = accordionSummary || [];
+      if (accordionTitle) {
+        const accordionPath = Path.parent(accordionTitlePath);
+        removeAccordion(editor, accordionPath);
+        preventDefault = true;
+        return;
+      }
+      const parentPath = Path.parent(currentPath);
+      const parentNode = getNode(editor, parentPath);
+      const isTextNode = ALLOWED_TEXT_NODES.includes(parentNode?.type);
+      if (isTextNode) {
+        const prevEntry = Editor.previous(editor, {
+          at: parentPath,
+          match: n => n.type === "accordion"
+        });
+        if (prevEntry) {
+          const [accordionNode, accordionPath] = prevEntry;
+          const dom = ReactEditor.toDOMNode(editor, accordionNode);
+          const aContent = dom.querySelector(".accordion-content");
+          const isContentVisible = aContent.style.display !== "none";
+          if (!isContentVisible) {
+            // If the accordion content is not visible and backspace is pressed,
+            // the content from the current node should be merged with the accordion title,
+            // and the cursor should move to the title.
+            // Otherwise, Slate will by default merge the current node into the hidden details section,
+            // which makes the content invisible.
+
+            let targetPath = [...accordionPath, 0, 0];
+            const targetNodeEntry = getNode(editor, targetPath);
+            if (targetNodeEntry) {
+              const nodeText = getNodeText(parentNode);
+              const endPath = Editor.end(editor, targetPath);
+
+              // Move current paragraph text into the end of the target block
+              Transforms.select(editor, Editor.start(editor, parentPath));
+              Transforms.delete(editor, {
+                at: parentPath
+              });
+              Transforms.insertText(editor, nodeText, {
+                at: endPath
+              });
+
+              // move the focus and cursor to the inserted node
+              Transforms.select(editor, {
+                anchor: endPath,
+                focus: endPath
+              });
+              ReactEditor.focus(editor);
+              preventDefault = true;
+              return;
+            }
+          }
+        }
+      }
+    }
+    return preventDefault;
+  } 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,8 +1,8 @@
-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 { getNode, isListItem } from "./helper";
 import RnDCtrlCmds from "./RnD/RnDCtrlCmds";
 import EDITORCMDS from "../common/EditorCmds";
 const HOTKEYS = {
@@ -183,6 +183,20 @@ const checkListEnterEvent = (editor, type) => {
     insertNewLine(editor);
   }
 };
+export const removeAccordion = (editor, accordionPath) => {
+  const accordion = getNode(editor, accordionPath);
+  Transforms.removeNodes(editor, {
+    at: accordionPath
+  });
+  const insertNodes = [];
+  accordion.children.forEach(a => {
+    a.children.forEach(n => insertNodes.push(n));
+  });
+  Transforms.insertNodes(editor, insertNodes, {
+    at: accordionPath,
+    select: true
+  });
+};
 export const enterEvent = (e, editor, isMobile) => {
   try {
     const ele = isListItem(editor);
@@ -225,9 +239,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);
@@ -348,7 +360,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/formfield.js

@@ -7,6 +7,7 @@ export const formField = data => {
     name: `field_${new Date().getTime()}`,
     key: `field_${new Date().getTime()}`,
     label: `field_${new Date().getTime()}`,
+    uid: `field_${new Date().getTime()}`,
     placeholder: "Placeholder...",
     children: [{
       text: ""