fix(driver): text color and measure cursor index

fixes #67
atty303 · May 26, 2024 · 93bfd1d · 93bfd1d
1 parent 332cf04
commit 93bfd1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/packages/driver/src/js/renderer/renderer.ts b/packages/driver/src/js/renderer/renderer.ts
@@ -227,14 +227,6 @@ export class Renderer {
 
       const subtext = text.substring(0, m.index);
       text = text.substring(m.index + m[0].length);
-      if (m[1]) {
-        this.currentColor = colorEscape[Number.parseInt(m[1])];
-      } else {
-        const r = Number.parseInt(m[2].substring(0, 2), 16);
-        const g = Number.parseInt(m[2].substring(2, 4), 16);
-        const b = Number.parseInt(m[2].substring(4, 6), 16);
-        this.currentColor = [r / 255, g / 255, b / 255, 1];
-      }
 
       if (subtext.length > 0) {
         for (const render of this.textRasterizer.get(height, font, subtext)) {
@@ -244,6 +236,15 @@ export class Renderer {
           });
         }
       }
+
+      if (m[1]) {
+        this.currentColor = colorEscape[Number.parseInt(m[1])];
+      } else {
+        const r = Number.parseInt(m[2].substring(0, 2), 16);
+        const g = Number.parseInt(m[2].substring(2, 4), 16);
+        const b = Number.parseInt(m[2].substring(4, 6), 16);
+        this.currentColor = [r / 255, g / 255, b / 255, 1];
+      }
     }
     if (text.length > 0) {
       for (const render of this.textRasterizer.get(height, font, text)) {

diff --git a/packages/driver/src/js/renderer/text.ts b/packages/driver/src/js/renderer/text.ts
@@ -48,12 +48,12 @@ export class TextMetrics {
 
   measureCursorIndex(size: number, fontNum: number, text: string, cursorX: number, cursorY: number) {
     this.context.font = font(size, fontNum);
-    const lines = text.replaceAll(reColorGlobal, "").split("\n");
+    const lines = text.split("\n");
     const y = Math.floor(Math.max(0, Math.min(lines.length - 1, cursorY / size)));
     const line = lines[y];
     let i = 0;
     for (; i <= line.length; i++) {
-      const w = this.context.measureText(line.substring(0, i)).width;
+      const w = this.context.measureText(line.substring(0, i).replaceAll(reColorGlobal, "")).width;
       if (w >= cursorX) {
         break;
       }