@quenty/buttonhighlightmodel 14.10.1-canary.513.484c203.0 → 14.11.0

package/CHANGELOG.md

@@ -3,13 +3,9 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [14.10.1-canary.513.484c203.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/buttonhighlightmodel@14.10.0...@quenty/buttonhighlightmodel@14.10.1-canary.513.484c203.0) (2024-10-24)
+# [14.11.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/buttonhighlightmodel@14.10.0...@quenty/buttonhighlightmodel@14.11.0) (2024-11-03)
 
-
-### Bug Fixes
-
-* Include dependency ([5e7a757](https://github.com/Quenty/NevermoreEngine/commit/5e7a7573c5ac93ea0f963b134c65079a30312822))
-* Mouse scrolling scrolling check ([cb322a8](https://github.com/Quenty/NevermoreEngine/commit/cb322a8cd249079890050ac3b520e7024c23e6ca))
+**Note:** Version bump only for package @quenty/buttonhighlightmodel
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/buttonhighlightmodel",
-  "version": "14.10.1-canary.513.484c203.0",
+  "version": "14.11.0",
   "description": "Contains model information for the current button",
   "keywords": [
     "Roblox",
@@ -26,18 +26,17 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/acceltween": "2.5.0",
-    "@quenty/baseobject": "10.7.0",
-    "@quenty/blend": "12.10.1-canary.513.484c203.0",
-    "@quenty/loader": "10.7.0",
-    "@quenty/maid": "3.4.0",
-    "@quenty/rectutils": "1.0.1-canary.513.484c203.0",
-    "@quenty/rx": "13.10.1-canary.513.484c203.0",
-    "@quenty/steputils": "3.5.2",
-    "@quenty/valueobject": "13.10.1-canary.513.484c203.0"
+    "@quenty/acceltween": "^2.5.0",
+    "@quenty/baseobject": "^10.7.0",
+    "@quenty/blend": "^12.11.0",
+    "@quenty/loader": "^10.7.0",
+    "@quenty/maid": "^3.4.0",
+    "@quenty/rx": "^13.11.0",
+    "@quenty/steputils": "^3.5.2",
+    "@quenty/valueobject": "^13.11.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "484c2031829caf7e983cae58a6aa6f0ceef1d059"
+  "gitHead": "a7e6d8dffd16e9b516e352050571009f57fe6c67"
 }

package/src/Client/ButtonHighlightModel.lua

@@ -42,8 +42,6 @@ local Maid = require("Maid")
 local Rx = require("Rx")
 local StepUtils = require("StepUtils")
 local ValueObject = require("ValueObject")
-local RectUtils = require("RectUtils")
-local RxInstanceUtils = require("RxInstanceUtils")
 
 local ButtonHighlightModel = setmetatable({}, BaseObject)
 ButtonHighlightModel.ClassName = "ButtonHighlightModel"
@@ -70,11 +68,6 @@ function ButtonHighlightModel.new(button, onUpdate)
 	self._isKeyDown = self._maid:Add(ValueObject.new(false, "boolean"))
 	self._isHighlighted = self._maid:Add(ValueObject.new(false, "boolean"))
 
-	-- Mouse state
-	self._isMouseOverBasedUponMouseMovement = self._maid:Add(ValueObject.new(false, "boolean"))
-	self._isMouseOverScrollingCheck = self._maid:Add(ValueObject.new(false, "boolean"))
-	self._lastMousePositionForScrollingCheck = self._maid:Add(ValueObject.new(nil))
-
 --[=[
 	@prop InteractionEnabledChanged Signal<boolean>
 	@readonly
@@ -160,8 +153,7 @@ function ButtonHighlightModel:SetButton(button: Instance)
 	if button then
 		maid:GiveTask(button.InputEnded:Connect(function(inputObject)
 			if inputObject.UserInputType == Enum.UserInputType.MouseMovement then
-				self._lastMousePositionForScrollingCheck.Value = inputObject.Position
-				self._isMouseOverBasedUponMouseMovement.Value = false
+				self._isMouseOver.Value = false
 			end
 
 			if inputObject.UserInputType == Enum.UserInputType.MouseButton1 then
@@ -183,9 +175,7 @@ function ButtonHighlightModel:SetButton(button: Instance)
 
 		maid:GiveTask(button.InputBegan:Connect(function(inputObject)
 			if inputObject.UserInputType == Enum.UserInputType.MouseMovement then
-				self._isMouseOverBasedUponMouseMovement.Value = true
-				self._isMouseOverScrollingCheck.Value = true
-				self._lastMousePositionForScrollingCheck.Value = inputObject.Position
+				self._isMouseOver.Value = true
 			end
 
 			if inputObject.UserInputType == Enum.UserInputType.MouseButton1 then
@@ -196,25 +186,6 @@ function ButtonHighlightModel:SetButton(button: Instance)
 				self:_trackTouch(inputObject)
 			end
 		end))
-
-		-- Track until something indicates removal
-		maid:GiveTask(self._isMouseOverBasedUponMouseMovement:ObserveBrio(function(mouseOver)
-			return mouseOver
-		end):Subscribe(function(brio)
-			if brio:IsDead() then
-				return
-			end
-
-			self:_trackIfButtonMovedOutFromMouse(brio:ToMaid(), button)
-		end))
-
-		-- We have to track as long as the mouse hasn't moved
-		maid:GiveTask(Rx.combineLatest({
-			isMouseOverFromInput = self._isMouseOverBasedUponMouseMovement:Observe();
-			isMouseOverScrollingCheck = self._isMouseOverScrollingCheck:Observe();
-		}):Subscribe(function(state)
-			self._isMouseOver.Value = state.isMouseOverFromInput and state.isMouseOverScrollingCheck
-		end))
 	end
 
 	self._maid._buttonMaid = maid
@@ -226,44 +197,6 @@ function ButtonHighlightModel:SetButton(button: Instance)
 	end
 end
 
-function ButtonHighlightModel:_trackIfButtonMovedOutFromMouse(maid, button)
-	maid:GiveTask(button.InputChanged:Connect(function(inputObject)
-		if inputObject.UserInputType == Enum.UserInputType.MouseMovement then
-			self._lastMousePositionForScrollingCheck.Value = inputObject.Position
-		end
-	end))
-
-	maid:GiveTask(Rx.combineLatest({
-		mousePosition = self._lastMousePositionForScrollingCheck:Observe();
-		absolutePosition = RxInstanceUtils.observeProperty(button, "AbsolutePosition");
-		absoluteSize = RxInstanceUtils.observeProperty(button, "AbsoluteSize");
-	}):Pipe({
-		Rx.map(function(state)
-			if not state.mousePosition then
-				return true
-			end
-
-			local area = Rect.new(state.absolutePosition, state.absolutePosition + state.absoluteSize)
-
-			if RectUtils.contains(area, Vector2.new(state.mousePosition.x, state.mousePosition.y)) then
-				return true
-			end
-
-			-- TODO: check rounded corners and rotated guis
-
-			return false
-		end)
-	}):Subscribe(function(state)
-		self._isMouseOverScrollingCheck.Value = state
-	end))
-
-	maid:GiveTask(function()
-		self._isMouseOverScrollingCheck.Value = false
-		self._lastMousePositionForScrollingCheck.Value = nil
-	end)
-
-end
-
 --[=[
 	Gets if the button is pressed
 	@return boolean