From e27cc2c08949c2e671bcf03a9894dcfc7c38f9e3 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 30 Dec 2025 04:06:26 -0800
Subject: [PATCH] Remove private API access from tests/demo

---
 addons/addon-image/test/ImageAddon.test.ts        | 2 +-
 addons/addon-web-links/test/WebLinksAddon.test.ts | 2 +-
 demo/client/client.ts                             | 4 ++--
 test/playwright/InputHandler.test.ts              | 2 +-
 test/playwright/MouseTracking.test.ts             | 2 +-
 test/playwright/Terminal.test.ts                  | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/addon-image/test/ImageAddon.test.ts b/addons/addon-image/test/ImageAddon.test.ts
index 25d47c82..a26ba0f4 100644
--- a/addons/addon-image/test/ImageAddon.test.ts
+++ b/addons/addon-image/test/ImageAddon.test.ts
@@ -300,7 +300,7 @@ test.describe('ImageAddon', () => {
  * terminal access helpers.
  */
 async function getDimensions(): Promise<IDimensions> {
-  const dimensions: any = await ctx.page.evaluate(`term._core._renderService.dimensions`);
+  const dimensions: any = await ctx.page.evaluate(`term.dimensions`);
   return {
     cellWidth: Math.round(dimensions.css.cell.width),
     cellHeight: Math.round(dimensions.css.cell.height),
diff --git a/addons/addon-web-links/test/WebLinksAddon.test.ts b/addons/addon-web-links/test/WebLinksAddon.test.ts
index e4d5f5f2..f5764601 100644
--- a/addons/addon-web-links/test/WebLinksAddon.test.ts
+++ b/addons/addon-web-links/test/WebLinksAddon.test.ts
@@ -180,7 +180,7 @@ async function cellPos(col: number, row: number): Promise<[number, number]> {
   const coords: any = await ctx.page.evaluate(`
     (function() {
       const rect = window.term.element.getBoundingClientRect();
-      const dim = term._core._renderService.dimensions;
+      const dim = window.term.dimensions;
       return {left: rect.left, top: rect.top, bottom: rect.bottom, right: rect.right, width: dim.css.cell.width, height: dim.css.cell.height};
     })();
   `);
diff --git a/demo/client/client.ts b/demo/client/client.ts
index 69913984..c2134773 100644
--- a/demo/client/client.ts
+++ b/demo/client/client.ts
@@ -582,9 +582,9 @@ function addDomListener(element: HTMLElement, type: string, handler: (...args: a
 
 function updateTerminalSize(): void {
   const width = optionsWindow.autoResize ? '100%'
-    : (term._core._renderService.dimensions.css.canvas.width + term._core.viewport.scrollBarWidth).toString() + 'px';
+    : (term.dimensions.css.canvas.width + term._core.viewport.scrollBarWidth).toString() + 'px';
   const height = optionsWindow.autoResize ? '100%'
-    : (term._core._renderService.dimensions.css.canvas.height).toString() + 'px';
+    : (term.dimensions.css.canvas.height).toString() + 'px';
   terminalContainer.style.width = width;
   terminalContainer.style.height = height;
   addons.fit.instance.fit();
diff --git a/test/playwright/InputHandler.test.ts b/test/playwright/InputHandler.test.ts
index fb2eeb9c..f7da81c6 100644
--- a/test/playwright/InputHandler.test.ts
+++ b/test/playwright/InputHandler.test.ts
@@ -1405,7 +1405,7 @@ async function getCursor(): Promise<{ col: number, row: number }> {
 }
 
 async function getDimensions(): Promise<any> {
-  const dim: IRenderDimensions = await ctx.page.evaluate(`term._core._renderService.dimensions`);
+  const dim: IRenderDimensions = await ctx.page.evaluate(`term.dimensions`);
   return {
     cellWidth: dim.css.cell.width.toFixed(0),
     cellHeight: dim.css.cell.height.toFixed(0),
diff --git a/test/playwright/MouseTracking.test.ts b/test/playwright/MouseTracking.test.ts
index 7620f881..4b6ad925 100644
--- a/test/playwright/MouseTracking.test.ts
+++ b/test/playwright/MouseTracking.test.ts
@@ -47,7 +47,7 @@ async function cellPos(col: number, row: number): Promise<number[]> {
   const coords: any = await ctx.page.evaluate(`
     (function() {
       const rect = window.term.element.getBoundingClientRect();
-      const dim = term._core._renderService.dimensions;
+      const dim = window.term.dimensions;
       return {left: rect.left, top: rect.top, bottom: rect.bottom, right: rect.right, width: dim.css.cell.width, height: dim.css.cell.height};
     })();
   `);
diff --git a/test/playwright/Terminal.test.ts b/test/playwright/Terminal.test.ts
index 830c8989..ee5678c3 100644
--- a/test/playwright/Terminal.test.ts
+++ b/test/playwright/Terminal.test.ts
@@ -719,7 +719,7 @@ test.describe('API Integration Tests', () => {
     await ctx.page.evaluate(`window.term = new Terminal()`);
     await ctx.page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
     await ctx.page.evaluate(`document.querySelector('#terminal-container').style.display=''`);
-    await pollFor(ctx.page, `window.term._core._renderService.dimensions.css.cell.width > 0`, true);
+    await pollFor(ctx.page, `window.term.dimensions.css.cell.width > 0`, true);
   });
 
   test.describe('registerDecoration', () => {
@@ -1035,7 +1035,7 @@ async function getDimensions(): Promise<IDimensions> {
       return {
         top: rect.top,
         left: rect.left,
-        renderDimensions: window.term._core._renderService.dimensions
+        renderDimensions: window.term.dimensions
       };
     })();
   `);