react-x11 2.18.0 → 2.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.18.0",
+  "version": "2.18.1",
   "description": "react renderer with X11 as a target",
   "main": "./src/index.js",
   "files": [

package/src/cocoa/glarea.js

@@ -28,6 +28,8 @@
 // so the ladder is visible before it is built. Policy decides, the machine
 // answers — the same rule the GL policy follows everywhere else.
 
+import { withoutActions } from './quiet.js';
+
 const RUNGS = ['auto', 'gl'];
 const KNOWN_RUNGS = ['auto', 'gl', 'gles', 'webgpu'];
 
@@ -145,8 +147,11 @@ export class CocoaGLArea {
     this.scale = this.parent.scale ?? app.scale ?? 1;
     this.destroyed = false;
     this._reactX11Node = null;
-    this.layer = this._native.createLayer();
-    this._native.addSublayer(this.parent._layer, this.layer);
+    this.layer = withoutActions(this._native, () => {
+      const layer = this._native.createLayer();
+      this._native.addSublayer(this.parent._layer, layer);
+      return layer;
+    });
     this.rect = null;
     this.setState({
       x: options.x ?? 0,
@@ -254,7 +259,9 @@ export class CocoaGLArea {
     this.destroyed = true;
     this._context?._destroy();
     this._context = null;
-    this._native.removeFromSuperlayer(this.layer);
+    withoutActions(this._native, () =>
+      this._native.removeFromSuperlayer(this.layer),
+    );
   }
 }
 

package/src/cocoa/overlay.js

@@ -15,6 +15,7 @@
 // was painted on the layer: ntk blits an X window's backing store on its
 // own, where a layer's contents are a copy the bitmap has to be pushed to.
 import { BackendContext2D } from '../backend/context2d.js';
+import { withoutActions } from './quiet.js';
 
 export const OVERLAY_Z = 1e7 + 1;
 
@@ -25,8 +26,11 @@ export class CocoaOverlayPane {
     this._native = app._native;
     this.scale = this.parent.scale ?? app.scale ?? 1;
     this.destroyed = false;
-    this.layer = this._native.createLayer();
-    this._native.addSublayer(this.parent._layer, this.layer);
+    this.layer = withoutActions(this._native, () => {
+      const layer = this._native.createLayer();
+      this._native.addSublayer(this.parent._layer, layer);
+      return layer;
+    });
     this.rect = null;
     this._surface = null;
     this._surfaceSize = null;
@@ -154,6 +158,11 @@ export class CocoaOverlayPane {
     this.destroyed = true;
     this._release();
     this._ctx = null;
-    this._native.removeFromSuperlayer(this.layer);
+    // Actions off, or the layer fades out over a quarter of a second, what
+    // the children last painted going translucent over a surface still
+    // drawing (#638).
+    withoutActions(this._native, () =>
+      this._native.removeFromSuperlayer(this.layer),
+    );
   }
 }

package/src/cocoa/panehost.js

@@ -3,13 +3,18 @@
 // contents are whatever IOSurface the pane process last presented. The pane
 // owns its buffers and its drawing; this side owns the layer, the layout
 // and the input — CPU offloading, not isolation (docs/frame.md).
+import { withoutActions } from './quiet.js';
+
 export class CocoaPaneHost {
   constructor(app, wnd) {
     this.app = app;
     this.wnd = wnd;
     this._native = app._native;
-    this.layer = this._native.createLayer();
-    this._native.addSublayer(wnd._layer, this.layer);
+    this.layer = withoutActions(this._native, () => {
+      const layer = this._native.createLayer();
+      this._native.addSublayer(wnd._layer, layer);
+      return layer;
+    });
     this.destroyed = false;
     this._rect = null;
   }
@@ -73,6 +78,8 @@ export class CocoaPaneHost {
   destroy() {
     if (this.destroyed) return;
     this.destroyed = true;
-    this._native.removeFromSuperlayer(this.layer);
+    withoutActions(this._native, () =>
+      this._native.removeFromSuperlayer(this.layer),
+    );
   }
 }

package/src/cocoa/quiet.js

@@ -0,0 +1,13 @@
+// Layer changes with Core Animation's implicit actions off, for a layer
+// that is ours rather than a presenter's (a <glarea>'s surface and overlay,
+// a frame pane's host): no frame's transaction covers it, so a bare
+// `addSublayer` or `removeFromSuperlayer` takes the default quarter-second
+// order-in or order-out fade, and a bare property set tweens.
+export function withoutActions(native, fn) {
+  native.txBegin({ disableActions: true });
+  try {
+    return fn();
+  } finally {
+    native.txCommit();
+  }
+}