fix: stroke/fill text should treat \n as space

Close #434
Brooooooklyn · Mar 10, 2022 · 4c9ac1e · 4c9ac1e
1 parent 0d12337
commit 4c9ac1e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/__test__/snapshots/fillText-line-break-as-space.png b/__test__/snapshots/fillText-line-break-as-space.png
diff --git a/__test__/snapshots/strokeText-line-break-as-space.png b/__test__/snapshots/strokeText-line-break-as-space.png
diff --git a/__test__/text.spec.ts b/__test__/text.spec.ts
@@ -35,3 +35,19 @@ for (const align of ['center', 'end', 'left', 'right', 'start'] as CanvasTextAli
     await snapshotImage(t)
   })
 }
+
+test(`fillText-line-break-as-space`, async (t) => {
+  const { ctx, canvas } = t.context
+  const x = canvas.width / 2
+  ctx.font = '16px Iosevka Slab'
+  ctx.fillText('Hello\nCanvas', x, 200)
+  await snapshotImage(t)
+})
+
+test(`strokeText-line-break-as-space`, async (t) => {
+  const { ctx, canvas } = t.context
+  const x = canvas.width / 2
+  ctx.font = '32px Iosevka Slab'
+  ctx.strokeText('Hello\nCanvas', x, 200)
+  await snapshotImage(t)
+})
diff --git a/src/ctx.rs b/src/ctx.rs
@@ -437,7 +437,13 @@ impl Context {
     max_width: f32,
   ) -> result::Result<(), SkError> {
     let stroke_paint = self.stroke_paint()?;
-    self.draw_text(text, x, y, max_width, &stroke_paint)?;
+    self.draw_text(
+      text.replace('\n', " ").as_str(),
+      x,
+      y,
+      max_width,
+      &stroke_paint,
+    )?;
     Ok(())
   }
 
@@ -469,7 +475,13 @@ impl Context {
     max_width: f32,
   ) -> result::Result<(), SkError> {
     let fill_paint = self.fill_paint()?;
-    self.draw_text(text, x, y, max_width, &fill_paint)?;
+    self.draw_text(
+      text.replace('\n', " ").as_str(),
+      x,
+      y,
+      max_width,
+      &fill_paint,
+    )?;
     Ok(())
   }