react-x11 2.8.1 → 2.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "react renderer with X11 as a target",
   "main": "./src/index.js",
   "files": [
@@ -98,7 +98,7 @@
     "yoga-layout": "^3.2.1"
   },
   "optionalDependencies": {
-    "@windowkit/appkit": "^0.5.1",
+    "@windowkit/appkit": "^0.6.0",
     "dbus-native": "^0.15.1",
     "x11-dri": "^0.7.0"
   },

package/src/cocoa/dnd.js

@@ -208,6 +208,19 @@ const wire = (value) =>
  * first item under its UTI, thunks as promises the bridge asks `provide`
  * to keep. The files thunk alone resolves now, because the items cannot
  * be counted without it.
+ *
+ * No image, and so no slide-back. The picture of the drag is the app's own
+ * `<popup dragPreview>`; what the system session carries is a blank 1×1.
+ * Left at AppKit's default, a refused or cancelled drop plays
+ * `animatesToStartingPositionsOnCancelOrFail`'s slide home **before**
+ * `draggingSession:endedAtPoint:operation:` — the callback that is
+ * `drag-session-ended`, which `onDragEnd` and the preview's unmount wait
+ * on — so the button was up for about a second with the gesture still
+ * open and the preview frozen where the pointer let go, while AppKit
+ * animated nothing back to the press (#494). Off, the release ends the
+ * gesture the moment it happens, as on X11, and the return is the app's
+ * to animate from `onDragEnd`. Not a seam: there is no system image for
+ * a caller to want slid back.
  */
 export function dragSpec(session, native, scale) {
   const types = session.types;
@@ -241,6 +254,7 @@ export function dragSpec(session, native, scale) {
     y: session.press.y / scale,
     items,
     operations: session.actions,
+    slideBack: false,
     provide: (uti) => wire(session._resolve(reverse.get(uti) ?? uti)),
   };
 }

package/src/cocoa/window.js

@@ -68,6 +68,16 @@ export class CocoaWindow {
       attributes.visual !== undefined || attributes.transparent;
     this._transparentWindow = Boolean(transparent);
     if (transparent) options.opaque = false;
+    // A `<popup dragPreview>` follows the pointer, so for the whole gesture
+    // it is the window the window server finds under it — and AppKit does
+    // not look past a window that registered no dragged types: the drag
+    // simply has no destination, and the window beneath never hears of it.
+    // Transparent to the pointer, the preview is passed over and the hit
+    // reaches what it covers (#488; @windowkit/appkit >= 0.6.0, an older
+    // bridge ignores the option). The drop side is excluded separately:
+    // nodes.js `_initDnd` gives a preview no DropSession and registers
+    // nothing.
+    if (attributes.dragPreview) options.ignoresMouseEvents = true;
     // The root layer's background is the "what newly exposed area shows"
     // attribute an X window has — worth seeding on an opaque window so a
     // resize flashes the right colour. On a transparent one it would sit

package/src/nodes.js

@@ -10477,11 +10477,13 @@ export class WindowNode extends Scrollable(Node) {
    * The one exception is a `<popup dragPreview>`. It follows the pointer,
    * so for the whole gesture it is the frontmost window under it, and it
    * must never be what the drag is over. Where react-x11 picks the target
-   * itself (src/dnd.js `topLevelAt`) it is skipped by name; where the OS
-   * picks — AppKit routes a drag to the frontmost window registered for a
-   * type it carries, and looks past one that registered none — the only
-   * way to say so is to register nothing (#488). So a preview gets none of
-   * this: no session, no registry entry, no property.
+   * itself (src/dnd.js `topLevelAt`) it is skipped by name. Where the OS
+   * picks, registering nothing is not enough: AppKit finds the window
+   * under the pointer first and does not look past one with no dragged
+   * types — the drag then has no destination at all — so the cocoa window
+   * is made transparent to the pointer instead (src/cocoa/window.js,
+   * `ignoresMouseEvents`, #488). A preview still gets none of this: no
+   * session, no registry entry, no property, nothing to refuse with.
    */
   _initDnd() {
     if (this.props.dragPreview) return;

package/src/types/elements.d.ts

@@ -436,11 +436,12 @@ export interface WindowProps
   xi2?: boolean | 'auto';
   /**
    * Mark this window as a drag preview: the drag router never treats it as
-   * the window under the pointer, and it is never a drop destination — on
-   * the cocoa backend, where AppKit picks the destination, that is what
-   * lets a drop reach the window beneath it. A `<popup dragPreview>` can
-   * therefore follow the pointer without swallowing its own drag. Read when
-   * the window is created. See `useDragSource`.
+   * the window under the pointer, it is never a drop destination, and on
+   * the cocoa backend — where the window server picks the window under the
+   * pointer — it is made transparent to the pointer, so a drop reaches the
+   * window beneath it. A `<popup dragPreview>` can therefore follow the
+   * pointer without swallowing its own drag. Read when the window is
+   * created. See `useDragSource`.
    */
   dragPreview?: boolean;
   /**