bare-pointer 0.1.5 → 0.1.7

package/lib/darwin.js

@@ -1,6 +1,7 @@
 const AnimationFrameProvider = require('bare-animation-frame')
 const AppKitApplication = require('bare-app-kit/application')
 const AppKitEvent = require('bare-app-kit/event')
+const FoundationProcessInfo = require('bare-foundation/process-info')
 
 const { TYPE, MASK } = AppKitEvent
 
@@ -12,6 +13,9 @@ module.exports = class DarwinPointer {
   constructor() {
     this._window = null
     this._point = null
+    this._press = 0
+    this._tap = null
+    this._monitor = null
   }
 
   size(view) {
@@ -50,6 +54,8 @@ module.exports = class DarwinPointer {
   }
 
   down(view, x, y) {
+    this._press++
+
     this._send(TYPE.LEFT_MOUSE_DOWN, view, x, y)
   }
 
@@ -62,19 +68,27 @@ module.exports = class DarwinPointer {
   }
 
   tap(view, x, y) {
-    const window = view.window
-    const point = view.convertPointToView(x, y, null)
+    this._tap = {
+      window: view.window,
+      point: view.convertPointToView(x, y, null),
+      missed: false,
+      dropping: false
+    }
 
-    // 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)
+    if (this._monitor === null) {
+      this._monitor = AppKitEvent.addLocalMonitorForEventsMatchingMask(
+        MASK.LEFT_MOUSE_DOWN | MASK.LEFT_MOUSE_UP,
+        this._onevent.bind(this)
+      )
+    }
+
+    this._post()
   }
 
   pending(view) {
     const window = view.window
 
-    if (window === null) return false
+    if (window === null || this._tap === null) return this._unmonitor()
 
     const event = AppKitApplication.nextEventMatchingMask(
       MASK.LEFT_MOUSE_DOWN | MASK.LEFT_MOUSE_UP,
@@ -83,10 +97,39 @@ module.exports = class DarwinPointer {
       false
     )
 
-    return event !== null && event.windowNumber === window.windowNumber
+    if (event !== null && event.windowNumber === window.windowNumber) return true
+
+    if (this._tap.missed) {
+      this._post()
+
+      return true
+    }
+
+    return this._unmonitor()
+  }
+
+  destroy() {
+    this._unmonitor()
+  }
+
+  _post() {
+    const { window, point } = this._tap
+
+    this._tap.missed = false
+    this._press++
+
+    AppKitApplication.postEvent(this._event(TYPE.LEFT_MOUSE_UP, window, point), true)
+    AppKitApplication.postEvent(this._event(TYPE.LEFT_MOUSE_DOWN, window, point), true)
   }
 
-  destroy() {}
+  _unmonitor() {
+    if (this._monitor !== null) AppKitEvent.removeMonitor(this._monitor)
+
+    this._monitor = null
+    this._tap = null
+
+    return false
+  }
 
   _send(type, view, x, y) {
     this._window = view.window
@@ -96,6 +139,37 @@ module.exports = class DarwinPointer {
   }
 
   _event(type, window, point) {
-    return AppKitEvent.mouseEvent(type, point.x, point.y, 0, 0, window.windowNumber)
+    return AppKitEvent.mouseEvent(
+      type,
+      point.x,
+      point.y,
+      0,
+      FoundationProcessInfo.processInfo.systemUptime,
+      window.windowNumber,
+      this._press
+    )
+  }
+
+  _onevent(event) {
+    const tap = this._tap
+
+    if (tap === null || event.windowNumber !== tap.window.windowNumber) return event
+
+    if (event.type === TYPE.LEFT_MOUSE_UP) {
+      if (!tap.dropping) return event
+
+      tap.dropping = false
+
+      return null
+    }
+
+    const { x, y } = event.locationInWindow
+
+    if (Math.abs(x - tap.point.x) < 1 && Math.abs(y - tap.point.y) < 1) return event
+
+    tap.missed = true
+    tap.dropping = true
+
+    return null
   }
 }

package/package.json

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