@scrider/formatter 1.10.9 → 1.10.11

package/dist/index.cjs

@@ -548,6 +548,9 @@ var LIST_WRAPPER_TAGS = {
   checked: "ul",
   unchecked: "ul"
 };
+function listWrapperFamily(listType) {
+  return LIST_WRAPPER_TAGS[listType] || "ul";
+}
 var EMBED_RENDERERS = {
   image: (value, attrs) => {
     const src = typeof value === "string" ? value : "";
@@ -3973,7 +3976,7 @@ function handleListOpen(stack, listType, indent, pretty, resolvedDocumentPresent
     }
   }
   const top = stack[stack.length - 1];
-  if (top && top.indent === indent && top.type !== listType) {
+  if (top && top.indent === indent && listWrapperFamily(top.type) !== listWrapperFamily(listType)) {
     const closed = stack.pop();
     if (closed) {
       const closeTag = LIST_WRAPPER_TAGS[closed.type] || "ul";
@@ -4419,6 +4422,7 @@ function htmlToDelta(html, options = {}) {
     if (align) {
       currentBlockAttributes.align = align;
     }
+    applyBlockIndentFromMargin(element);
     if (format.format === "header") {
       const id = element.getAttribute("id");
       if (id) {
@@ -4837,6 +4841,7 @@ function htmlToDelta(html, options = {}) {
     if (align) {
       currentBlockAttributes.align = align;
     }
+    applyBlockIndentFromMargin(element);
     const children2 = element.childNodes;
     const firstChild = children2[0];
     const isBrOnlyParagraph = children2.length === 1 && firstChild !== void 0 && isElement(firstChild) && firstChild.tagName.toLowerCase() === "br" && !firstChild.hasAttribute("data-scrider-embed");
@@ -4853,6 +4858,26 @@ function htmlToDelta(html, options = {}) {
     }
     return null;
   }
+  function parseIndentEm(raw) {
+    if (!raw) return null;
+    const match = raw.trim().match(/^(-?[\d.]+)em$/i);
+    if (!match) return null;
+    const em = Number.parseFloat(match[1]);
+    if (!Number.isFinite(em) || em <= 0) return null;
+    const level = Math.round(em / 2);
+    if (level < 1 || level > 8) return null;
+    return level;
+  }
+  function getIndentFromMarginLeft(element) {
+    const fromAttr = (element.getAttribute?.("style") ?? "").match(/(?:^|;)\s*margin-left:\s*([^;]+)/i)?.[1];
+    const fromStyle = element.style?.getPropertyValue?.("margin-left");
+    return parseIndentEm(fromAttr) ?? parseIndentEm(fromStyle);
+  }
+  function applyBlockIndentFromMargin(element) {
+    if (currentBlockAttributes.list != null) return;
+    const indent = getIndentFromMarginLeft(element);
+    if (indent != null) currentBlockAttributes.indent = indent;
+  }
   const children = fragment.childNodes;
   for (let i = 0; i < children.length; i++) {
     const child = children[i];