@scrider/formatter 1.10.7 → 1.10.9

package/dist/index.d.cts

@@ -1077,6 +1077,9 @@ declare const alignFormat: Format<AlignType>;
  * Blockquote format
  *
  * Delta: { insert: "\n", attributes: { blockquote: true } }
+ *
+ * HTML render groups consecutive quote lines into one `<blockquote>` wrapping
+ * inner `<p>`s. Delta stays per-line; grouping is render-only.
  */
 declare const blockquoteFormat: Format<boolean>;
 

package/dist/index.d.ts

@@ -1077,6 +1077,9 @@ declare const alignFormat: Format<AlignType>;
  * Blockquote format
  *
  * Delta: { insert: "\n", attributes: { blockquote: true } }
+ *
+ * HTML render groups consecutive quote lines into one `<blockquote>` wrapping
+ * inner `<p>`s. Delta stays per-line; grouping is render-only.
  */
 declare const blockquoteFormat: Format<boolean>;
 

package/dist/index.js

@@ -3405,7 +3405,25 @@ function deltaToHtml(delta, options = {}) {
       i += tableLines.length - 1;
       continue;
     }
-    const { tag, isList, listType, indent, isCodeBlock } = getBlockInfo(line.attributes);
+    const { tag, isList, listType, indent, isCodeBlock, isBlockquote } = getBlockInfo(
+      line.attributes
+    );
+    if (isBlockquote) {
+      html += closeAllLists(listStack, pretty);
+      listStack = [];
+      counters = [];
+      const quoteLines = collectBlockquoteLines(lines, i);
+      html += renderBlockquote(
+        quoteLines,
+        embedRenderers,
+        pretty,
+        blockHandlers,
+        options,
+        resolvedDocumentPresentation
+      );
+      i += quoteLines.length - 1;
+      continue;
+    }
     if (isCodeBlock) {
       html += closeAllLists(listStack, pretty);
       listStack = [];
@@ -3434,13 +3452,7 @@ function deltaToHtml(delta, options = {}) {
       continue;
     }
     if (isList) {
-      html += handleListOpen(
-        listStack,
-        listType,
-        indent,
-        pretty,
-        resolvedDocumentPresentation
-      );
+      html += handleListOpen(listStack, listType, indent, pretty, resolvedDocumentPresentation);
       if (hierarchicalNumbers && listType === "ordered") {
         if (counters.length > indent + 1) {
           counters = counters.slice(0, indent + 1);
@@ -3673,24 +3685,90 @@ function renderTableRow(cells, maxCol, cellTag, embedRenderers, pretty, depth, b
 }
 function getBlockInfo(attributes) {
   if (!attributes) {
-    return { tag: "p", isList: false, isCodeBlock: false, listType: void 0, indent: 0 };
+    return {
+      tag: "p",
+      isList: false,
+      isCodeBlock: false,
+      isBlockquote: false,
+      listType: void 0,
+      indent: 0
+    };
   }
   const indent = typeof attributes.indent === "number" ? attributes.indent : 0;
   if (attributes["code-block"]) {
-    return { tag: "pre", isList: false, isCodeBlock: true, listType: void 0, indent };
+    return {
+      tag: "pre",
+      isList: false,
+      isCodeBlock: true,
+      isBlockquote: false,
+      listType: void 0,
+      indent
+    };
   }
   if (attributes.list) {
     const listVal = attributes.list;
     const listType = typeof listVal === "string" ? listVal : "bullet";
-    return { tag: "li", isList: true, isCodeBlock: false, listType, indent };
+    return { tag: "li", isList: true, isCodeBlock: false, isBlockquote: false, listType, indent };
+  }
+  if (attributes.blockquote) {
+    return {
+      tag: "blockquote",
+      isList: false,
+      isCodeBlock: false,
+      isBlockquote: true,
+      listType: void 0,
+      indent
+    };
   }
   for (const [format, tagOrFn] of Object.entries(BLOCK_FORMAT_TAGS)) {
     if (format in attributes && format !== "list" && format !== "code-block") {
       const tag = typeof tagOrFn === "function" ? tagOrFn(attributes[format]) : tagOrFn;
-      return { tag, isList: false, isCodeBlock: false, listType: void 0, indent };
+      return {
+        tag,
+        isList: false,
+        isCodeBlock: false,
+        isBlockquote: false,
+        listType: void 0,
+        indent
+      };
     }
   }
-  return { tag: "p", isList: false, isCodeBlock: false, listType: void 0, indent };
+  return {
+    tag: "p",
+    isList: false,
+    isCodeBlock: false,
+    isBlockquote: false,
+    listType: void 0,
+    indent
+  };
+}
+function collectBlockquoteLines(lines, startIndex) {
+  const quoteLines = [];
+  for (let i = startIndex; i < lines.length; i++) {
+    const line = lines[i];
+    if (!line || !line.attributes?.blockquote) break;
+    quoteLines.push(line);
+  }
+  return quoteLines;
+}
+function renderBlockquote(quoteLines, embedRenderers, pretty, blockHandlers, options, resolvedDocumentPresentation) {
+  const firstAttrs = quoteLines[0]?.attributes;
+  const wrapperIndent = firstAttrs && typeof firstAttrs.indent === "number" && firstAttrs.indent > 0 ? ` style="margin-left: ${firstAttrs.indent * 2}em"` : "";
+  const nl = pretty ? "\n" : "";
+  const innerIndent = pretty ? "  " : "";
+  let html = `<blockquote${wrapperIndent}>${nl}`;
+  for (const line of quoteLines) {
+    const content = renderLineContent(line.ops, embedRenderers, blockHandlers, options);
+    html += `${innerIndent}${renderBlockquoteParagraph(content, line.attributes, resolvedDocumentPresentation)}${nl}`;
+  }
+  html += `</blockquote>`;
+  return pretty ? html + "\n" : html;
+}
+function renderBlockquoteParagraph(content, attributes, resolvedDocumentPresentation) {
+  const styleSource = attributes ? { ...attributes, indent: void 0 } : void 0;
+  const styleAttr = getBlockStyleAttribute("blockquote", styleSource, resolvedDocumentPresentation);
+  const innerContent = content || "<br>";
+  return `<p${styleAttr}>${innerContent}</p>`;
 }
 function collectCodeBlockLines(lines, startIndex) {
   const codeLines = [];
@@ -3941,6 +4019,22 @@ function renderEmbed(value, attributes, renderers, blockHandlers, options) {
 
 // src/conversion/html/html-to-delta.ts
 import { Delta as Delta8 } from "@scrider/delta";
+var BLOCKQUOTE_INNER_BLOCK_TAGS = /* @__PURE__ */ new Set([
+  "p",
+  "div",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "ul",
+  "ol",
+  "li",
+  "pre",
+  "blockquote",
+  "table"
+]);
 function isCssWideKeyword(value) {
   return /^(inherit|initial|unset|revert|revert-layer)$/i.test(value.trim());
 }
@@ -4040,6 +4134,12 @@ function htmlToDelta(html, options = {}) {
       pendingText = "";
     }
   }
+  function beginBlockEmbedLine() {
+    flushText();
+    if (!atLineStart) {
+      context.pushNewline();
+    }
+  }
   function processNode(node) {
     if (node.nodeType === NODE_TYPE.TEXT_NODE) {
       const text = node.textContent ?? "";
@@ -4187,9 +4287,21 @@ function htmlToDelta(html, options = {}) {
       }
     }
     processChildren(element);
-    context.pushNewline();
+    if (!(format.format === "blockquote" && hasBlockChildElement(element))) {
+      context.pushNewline();
+    }
     currentBlockAttributes = prevBlockAttrs;
   }
+  function hasBlockChildElement(element) {
+    const children2 = element.childNodes;
+    for (let i = 0; i < children2.length; i++) {
+      const child = children2[i];
+      if (!child || !isElement(child)) continue;
+      const tag = child.tagName.toLowerCase();
+      if (BLOCKQUOTE_INNER_BLOCK_TAGS.has(tag)) return true;
+    }
+    return false;
+  }
   function processCodeBlockElement(element) {
     const prevBlockAttrs = { ...currentBlockAttributes };
     let language;
@@ -4406,7 +4518,7 @@ function htmlToDelta(html, options = {}) {
       };
       const data = footnotesHandler.fromHtml(section, blockContext);
       if (data) {
-        flushText();
+        beginBlockEmbedLine();
         delta.insert({ block: data });
         delta.insert("\n");
         atLineStart = true;
@@ -4428,7 +4540,7 @@ function htmlToDelta(html, options = {}) {
       };
       const data = alertHandler.fromHtml(element, blockContext);
       if (data) {
-        flushText();
+        beginBlockEmbedLine();
         delta.insert({ block: data });
         delta.insert("\n");
         atLineStart = true;
@@ -4450,7 +4562,7 @@ function htmlToDelta(html, options = {}) {
       };
       const data = columnsHandler.fromHtml(element, blockContext);
       if (data) {
-        flushText();
+        beginBlockEmbedLine();
         delta.insert({ block: data });
         delta.insert("\n");
         atLineStart = true;
@@ -4472,7 +4584,7 @@ function htmlToDelta(html, options = {}) {
       };
       const data = boxHandler.fromHtml(element, blockContext);
       if (data) {
-        flushText();
+        beginBlockEmbedLine();
         const opAttrs = {};
         const dataFloat = element.getAttribute("data-float");
         if (dataFloat) opAttrs.float = dataFloat;
@@ -4521,7 +4633,7 @@ function htmlToDelta(html, options = {}) {
     let data = tableHandler.fromHtml(table, makeTableBlockParseContext());
     if (!data) return false;
     if (host) data = enrichTableBlockFromHost(data, host);
-    flushText();
+    beginBlockEmbedLine();
     delta.insert({ block: data });
     delta.insert("\n");
     atLineStart = true;