Merge branch 'main' into fix/869

Author: simonklee

bun.lock

@@ -9,7 +9,7 @@
   "types": "src/index.ts",
   "module": "src/index.ts",
   "main": "src/index.ts",
-  "version": "0.1.91",
+  "version": "0.1.93",
   "type": "module",
   "scripts": {
     "build": "bun run build:native && bun run build:lib",
@@ -50,12 +50,12 @@
     "bun-webgpu": "0.1.5",
     "planck": "^1.4.2",
     "three": "0.177.0",
-    "@opentui/core-darwin-x64": "0.1.91",
-    "@opentui/core-darwin-arm64": "0.1.91",
-    "@opentui/core-linux-x64": "0.1.91",
-    "@opentui/core-linux-arm64": "0.1.91",
-    "@opentui/core-win32-x64": "0.1.91",
-    "@opentui/core-win32-arm64": "0.1.91"
+    "@opentui/core-darwin-x64": "0.1.93",
+    "@opentui/core-darwin-arm64": "0.1.93",
+    "@opentui/core-linux-x64": "0.1.93",
+    "@opentui/core-linux-arm64": "0.1.93",
+    "@opentui/core-win32-x64": "0.1.93",
+    "@opentui/core-win32-arm64": "0.1.93"
   },
   "exports": {
     ".": {

packages/core/package.json

@@ -565,35 +565,39 @@ export abstract class Renderable extends BaseRenderable {
   }
 
   public set width(value: number | "auto" | `${number}%`) {
-    if (isDimensionType(value)) {
-      this._width = value
-      this.yogaNode.setWidth(value)
+    if (!isDimensionType(value) || this._width === value) {
+      return
+    }
 
-      if (typeof value === "number" && this._flexShrink === 1) {
-        this._flexShrink = 0
-        this.yogaNode.setFlexShrink(0)
-      }
+    this._width = value
+    this.yogaNode.setWidth(value)
 
-      this.requestRender()
+    if (typeof value === "number" && this._flexShrink === 1) {
+      this._flexShrink = 0
+      this.yogaNode.setFlexShrink(0)
     }
+
+    this.requestRender()
   }
 
   public get height(): number {
     return this._heightValue
   }
 
   public set height(value: number | "auto" | `${number}%`) {
-    if (isDimensionType(value)) {
-      this._height = value
-      this.yogaNode.setHeight(value)
+    if (!isDimensionType(value) || this._height === value) {
+      return
+    }
 
-      if (typeof value === "number" && this._flexShrink === 1) {
-        this._flexShrink = 0
-        this.yogaNode.setFlexShrink(0)
-      }
+    this._height = value
+    this.yogaNode.setHeight(value)
 
-      this.requestRender()
+    if (typeof value === "number" && this._flexShrink === 1) {
+      this._flexShrink = 0
+      this.yogaNode.setFlexShrink(0)
     }
+
+    this.requestRender()
   }
 
   public get zIndex(): number {

packages/core/src/Renderable.ts

@@ -350,21 +350,17 @@ if (spawnPerScenario && !scenarioFilter) {
   process.exit(0)
 }
 
-process.env.OTUI_OVERRIDE_STDOUT = "false"
-process.env.OTUI_USE_ALTERNATE_SCREEN = "false"
-
 const renderer = await createCliRenderer({
   exitOnCtrlC: true,
   targetFps,
   maxFps,
   testing,
-  useAlternateScreen: false,
-  useConsole: false,
+  screenMode: "main-screen",
+  externalOutputMode: "passthrough",
+  consoleMode: "disabled",
   useMouse: false,
 })
 
-renderer.disableStdoutInterception()
-
 renderer.requestRender = () => {}
 
 const syntaxStyleA = SyntaxStyle.fromStyles({
@@ -1740,11 +1736,7 @@ async function runSpawnedScenarios(plans: ScenarioPlan[]): Promise<void> {
     const child = Bun.spawn([process.execPath, new URL(import.meta.url).pathname, ...args], {
       stdout: "inherit",
       stderr: "inherit",
-      env: {
-        ...process.env,
-        OTUI_OVERRIDE_STDOUT: "false",
-        OTUI_USE_ALTERNATE_SCREEN: "false",
-      },
+      env: process.env,
     })
     const exitCode = await child.exited
     if (exitCode !== 0) {

packages/core/src/benchmark/markdown-benchmark.ts

@@ -272,8 +272,9 @@ if (scenarioFilter && filteredScenarios.length === 0) {
 const { renderer, renderOnce } = await createTestRenderer({
   width,
   height,
-  useAlternateScreen: false,
-  useConsole: false,
+  screenMode: "main-screen",
+  externalOutputMode: "passthrough",
+  consoleMode: "disabled",
 })
 
 renderer.requestRender = () => {}

packages/core/src/benchmark/text-table-benchmark.ts

@@ -166,8 +166,6 @@ class TerminalConsoleCache extends EventEmitter {
     if (this._originalConsole) {
       global.console = this._originalConsole
     }
-
-    this.setupConsoleCapture()
   }
 
   public addLogEntry(level: LogLevel, ...args: any[]) {