From c64115e0a0850939ba13f2df78166a731c0b94be Mon Sep 17 00:00:00 2001
From: tisilent <tisilent@163.com>
Date: Fri, 8 Sep 2023 17:34:03 +0800
Subject: [PATCH 1/4] Add handling of invisible

---
 src/browser/renderer/dom/DomRendererRowFactory.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/browser/renderer/dom/DomRendererRowFactory.ts b/src/browser/renderer/dom/DomRendererRowFactory.ts
index e6412b80..2d21a647 100644
--- a/src/browser/renderer/dom/DomRendererRowFactory.ts
+++ b/src/browser/renderer/dom/DomRendererRowFactory.ts
@@ -180,7 +180,11 @@ export class DomRendererRowFactory {
           && !isDecorated
         ) {
           // no span alterations, thus only account chars skipping all code below
-          text += chars;
+          if (cell.isInvisible()) {
+            text += WHITESPACE_CELL_CHAR;
+          } else {
+            text += chars;
+          }
           cellAmount++;
           continue;
         } else {

From 4e69307074215b42e5fb4e152a67b1403b1d3929 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 05:59:24 -0700
Subject: [PATCH 2/4] Add regression test

---
 test/playwright/SharedRendererTests.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/playwright/SharedRendererTests.ts b/test/playwright/SharedRendererTests.ts
index f8d70cc9..4fb6db13 100644
--- a/test/playwright/SharedRendererTests.ts
+++ b/test/playwright/SharedRendererTests.ts
@@ -144,7 +144,7 @@ export function injectSharedRendererTests(ctx: ISharedRendererTestContext): void
     await pollFor(ctx.value.page, () => getCellColor(ctx.value, 8, 1), [22, 23, 24, 255]);
   });
 
-  test('foreground 0-15 inivisible', async () => {
+  test('foreground 0-15 invisible', async () => {
     const theme: ITheme = {
       black: '#010203',
       red: '#040506',
@@ -167,7 +167,7 @@ export function injectSharedRendererTests(ctx: ISharedRendererTestContext): void
     await pollFor(ctx.value.page, () => getCellColor(ctx.value, 8, 1), [0, 0, 0, 255]);
   });
 
-  test('background 0-15 inivisible', async () => {
+  test('background 0-15 invisible', async () => {
     const theme: ITheme = {
       black: '#010203',
       red: '#040506',
@@ -1070,6 +1070,17 @@ export function injectSharedRendererTests(ctx: ISharedRendererTestContext): void
       await pollFor(ctx.value.page, () => getCellColor(ctx.value, 2, 1), [0, 0, 255, 255]); // inverse background of ' ' should be decoration bg override
     });
   });
+
+  test.describe('regression tests', () => {
+    test('#4758: multiple invisible text characters without SGR change should not be rendered', async () => {
+      // Regression test: #4758 when multiple invisible characters are used
+      await ctx.value.proxy.writeln(`\x1b[8m■■`);
+      // Full refresh as the before result is the same as after
+      await ctx.value.proxy.refresh(0, await ctx.value.proxy.rows - 1);
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 1), [0, 0, 0, 255]);
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 2, 1), [0, 0, 0, 255]);
+    });
+  });
 }
 
 /**

From 57ab29bb8529bf39703c7f2dac17c2dcba9a4250 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 06:02:32 -0700
Subject: [PATCH 3/4] Handle canvas renderer's more delayed rendering

---
 test/playwright/SharedRendererTests.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/playwright/SharedRendererTests.ts b/test/playwright/SharedRendererTests.ts
index 4fb6db13..d811ad21 100644
--- a/test/playwright/SharedRendererTests.ts
+++ b/test/playwright/SharedRendererTests.ts
@@ -1074,11 +1074,13 @@ export function injectSharedRendererTests(ctx: ISharedRendererTestContext): void
   test.describe('regression tests', () => {
     test('#4758: multiple invisible text characters without SGR change should not be rendered', async () => {
       // Regression test: #4758 when multiple invisible characters are used
-      await ctx.value.proxy.writeln(`\x1b[8m■■`);
+      await ctx.value.proxy.writeln(`■\x1b[8m■■`);
       // Full refresh as the before result is the same as after
       await ctx.value.proxy.refresh(0, await ctx.value.proxy.rows - 1);
-      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 1), [0, 0, 0, 255]);
+      // Control to ensure rendering has occurred
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 1), [255, 255, 255, 255]);
       await pollFor(ctx.value.page, () => getCellColor(ctx.value, 2, 1), [0, 0, 0, 255]);
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 3, 1), [0, 0, 0, 255]);
     });
   });
 }

From 056206d7a4ab2be784343fc4f06c9432a7cbb723 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 06:09:07 -0700
Subject: [PATCH 4/4] Clear theme at start of every renderer test

---
 test/playwright/SharedRendererTests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/playwright/SharedRendererTests.ts b/test/playwright/SharedRendererTests.ts
index d811ad21..8a7eabf4 100644
--- a/test/playwright/SharedRendererTests.ts
+++ b/test/playwright/SharedRendererTests.ts
@@ -19,6 +19,7 @@ export function injectSharedRendererTests(ctx: ISharedRendererTestContext): void
     ctx.value.page.evaluate(`
       window.term.options.minimumContrastRatio = 1;
       window.term.options.allowTransparency = false;
+      window.term.options.theme = undefined;
     `);
     // Clear the cached screenshot before each test
     frameDetails = undefined;