@seafile/sea-email-editor 0.0.12 → 0.0.14

package/dist/slate-convert/html-to-slate/index.js

@@ -11,6 +11,7 @@ var _constants = require("./constants");
 var _rules = _interopRequireDefault(require("./rules"));
 var _helper = require("./helper");
 var _dom = require("../../utils/dom");
+var _constants2 = require("../../extension/constants");
 const generateDefaultValue = () => {
   return [{
     id: _slugid.default.nice(),
@@ -107,12 +108,75 @@ const deserializeElements = function () {
 //   return node;
 // };
 
+// Split block-level children out of a paragraph-like node into siblings.
+// Recursively processes children of any block node to flatten nested structures.
+const flattenNestedBlockChildren = (children, parentNode) => {
+  const result = [];
+  let inlineChildren = [];
+  for (const child of children) {
+    if (child.type && _constants.TOP_LEVEL_TYPES.includes(child.type)) {
+      if (inlineChildren.length > 0) {
+        result.push({
+          id: _slugid.default.nice(),
+          type: parentNode.type,
+          children: inlineChildren
+        });
+        inlineChildren = [];
+      }
+      // If this block child itself has children with nested blocks, recurse
+      if (Array.isArray(child.children) && child.children.some(c => c.type && _constants.TOP_LEVEL_TYPES.includes(c.type))) {
+        const flattened = flattenNestedBlockChildren(child.children, {
+          type: _constants2.ElementTypes.PARAGRAPH
+        });
+        // Paragraph types cannot contain block children — spread as siblings
+        if (child.type === _constants2.ElementTypes.PARAGRAPH || child.type === _constants2.ElementTypes.P) {
+          result.push(...flattened);
+        } else {
+          result.push({
+            ...child,
+            children: flattened
+          });
+        }
+      } else {
+        result.push(child);
+      }
+    } else {
+      inlineChildren.push(child);
+    }
+  }
+  if (inlineChildren.length > 0) {
+    result.push({
+      id: _slugid.default.nice(),
+      type: parentNode.type,
+      children: inlineChildren
+    });
+  }
+  return result;
+};
 const formatElementNodes = nodes => {
   if (nodes.length === 0) {
     return generateDefaultValue();
   }
   nodes = nodes.reduce((memo, node) => {
     if (_constants.TOP_LEVEL_TYPES.includes(node.type)) {
+      // If a paragraph-like node contains nested block-level children,
+      // split them into sibling relationships
+      if ((node.type === _constants2.ElementTypes.PARAGRAPH || node.type === _constants2.ElementTypes.P) && Array.isArray(node.children) && node.children.some(child => child.type && _constants.TOP_LEVEL_TYPES.includes(child.type))) {
+        const flattened = flattenNestedBlockChildren(node.children, node);
+        memo.push(...flattened);
+        return memo;
+      }
+
+      // Blockquote may also contain nested paragraphs that need flattening
+      if (node.type === _constants2.ElementTypes.BLOCKQUOTE && Array.isArray(node.children) && node.children.some(child => child.type && _constants.TOP_LEVEL_TYPES.includes(child.type))) {
+        memo.push({
+          ...node,
+          children: flattenNestedBlockChildren(node.children, {
+            type: _constants2.ElementTypes.PARAGRAPH
+          })
+        });
+        return memo;
+      }
       memo.push(node);
     }
     if (node.type === _constants.LIST_ITEM) {

package/dist/slate-convert/md-to-slate/index.js

@@ -22,22 +22,34 @@ const getProcessor = () => {
 const reconciledSlateNodes = nodes => {
   return nodes;
 };
+const getLeadingLineBreakCount = content => {
+  if (typeof content !== 'string') return 0;
+  const matched = content.match(/^(?:\r\n|\r|\n)+/);
+  if (!matched) return 0;
+  return matched[0].match(/\r\n|\r|\n/g).length;
+};
+const generateLeadingParagraphs = count => {
+  return Array.from({
+    length: count
+  }, () => (0, _core.generateDefaultParagraph)());
+};
 
 // md string --> md ast --> slate ast
 // https://github.com/syntax-tree/mdast
 const mdStringToSlate = mdString => {
-  if (!mdString) return [(0, _core.generateDefaultParagraph)()];
   let content = mdString;
   if (typeof mdString === 'number') {
     content = mdString + '';
   }
+  if (!content) return [(0, _core.generateDefaultParagraph)()];
+  const leadingParagraphs = generateLeadingParagraphs(getLeadingLineBreakCount(content));
 
   // md string --> md ast
   const root = getProcessor().parse(content);
 
   // the mdString is '\r\n'
   if (root.children.length === 0) {
-    return [(0, _core.generateDefaultParagraph)()];
+    return leadingParagraphs.length > 0 ? leadingParagraphs : [(0, _core.generateDefaultParagraph)()];
   }
 
   // md ast --> slate ast
@@ -45,6 +57,6 @@ const mdStringToSlate = mdString => {
 
   // Format the document
   const nodes = reconciledSlateNodes(slateNodes);
-  return [(0, _core.generateDefaultParagraph)(), (0, _core.generateDefaultParagraph)(), (0, _core.generateDefaultParagraph)(), ...nodes];
+  return [...leadingParagraphs, ...nodes];
 };
 var _default = exports.default = mdStringToSlate;

package/dist/utils/dom.js

@@ -142,14 +142,26 @@ const removeInvalidNodes = root => {
   elementsToRemove.forEach(element => {
     element.remove();
   });
-  for (let i = root.childNodes.length - 1; i >= 0; i--) {
-    const child = root.childNodes[i];
+  const children = Array.from(root.childNodes);
+  let prevWasBr = false;
+  children.forEach(child => {
     if (child.nodeType === Node.COMMENT_NODE) {
       root.removeChild(child);
     } else if (child.nodeType === Node.ELEMENT_NODE) {
-      removeInvalidNodes(child);
+      if (child.nodeName === 'BR') {
+        if (prevWasBr) {
+          root.removeChild(child);
+        } else {
+          prevWasBr = true;
+        }
+      } else {
+        prevWasBr = false;
+        removeInvalidNodes(child);
+      }
+    } else {
+      prevWasBr = false;
     }
-  }
+  });
 };
 const stripCSSComments = function () {
   let cssText = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sea-email-editor",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "A Slate-based rich email editor with HTML, markdown, tables, images, links, and block plugins.",
   "main": "dist/index.js",
   "dependencies": {