@quenty/colorpalette 4.19.1 → 4.20.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.
 
+# [4.20.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.19.1...@quenty/colorpalette@4.20.0) (2023-04-07)
+
+
+### Features
+
+* Add FontPalette:GetFontFaceValue(fontName) ([3411e11](https://github.com/Quenty/NevermoreEngine/commit/3411e116f2d48453a016d9dc15eab6ea64fb1bc4))
+
+
+
+
+
 ## [4.19.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@4.19.0...@quenty/colorpalette@4.19.1) (2023-04-07)
 
 **Note:** Version bump only for package @quenty/colorpalette

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/colorpalette",
-  "version": "4.19.1",
+  "version": "4.20.0",
   "description": "Color palette system for Roblox",
   "keywords": [
     "Roblox",
@@ -40,5 +40,5 @@
     "@quenty/table": "^3.2.0",
     "@quenty/valueobject": "^7.11.1"
   },
-  "gitHead": "0b250b1557f7ac594d38498c5d69af79a96f8bcf"
+  "gitHead": "d31bf8d9390b1c339a15aa80130b099e39d5c5a4"
 }

package/src/Shared/Font/FontPalette.lua

@@ -25,6 +25,7 @@ function FontPalette.new()
 	local self = setmetatable(BaseObject.new(), FontPalette)
 
 	self._fonts = {}
+	self._fontFaces = {}
 	self._defaultFontMap = {} -- [name] = Enum.Font.?
 
 	self.FontAdded = Signal.new() -- :Fire(name)
@@ -96,21 +97,38 @@ end
 function FontPalette:ObserveFontFace(fontName, weight, style)
 	assert(type(fontName) == "string", "Bad fontName")
 
+	if weight == nil and style == nil then
+		return self:GetFontFaceValue(fontName):Observe()
+	end
+
 	return Rx.combineLatest({
-		family = self:GetFontValue(fontName):Observe():Pipe({
-			Rx.map(function(fontEnum)
-				return Font.fromEnum(fontEnum).Family
-			end);
-		});
-		weight = weight or Enum.FontWeight.Regular;
-		style = style or Enum.FontStyle.Normal;
+		font = self:GetFontFaceValue(fontName):Observe();
+		weight = weight;
+		style = style;
 	}):Pipe({
 		Rx.map(function(state)
-			return Font.new(state.family, state.weight, state.style)
+			return Font.new(state.font.Family, state.weight or state.font.Weight, state.style or state.font.Style)
 		end);
 	})
 end
 
+--[=[
+	Gets a font value object for a given font.
+
+	@param fontName string
+	@return ValueObject<Enum.Font>
+]=]
+function FontPalette:GetFontFaceValue(fontName)
+	assert(type(fontName) == "string", "Bad fontName")
+
+	local fontValue = self._fontFaces[fontName]
+	if not fontValue then
+		error(("No font with name %q"):format(fontName))
+	end
+
+	return fontValue
+end
+
 --[=[
 	Gets a font value object for a given font.
 
@@ -120,12 +138,12 @@ end
 function FontPalette:GetFontValue(fontName)
 	assert(type(fontName) == "string", "Bad fontName")
 
-	local font = self._fonts[fontName]
-	if not font then
+	local fontValue = self._fonts[fontName]
+	if not fontValue then
 		error(("No font with name %q"):format(fontName))
 	end
 
-	return font
+	return fontValue
 end
 
 --[=[
@@ -140,27 +158,68 @@ end
 	Defines a new font into the palette which can be changed over time.
 
 	@param fontName string
-	@param font Font
-	@return ValueObject<Enum.Font>
+	@param defaultFont Enum.Font | Font
+	@return ValueObject<Enum.Font | Font>
 ]=]
-function FontPalette:DefineFont(fontName, font)
+function FontPalette:DefineFont(fontName, defaultFont)
 	assert(type(fontName) == "string", "Bad fontName")
-	assert(typeof(font) == "EnumItem", "Bad font")
+	assert(typeof(defaultFont) == "EnumItem" or typeof(defaultFont) == "Font", "Bad defaultFont")
 
 	if self._fonts[fontName] then
-		warn(("Already defined font of name %q"):format(fontName))
+		warn(("Already defined defaultFont of name %q"):format(fontName))
 		return
 	end
 
-	local fontValue = ValueObject.new(font)
+	local defaultFontEnum
+	local defaultFontFace
+	if typeof(defaultFont) == "EnumItem" then
+		defaultFontEnum = defaultFont
+		defaultFontFace = Font.fromEnum(defaultFont)
+	elseif typeof(defaultFont) == "Font" then
+		defaultFontEnum = defaultFont
+		defaultFontFace = defaultFont
+	else
+		error("Bad defaultFont")
+	end
+
+	local fontValue = ValueObject.new(defaultFontEnum)
 	self._maid:GiveTask(fontValue)
 
+	local fontFaceValue = ValueObject.new(defaultFontFace)
+	self._maid:GiveTask(fontFaceValue)
+
 	self._fonts[fontName] = fontValue
-	self._defaultFontMap[fontName] = font
+	self._fontFaces[fontName] = fontFaceValue
+	self._defaultFontMap[fontName] = defaultFont
+
+	self._maid:GiveTask(fontFaceValue.Changed:Connect(function(fontFace)
+		fontValue.Value = self:_tryToGetFontFace(fontFace)
+	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)
+	end))
 
 	self.FontAdded:Fire(fontName)
 
 	return fontValue
 end
 
+function FontPalette:_tryToGetFontFace(fontFace)
+	local assetName = string.gmatch(fontFace.Family, "rbxasset://fonts/families/([%w]+).json$")()
+
+	local fontEnum
+	pcall(function()
+		fontEnum = Enum.Font[assetName]
+	end)
+
+	if fontEnum then
+		return fontEnum
+	else
+		return Enum.Font.Unknown
+	end
+end
+
 return FontPalette