bare-pointer 0.1.3 → 0.1.5

package/index.js

@@ -52,6 +52,15 @@ module.exports = class Pointer {
 
     if (this._backend.tap) {
       this._backend.tap(view, ...point)
+
+      // A tap can be posted to an event queue rather than delivered at once.
+      if (this._backend.pending !== undefined) {
+        for (let frames = 0; this._backend.pending(view); frames++) {
+          if (frames === 60) throw new Error('The tap was not delivered')
+
+          await this._frame(view)
+        }
+      }
     } else {
       this._backend.down(view, ...point)
 

package/lib/darwin.js

@@ -2,7 +2,11 @@ const AnimationFrameProvider = require('bare-animation-frame')
 const AppKitApplication = require('bare-app-kit/application')
 const AppKitEvent = require('bare-app-kit/event')
 
-const { TYPE } = AppKitEvent
+const { TYPE, MASK } = AppKitEvent
+
+// A run loop mode of its own, so that nothing else runs while the event queue
+// is read.
+const MODE = 'to.holepunch.bare.pointer'
 
 module.exports = class DarwinPointer {
   constructor() {
@@ -61,8 +65,25 @@ module.exports = class DarwinPointer {
     const window = view.window
     const point = view.convertPointToView(x, y, null)
 
-    AppKitApplication.postEvent(this._event(TYPE.LEFT_MOUSE_DOWN, window, point))
-    AppKitApplication.postEvent(this._event(TYPE.LEFT_MOUSE_UP, window, point))
+    // Ahead of anything already queued that could take the window off key, as
+    // the first press in a window that is not key only makes it key.
+    AppKitApplication.postEvent(this._event(TYPE.LEFT_MOUSE_UP, window, point), true)
+    AppKitApplication.postEvent(this._event(TYPE.LEFT_MOUSE_DOWN, window, point), true)
+  }
+
+  pending(view) {
+    const window = view.window
+
+    if (window === null) return false
+
+    const event = AppKitApplication.nextEventMatchingMask(
+      MASK.LEFT_MOUSE_DOWN | MASK.LEFT_MOUSE_UP,
+      null,
+      MODE,
+      false
+    )
+
+    return event !== null && event.windowNumber === window.windowNumber
   }
 
   destroy() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-pointer",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Simulated pointer input for testing Bare apps",
   "exports": {
     "./package": "./package.json",
@@ -48,7 +48,7 @@
   "homepage": "https://github.com/holepunchto/bare-pointer#readme",
   "dependencies": {
     "bare-animation-frame": "^0.1.1",
-    "bare-app-kit": "^0.3.1",
+    "bare-app-kit": "^0.3.3",
     "bare-ndk": "^0.3.4",
     "bare-ui-kit-touch": "^0.1.0",
     "bare-user32": "^0.1.1",