Remove private API access from tests/demo
This commit is contained in:
@@ -300,7 +300,7 @@ test.describe('ImageAddon', () => {
|
|||||||
* terminal access helpers.
|
* terminal access helpers.
|
||||||
*/
|
*/
|
||||||
async function getDimensions(): Promise<IDimensions> {
|
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 {
|
return {
|
||||||
cellWidth: Math.round(dimensions.css.cell.width),
|
cellWidth: Math.round(dimensions.css.cell.width),
|
||||||
cellHeight: Math.round(dimensions.css.cell.height),
|
cellHeight: Math.round(dimensions.css.cell.height),
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ async function cellPos(col: number, row: number): Promise<[number, number]> {
|
|||||||
const coords: any = await ctx.page.evaluate(`
|
const coords: any = await ctx.page.evaluate(`
|
||||||
(function() {
|
(function() {
|
||||||
const rect = window.term.element.getBoundingClientRect();
|
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};
|
return {left: rect.left, top: rect.top, bottom: rect.bottom, right: rect.right, width: dim.css.cell.width, height: dim.css.cell.height};
|
||||||
})();
|
})();
|
||||||
`);
|
`);
|
||||||
|
|||||||
@@ -582,9 +582,9 @@ function addDomListener(element: HTMLElement, type: string, handler: (...args: a
|
|||||||
|
|
||||||
function updateTerminalSize(): void {
|
function updateTerminalSize(): void {
|
||||||
const width = optionsWindow.autoResize ? '100%'
|
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%'
|
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.width = width;
|
||||||
terminalContainer.style.height = height;
|
terminalContainer.style.height = height;
|
||||||
addons.fit.instance.fit();
|
addons.fit.instance.fit();
|
||||||
|
|||||||
@@ -1405,7 +1405,7 @@ async function getCursor(): Promise<{ col: number, row: number }> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getDimensions(): Promise<any> {
|
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 {
|
return {
|
||||||
cellWidth: dim.css.cell.width.toFixed(0),
|
cellWidth: dim.css.cell.width.toFixed(0),
|
||||||
cellHeight: dim.css.cell.height.toFixed(0),
|
cellHeight: dim.css.cell.height.toFixed(0),
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ async function cellPos(col: number, row: number): Promise<number[]> {
|
|||||||
const coords: any = await ctx.page.evaluate(`
|
const coords: any = await ctx.page.evaluate(`
|
||||||
(function() {
|
(function() {
|
||||||
const rect = window.term.element.getBoundingClientRect();
|
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};
|
return {left: rect.left, top: rect.top, bottom: rect.bottom, right: rect.right, width: dim.css.cell.width, height: dim.css.cell.height};
|
||||||
})();
|
})();
|
||||||
`);
|
`);
|
||||||
|
|||||||
@@ -719,7 +719,7 @@ test.describe('API Integration Tests', () => {
|
|||||||
await ctx.page.evaluate(`window.term = new Terminal()`);
|
await ctx.page.evaluate(`window.term = new Terminal()`);
|
||||||
await ctx.page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
|
await ctx.page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
|
||||||
await ctx.page.evaluate(`document.querySelector('#terminal-container').style.display=''`);
|
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', () => {
|
test.describe('registerDecoration', () => {
|
||||||
@@ -1035,7 +1035,7 @@ async function getDimensions(): Promise<IDimensions> {
|
|||||||
return {
|
return {
|
||||||
top: rect.top,
|
top: rect.top,
|
||||||
left: rect.left,
|
left: rect.left,
|
||||||
renderDimensions: window.term._core._renderService.dimensions
|
renderDimensions: window.term.dimensions
|
||||||
};
|
};
|
||||||
})();
|
})();
|
||||||
`);
|
`);
|
||||||
|
|||||||
Reference in New Issue
Block a user