@quenty/colorpalette 5.0.0-canary.367.e9fdcbc.0 → 5.0.0

package/CHANGELOG.md

@@ -3,7 +3,117 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [5.0.0-canary.367.e9fdcbc.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.23.0...@quenty/colorpalette@5.0.0-canary.367.e9fdcbc.0) (2023-06-05)
+# [5.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.34.0...@quenty/colorpalette@5.0.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
+
+
+
+
+
+# [4.33.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.32.0...@quenty/colorpalette@4.33.0) (2023-09-04)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.32.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.31.0...@quenty/colorpalette@4.32.0) (2023-08-23)
+
+
+### Bug Fixes
+
+* Remove dead code ([b8719a7](https://github.com/Quenty/NevermoreEngine/commit/b8719a7abe0b7a34bc869064a5a1595499801598))
+* Use table.clone instead of Table.copy ([44468bd](https://github.com/Quenty/NevermoreEngine/commit/44468bda58a95b5a17c5998807231124d2a55187))
+* Vividness pass-though as messy ([9335e8d](https://github.com/Quenty/NevermoreEngine/commit/9335e8d2809de7c8768982addf03d6b64b60ea6a))
+
+
+### Features
+
+* Add ColorGradeUtils.addGradeToColor(color, difference, vividness) ([715abf8](https://github.com/Quenty/NevermoreEngine/commit/715abf8b497fb1c087e29266eb7c88ed538a2870))
+
+
+
+
+
+# [4.31.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.30.0...@quenty/colorpalette@4.31.0) (2023-08-01)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.30.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.29.0...@quenty/colorpalette@4.30.0) (2023-07-28)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.29.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.28.0...@quenty/colorpalette@4.29.0) (2023-07-25)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.28.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.27.0...@quenty/colorpalette@4.28.0) (2023-07-23)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.27.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.26.1...@quenty/colorpalette@4.27.0) (2023-07-15)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+## [4.26.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.26.0...@quenty/colorpalette@4.26.1) (2023-07-11)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.26.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.25.0...@quenty/colorpalette@4.26.0) (2023-07-10)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.25.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.24.0...@quenty/colorpalette@4.25.0) (2023-06-17)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [4.24.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.23.0...@quenty/colorpalette@4.24.0) (2023-06-05)
 
 **Note:** Version bump only for package @quenty/colorpalette
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/colorpalette",
-  "version": "5.0.0-canary.367.e9fdcbc.0",
+  "version": "5.0.0",
   "description": "Color palette system for Roblox",
   "keywords": [
     "Roblox",
@@ -28,17 +28,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/baseobject": "6.2.1",
-    "@quenty/blend": "7.0.0-canary.367.e9fdcbc.0",
-    "@quenty/color3utils": "6.0.0-canary.367.e9fdcbc.0",
-    "@quenty/colorpicker": "5.0.0-canary.367.e9fdcbc.0",
-    "@quenty/loader": "6.2.1",
-    "@quenty/maid": "2.5.0",
-    "@quenty/math": "3.0.0-canary.367.e9fdcbc.0",
-    "@quenty/rx": "7.11.0",
-    "@quenty/signal": "2.4.0",
-    "@quenty/table": "3.2.0",
-    "@quenty/valueobject": "8.0.0-canary.367.e9fdcbc.0"
+    "@quenty/baseobject": "^7.0.0",
+    "@quenty/blend": "^7.0.0",
+    "@quenty/color3utils": "^6.0.0",
+    "@quenty/colorpicker": "^5.0.0",
+    "@quenty/loader": "^7.0.0",
+    "@quenty/maid": "^2.6.0",
+    "@quenty/math": "^2.5.0",
+    "@quenty/rx": "^8.0.0",
+    "@quenty/signal": "^3.0.0",
+    "@quenty/table": "^3.3.0",
+    "@quenty/valueobject": "^8.0.0"
   },
-  "gitHead": "e9fdcbc6ea1d46e068bf42a08b833099e9005259"
+  "gitHead": "fdeae46099587019ec5fc15317dc673aed379400"
 }

package/src/Shared/ColorPalette.lua

@@ -148,12 +148,6 @@ function ColorPalette:GetColorSwatch(colorName)
 	return swatch
 end
 
-function ColorPalette:SetColor(colorName, value)
-	assert(type(colorName) == "string", "Bad colorName")
-
-	self._swatches[colorName]:SetColor(value)
-end
-
 function ColorPalette:ObserveGradeOn(colorName, newSurfaceName, baseSurfaceName)
 	return self._gradePalette:ObserveOn(colorName, newSurfaceName, baseSurfaceName)
 end
@@ -190,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
@@ -205,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
 
@@ -240,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

@@ -85,7 +85,6 @@ function ColorGradePalette:GetVividness(gradeName)
 
 	assert(type(vividness) == "number", "Bad vividness retrieved")
 	return vividness
-
 end
 
 function ColorGradePalette:Add(gradeName, colorGrade, vividness)
@@ -168,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]

package/src/Shared/Grade/ColorGradeUtils.lua

@@ -42,6 +42,11 @@ function ColorGradeUtils.addGrade(grade, difference)
 	return finalGrade
 end
 
+function ColorGradeUtils.addGradeToColor(color, difference)
+	local grade = ColorGradeUtils.getGrade(color)
+	return ColorGradeUtils.getGradedColor(color, ColorGradeUtils.addGrade(grade, difference))
+end
+
 --[=[
 	Ensures the given contrast between the color and the backing, with
 	an adjustment to saturation to keep the UI loking good
@@ -65,7 +70,8 @@ function ColorGradeUtils.ensureGradeContrast(color, backing, amount)
 		return color
 	end
 
-	local newRel = math.sign(rel)*amount
+	local direction = math.sign(rel) > 0 and 1 or -1
+	local newRel = direction*amount
 
 	local newGrade = math.clamp(backingGrade + newRel, 0, 100)
 	local otherNewGrade = math.clamp(backingGrade - newRel, 0, 100)