@quenty/colorpalette 4.22.0 → 4.23.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.23.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.22.0...@quenty/colorpalette@4.23.0) (2023-05-26)
+
+
+### Bug Fixes
+
+* Fix unknown font construction in FontPalette ([b14b679](https://github.com/Quenty/NevermoreEngine/commit/b14b6799e0313fda7cd9977be7921d3edaba7fb2))
+
+
+### Features
+
+* Initial refactor of guis to use ValueObject instead of ValueObject ([723aba0](https://github.com/Quenty/NevermoreEngine/commit/723aba0208cae7e06c9d8bf2d8f0092d042d70ea))
+
+
+
+
+
 # [4.22.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.21.0...@quenty/colorpalette@4.22.0) (2023-05-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/colorpalette",
-  "version": "4.22.0",
+  "version": "4.23.0",
   "description": "Color palette system for Roblox",
   "keywords": [
     "Roblox",
@@ -29,16 +29,16 @@
   },
   "dependencies": {
     "@quenty/baseobject": "^6.2.1",
-    "@quenty/blend": "^6.17.0",
-    "@quenty/color3utils": "^5.18.0",
-    "@quenty/colorpicker": "^4.19.0",
+    "@quenty/blend": "^6.18.0",
+    "@quenty/color3utils": "^5.19.0",
+    "@quenty/colorpicker": "^4.20.0",
     "@quenty/loader": "^6.2.1",
     "@quenty/maid": "^2.5.0",
     "@quenty/math": "^2.3.0",
-    "@quenty/rx": "^7.10.0",
-    "@quenty/signal": "^2.3.0",
+    "@quenty/rx": "^7.11.0",
+    "@quenty/signal": "^2.4.0",
     "@quenty/table": "^3.2.0",
-    "@quenty/valueobject": "^7.13.0"
+    "@quenty/valueobject": "^7.14.0"
   },
-  "gitHead": "2ad8cea7dd3ad79a39afd7d7b785b489b90553fd"
+  "gitHead": "11058e90e51ea83d3dad6ae9abe59cc19c36b94b"
 }

package/src/Shared/ColorPalette.lua

@@ -315,9 +315,7 @@ function ColorPalette:SetColor(colorName, color)
 		error(("No color grade with name %q"):format(colorName))
 	end
 
-	self._colorMaid[colorName] = Blend.mount(self._colorValues[colorName], {
-		Value = color;
-	})
+	self._colorMaid[colorName] = self._colorValues[colorName]:Mount(color)
 end
 
 function ColorPalette:SetVividness(gradeName, vividness)
@@ -327,21 +325,18 @@ function ColorPalette:SetVividness(gradeName, vividness)
 		error(("No vividness with name %q"):format(gradeName))
 	end
 
-	self._vividMaid[gradeName] = Blend.mount(self._vividnessValues[gradeName], {
-		Value = vividness;
-	})
+	self._vividMaid[gradeName] = self._vividnessValues[gradeName]:Mount(vividness)
 end
 
 function ColorPalette:SetColorGrade(gradeName, grade)
 	assert(type(gradeName) == "string", "Bad colorName")
+	assert(grade, "Bad grade")
 
 	if not self._colorGradeValues[gradeName] then
 		error(("No color grade with name %q"):format(gradeName))
 	end
 
-	self._gradeMaid[gradeName] = Blend.mount(self._colorGradeValues[gradeName], {
-		Value = grade;
-	})
+	self._gradeMaid[gradeName] = self._colorGradeValues[gradeName]:Mount(grade)
 end
 
 
@@ -355,11 +350,11 @@ function ColorPalette:DefineColorGrade(gradeName, gradeValue, vividnessValue)
 	assert(type(gradeName) == "string", "Bad gradeName")
 
 	if self._colorGradeValues[gradeName] then
-		warn(("Already defined grade of name %q"):format(gradeName))
+		warn(("[ColorPalette.DefineColorGrade] - Already defined grade of name %q"):format(gradeName))
 		return
 	end
 
-	local colorGrade = Instance.new("NumberValue")
+	local colorGrade = ValueObject.new(0, "number")
 	self._maid:GiveTask(colorGrade)
 
 	local vividness = ValueObject.new(nil)
@@ -371,7 +366,7 @@ function ColorPalette:DefineColorGrade(gradeName, gradeValue, vividnessValue)
 	self._vividnessValues[gradeName] = vividness
 
 	self:SetVividness(gradeName, vividnessValue)
-	self:SetColorGrade(gradeName, gradeValue)
+	self:SetColorGrade(gradeName, gradeValue or 0)
 
 	self.ColorGradeAdded:Fire(gradeName)
 
@@ -382,12 +377,11 @@ function ColorPalette:DefineColorSwatch(colorName, value)
 	assert(type(colorName) == "string", "Bad colorName")
 
 	if self._swatches[colorName] then
-		warn(("Already defined color of name %q"):format(colorName))
+		warn(("[ColorPalette.DefineColorGrade] -Already defined color of name %q"):format(colorName))
 		return
 	end
 
-	local colorValue = Instance.new("Color3Value")
-	colorValue.Value = value or Color3.new(0, 0, 0)
+	local colorValue = ValueObject.new(value or Color3.new(0, 0, 0), "Color3")
 	self._maid:GiveTask(colorValue)
 
 	local colorSwatch = ColorSwatch.new(colorValue)

package/src/Shared/ColorPalette.story.lua

@@ -8,6 +8,7 @@ local Maid = require("Maid")
 local Blend = require("Blend")
 local ColorPickerStoryUtils = require("ColorPickerStoryUtils")
 local ColorPalette = require("ColorPalette")
+local ValueObject = require("ValueObject")
 
 local DARK_MODE_ENABLED = false
 
@@ -61,8 +62,7 @@ return function(target)
 	end
 
 	local function sampleGui(labelText)
-		local mouseOver = Instance.new("NumberValue")
-		mouseOver.Value = 0
+		local mouseOver = ValueObject.new(0, "number")
 		maid:GiveTask(mouseOver)
 
 		local percentMouseOver = Blend.Spring(mouseOver, 60)

package/src/Shared/Font/FontPalette.lua

@@ -197,9 +197,12 @@ function FontPalette:DefineFont(fontName, defaultFont)
 	end))
 
 	self._maid:GiveTask(fontValue.Changed:Connect(function(fontEnum)
-		local font = Font.fromEnum(fontEnum)
-		local current = fontFaceValue.Value
-		fontFaceValue.Value = Font.new(font.Family, current.Weight, current.Style)
+		-- Assume fontFace is set with something reasonable
+		if fontEnum ~= Enum.Font.Unknown then
+			local font = Font.fromEnum(fontEnum)
+			local current = fontFaceValue.Value
+			fontFaceValue.Value = Font.new(font.Family, current.Weight, current.Style)
+		end
 	end))
 
 	self.FontAdded:Fire(fontName)

package/src/Shared/Grade/ColorGradePalette.story.lua

@@ -53,8 +53,7 @@ return function(target)
 	dark:Add("mouseOver", -15)
 
 	local function sampleGui(labelText, gradePalette)
-		local mouseOver = Instance.new("NumberValue")
-		mouseOver.Value = 0
+		local mouseOver = ValueObject.new(0, "number")
 		maid:GiveTask(mouseOver)
 
 		local percentMouseOver = Blend.Spring(mouseOver, 60)