@breakside/jskit 2023.18.3 → 2023.19.0

package/Root/Frameworks/UIKit/UIListView.js

@@ -2385,53 +2385,73 @@ JSClass("UIListView", UIScrollView, {
 
     touchesBegan: function(touches, event){
         UIListView.$super.touchesBegan.call(this, touches, event);
-        if (touches.length > 1){
-            return;
+        if (this._touch !== null){
+            if (event.touchForIdentifier(this._touch.identifier) !== null){
+                return;
+            }
         }
+        var touch = touches[0];
         this._touch = {
-            location0: touches[0].locationInWindow,
+            identifier: touch.identifier,
+            location0: touch.locationInWindow,
             cell: null,
             timer: JSTimer.scheduledTimerWithInterval(0.05, function(){
                 this._touch.timer = null;
-                this._makeTouchActiveCell(touches[0], true);
+                this._makeTouchActiveCell(touch, true);
             }, this)
         };
     },
 
     touchesMoved: function(touches, event){
         UIListView.$super.touchesMoved.call(this, touches, event);
-        if (this._touch !== null){
-            var location = touches[0].locationInWindow;
-            var diff = location.subtracting(this._touch.location0);
-            if ((diff.x * diff.x + diff.y * diff.y) > 2){
-                this._cancelTouchSelection();
-            }
+        if (this._touch === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._touch.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
+        var location = touch.locationInWindow;
+        var diff = location.subtracting(this._touch.location0);
+        if ((diff.x * diff.x + diff.y * diff.y) > 2){
+            this._cancelTouchSelection();
         }
     },
 
     touchesEnded: function(touches, event){
         UIListView.$super.touchesEnded.call(this, touches, event);
-        if (touches.length > 1){
+        if (this._touch === null){
             return;
         }
-        if (this._touch !== null){
-            if (this._touch.timer !== null){
-                this._touch.timer.invalidate();
-                this._makeTouchActiveCell(touches[0]);
+        var touch = event.touchForIdentifier(this._touch.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
+        if (this._touch.timer !== null){
+            this._touch.timer.invalidate();
+            if (touch !== null){
+                this._makeTouchActiveCell(touch);
             }
-            if (this._touch.cell){
-                this._touch.cell.active = false;
-                this._setSelectedIndexPaths([this._touch.cell.indexPath], {notifyDelegate: true});
-                if (this.delegate && this.delegate.listViewDidFinishSelectingCellAtIndexPath){
-                    this.delegate.listViewDidFinishSelectingCellAtIndexPath(this, this._touch.cell.indexPath);
-                }
+        }
+        if (this._touch.cell){
+            this._touch.cell.active = false;
+            this._setSelectedIndexPaths([this._touch.cell.indexPath], {notifyDelegate: true});
+            if (this.delegate && this.delegate.listViewDidFinishSelectingCellAtIndexPath){
+                this.delegate.listViewDidFinishSelectingCellAtIndexPath(this, this._touch.cell.indexPath);
             }
-            this._touch = null;
         }
+        this._touch = null;
     },
 
     touchesCanceled: function(touches, event){
         UIListView.$super.touchesCanceled.call(this, touches, event);
+        if (this._touch === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._touch.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
         this._cancelTouchSelection();
     },
 

package/Root/Frameworks/UIKit/UIMenuView.js

@@ -390,14 +390,22 @@ JSClass("UIMenuWindow", UIWindow, {
     // -----------------------------------------------------------------------
     // MARK: - Touch Events
 
+    _activeTouchInfo: null,
+
     touchesBegan: function(touches, event){
         if (this._isClosing){
             return;
         }
-        if (touches.length > 1){
-            return;
+        if (this._activeTouchInfo !== null){
+            if (event.touchForIdentifier(this._activeTouchInfo.identifier) !== null){
+                return;
+            }
         }
-        var location = touches[0].locationInView(this);
+        var touch = touches[0];
+        this._activeTouchInfo = {
+            identifier: touch.identifier
+        };
+        var location = touch.locationInView(this);
         if (!this.containsPoint(location)){
             if (this._menu.supermenu && this._menu.supermenu.stylerProperties.window){
                 this._menu.supermenu.stylerProperties.window.touchesBegan(touches, event);
@@ -411,10 +419,14 @@ JSClass("UIMenuWindow", UIWindow, {
     },
 
     touchesMoved: function(touches, event){
-        if (this._isClosing){
+        if (this._activeTouchInfo === null){
             return;
         }
-        var location = touches[0].locationInView(this);
+        var touch = event.touchForIdentifier(this._activeTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
+        var location = touch.locationInView(this);
         this._lastMoveLocation = location;
         this._adjustHighlightForLocation(this._lastMoveLocation);
         if (!this.containsPoint(location)){
@@ -428,10 +440,15 @@ JSClass("UIMenuWindow", UIWindow, {
         if (event.timestamp - this._itemDownTimestamp < 0.2){
             return;
         }
-        if (this._isClosing){
+        if (this._activeTouchInfo === null){
             return;
         }
-        var location = touches[0].locationInView(this);
+        var touch = event.touchForIdentifier(this._activeTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
+        this._activeTouchInfo = null;
+        var location = touch.locationInView(this);
         if (this.containsPoint(location)){
             this._performActionForHighlightedItem();
         }else{
@@ -444,6 +461,14 @@ JSClass("UIMenuWindow", UIWindow, {
     },
 
     touchesCanceled: function(touches, event){
+        if (this._activeTouchInfo === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._activeTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
+        this._activeTouchInfo = null;
     },
 
     // -----------------------------------------------------------------------

package/Root/Frameworks/UIKit/UIPressGestureRecognizer.js

@@ -36,48 +36,45 @@ JSClass("UIPressGestureRecognizer", UIGestureRecognizer, {
 
     // MARK: - Events
 
-    began: false,
-    beganLocation: null,
-    beganTouchID: null,
-    pressTimer: null,
+    _firstTouchInfo: null,
 
     touchesBegan: function(touches, event){
-        if (this.began){
-            return;
-        }
-        this.began = true;
         if (this._state === UIGestureRecognizer.State.possible){
-            if (touches.length === 1){
-                this.beganTouchID = touches[0].identifier;
-                this.beganLocation = touches[0].locationInView(this.view);
-                this.pressTimer = JSTimer.scheduledTimerWithInterval(this.minimumPressInterval, this.minimumTimeReached, this);
+            if (touches.length === 1 && event.touches.length === 1){
+                var touch = touches[0];
+                this._firstTouchInfo = {
+                    identifier: touch.identifier,
+                    location: touch.locationInWindow,
+                    timer: JSTimer.scheduledTimerWithInterval(this.minimumPressInterval, this.minimumTimeReached, this)
+                };
                 this._setState(UIGestureRecognizer.State.began);
             }
         }else{
-            this._setState(UIGestureRecognizer.State.failed);
+            this.end(UIGestureRecognizer.State.failed);
         }
     },
 
     minimumTimeReached: function(timer){
+        this._firstTouchInfo = null;
         this._setState(UIGestureRecognizer.State.recognized);
-        this.pressTimer = null;
     },
 
     end: function(state){
-        if (this.pressTimer !== null){
-            this.pressTimer.invalidate();
-            this.pressTimer = null;
+        if (this._firstTouchInfo !== null){
+            if (this._firstTouchInfo.timer !== null){
+                this._firstTouchInfo.timer.invalidate();
+            }
+            this._firstTouchInfo = null;
         }
-        this._setState(UIGestureRecognizer.State.failed);
+        this._setState(state);
     },
 
     touchesMoved: function(touches, event){
-        if (this._state === UIGestureRecognizer.State.possible){
+        if (this._firstTouchInfo === null){
             return;
         }
-        var touch = event.touchForIdentifier(this.beganTouchID);
-        if (touch === null){
-            this.end(UIGestureRecognizer.State.failed);
+        var touch = event.touchForIdentifier(this._firstTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
             return;
         }
         var location = touch.locationInView(this.view);
@@ -88,26 +85,22 @@ JSClass("UIPressGestureRecognizer", UIGestureRecognizer, {
     },
 
     touchesEnded: function(touches, event){
-        var beganTouchID = this.beganTouchID;
-        this.began = false;
-        this.beganLocation = null;
-        this.beganTouchID = null;
-        if (this._state === UIGestureRecognizer.State.possible){
+        if (this._firstTouchInfo === null){
             return;
         }
-        var touch = event.touchForIdentifier(beganTouchID);
-        if (touch === null){
-            this.end(UIGestureRecognizer.State.failed);
+        var touch = event.touchForIdentifier(this._firstTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
             return;
         }
         this.end(UIGestureRecognizer.State.cancled);
     },
 
     touchesCanceled: function(touches, event){
-        this.began = false;
-        this.beganLocation = null;
-        this.beganTouchID = null;
-        if (this._state === UIGestureRecognizer.State.possible){
+        if (this._firstTouchInfo === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._firstTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
             return;
         }
         this.end(UIGestureRecognizer.State.failed);

package/Root/Frameworks/UIKit/UIScrollGestureRecognizer.js

@@ -48,7 +48,7 @@ JSClass("UIScrollGestureRecognizer", UIGestureRecognizer, {
         var touch = touches[0];
         var location = touch.locationInWindow;
         this._touchTracking = {
-            identifier: touches[0],
+            identifier: touch.identifier,
             startingLocation: JSPoint(location),
             location: location,
             contentOffset: JSPoint(this.contentOffset),
@@ -80,9 +80,12 @@ JSClass("UIScrollGestureRecognizer", UIGestureRecognizer, {
         if (!this._scrollsVertically && !this._scrollsHorizontally){
             return;
         }
-        if (this._touchTracking === null){
-            this._beginTrackingTouches(touches, event);
+        if (this._touchTracking !== null){
+            if (event.touchForIdentifier(this._touchTracking.identifier) !== null){
+                return;
+            }
         }
+        this._beginTrackingTouches(touches, event);
     },
 
     touchesMoved: function(touches, event){
@@ -96,8 +99,8 @@ JSClass("UIScrollGestureRecognizer", UIGestureRecognizer, {
             }
         }
         var touch = event.touchForIdentifier(this._touchTracking.identifier);
-        if (touch === null){
-            touch = touches[0];
+        if (touches.indexOf(touch) < 0){
+            return;
         }
         var location = touch.locationInWindow;
         var delta = location.subtracting(this._touchTracking.startingLocation);
@@ -133,6 +136,13 @@ JSClass("UIScrollGestureRecognizer", UIGestureRecognizer, {
         if (!this._scrollsVertically && !this._scrollsHorizontally){
             return;
         }
+        if (this._touchTracking === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._touchTracking.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
         var dt = event.timestamp - this._touchTracking.timestamp;
         if (dt < 0.05){
             this._beginCoasting(this._touchTracking.velocity);
@@ -146,6 +156,13 @@ JSClass("UIScrollGestureRecognizer", UIGestureRecognizer, {
         if (!this._scrollsVertically && !this._scrollsHorizontally){
             return;
         }
+        if (this._touchTracking === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._touchTracking.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
         this._endTrackingTouches();
         this._setState(UIGestureRecognizer.State.ended);
     },

package/Root/Frameworks/UIKit/UIScrollView.js

@@ -555,7 +555,7 @@ JSClass('UIScrollView', UIView, {
         var touch = touches[0];
         var location = touch.locationInView(this);
         this._touchTracking = {
-            identifier: touches[0],
+            identifier: touch.identifier,
             startingLocation: JSPoint(location),
             location: location,
             contentOffset: JSPoint(this.contentOffset),
@@ -586,6 +586,11 @@ JSClass('UIScrollView', UIView, {
         if (!this._scrollsVertically && !this._scrollsHorizontally){
             return UIScrollView.$super.touchesBegan.call(this, touches, event);
         }
+        if (this._touchTracking !== null){
+            if (event.touchForIdentifier(this._touchTracking.identifier) !== null){
+                return;
+            }
+        }
         this._beginTrackingTouches(touches, event);
     },
 
@@ -597,8 +602,8 @@ JSClass('UIScrollView', UIView, {
             this._beginTrackingTouches(touches, event);
         }
         var touch = event.touchForIdentifier(this._touchTracking.identifier);
-        if (touch === null){
-            touch = touches[0];
+        if (touches.indexOf(touch) < 0){
+            return;
         }
         var location = touch.locationInView(this);
         var delta = location.subtracting(this._touchTracking.startingLocation);
@@ -623,6 +628,13 @@ JSClass('UIScrollView', UIView, {
         if (!this._scrollsVertically && !this._scrollsHorizontally){
             return UIScrollView.$super.touchesEnded.call(this, touches, event);
         }
+        if (this._touchTracking === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._touchTracking.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
         var dt = event.timestamp - this._touchTracking.timestamp;
         if (dt < 0.05){
             this._beginCoasting(this._touchTracking.velocity);
@@ -634,6 +646,13 @@ JSClass('UIScrollView', UIView, {
         if (!this._scrollsVertically && !this._scrollsHorizontally){
             return UIScrollView.$super.touchesCanceled.call(this, touches, event);
         }
+        if (this._touchTracking === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._touchTracking.identifier);
+        if (touches.indexOf(touch) < 0){
+            return;
+        }
         this._endTrackingTouches();
     },
 

package/Root/Frameworks/UIKit/UITapGestureRecognizer.js

@@ -20,65 +20,60 @@ JSClass("UITapGestureRecognizer", UIGestureRecognizer, {
 
     // MARK: - Events
 
-    began: false,
-    beganLocation: null,
-    beganTouchID: null,
+    _firstTouchInfo: null,
 
     touchesBegan: function(touches, event){
-        if (this.began){
-            return;
-        }
-        this.began = true;
         if (this._state === UIGestureRecognizer.State.possible){
-            if (touches.length === 1){
-                this.beganTouchID = touches[0].identifier;
-                this.beganLocation = touches[0].locationInView(this.view);
+            if (touches.length === 1 && event.touches.length === 1){
+                var touch = touches[0];
+                this._firstTouchInfo = {
+                    identifier: touch.identifier,
+                    location: JSPoint(touch.locationInWindow)
+                };
                 this._setState(UIGestureRecognizer.State.began);
             }
         }else{
+            this._firstTouchInfo = null;
             this._setState(UIGestureRecognizer.State.failed);
         }
     },
 
     touchesMoved: function(touches, event){
-        if (this._state === UIGestureRecognizer.State.possible){
+        if (this._firstTouchInfo === null){
             return;
         }
-        var touch = event.touchForIdentifier(this.beganTouchID);
-        if (touch === null){
-            this._setState(UIGestureRecognizer.State.failed);
+        var touch = event.touchForIdentifier(this._firstTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
             return;
         }
-        var location = touch.locationInView(this.view);
-        var distance = location.distanceToPoint(this.beganLocation);
+        var distance = touch.locationInWindow.distanceToPoint(this._firstTouchInfo.location);
         if (distance > 10){
+            this._firstTouchInfo = null;
             this._setState(UIGestureRecognizer.State.failed);
         }
     },
 
     touchesEnded: function(touches, event){
-        var beganTouchID = this.beganTouchID;
-        this.began = false;
-        this.beganLocation = null;
-        this.beganTouchID = null;
-        if (this._state === UIGestureRecognizer.State.possible){
+        if (this._firstTouchInfo === null){
             return;
         }
-        var touch = event.touchForIdentifier(beganTouchID);
-        if (touch === null){
-            this._setState(UIGestureRecognizer.State.failed);
+        var touch = event.touchForIdentifier(this._firstTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
             return;
         }
+        this._firstTouchInfo = null;
         this._setState(UIGestureRecognizer.State.recognized);
     },
 
     touchesCanceled: function(touches, event){
-        this.began = false;
-        this.beganLocation = null;
-        this.beganTouchID = null;
-        if (this._state === UIGestureRecognizer.State.possible){
+        if (this._firstTouchInfo === null){
+            return;
+        }
+        var touch = event.touchForIdentifier(this._firstTouchInfo.identifier);
+        if (touches.indexOf(touch) < 0){
             return;
         }
+        this._firstTouchInfo = null;
         this._setState(UIGestureRecognizer.State.failed);
     }
 

package/Root/Frameworks/UIKit/UIWindow.js

@@ -1028,21 +1028,22 @@ JSClass('UIWindow', UIView, {
         }
     },
 
+    _hadModalWhenTouchesBegan: false,
+
     _sendTouchEvent: function(event){
         var modal = this._modal;
         while (modal !== null && modal._modal !== null){
             modal = modal._modal;
         }
         var i, l;
+        if (event.type === UIEvent.Type.touchesBegan){
+            if (!event.hasPastTouches()){
+                this._hadModalWhenTouchesBegan = modal !== null;
+            }
+        }
         if (modal !== null){
             if (event.type == UIEvent.Type.touchesEnded){
-                var activeTouchCount = 0;
-                for (i = 0, l = event.touches.length; i < l; ++i){
-                    if (event.touches[i].phase !== UITouch.Phase.ended && event.touches[i].phase !== UITouch.Phase.canceled){
-                        ++activeTouchCount;
-                    }
-                }
-                if (modal._isOpen && activeTouchCount === 0){
+                if (modal._isOpen && !event.hasFutureTouches() && this._hadModalWhenTouchesBegan){
                     modal.makeKeyAndOrderFront();
                     modal.indicateModalStatus();
                 }
@@ -1052,55 +1053,72 @@ JSClass('UIWindow', UIView, {
         var j, k;
         // We only dispatch the touches that changed in this version of the event.
         // A view can get all the touches it wants from the event.
-        var touches = event.changedTouchesInWindow(this);
-        if (touches.length === 0){
+        var changedTouches = event.changedTouchesInWindow(this);
+        if (changedTouches.length === 0){
             return;
         }
         var touch;
         var view;
-        var touchesByView = {};
-        for (i = 0, l = touches.length; i < l; ++i){
-            touch = touches[i];
+        var changedTouchesByView = {};
+        for (i = 0, l = changedTouches.length; i < l; ++i){
+            touch = changedTouches[i];
             if (touch.view){
-                if (!touchesByView[touch.view.objectID]){
-                    touchesByView[touch.view.objectID] = [];
+                if (!changedTouchesByView[touch.view.objectID]){
+                    changedTouchesByView[touch.view.objectID] = [];
                 }
-                touchesByView[touch.view.objectID].push(touch);
+                changedTouchesByView[touch.view.objectID].push(touch);
             }
         }
         if (event.type === UIEvent.Type.touchesBegan){
-            for (i = 0, l = touches.length; i < l; ++i){
-                touch = touches[i];
+            var allTouches = event.touches;
+            var allTouchesByView = {};
+            for (i = 0, l = allTouches.length; i < l; ++i){
+                touch = allTouches[i];
+                if (touch.view){
+                    if (!allTouchesByView[touch.view.objectID]){
+                        allTouchesByView[touch.view.objectID] = [];
+                    }
+                    allTouchesByView[touch.view.objectID].push(touch);
+                }
+            }
+            for (i = 0, l = changedTouches.length; i < l; ++i){
+                touch = changedTouches[i];
                 if (touch.view !== null){
                     logger.warn("beginning touch that already has a view");
                     continue;
                 }
                 view = this.hitTest(touch.locationInWindow) || this;
-                if (!touchesByView[view.objectID]){
-                    touchesByView[view.objectID] = [];
-                }
-                if (view.isMultipleTouchEnabled || touchesByView[view.objectID].length === 0){
+                // For views that don't support multiple touch, only the first
+                // seen touch will be associated with the view.  If a touch isn't
+                // associated with a view here on touchesBegan, the touch will
+                // never be sent to any view for any future event.
+                if (view.isMultipleTouchEnabled || !allTouchesByView[view.objectID]){
+                    allTouchesByView[view.objectID] = [];
+                    if (!changedTouchesByView[view.objectID]){
+                        changedTouchesByView[view.objectID] = [];
+                    }
                     touch.view = view;
-                    touchesByView[view.objectID].push(touch);
+                    changedTouchesByView[view.objectID].push(touch);
+                    allTouchesByView[view.objectID].push(touch);
                 }
             }
         }
-        for (var id in touchesByView){
-            touches = touchesByView[id];
-            view = touches[0].view;
+        for (var id in changedTouchesByView){
+            changedTouches = changedTouchesByView[id];
+            view = changedTouches[0].view;
             if (view.window === this){
                 switch (event.type){
                     case UIEvent.Type.touchesBegan:
-                        view.touchesBegan(touches, event);
+                        view.touchesBegan(changedTouches, event);
                         break;
                     case UIEvent.Type.touchesMoved:
-                        view.touchesMoved(touches, event);
+                        view.touchesMoved(changedTouches, event);
                         break;
                     case UIEvent.Type.touchesCanceled:
-                        view.touchesCanceled(touches, event);
+                        view.touchesCanceled(changedTouches, event);
                         break;
                     case UIEvent.Type.touchesEnded:
-                        view.touchesEnded(touches, event);
+                        view.touchesEnded(changedTouches, event);
                         break;
                 }
             }

package/Root/Frameworks/UIKit/UIWindowServer.js

@@ -850,7 +850,7 @@ JSClass("UIWindowServer", JSObject, {
 
     activeTouchEvent: null,
 
-    createTouchEvent: function(type, timestamp, changedTouchDescriptors){
+    createTouchEvent: function(type, timestamp, changedTouchDescriptors, touchIdentifiers){
         var window;
         var touch;
         var descriptor;
@@ -858,6 +858,15 @@ JSClass("UIWindowServer", JSObject, {
         var i, l;
         var phase = this._touchPhaseForEventType(type);
 
+        if (this.activeTouchEvent !== null){
+            if (this.activeTouchEvent.removeUnreferencedTouches(touchIdentifiers) > 0){
+                logger.warn("removed unreferenced touches");
+            }
+            if (this.activeTouchEvent.touches.length === 0){
+                this.activeTouchEvent = null;
+            }
+        }
+
         // Create or update the active touch event
         if (this.activeTouchEvent === null){
             if (type != UIEvent.Type.touchesBegan){

package/Root/Frameworks/UIKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKitTesting
-JSBundleVersion: 2023.18.3
+JSBundleVersion: 2023.19.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/package.json

@@ -9,7 +9,7 @@
     "node": ">=10.10.0"
   },
   "name": "@breakside/jskit",
-  "version": "2023.18.3",
+  "version": "2023.19.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "files": [
     "*"