modern-text 1.3.8 → 1.3.10

package/dist/index.cjs

@@ -453,20 +453,7 @@ function parseValueNumber(value, ctx) {
   }
 }
 function parseColormap(colormap) {
-  const _colormap = isNone(colormap) ? {} : colormap;
-  return Object.keys(_colormap).reduce((obj, key) => {
-    let value = _colormap[key];
-    const keyRgb = hexToRgb(key);
-    const valueRgb = hexToRgb(value);
-    if (keyRgb) {
-      key = keyRgb;
-    }
-    if (valueRgb) {
-      value = valueRgb;
-    }
-    obj[key] = value;
-    return obj;
-  }, {});
+  return isNone(colormap) ? {} : colormap;
 }
 function isNone(val) {
   return !val || val === "none";
@@ -947,7 +934,11 @@ function background() {
     update: (text) => {
       pathSet.paths.length = 0;
       const { style, lineBox, isVertical } = text;
-      const { backgroundImage, backgroundSize } = style;
+      const {
+        backgroundImage,
+        backgroundSize,
+        backgroundColormap = "none"
+      } = style;
       if (isNone(backgroundImage))
         return;
       const { pathSet: imagePathSet } = parser.parse(backgroundImage);
@@ -958,7 +949,17 @@ function background() {
       } else {
         ({ x, y, width, height } = lineBox);
       }
-      const paths = imagePathSet.paths.map((p) => p.clone());
+      const colormap = parseColormap(backgroundColormap);
+      const paths = imagePathSet.paths.map((p) => {
+        const cloned = p.clone();
+        if (cloned.style.fill && cloned.style.fill in colormap) {
+          cloned.style.fill = colormap[cloned.style.fill];
+        }
+        if (cloned.style.stroke && cloned.style.stroke in colormap) {
+          cloned.style.stroke = colormap[cloned.style.stroke];
+        }
+        return cloned;
+      });
       let scaleX;
       let scaleY;
       if (backgroundSize === "rigid") {
@@ -1352,41 +1353,37 @@ function listStyle() {
         }
         const imagePathSet = modernPath2d.svgToPath2DSet(image);
         const imageBox = imagePathSet.getBoundingBox();
-        let prevChar;
-        paragraph.fragments.forEach((f) => {
-          f.characters.forEach((c) => {
-            const { inlineBox } = c;
-            if (isVertical ? prevChar?.inlineBox.left !== inlineBox.left : prevChar?.inlineBox.top !== inlineBox.top) {
-              prevChar = c;
-              const scale = size === "cover" ? 1 : parseValueNumber(size, { total: fontSize, fontSize }) / fontSize;
-              const m = new modernPath2d.Matrix3();
-              if (isVertical) {
-                const _scale = fontSize / imageBox.height * scale;
-                m.translate(-imageBox.left, -imageBox.top).rotate(Math.PI / 2).scale(_scale, _scale).translate(
-                  inlineBox.left + (inlineBox.width - imageBox.height * _scale) / 2,
-                  inlineBox.top - padding
-                );
-              } else {
-                const _scale = fontSize / imageBox.height * scale;
-                m.translate(-imageBox.left, -imageBox.top).scale(_scale, _scale).translate(
-                  inlineBox.left - imageBox.width * _scale - padding,
-                  inlineBox.top + (inlineBox.height - imageBox.height * _scale) / 2
-                );
-              }
-              pathSet.paths.push(...imagePathSet.paths.map((p) => {
-                const path = p.clone();
-                path.applyTransform(m);
-                if (path.style.fill && path.style.fill in colormap) {
-                  path.style.fill = colormap[path.style.fill];
-                }
-                if (path.style.stroke && path.style.stroke in colormap) {
-                  path.style.stroke = colormap[path.style.stroke];
-                }
-                return path;
-              }));
-            }
-          });
-        });
+        const char = paragraph.fragments[0]?.characters[0];
+        if (!char) {
+          return;
+        }
+        const { inlineBox } = char;
+        const scale = size === "cover" ? 1 : parseValueNumber(size, { total: fontSize, fontSize }) / fontSize;
+        const m = new modernPath2d.Matrix3();
+        if (isVertical) {
+          const _scale = fontSize / imageBox.height * scale;
+          m.translate(-imageBox.left, -imageBox.top).rotate(Math.PI / 2).scale(_scale, _scale).translate(
+            inlineBox.left + (inlineBox.width - imageBox.height * _scale) / 2,
+            inlineBox.top - padding
+          );
+        } else {
+          const _scale = fontSize / imageBox.height * scale;
+          m.translate(-imageBox.left, -imageBox.top).scale(_scale, _scale).translate(
+            inlineBox.left - imageBox.width * _scale - padding,
+            inlineBox.top + (inlineBox.height - imageBox.height * _scale) / 2
+          );
+        }
+        pathSet.paths.push(...imagePathSet.paths.map((p) => {
+          const path = p.clone();
+          path.applyTransform(m);
+          if (path.style.fill && path.style.fill in colormap) {
+            path.style.fill = colormap[path.style.fill];
+          }
+          if (path.style.stroke && path.style.stroke in colormap) {
+            path.style.stroke = colormap[path.style.stroke];
+          }
+          return path;
+        }));
       });
     }
   });