@quenty/buttonhighlightmodel 9.1.1 → 9.2.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/buttonhighlightmodel@9.1.1...@quenty/buttonhighlightmodel@9.2.0) (2023-12-14)
+
+
+### Bug Fixes
+
+* Handle button higlight model cleaningup during event emission ([e8263f8](https://github.com/Quenty/NevermoreEngine/commit/e8263f8efee344e120708b14caf7cbe429cf7493))
+* Handle edge case where we'd clean up while fingers are still down ([71ef8f7](https://github.com/Quenty/NevermoreEngine/commit/71ef8f7d4313909b06876f67411a13efd5c22f3b))
+
+
+
+
+
 ## [9.1.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/buttonhighlightmodel@9.1.0...@quenty/buttonhighlightmodel@9.1.1) (2023-10-28)
 
 **Note:** Version bump only for package @quenty/buttonhighlightmodel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/buttonhighlightmodel",
-  "version": "9.1.1",
+  "version": "9.2.0",
   "description": "Contains model information for the current button",
   "keywords": [
     "Roblox",
@@ -27,16 +27,16 @@
   ],
   "dependencies": {
     "@quenty/acceltween": "^2.3.0",
-    "@quenty/baseobject": "^7.0.0",
-    "@quenty/blend": "^7.1.1",
-    "@quenty/loader": "^7.0.0",
+    "@quenty/baseobject": "^7.1.0",
+    "@quenty/blend": "^7.2.0",
+    "@quenty/loader": "^7.1.0",
     "@quenty/maid": "^2.6.0",
-    "@quenty/rx": "^8.1.1",
+    "@quenty/rx": "^8.2.0",
     "@quenty/steputils": "^3.3.0",
-    "@quenty/valueobject": "^8.1.1"
+    "@quenty/valueobject": "^8.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "440aca7ce2b50b74317ee05fdc0b8d1e58001af3"
+  "gitHead": "2c2dbbc0cb2fbb46b4f3270c559c63890fe18b26"
 }

package/src/Client/ButtonHighlightModel.lua

@@ -396,7 +396,9 @@ function ButtonHighlightModel:_trackTouch(inputObject)
 
 	self._numFingerDown.Value = self._numFingerDown.Value + 1
 	maid:GiveTask(function()
-		self._numFingerDown.Value = self._numFingerDown.Value - 1
+		if self._numFingerDown.Destroy then
+			self._numFingerDown.Value = self._numFingerDown.Value - 1
+		end
 	end)
 	maid:GiveTask(inputObject:GetPropertyChangedSignal("UserInputState"):Connect(function()
 		if inputObject.UserInputState == Enum.UserInputState.End then
@@ -414,12 +416,19 @@ end
 
 function ButtonHighlightModel:_updateTargets()
 	self._isMouseOrTouchOver.Value = self._isMouseOver.Value or self._numFingerDown.Value > 0
-	self._isPressed.Value = (self._isMouseDown.Value or self._isKeyDown.Value or self._numFingerDown.Value > 0)
-	self._isHighlighted.Value = self._isSelected.Value
-		or self._numFingerDown.Value > 0
-		or self._isKeyDown.Value
-		or self._isMouseOver.Value
-		or self._isMouseDown.Value
+
+	-- Assume event emission can lead to cleanup in middle of call
+	if self._isPressed.Destroy then
+		self._isPressed.Value = (self._isMouseDown.Value or self._isKeyDown.Value or self._numFingerDown.Value > 0)
+	end
+
+	if self._isHighlighted.Destroy then
+		self._isHighlighted.Value = self._isSelected.Value
+			or self._numFingerDown.Value > 0
+			or self._isKeyDown.Value
+			or self._isMouseOver.Value
+			or self._isMouseDown.Value
+	end
 end
 
 function ButtonHighlightModel:_update()