@scrider/formatter 1.10.6 → 1.10.8

package/dist/index.js

@@ -2597,6 +2597,10 @@ var imageFormat = {
     if (element.tagName.toLowerCase() !== "img") return null;
     const src = element.getAttribute("src");
     if (!src) return null;
+    const style = element.getAttribute("style") || "";
+    if (/(?:^|;)\s*opacity\s*:\s*0(?:\.0+)?\s*(?:;|$)/i.test(style)) {
+      return null;
+    }
     const attrs = {};
     const alt = element.getAttribute("alt");
     const width = element.getAttribute("width");
@@ -3870,15 +3874,6 @@ function renderInlineText(text, attributes) {
   if (!text) return "";
   let html = escapeHtml(text);
   if (!attributes) return html;
-  const styles = [];
-  for (const [format, cssProperty] of Object.entries(INLINE_STYLE_FORMATS)) {
-    if (format in attributes) {
-      styles.push(`${cssProperty}: ${String(attributes[format])}`);
-    }
-  }
-  if (styles.length > 0) {
-    html = `<span style="${styles.join("; ")}">${html}</span>`;
-  }
   for (let i = INLINE_FORMAT_ORDER.length - 1; i >= 0; i--) {
     const format = INLINE_FORMAT_ORDER[i];
     if (!format) continue;
@@ -3892,6 +3887,15 @@ function renderInlineText(text, attributes) {
       html = `<${tag}>${html}</${tag}>`;
     }
   }
+  const styles = [];
+  for (const [format, cssProperty] of Object.entries(INLINE_STYLE_FORMATS)) {
+    if (format in attributes) {
+      styles.push(`${cssProperty}: ${String(attributes[format])}`);
+    }
+  }
+  if (styles.length > 0) {
+    html = `<span style="${styles.join("; ")}">${html}</span>`;
+  }
   return html;
 }
 function renderEmbed(value, attributes, renderers, blockHandlers, options) {
@@ -3937,6 +3941,44 @@ function renderEmbed(value, attributes, renderers, blockHandlers, options) {
 
 // src/conversion/html/html-to-delta.ts
 import { Delta as Delta8 } from "@scrider/delta";
+function isCssWideKeyword(value) {
+  return /^(inherit|initial|unset|revert|revert-layer)$/i.test(value.trim());
+}
+function cleanPastedFontFamily(value) {
+  if (value == null) return null;
+  const trimmed = value.trim();
+  if (!trimmed || isCssWideKeyword(trimmed)) return null;
+  const first = trimmed.split(",").map((part) => part.trim().replace(/^["']|["']$/g, "")).find((part) => part && !isCssWideKeyword(part) && !part.startsWith("var("));
+  if (!first) return null;
+  const lower = first.toLowerCase();
+  if (lower === "serif" || lower === "sans-serif" || lower === "monospace" || lower === "cursive" || lower === "fantasy" || lower === "system-ui") {
+    return null;
+  }
+  return first;
+}
+function cleanPastedFontSize(value) {
+  if (value == null) return null;
+  const trimmed = value.trim();
+  if (!trimmed || isCssWideKeyword(trimmed)) return null;
+  if (/^(medium|smaller|larger|xx-small|x-small|small|large|x-large|xx-large)$/i.test(trimmed)) {
+    return null;
+  }
+  const px = trimmed.match(/^([\d.]+)\s*px$/i);
+  if (px?.[1]) {
+    const pt = Math.round(Number(px[1]) * 72 / 96);
+    return pt > 0 ? `${pt}pt` : null;
+  }
+  return trimmed;
+}
+function isSelectionBackgroundColor(value) {
+  const m = value.trim().match(/^rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/i);
+  if (!m) return false;
+  const r = Number(m[1]);
+  const g = Number(m[2]);
+  const b = Number(m[3]);
+  if (![r, g, b].every((n) => Number.isFinite(n))) return false;
+  return r >= 180 && g >= 180 && b >= 180 && b >= r - 5 && b >= g - 5 && b - Math.min(r, g) <= 40;
+}
 function htmlToDelta(html, options = {}) {
   const adapter = options.adapter ?? getAdapter();
   const normalizeWhitespace = options.normalizeWhitespace ?? true;
@@ -3998,6 +4040,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 ?? "";
@@ -4285,20 +4333,30 @@ function htmlToDelta(html, options = {}) {
     flushText();
     const prevAttrs = { ...currentAttributes };
     const color = element.style?.color || element.style?.getPropertyValue?.("color");
-    if (color) {
+    if (color && !isCssWideKeyword(color)) {
       currentAttributes.color = color;
     }
     const bg = element.style?.backgroundColor || element.style?.getPropertyValue?.("background-color");
-    if (bg) {
+    if (bg && !isCssWideKeyword(bg) && !isSelectionBackgroundColor(bg)) {
       currentAttributes.background = bg;
     }
     const fontFamily = element.style?.fontFamily || element.style?.getPropertyValue?.("font-family");
-    if (fontFamily) {
-      currentAttributes.font = fontFamily.replace(/^["']|["']$/g, "");
+    const cleanedFont = cleanPastedFontFamily(fontFamily);
+    if (cleanedFont) {
+      currentAttributes.font = cleanedFont;
     }
     const fontSize = element.style?.fontSize || element.style?.getPropertyValue?.("font-size");
-    if (fontSize) {
-      currentAttributes.size = fontSize;
+    const cleanedSize = cleanPastedFontSize(fontSize);
+    if (cleanedSize) {
+      currentAttributes.size = cleanedSize;
+    }
+    const fontWeight = element.style?.fontWeight || element.style?.getPropertyValue?.("font-weight");
+    if (fontWeight === "bold" || fontWeight === "bolder" || fontWeight != null && Number.parseInt(String(fontWeight), 10) >= 600) {
+      currentAttributes.bold = true;
+    }
+    const fontStyle = element.style?.fontStyle || element.style?.getPropertyValue?.("font-style");
+    if (fontStyle === "italic" || fontStyle === "oblique") {
+      currentAttributes.italic = true;
     }
     processChildren(element);
     flushText();
@@ -4307,6 +4365,10 @@ function htmlToDelta(html, options = {}) {
   function processImageElement(element) {
     const src = element.getAttribute("src");
     if (!src) return;
+    const style = element.getAttribute("style") || "";
+    if (/(?:^|;)\s*opacity\s*:\s*0(?:\.0+)?\s*(?:;|$)/i.test(style)) {
+      return;
+    }
     const attrs = {};
     const alt = element.getAttribute("alt");
     const width = element.getAttribute("width");
@@ -4350,7 +4412,7 @@ function htmlToDelta(html, options = {}) {
       };
       const data = footnotesHandler.fromHtml(section, blockContext);
       if (data) {
-        flushText();
+        beginBlockEmbedLine();
         delta.insert({ block: data });
         delta.insert("\n");
         atLineStart = true;
@@ -4372,7 +4434,7 @@ function htmlToDelta(html, options = {}) {
       };
       const data = alertHandler.fromHtml(element, blockContext);
       if (data) {
-        flushText();
+        beginBlockEmbedLine();
         delta.insert({ block: data });
         delta.insert("\n");
         atLineStart = true;
@@ -4394,7 +4456,7 @@ function htmlToDelta(html, options = {}) {
       };
       const data = columnsHandler.fromHtml(element, blockContext);
       if (data) {
-        flushText();
+        beginBlockEmbedLine();
         delta.insert({ block: data });
         delta.insert("\n");
         atLineStart = true;
@@ -4416,7 +4478,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;
@@ -4465,7 +4527,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;