@quenty/colorpicker 10.3.0 → 10.4.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.
 
+# [10.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpicker@10.3.0...@quenty/colorpicker@10.4.0) (2024-05-09)
+
+
+### Bug Fixes
+
+* Bootstrap specifically to loader ([7f4d4f9](https://github.com/Quenty/NevermoreEngine/commit/7f4d4f9cd4a6602af8daaf04983bb349dafc7e95))
+* Fix .package-lock.json replicating in packages ([75d0efe](https://github.com/Quenty/NevermoreEngine/commit/75d0efeef239f221d93352af71a5b3e930ec23c5))
+
+
+
+
+
 # [10.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpicker@10.2.1...@quenty/colorpicker@10.3.0) (2024-04-27)
 
 **Note:** Version bump only for package @quenty/colorpicker

package/default.project.json

@@ -1,5 +1,6 @@
 {
   "name": "colorpicker",
+  "globIgnorePaths": [ "**/.package-lock.json" ],
   "tree": {
     "$path": "src"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/colorpicker",
-  "version": "10.3.0",
+  "version": "10.4.0",
   "description": "Color picking UI system for Roblox.",
   "keywords": [
     "Roblox",
@@ -28,16 +28,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/baseobject": "^10.2.0",
-    "@quenty/basicpane": "^13.2.0",
-    "@quenty/blend": "^12.2.0",
-    "@quenty/color3utils": "^11.2.0",
-    "@quenty/inputobjectutils": "^4.3.0",
-    "@quenty/instanceutils": "^13.2.0",
-    "@quenty/loader": "^10.2.0",
-    "@quenty/maid": "^3.1.0",
-    "@quenty/math": "^2.6.0",
-    "@quenty/valueobject": "^13.2.0"
+    "@quenty/baseobject": "^10.3.0",
+    "@quenty/basicpane": "^13.3.0",
+    "@quenty/blend": "^12.3.0",
+    "@quenty/buttondragmodel": "^1.1.0",
+    "@quenty/color3utils": "^11.3.0",
+    "@quenty/inputobjectutils": "^4.4.0",
+    "@quenty/instanceutils": "^13.3.0",
+    "@quenty/loader": "^10.3.0",
+    "@quenty/maid": "^3.2.0",
+    "@quenty/math": "^2.7.0",
+    "@quenty/valueobject": "^13.3.0"
   },
-  "gitHead": "5c9eab1eac73f0d54953cca5017b7be968182f72"
+  "gitHead": "3fd5cdca3128bf34c8d9dfae1e92d62533b6e6f5"
 }

package/src/Client/Cursor/HSColorPickerCursor.lua

@@ -18,26 +18,13 @@ HSColorPickerCursor.__index = HSColorPickerCursor
 function HSColorPickerCursor.new()
 	local self = setmetatable(BaseObject.new(), HSColorPickerCursor)
 
-	self._backgroundColorHint = ValueObject.new(Color3.new(0, 0, 0), "Color3")
-	self._maid:GiveTask(self._backgroundColorHint)
-
-	self._height = ValueObject.new(0.075, "number")
-	self._maid:GiveTask(self._height)
-
-	self._crossHairWidthAbs = ValueObject.new(1, "number")
-	self._maid:GiveTask(self._crossHairWidthAbs)
-
-	self._verticalHairVisible = ValueObject.new(true, "boolean")
-	self._maid:GiveTask(self._verticalHairVisible)
-
-	self._horizontalHairVisible = ValueObject.new(true, "boolean")
-	self._maid:GiveTask(self._horizontalHairVisible)
-
-	self._position = ValueObject.new(Vector2.zero, "Vector2")
-	self._maid:GiveTask(self._position)
-
-	self._transparency = ValueObject.new(0, "number")
-	self._maid:GiveTask(self._transparency)
+	self._backgroundColorHint = self._maid:Add(ValueObject.new(Color3.new(0, 0, 0), "Color3"))
+	self._height = self._maid:Add(ValueObject.new(0.075, "number"))
+	self._crossHairWidthAbs = self._maid:Add(ValueObject.new(1, "number"))
+	self._verticalHairVisible = self._maid:Add(ValueObject.new(true, "boolean"))
+	self._horizontalHairVisible = self._maid:Add(ValueObject.new(true, "boolean"))
+	self._position = self._maid:Add(ValueObject.new(Vector2.zero, "Vector2"))
+	self._transparency = self._maid:Add(ValueObject.new(0, "number"))
 
 	self._maid:GiveTask(self:_render():Subscribe(function(gui)
 		self.Gui = gui

package/src/Client/HSV/HSColorPicker.lua

@@ -10,7 +10,7 @@ local require = require(script.Parent.loader).load(script)
 local BaseObject = require("BaseObject")
 local Blend = require("Blend")
 local ColorPickerCursorPreview = require("ColorPickerCursorPreview")
-local ColorPickerInput = require("ColorPickerInput")
+local ButtonDragModel = require("ButtonDragModel")
 local HSColorPickerCursor = require("HSColorPickerCursor")
 local ValueObject = require("ValueObject")
 
@@ -21,26 +21,17 @@ HSColorPicker.__index = HSColorPicker
 function HSColorPicker.new()
 	local self = setmetatable(BaseObject.new(), HSColorPicker)
 
-	self._hsvColorValue = Instance.new("Vector3Value")
-	self._hsvColorValue.Value = Vector3.zero
-	self._maid:GiveTask(self._hsvColorValue)
+	self._hsvColorValue = self._maid:Add(ValueObject.new(Vector3.zero, "Vector3"))
+	self._sizeValue = self._maid:Add(ValueObject.new(Vector2.new(4, 4), "Vector2"))
+	self._transparency = self._maid:Add(ValueObject.new(0, "number"))
 
-	self.ColorChanged = self._hsvColorValue.Changed
-
-	self._sizeValue = ValueObject.new(Vector2.new(4, 4), "Vector2")
-	self._maid:GiveTask(self._sizeValue)
-
-	self._transparency = ValueObject.new(0, "number")
-	self._maid:GiveTask(self._transparency)
+	self._dragModel = self._maid:Add(ButtonDragModel.new())
+	self._dragModel:SetClampWithinButton(true)
 
-	self._input = ColorPickerInput.new()
-	self._maid:GiveTask(self._input)
+	self._cursor = self._maid:Add(HSColorPickerCursor.new())
+	self._preview = self._maid:Add(ColorPickerCursorPreview.new())
 
-	self._cursor = HSColorPickerCursor.new()
-	self._maid:GiveTask(self._cursor)
-
-	self._preview = ColorPickerCursorPreview.new()
-	self._maid:GiveTask(self._preview)
+	self.ColorChanged = self._hsvColorValue.Changed
 
 	self._maid:GiveTask(self:_render():Subscribe(function(gui)
 		self.Gui = gui
@@ -52,11 +43,13 @@ function HSColorPicker.new()
 	end))
 
 	-- Binding
-	self._maid:GiveTask(self._input.PositionChanged:Connect(function()
-		local position = self._input:GetPosition()
-		local v = self._hsvColorValue.Value.z
-		self._hsvColorValue.Value = Vector3.new(1 - position.x, 1 - position.y, v)
-		self._cursor:SetPosition(position)
+	self._maid:GiveTask(self._dragModel.DragPositionChanged:Connect(function()
+		local position = self._dragModel:GetDragPosition()
+		if position then
+			local v = self._hsvColorValue.Value.z
+			self._hsvColorValue.Value = Vector3.new(1 - position.x, 1 - position.y, v)
+			self._cursor:SetPosition(position)
+		end
 	end))
 
 	self._maid:GiveTask(self._hsvColorValue.Changed:Connect(function()
@@ -66,8 +59,8 @@ function HSColorPicker.new()
 	end))
 
 	-- Setup preview
-	self._maid:GiveTask(self._input.IsPressedChanged:Connect(function()
-		self._preview:SetVisible(self._input:GetIsPressed())
+	self._maid:GiveTask(self._dragModel:ObserveIsDragging():Subscribe(function(isDragging)
+		self._preview:SetVisible(isDragging)
 	end))
 	self._maid:GiveTask(self._cursor.PositionChanged:Connect(function()
 		self._preview:SetPosition(self._cursor:GetPosition())
@@ -85,8 +78,8 @@ end
 
 	@return BoolValue
 ]=]
-function HSColorPicker:GetIsPressedValue()
-	return self._input:GetIsPressedValue()
+function HSColorPicker:ObserveIsPressed()
+	return self._dragModel:ObserveIsPressed()
 end
 
 function HSColorPicker:_updateHintedColors()
@@ -183,7 +176,7 @@ function HSColorPicker:_render()
 		Image = "rbxassetid://9290917908";
 		ImageTransparency = self._transparency;
 		[Blend.Instance] = function(inst)
-			self._input:SetButton(inst)
+			self._dragModel:SetButton(inst)
 		end;
 		[Blend.Children] = {
 			Blend.New "UIAspectRatioConstraint" {

package/src/Client/HSV/HSColorPicker.story.lua

@@ -2,7 +2,7 @@
 	@class serviceBag.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
+local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
 local Maid = require("Maid")
 local HSColorPicker = require("HSColorPicker")

package/src/Client/HSV/HSVColorPicker.lua

@@ -223,7 +223,7 @@ function HSVColorPicker:_render()
 			Position = props.Position;
 			BackgroundTransparency = 1;
 			Size = UDim2.new(1, 0, 1, 0);
-			ZIndex = Blend.Computed(picker:GetIsPressedValue(), function(isPressed)
+			ZIndex = Blend.Computed(picker:ObserveIsPressed(), function(isPressed)
 				return isPressed and 2 or 1
 			end);
 			[Blend.Children] = {

package/src/Client/HSV/HSVColorPicker.story.lua

@@ -2,7 +2,7 @@
 	@class HSVColorPicker.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
+local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
 local Maid = require("Maid")
 local HSVColorPicker = require("HSVColorPicker")

package/src/Client/HSV/ValueColorPicker.lua

@@ -7,7 +7,7 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local Blend = require("Blend")
-local ColorPickerInput = require("ColorPickerInput")
+local ButtonDragModel = require("ButtonDragModel")
 local ValueObject = require("ValueObject")
 local ColorPickerCursorPreview = require("ColorPickerCursorPreview")
 local ColorPickerTriangle = require("ColorPickerTriangle")
@@ -19,26 +19,16 @@ ValueColorPicker.__index = ValueColorPicker
 function ValueColorPicker.new()
 	local self = setmetatable(BaseObject.new(), ValueColorPicker)
 
-	self._hsvColorValue = ValueObject.new(Vector3.zero, "Vector3")
-	self._maid:GiveTask(self._hsvColorValue)
+	self._hsvColorValue = self._maid:Add(ValueObject.new(Vector3.zero, "Vector3"))
+	self._backgroundColorHint = self._maid:Add(ValueObject.new(Color3.new(0, 0, 0), "Color3"))
+	self._sizeValue = self._maid:Add(ValueObject.new(Vector2.new(0, 4), "Vector2"))
+	self._leftWidth = self._maid:Add(ValueObject.new(0.25, "number"))
+	self._transparency = self._maid:Add(ValueObject.new(0, "number"))
 
-	self._backgroundColorHint = ValueObject.new(Color3.new(0, 0, 0), "Color3")
-	self._maid:GiveTask(self._backgroundColorHint)
+	self._dragModel = self._maid:Add(ButtonDragModel.new())
+	self._dragModel:SetClampWithinButton(true)
 
 	self.ColorChanged = self._hsvColorValue.Changed
-
-	self._sizeValue = ValueObject.new(Vector2.new(0, 4), "Vector2")
-	self._maid:GiveTask(self._sizeValue)
-
-	self._leftWidth = ValueObject.new(0.25, "number")
-	self._maid:GiveTask(self._leftWidth)
-
-	self._transparency = ValueObject.new(0, "number")
-	self._maid:GiveTask(self._transparency)
-
-	self._input = ColorPickerInput.new()
-	self._maid:GiveTask(self._input)
-
 	-- self._cursor = HSColorPickerCursor.new()
 	-- self._cursor:SetHeight(1)
 	-- self._cursor:SetVerticalHairVisible(false)
@@ -65,13 +55,15 @@ function ValueColorPicker.new()
 	end))
 
 	-- Binding
-	self._maid:GiveTask(self._input.PositionChanged:Connect(function()
-		local position = self._input:GetPosition()
-		local current = self._hsvColorValue.Value
-		local h, s = current.x, current.y
-		self._hsvColorValue.Value = Vector3.new(h, s, 1 - position.y)
-		-- self._cursor:SetPosition(Vector3.new(0.5, position.y, 0))
-		self._triangle.Gui.Position = UDim2.fromScale(0, position.y)
+	self._maid:GiveTask(self._dragModel.DragPositionChanged:Connect(function()
+		local position = self._dragModel:GetDragPosition()
+		if position then
+			local current = self._hsvColorValue.Value
+			local h, s = current.x, current.y
+			self._hsvColorValue.Value = Vector3.new(h, s, 1 - position.y)
+			-- self._cursor:SetPosition(Vector3.new(0.5, position.y, 0))
+			self._triangle.Gui.Position = UDim2.fromScale(0, position.y)
+		end
 	end))
 	self._maid:GiveTask(self._hsvColorValue.Changed:Connect(function()
 		local v = self._hsvColorValue.Value.z
@@ -80,8 +72,8 @@ function ValueColorPicker.new()
 	end))
 
 	-- Setup preview
-	self._maid:GiveTask(self._input.IsPressedChanged:Connect(function()
-		self._preview:SetVisible(self._input:GetIsPressed())
+	self._maid:GiveTask(self._dragModel:ObserveIsDragging():Subscribe(function(isDragging)
+		self._preview:SetVisible(isDragging)
 	end))
 	self._maid:GiveTask(self._hsvColorValue.Changed:Connect(function()
 		self:_updatePreviewPosition()
@@ -142,8 +134,8 @@ function ValueColorPicker:_updateHintedColors()
 	self._preview:SetColor(color)
 end
 
-function ValueColorPicker:GetIsPressedValue()
-	return self._input:GetIsPressedValue()
+function ValueColorPicker:ObserveIsPressed()
+	return self._dragModel:ObserveIsPressed()
 end
 
 function ValueColorPicker:SetHSVColor(hsvColor)
@@ -188,7 +180,7 @@ function ValueColorPicker:_render()
 		BackgroundTransparency = 1;
 		Active = true;
 		[Blend.Instance] = function(inst)
-			self._input:SetButton(inst)
+			self._dragModel:SetButton(inst)
 		end;
 		[Blend.Children] = {
 			Blend.New "UIAspectRatioConstraint" {

package/src/Client/HSV/ValueColorPicker.story.lua

@@ -2,7 +2,7 @@
 	@class ValueColorPicker.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
+local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
 local Maid = require("Maid")
 local ValueColorPicker = require("ValueColorPicker")

package/src/Client/Input/ColorPickerInput.lua

@@ -1,221 +0,0 @@
---[=[
-	@class ColorPickerInput
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local UserInputService = game:GetService("UserInputService")
-
-local BaseObject = require("BaseObject")
-local Maid = require("Maid")
-local InputObjectUtils = require("InputObjectUtils")
-local ValueObject = require("ValueObject")
-
-local ColorPickerInput = setmetatable({}, BaseObject)
-ColorPickerInput.ClassName = "ColorPickerInput"
-ColorPickerInput.__index = ColorPickerInput
-
-function ColorPickerInput.new()
-	local self = setmetatable(BaseObject.new(), ColorPickerInput)
-
-	self._isMouseDown = Instance.new("BoolValue")
-	self._isMouseDown.Value = false
-	self._maid:GiveTask(self._isMouseDown)
-
-	self._numFingerDown = Instance.new("IntValue")
-	self._numFingerDown.Value = 0
-	self._maid:GiveTask(self._numFingerDown)
-
-	self._currentPosition = ValueObject.new(Vector2.zero, "Vector2")
-	self._maid:GiveTask(self._currentPosition)
-
-	self._activePositions = {}
-
-	self._isPressed = Instance.new("BoolValue")
-	self._isPressed.Value = false
-	self._maid:GiveTask(self._isPressed)
-
-	self._maid:GiveTask(self._isMouseDown.Changed:Connect(function()
-		self:_updateIsPressed()
-	end))
-	self._maid:GiveTask(self._numFingerDown.Changed:Connect(function()
-		self:_updateIsPressed()
-	end))
-
-	self.PositionChanged = self._currentPosition.Changed
-	self.IsPressedChanged = self._isPressed.Changed
-
-	return self
-end
-
-function ColorPickerInput:GetIsPressedValue()
-	return self._isPressed
-end
-
-function ColorPickerInput:GetPosition()
-	return self._currentPosition.Value
-end
-
-function ColorPickerInput:GetIsPressed()
-	return self._isPressed.Value
-end
-
-function ColorPickerInput:SetButton(button)
-	if not button then
-		self._maid._button = nil
-		return
-	end
-
-	local maid = Maid.new()
-
-	maid:GiveTask(button.InputBegan:Connect(function(inputObject)
-		if inputObject.UserInputType == Enum.UserInputType.MouseButton1 then
-			self._isMouseDown.Value = true
-			self._activePositions.mouse = self:_toButtonSpace(button, inputObject.Position)
-			self:_updateCurrentPosition()
-		end
-
-		if inputObject.UserInputType == Enum.UserInputType.Touch then
-			self:_trackTouch(maid, button, inputObject)
-		end
-	end))
-
-	maid:GiveTask(button.InputEnded:Connect(function(inputObject)
-		if inputObject.UserInputType == Enum.UserInputType.MouseButton1 then
-			self._isMouseDown.Value = false
-		end
-
-		if inputObject.UserInputType == Enum.UserInputType.Touch then
-			self:_stopTouchTrack(maid, inputObject)
-		end
-	end))
-
-	maid:GiveTask(UserInputService.InputEnded:Connect(function(inputObject)
-		if inputObject.UserInputType == Enum.UserInputType.MouseButton1 then
-			self._isMouseDown.Value = false
-		end
-	end))
-
-	maid:GiveTask(function()
-		self._isMouseDown.Value = false
-	end)
-
-	maid:GiveTask(self._isMouseDown.Changed:Connect(function()
-		self:_updateMouseTracking(maid, button)
-	end))
-
-	self._maid._button = maid
-end
-
-function ColorPickerInput:_updateIsPressed()
-	if self._numFingerDown.Value > 0 or self._isMouseDown.Value then
-		self._isPressed.Value = true
-	else
-		self._isPressed.Value = false
-	end
-end
-
-function ColorPickerInput:_updateMouseTracking(buttonMaid, button)
-	if not self._isMouseDown.Value then
-		buttonMaid._mouse = nil
-		return
-	end
-
-	local maid = Maid.new()
-
-	maid:GiveTask(UserInputService.InputChanged:Connect(function(inputObject)
-		if not InputObjectUtils.isMouseUserInputType(inputObject.UserInputType) then
-			return
-		end
-
-		local screenGui = button:FindFirstAncestorWhichIsA("ScreenGui")
-		if not screenGui then
-			return
-		end
-
-		if not (screenGui:FindFirstAncestorWhichIsA("PlayerGui") or screenGui:FindFirstAncestorWhichIsA("CoreGui")) then
-			-- TODO: Handle billboard guis
-			return
-		end
-
-		self._activePositions.mouse = self:_toButtonSpace(button, inputObject.Position)
-		self:_updateCurrentPosition()
-	end))
-
-	maid:GiveTask(button.InputChanged:Connect(function(inputObject)
-		if InputObjectUtils.isMouseUserInputType(inputObject.UserInputType) then
-			self._activePositions.mouse = self:_toButtonSpace(button, inputObject.Position)
-			self:_updateCurrentPosition()
-		end
-	end))
-
-	maid:GiveTask(function()
-		self._activePositions.mouse = nil
-		self:_updateCurrentPosition()
-	end)
-
-	buttonMaid._mouse = maid
-end
-
-function ColorPickerInput:_trackTouch(buttonMaid, button, inputObject)
-	buttonMaid[inputObject] = nil
-
-	if inputObject.UserInputState == Enum.UserInputState.End then
-		return
-	end
-
-	local maid = Maid.new()
-
-	self._activePositions[inputObject] = self:_toButtonSpace(button, inputObject.Position)
-	self._numFingerDown.Value = self._numFingerDown.Value + 1
-
-	maid:GiveTask(inputObject:GetPropertyChangedSignal("Position"):Connect(function()
-		self._activePositions[inputObject] = self:_toButtonSpace(button, inputObject.Position)
-		self:_updateCurrentPosition()
-	end))
-	maid:GiveTask(inputObject:GetPropertyChangedSignal("UserInputState"):Connect(function()
-		if inputObject.UserInputState == Enum.UserInputState.End then
-			maid[inputObject] = nil
-		end
-	end))
-
-	maid:GiveTask(function()
-		self._activePositions[inputObject] = nil
-		self._numFingerDown.Value = self._numFingerDown.Value - 1
-		self:_updateCurrentPosition()
-	end)
-
-	self:_updateCurrentPosition()
-
-	maid[inputObject] = maid
-end
-
-function ColorPickerInput:_stopTouchTrack(buttonMaid, inputObject)
-	-- Clears the input tracking as we slide off the button
-	buttonMaid[inputObject] = nil
-end
-
-function ColorPickerInput:_toButtonSpace(button, position)
-	local pos = button.AbsolutePosition
-	local size = button.AbsoluteSize
-
-	local result = (Vector2.new(position.x, position.y) - pos)/size
-	return Vector2.new(math.clamp(result.x, 0, 1), math.clamp(result.y, 0, 1))
-end
-
-function ColorPickerInput:_updateCurrentPosition()
-	local current = Vector2.zero
-	local count = 0
-	for _, item in pairs(self._activePositions) do
-		current = current + item
-		count = count + 1
-	end
-	if count == 0 then
-		return
-	end
-
-	current = current/count
-	self._currentPosition.Value = current
-end
-
-return ColorPickerInput