@quenty/buttondragmodel 1.1.0 → 1.1.1-canary.472.c5ee856.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.1-canary.472.c5ee856.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/buttondragmodel@1.1.0...@quenty/buttondragmodel@1.1.1-canary.472.c5ee856.0) (2024-05-13)
+
+
+### Bug Fixes
+
+* Fix drag model in color picker code ([a46b6fd](https://github.com/Quenty/NevermoreEngine/commit/a46b6fd06a7a385cdbca1ec6e6102becd499e579))
+
+
+
+
+
 # 1.1.0 (2024-05-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/buttondragmodel",
-  "version": "1.1.0",
+  "version": "1.1.1-canary.472.c5ee856.0",
   "description": "Model for dragging buttons around",
   "keywords": [
     "Roblox",
@@ -25,15 +25,15 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.3.0",
-    "@quenty/inputobjectutils": "^4.4.0",
-    "@quenty/loader": "^10.3.0",
-    "@quenty/maid": "^3.2.0",
-    "@quenty/rx": "^13.3.0",
-    "@quenty/valueobject": "^13.3.0"
+    "@quenty/baseobject": "10.3.0",
+    "@quenty/inputobjectutils": "4.4.0",
+    "@quenty/loader": "10.3.0",
+    "@quenty/maid": "3.2.0",
+    "@quenty/rx": "13.3.0",
+    "@quenty/valueobject": "13.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3fd5cdca3128bf34c8d9dfae1e92d62533b6e6f5"
+  "gitHead": "c5ee856d8d75948a21e30b90872bbad28d09e23f"
 }

package/src/Client/ButtonDragModel.lua

@@ -32,17 +32,17 @@ function ButtonDragModel.new(initialButton)
 	self._button = self._maid:Add(ValueObject.new(nil))
 
 	self._absoluteSize = self._maid:Add(ValueObject.new(Vector2.zero, "Vector2"))
-	self._isDragging = self._maid:Add(ValueObject.new(false, "boolean"))
+	self._isPressed = self._maid:Add(ValueObject.new(false, "boolean"))
 	self._clampWithinButton = self._maid:Add(ValueObject.new(false, "boolean"))
 
 	self._activePositions = {}
 
 	self._maid:GiveTask(self._dragPosition.Changed:Connect(function()
-		self._isDragging.Value = self._dragPosition.Value ~= nil
+		self._isPressed.Value = self._dragPosition.Value ~= nil
 	end))
 
 	self.DragPositionChanged = self._dragPosition.Changed
-	self.IsDraggingChanged = self._isDragging.Changed
+	self.IsDraggingChanged = self._isPressed.Changed
 
 	if initialButton then
 		self:SetButton(initialButton)
@@ -62,20 +62,29 @@ function ButtonDragModel.new(initialButton)
 	return self
 end
 
+--[=[
+	Returns true if pressed
+
+	@return boolean
+]=]
+function ButtonDragModel:IsPressed()
+	return self._isPressed.Value
+end
+
 --[=[
 	Observes if anything is pressing down on the button itself
 
 	@return Observable<boolean>
 ]=]
-function ButtonDragModel:ObserveIsDragging()
-	return self._isDragging:Observe()
+function ButtonDragModel:ObserveIsPressed()
+	return self._isPressed:Observe()
 end
 
 --[=[
 	@return Observable<Brio<true>>
 ]=]
-function ButtonDragModel:ObserveIsDraggingBrio()
-	return self._isDragging:ObserveBrio(function(value)
+function ButtonDragModel:ObserveIsPressedBrio()
+	return self._isPressed:ObserveBrio(function(value)
 		return value
 	end)
 end
@@ -94,15 +103,6 @@ function ButtonDragModel:GetDragDelta()
 	return self._dragDelta.Value
 end
 
---[=[
-	Returns true if pressed
-
-	@return boolean
-]=]
-function ButtonDragModel:GetIsPressed()
-	return self._isDragging.Value
-end
-
 --[=[
 	Returns the scale position on the Gui from 0 to 1
 
@@ -323,7 +323,7 @@ function ButtonDragModel:_updateCurrentPosition()
 
 	if self._clampWithinButton.Value then
 		x = math.clamp(x, 0, 1)
-		y = math.clamp(x, 0, 1)
+		y = math.clamp(y, 0, 1)
 	end
 
 	local position = Vector2.new(x, y)