@quenty/colorpalette 4.34.0 → 4.34.1-canary.417.052e8ba.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.
 
+## [4.34.1-canary.417.052e8ba.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.34.0...@quenty/colorpalette@4.34.1-canary.417.052e8ba.0) (2023-10-11)
+
+
+### Bug Fixes
+
+* GradePalette can take in Color3 value ([642796d](https://github.com/Quenty/NevermoreEngine/commit/642796d24e23f0691f0ee324e646c89c4396ee6e))
+* Vividness handling for custom colors is more consistent ([539fbee](https://github.com/Quenty/NevermoreEngine/commit/539fbeed18aaaeefaa9772ba9ca4f7fd8084e710))
+
+
+
+
+
 # [4.34.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.33.0...@quenty/colorpalette@4.34.0) (2023-09-21)
 
 **Note:** Version bump only for package @quenty/colorpalette

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/colorpalette",
-  "version": "4.34.0",
+  "version": "4.34.1-canary.417.052e8ba.0",
   "description": "Color palette system for Roblox",
   "keywords": [
     "Roblox",
@@ -28,17 +28,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/baseobject": "^6.3.0",
-    "@quenty/blend": "^6.29.0",
-    "@quenty/color3utils": "^5.30.0",
-    "@quenty/colorpicker": "^4.31.0",
-    "@quenty/loader": "^6.3.0",
-    "@quenty/maid": "^2.6.0",
-    "@quenty/math": "^2.5.0",
-    "@quenty/rx": "^7.16.0",
-    "@quenty/signal": "^2.4.0",
-    "@quenty/table": "^3.3.0",
-    "@quenty/valueobject": "^7.24.0"
+    "@quenty/baseobject": "6.3.1-canary.417.052e8ba.0",
+    "@quenty/blend": "6.29.1-canary.417.052e8ba.0",
+    "@quenty/color3utils": "5.30.1-canary.417.052e8ba.0",
+    "@quenty/colorpicker": "4.31.1-canary.417.052e8ba.0",
+    "@quenty/loader": "6.3.1-canary.417.052e8ba.0",
+    "@quenty/maid": "2.6.0",
+    "@quenty/math": "2.5.0",
+    "@quenty/rx": "7.16.1-canary.417.052e8ba.0",
+    "@quenty/signal": "2.4.1-canary.417.052e8ba.0",
+    "@quenty/table": "3.3.0",
+    "@quenty/valueobject": "7.24.1-canary.417.052e8ba.0"
   },
-  "gitHead": "fd634d0ed1918fc14bae8501aff1cc099d0537e7"
+  "gitHead": "052e8ba33437f71398c4c08c8dbcbf076022d388"
 }

package/src/Shared/ColorPalette.lua

@@ -184,7 +184,7 @@ function ColorPalette:_toGradeObservable(grade, fallbackColorSource)
 	end
 end
 
-function ColorPalette:_toVividnessObservable(vividness, grade, fallbackColorSource)
+function ColorPalette:_toVividnessObservable(vividness, grade, colorOrObservable)
 	if type(vividness) == "string" then
 		return self._gradePalette:ObserveVividness(vividness)
 	elseif type(vividness) == "number" then
@@ -199,25 +199,14 @@ function ColorPalette:_toVividnessObservable(vividness, grade, fallbackColorSour
 	end
 
 	if type(grade) == "string" then
-		-- Fall back to the grade value
+		-- Fall back to the grade value's vividness
 		return self._gradePalette:ObserveVividness(grade)
-	end
-
-	-- Otherwise fall back to name of color
-	if type(fallbackColorSource) == "string" then
-		return (self._gradePalette:ObserveVividness(fallbackColorSource))
-	elseif typeof(fallbackColorSource) == "Color3" then
-		local luvColor = LuvColor3Utils.fromColor3(fallbackColorSource)
-		return Rx.of(luvColor[2])
-	elseif Observable.isObservable(fallbackColorSource) then
-		return fallbackColorSource:Pipe({
-			Rx.map(function(value)
-				local luvColor = LuvColor3Utils.fromColor3(value)
-				return luvColor[2]
-			end)
-		})
+	elseif type(colorOrObservable) == "string" then
+		-- Fall back to color
+		return self._gradePalette:ObserveVividness(colorOrObservable)
 	else
-		error("Bad fallbackColorSource argument")
+		-- Vividness is pretty optional
+		return Rx.of(nil)
 	end
 end
 
@@ -234,8 +223,8 @@ end
 function ColorPalette:_toVividness(vividness, grade, name)
 	if type(vividness) == "string" then
 		return self._gradePalette:GetVividness(vividness)
-	elseif type(grade) == "number" then
-		return grade
+	elseif type(vividness) == "number" then
+		return vividness
 	elseif type(grade) == "string" then
 		-- Fall back to the grade value
 		return self._gradePalette:GetVividness(grade)

package/src/Shared/ColorPalette.story.lua

@@ -10,7 +10,7 @@ local ColorPickerStoryUtils = require("ColorPickerStoryUtils")
 local ColorPalette = require("ColorPalette")
 local ValueObject = require("ValueObject")
 
-local DARK_MODE_ENABLED = false
+local DARK_MODE_ENABLED = true
 
 return function(target)
 	local maid = Maid.new()
@@ -53,12 +53,14 @@ return function(target)
 		palette:SetColorGrade("highlight", 70, 1)
 		palette:SetColorGrade("action", palette:ObserveColorBaseGradeBetween("action", 70, 100), 0.1)
 		palette:SetColorGrade("mouseOver", -15)
+		palette:SetVividness("text", 0.5)
+		palette:SetVividness("action", 0.5)
 	end
 
 	if DARK_MODE_ENABLED then
-		light()
-	else
 		dark()
+	else
+		light()
 	end
 
 	local function sampleGui(labelText)
@@ -225,6 +227,12 @@ return function(target)
 			Blend.New "UIPadding" {
 				PaddingTop = UDim.new(0, 10);
 			};
+
+			Blend.New "Frame" {
+				Name = "TestCustomColor";
+				Size = UDim2.new(0, 30, 0, 30);
+				BackgroundColor3 = palette:ObserveColor(Color3.new(0, 0, 1), "text");
+			};
 		}
 	}):Subscribe())
 

package/src/Shared/Grade/ColorGradePalette.lua

@@ -167,7 +167,17 @@ function ColorGradePalette:_observeGradeFromName(gradeName)
 	if typeof(gradeName) == "Color3" then
 		return Rx.of(ColorGradeUtils.getGrade(gradeName))
 	elseif Observable.isObservable(gradeName) then
-		return gradeName
+		return gradeName:Pipe({
+			Rx.map(function(value)
+				if typeof(value) == "Color3" then
+					return ColorGradeUtils.getGrade(value)
+				elseif typeof(value) == "number" then
+					return value
+				else
+					error("Bad grade value")
+				end
+			end)
+		})
 	end
 
 	local gradeObservable = self._grades[gradeName]