@quenty/blend 6.17.0 → 6.18.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.
 
+# [6.18.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/blend@6.17.0...@quenty/blend@6.18.0) (2023-05-26)
+
+
+### Features
+
+* Initial refactor of guis to use ValueObject instead of ValueObject ([723aba0](https://github.com/Quenty/NevermoreEngine/commit/723aba0208cae7e06c9d8bf2d8f0092d042d70ea))
+
+
+
+
+
 # [6.17.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/blend@6.16.0...@quenty/blend@6.17.0) (2023-05-08)
 
 **Note:** Version bump only for package @quenty/blend

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/blend",
-  "version": "6.17.0",
+  "version": "6.18.0",
   "description": "Declarative UI system.",
   "keywords": [
     "Roblox",
@@ -28,22 +28,22 @@
   },
   "dependencies": {
     "@quenty/acceltween": "^2.2.1",
-    "@quenty/brio": "^8.12.0",
-    "@quenty/instanceutils": "^7.13.0",
+    "@quenty/brio": "^8.13.0",
+    "@quenty/instanceutils": "^7.14.0",
     "@quenty/loader": "^6.2.1",
     "@quenty/maid": "^2.5.0",
     "@quenty/promise": "^6.5.0",
-    "@quenty/rx": "^7.10.0",
-    "@quenty/signal": "^2.3.0",
-    "@quenty/spring": "^6.2.1",
+    "@quenty/rx": "^7.11.0",
+    "@quenty/signal": "^2.4.0",
+    "@quenty/spring": "^6.3.0",
     "@quenty/steputils": "^3.2.0",
     "@quenty/string": "^3.1.0",
-    "@quenty/valuebaseutils": "^7.13.0",
-    "@quenty/valueobject": "^7.13.0"
+    "@quenty/valuebaseutils": "^7.14.0",
+    "@quenty/valueobject": "^7.14.0"
   },
   "devDependencies": {
-    "@quenty/contentproviderutils": "^6.9.0",
+    "@quenty/contentproviderutils": "^6.10.0",
     "@quenty/playerthumbnailutils": "^6.5.0"
   },
-  "gitHead": "2ad8cea7dd3ad79a39afd7d7b785b489b90553fd"
+  "gitHead": "11058e90e51ea83d3dad6ae9abe59cc19c36b94b"
 }

package/src/Shared/Blend/Blend.lua

@@ -75,10 +75,11 @@ end
 	Creates a new Blend State which is actually just a ValueObject underneath.
 
 	@param defaultValue T
+	@param checkType string | nil
 	@return ValueObject<T>
 ]=]
-function Blend.State(defaultValue)
-	return ValueObject.new(defaultValue)
+function Blend.State(defaultValue, checkType)
+	return ValueObject.new(defaultValue, checkType)
 end
 
 --[=[
@@ -1024,6 +1025,8 @@ end
 	@return Maid
 ]=]
 function Blend.mount(instance, props)
+	assert(typeof(instance) == "Instance", "Bad instance")
+
 	local maid = Maid.new()
 
 	local parent = nil

package/src/Shared/Test/BlendChildren.story.lua

@@ -25,28 +25,45 @@ return function(target)
 	maid:GiveTask(uiCornerValueObject)
 
 	-- Reassign to a new value
-	task.delay(1, function()
-		if uiCornerValueObject.Destroy then
-			uiCornerValueObject.Value = Blend.New "UICorner" {
-				CornerRadius = UDim.new(0, 25);
-			};
-		end
-	end)
+	maid:GiveTask(task.delay(1, function()
+		uiCornerValueObject.Value = Blend.New "UICorner" {
+			CornerRadius = UDim.new(0, 5);
+		};
+	end))
 
+	local transparency = Blend.Computed(percentVisible, function(visible)
+		return 1 - visible
+	end);
+
+	-- Try a kitchen sink of items
 	maid:GiveTask((Blend.New "TextLabel" {
 		Parent = target;
+		Font = Enum.Font.FredokaOne;
 		Size = Blend.Computed(percentVisible, function(visible)
-			return UDim2.new(0, visible*100, 0, 50);
-		end);
-		BackgroundTransparency = Blend.Computed(percentVisible, function(visible)
-			return 1 - visible
+			return UDim2.new(0, visible*100 + 50, 0, 50);
 		end);
+		TextTransparency = transparency;
+		BackgroundTransparency = transparency;
 		Position = UDim2.new(0.5, 0, 0.5, 0);
 		AnchorPoint = Vector2.new(0.5, 0.5);
 		Text = state;
-		TextScaled = true;
+		TextSize = 15;
+		TextScaled = false;
 
 		[Blend.Children] = {
+			Blend.New "UIPadding" {
+				PaddingLeft = UDim.new(0, 10);
+				PaddingRight = UDim.new(0, 10);
+				PaddingTop = UDim.new(0, 10);
+				PaddingBottom = UDim.new(0, 10);
+			};
+
+			Blend.New "UIScale" {
+				Scale = Blend.Computed(percentVisible, function(visible)
+					return 0.8 + 0.2*visible;
+				end);
+			};
+
 			uiCornerValueObject;
 
 			Rx.NEVER;
@@ -58,9 +75,15 @@ return function(target)
 						return nil
 					else
 						return Blend.New "Frame" {
-							Size = UDim2.new(0, 100, 0, 100);
-							BackgroundTransparency = 0.5;
-						}
+							Size = UDim2.new(0, 150, 0, 30);
+							AnchorPoint = Vector2.new(0.5, 0);
+							Position = UDim2.new(0.5, 0, 1, 10);
+							BackgroundTransparency = transparency;
+
+							Blend.New "UICorner" {
+								CornerRadius = UDim.new(0, 10);
+							}
+						};
 					end
 				end));
 
@@ -71,17 +94,18 @@ return function(target)
 					local results = {}
 
 					-- constructs a ton of children everytime this changes
-					for x=0, visible*100, 10 do
+					for x=0, visible*100, 20 do
 						table.insert(results, Blend.New "Frame" {
 							Size = UDim2.new(0, 8, 0, 8);
-							Position = UDim2.new(0, x, 0.9, 0);
+							Position = UDim2.new(x/100, 0, 0.9, 0);
 							AnchorPoint = Vector2.new(0.5, 0.5);
 							BorderSizePixel = 0;
 							BackgroundColor3 = Color3.new(x/100, 0.5, 0.5);
+							BackgroundTransparency = transparency;
 
 							[Blend.Children] = {
 								Blend.New "UICorner" {
-									CornerRadius = UDim.new(0.5, 5);
+									CornerRadius = UDim.new(0, 10);
 								};
 							};
 						})
@@ -95,8 +119,9 @@ return function(target)
 
 	local PERIOD = 5
 	maid:GiveTask(RunService.RenderStepped:Connect(function()
-		state.Value = tostring(os.clock())
-		percentVisible.Value = (math.sin(os.clock()*math.pi*2/PERIOD) + 1)/2
+		local timeElapsed = os.clock()
+		state.Value = string.format("%02d:%02d:%0.3d", math.floor(timeElapsed / 60) % 60, math.floor(timeElapsed % 60), math.floor(timeElapsed*1000) % 1000)
+		percentVisible.Value = math.clamp((math.sin(os.clock()*math.pi*2/PERIOD) + 1), 0, 1)
 	end))
 
 	return function()