@flozy/editor 11.0.9 → 11.1.0

package/dist/Editor/utils/accordion.js

@@ -1,5 +1,7 @@
 import { Editor, Element, Path, Transforms } from "slate";
+import insertNewLine from "./insertNewLine";
 import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType, getSelectedText } from "./helper";
+import { isMobileWindow } from "../helper";
 import { removeAccordion } from "./events";
 import { ReactEditor } from "slate-react";
 const focusAccordion = (editor, upPath) => {
@@ -7,74 +9,51 @@ const focusAccordion = (editor, upPath) => {
     path: upPath,
     offset: 0
   });
-  ReactEditor.focus(editor);
 };
-const getAccordionNode = summaryNode => {
-  return {
-    type: "accordion",
-    children: [{
-      type: "accordion-summary",
-      children: summaryNode
-    }, {
-      type: "accordion-details",
+export const insertAccordion = (editor, path) => {
+  try {
+    const selectedText = getSelectedText(editor);
+    const accordion = {
+      type: "accordion",
       children: [{
-        type: "paragraph",
+        type: "accordion-summary",
         children: [{
-          text: ""
+          type: "paragraph",
+          children: [{
+            text: selectedText || ""
+          }]
         }]
-      }]
-    }]
-  };
-};
-export const insertAccordion = (editor, path) => {
-  try {
-    const {
-      selection
-    } = editor;
-    let accordionPath;
-    if (path) {
-      const summaryNode = {
-        type: "paragraph",
+      }, {
+        type: "accordion-details",
         children: [{
-          text: ""
+          type: "paragraph",
+          children: [{
+            text: ""
+          }]
         }]
-      };
-      const accordion = getAccordionNode([summaryNode]);
-      Transforms.insertNodes(editor, accordion, {
-        at: path
-      });
-      accordionPath = path;
-    } else if (selection) {
-      const selectedNodes = Array.from(Editor.nodes(editor, {
-        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,
-        //   };
-        // }
+      }]
+    };
+    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;
 
-        let accordion = getAccordionNode([currNode]);
-        Transforms.removeNodes(editor, {
-          at: path
-        });
-        Transforms.insertNodes(editor, accordion, {
-          at: path
-        });
-        accordionPath = path;
-      }
-      const lastNode = selectedNodes[selectedNodes.length - 1];
-      const lastNodePath = lastNode[1];
-      accordionPath = lastNodePath;
+    // select accordion title by default
+    if (isMobileWindow()) {
+      // timeout to resolve focus issue in mobile
+      setTimeout(() => focusAccordion(editor, upPath), 0);
+    } else {
+      focusAccordion(editor, upPath);
     }
-    const focusPath = [...accordionPath, 0, 0, 0];
-    focusAccordion(editor, focusPath);
+    insertNewLine(editor);
   } catch (err) {
     console.log(err);
   }
@@ -154,11 +133,4 @@ export const onDeleteBackwardAccordion = editor => {
   } catch (err) {
     console.log(err);
   }
-};
-export const toggleAccordion = editor => {
-  const parentAccordion = Editor.above(editor, {
-    match: node => Element.isElement(node) && node.type === "accordion"
-  });
-  const [, accordionPath] = parentAccordion;
-  removeAccordion(editor, accordionPath);
 };

package/dist/Editor/utils/draftToSlate.js

@@ -82,8 +82,7 @@ const splitInlineStyleRanges = (text, inlineStyleRanges, data) => {
 };
 export const draftToSlate = props => {
   const {
-    data,
-    needLayout
+    data
   } = props;
   if (data?.blocks && data?.blocks?.length > 0) {
     const converted = data?.blocks?.reduce((a, b) => {
@@ -105,7 +104,7 @@ export const draftToSlate = props => {
     return data;
   } else {
     return [{
-      type: needLayout ? "title" : "paragraph",
+      type: "paragraph",
       children: [{
         text: ""
       }]

package/dist/Editor/utils/events.js

@@ -197,102 +197,9 @@ export const removeAccordion = (editor, accordionPath) => {
     select: true
   });
 };
-export const customizeEnterEvent = (editor, ele, e) => {
-  const {
-    type
-  } = ele[0];
-  const path = ele[1];
-  const text = Node.string(ele[0]);
-  let breakNext = false;
-  switch (type) {
-    case "list-item":
-      if (!text) {
-        e?.preventDefault();
-        escapeEvent({
-          editor
-        });
-      }
-      break;
-    case "check-list-item":
-      const selectionPath = editor?.selection?.anchor?.path;
-      const currEle = Node.parent(editor, selectionPath);
-      const currEleText = Node.string(currEle);
-      if (!currEleText) {
-        e?.preventDefault();
-        checkListEnterEvent(editor, type);
-      }
-      break;
-    case "accordion-summary":
-      e?.preventDefault();
-      breakNext = true;
-      if (!text) {
-        const accordionIndex = ele[1].slice(0, Math.max(ele[1].length - 1));
-        removeAccordion(editor, accordionIndex);
-      } else {
-        const nextPath = Path.next(Path.parent(ele[1]));
-        insertAccordion(editor, nextPath);
-      }
-      break;
-    case "headingOne":
-    case "headingTwo":
-    case "headingThree":
-      const {
-        selection
-      } = editor;
-      if (selection && Range.isCollapsed(selection)) {
-        const isAtEnd = Editor.isEnd(editor, selection.anchor, path);
-        const isAtStart = Editor.isStart(editor, selection.anchor, path);
-        if (isAtEnd) {
-          e?.preventDefault();
-          Transforms.insertNodes(editor, {
-            type: "paragraph",
-            children: [{
-              text: ""
-            }]
-          });
-          const newLocation = Editor.after(editor, selection);
-          if (newLocation) {
-            Transforms.select(editor, newLocation);
-          }
-        } else if (!isAtStart) {
-          e?.preventDefault();
-          Transforms.splitNodes(editor);
-          Transforms.setNodes(editor, {
-            type: "paragraph"
-          }, {
-            at: Editor.after(editor, selection)
-          });
-          const newLocation = Editor.after(editor, selection);
-          if (newLocation) {
-            Transforms.select(editor, newLocation);
-          }
-        } else if (isAtStart) {
-          e?.preventDefault();
-          Transforms.insertNodes(editor, {
-            type: "paragraph",
-            children: [{
-              text: ""
-            }]
-          }, {
-            at: Editor.before(editor, selection)
-          });
-          Transforms.select(editor, Editor.before(editor, selection));
-          const newLocation = Editor.before(editor, selection);
-          if (newLocation) {
-            Transforms.select(editor, newLocation);
-          }
-        }
-        return;
-      }
-      break;
-    default:
-  }
-  return {
-    breakNext
-  };
-};
 export const enterEvent = (e, editor, isMobile) => {
   try {
+    const ele = isListItem(editor);
     // on shift enter break line in same node
     if (e.shiftKey && !isMobile) {
       e.preventDefault();
@@ -304,6 +211,94 @@ export const enterEvent = (e, editor, isMobile) => {
       } else {
         Transforms.insertText(editor, "\n");
       }
+    } else if (ele && ele[0]) {
+      const {
+        type
+      } = ele[0];
+      const path = ele[1];
+      const text = Node.string(ele[0]);
+      switch (type) {
+        case "list-item":
+          if (!text) {
+            e.preventDefault();
+            escapeEvent({
+              editor
+            });
+          }
+          break;
+        case "check-list-item":
+          const selectionPath = editor?.selection?.anchor?.path;
+          const currEle = Node.parent(editor, selectionPath);
+          const currEleText = Node.string(currEle);
+          if (!currEleText) {
+            e.preventDefault();
+            checkListEnterEvent(editor, type);
+          }
+          break;
+        case "accordion-summary":
+          e.preventDefault();
+          if (!text) {
+            const accordionIndex = ele[1].slice(0, Math.max(ele[1].length - 1));
+            removeAccordion(editor, accordionIndex);
+          } else {
+            const nextPath = Path.next(Path.parent(ele[1]));
+            insertAccordion(editor, nextPath);
+          }
+          break;
+        case "headingOne":
+        case "headingTwo":
+        case "headingThree":
+          const {
+            selection
+          } = editor;
+          if (selection && Range.isCollapsed(selection)) {
+            const isAtEnd = Editor.isEnd(editor, selection.anchor, path);
+            const isAtStart = Editor.isStart(editor, selection.anchor, path);
+            if (isAtEnd) {
+              e.preventDefault();
+              Transforms.insertNodes(editor, {
+                type: "paragraph",
+                children: [{
+                  text: ""
+                }]
+              });
+              const newLocation = Editor.after(editor, selection);
+              if (newLocation) {
+                Transforms.select(editor, newLocation);
+              }
+            } else if (!isAtStart) {
+              e.preventDefault();
+              Transforms.splitNodes(editor);
+              Transforms.setNodes(editor, {
+                type: "paragraph"
+              }, {
+                at: Editor.after(editor, selection)
+              });
+              const newLocation = Editor.after(editor, selection);
+              if (newLocation) {
+                Transforms.select(editor, newLocation);
+              }
+            } else if (isAtStart) {
+              e.preventDefault();
+              Transforms.insertNodes(editor, {
+                type: "paragraph",
+                children: [{
+                  text: ""
+                }]
+              }, {
+                at: Editor.before(editor, selection)
+              });
+              Transforms.select(editor, Editor.before(editor, selection));
+              const newLocation = Editor.before(editor, selection);
+              if (newLocation) {
+                Transforms.select(editor, newLocation);
+              }
+            }
+            return;
+          }
+          break;
+        default:
+      }
     }
     // Handle blockquote splitting
     if (!e.shiftKey) {

package/dist/Editor/utils/helper.js

@@ -219,13 +219,9 @@ export const handleInsertLastElement = (event, editor) => {
 };
 export const isListItem = editor => {
   const format = ["list-item", "check-list-item", "accordion-summary", "headingOne", "headingTwo", "headingThree"];
-  const [node1, node2] = Editor.nodes(editor, {
+  const [node] = 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) => {
@@ -743,10 +739,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
@@ -765,13 +757,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) {
@@ -802,17 +787,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 = {
@@ -826,6 +814,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);
@@ -876,6 +869,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 insertSlashNode = (editor, insertNode) => {
   try {
     // Delete the currently selected text

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "11.0.9",
+  "version": "11.1.0",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"
@@ -38,6 +38,7 @@
     "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",
@@ -68,7 +69,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/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: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:flozy": "./publish-flozy.sh",
     "publish:flozy2": "./publish-flozy2.sh",
     "publish:permission": "chmod +x publish-flozy.sh && chmod +x publish-flozy2.sh"
@@ -121,8 +122,7 @@
     "prop-types": "^15.8.1",
     "source-map-explorer": "^2.5.3",
     "storybook": "^7.4.0",
-    "webpack": "^5.88.2",
-    "react-scripts": "5.0.1"
+    "webpack": "^5.88.2"
   },
   "overrides": {
     "react-refresh": "0.11.0"

package/dist/Editor/common/StyleBuilder/fieldTypes/embedUpload.js

@@ -1,115 +0,0 @@
-import React, { useState } from "react";
-import { Grid, Button, Typography } from "@mui/material";
-import ImageSelector from "../../ImageSelector/ImageSelector";
-import UploadStyles from "../../ImageSelector/UploadStyles";
-import Icon from "../../Icon";
-import { useEditorContext } from "../../../hooks/useMouseMove";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-const EmbedUpload = props => {
-  const {
-    value,
-    data,
-    customProps,
-    onChange
-  } = props;
-  const {
-    translation
-  } = customProps;
-  const {
-    key
-  } = data;
-  const [base64, setBase64] = useState(value);
-  const [open, setOpen] = useState(false);
-  const {
-    theme
-  } = useEditorContext();
-  const classes = UploadStyles(theme);
-  const onRemoveBG = () => {
-    setBase64(null);
-    onChange({
-      [key]: "none"
-    });
-  };
-  const handleClick = () => {
-    setOpen(true);
-  };
-  const handleClose = () => {
-    setOpen(false);
-  };
-  const onSelectImage = img => {
-    setBase64(img);
-    onChange({
-      [key]: img
-    });
-    handleClose();
-  };
-  return /*#__PURE__*/_jsxs(Grid, {
-    item: true,
-    xs: 12,
-    children: [/*#__PURE__*/_jsx(Typography, {
-      variant: "body1",
-      color: "primary",
-      sx: {
-        fontSize: "14px",
-        fontWeight: "500",
-        marginBottom: "8px"
-      },
-      children: translation("Upload Video")
-    }), /*#__PURE__*/_jsx(Grid, {
-      container: true,
-      sx: classes.uploadContainer,
-      children: /*#__PURE__*/_jsx(Grid, {
-        item: true,
-        xs: 12,
-        sx: classes.uploadField,
-        children: /*#__PURE__*/_jsx(Grid, {
-          className: "uploadImageSection",
-          children: base64 ? /*#__PURE__*/_jsxs(Grid, {
-            justifyItems: "center",
-            alignItems: "center",
-            children: [/*#__PURE__*/_jsx(Typography, {
-              style: {
-                padding: "8px",
-                fontSize: "8px",
-                color: theme?.palette?.editor?.textColor,
-                textAlign: "center"
-              },
-              children: base64
-            }), /*#__PURE__*/_jsx(Grid, {
-              className: "removeImageText",
-              onClick: onRemoveBG,
-              children: translation("REMOVE")
-            })]
-          }) : /*#__PURE__*/_jsx(Grid, {
-            className: "uploadImageText",
-            children: /*#__PURE__*/_jsxs(Button, {
-              component: "label",
-              variant: "text",
-              style: {
-                background: "none"
-              },
-              onClick: handleClick,
-              sx: classes.uploadIcon,
-              children: [/*#__PURE__*/_jsx(Icon, {
-                icon: "fileUpload"
-              }), /*#__PURE__*/_jsx("span", {
-                style: {
-                  paddingLeft: "8px"
-                },
-                children: translation("Upload a Video")
-              })]
-            })
-          })
-        })
-      })
-    }), /*#__PURE__*/_jsx(ImageSelector, {
-      open: open,
-      title: "Video",
-      onClose: handleClose,
-      customProps: customProps,
-      onSelectImage: onSelectImage
-    })]
-  });
-};
-export default EmbedUpload;

package/dist/Editor/helper/textIndeces.js

@@ -1,58 +0,0 @@
-export function extractTextWithPath(data, path = []) {
-  let result = [];
-  data.forEach((item, index) => {
-    const currentPath = [...path, index];
-    if (item.text) {
-      result.push({
-        path_id: currentPath.join(","),
-        text: item.text
-      });
-    }
-    if (item.children) {
-      result = result.concat(extractTextWithPath(item.children, currentPath));
-    }
-  });
-  return result;
-}
-export function replaceTextPath(nestedJson, pathIdJson) {
-  // Create a map from path_id JSON for quick lookup
-  const pathIdMap = new Map(pathIdJson.map(item => [item.path_id, item.text]));
-  console.log(pathIdMap);
-  function extractTextWithPath(data, path = []) {
-    data.forEach((item, index) => {
-      const currentPath = [...path, index];
-      if (item.text) {
-        if (pathIdMap.has(currentPath?.join(","))) {
-          item.text = pathIdMap.get(currentPath?.join(","));
-        }
-      }
-      if (item.children) {
-        extractTextWithPath(item.children, currentPath);
-      }
-    });
-  }
-  extractTextWithPath(nestedJson, []);
-  return nestedJson;
-}
-
-// export function replaceTextPath(nestedJson, pathIdJson) {
-//   // Create a map from path_id JSON for quick lookup
-//   const pathIdMap = new Map(
-//     pathIdJson.map((item) => [item.path_id, item.text])
-//   );
-
-//   function traverseAndReplace(node) {
-//     if (Array.isArray(node)) {
-//       node.forEach(traverseAndReplace);
-//     } else if (typeof node === "object" && node !== null) {
-//       console.log(node);
-//       if (node.text && pathIdMap.has(node.text)) {
-//         node.text = pathIdMap.get(node.path_id);
-//       }
-//       Object.values(node).forEach(traverseAndReplace);
-//     }
-//   }
-
-//   traverseAndReplace(nestedJson);
-//   return nestedJson;
-// }