@hirokisakabe/pom 0.1.3 → 0.1.4

package/dist/calcYogaLayout/measureText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measureText.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/measureText.ts"],"names":[],"mappings":"AAEA,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAKF;;GAEG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,cAAc,GACnB;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAoCA"}
+{"version":3,"file":"measureText.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/measureText.ts"],"names":[],"mappings":"AAEA,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAKF;;GAEG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,cAAc,GACnB;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CA+CA"}

package/dist/calcYogaLayout/measureText.js

@@ -6,28 +6,37 @@ const ctx = canvas.getContext("2d");
  */
 export function measureText(text, maxWidthPx, opts) {
     applyFontStyle(opts);
-    const words = splitForWrap(text);
+    // まず改行で段落に分割
+    const paragraphs = text.split("\n");
     const lines = [];
-    let current = "";
-    let currentWidth = 0;
-    for (const word of words) {
-        const candidate = current ? current + word : word;
-        const w = ctx.measureText(candidate).width;
-        if (w <= maxWidthPx || !current) {
-            // まだ詰められる
-            current = candidate;
-            currentWidth = w;
+    for (const paragraph of paragraphs) {
+        // 空の段落（連続した改行）も1行としてカウント
+        if (paragraph === "") {
+            lines.push({ widthPx: 0 });
+            continue;
         }
-        else {
-            // 折り返す
+        const words = splitForWrap(paragraph);
+        let current = "";
+        let currentWidth = 0;
+        for (const word of words) {
+            const candidate = current ? current + word : word;
+            const w = ctx.measureText(candidate).width;
+            if (w <= maxWidthPx || !current) {
+                // まだ詰められる
+                current = candidate;
+                currentWidth = w;
+            }
+            else {
+                // 折り返す
+                lines.push({ widthPx: currentWidth });
+                current = word;
+                currentWidth = ctx.measureText(word).width;
+            }
+        }
+        if (current) {
             lines.push({ widthPx: currentWidth });
-            current = word;
-            currentWidth = ctx.measureText(word).width;
         }
     }
-    if (current) {
-        lines.push({ widthPx: currentWidth });
-    }
     const lineHeightRatio = opts.lineHeight ?? 1.3;
     const lineHeightPx = opts.fontSizePx * lineHeightRatio;
     const widthPx = lines.length ? Math.max(...lines.map((l) => l.widthPx)) : 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirokisakabe/pom",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "PowerPoint Object Model - A declarative TypeScript library for creating PowerPoint presentations",
   "type": "module",
   "main": "./dist/index.js",