@quenty/blend 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/blend@2.1.1...@quenty/blend@2.2.0) (2022-01-07)
+
+
+### Bug Fixes
+
+* Blend does not complete all observables is a sub-observable completes ([f5ce02b](https://github.com/Quenty/NevermoreEngine/commit/f5ce02bcb18003b9dd86cf9cf013cb5cc411cdcd))
+
+
+
+
+
+## [2.1.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/blend@2.1.0...@quenty/blend@2.1.1) (2022-01-06)
+
+**Note:** Version bump only for package @quenty/blend
+
+
+
+
+
 # [2.1.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/blend@2.0.2...@quenty/blend@2.1.0) (2022-01-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/blend",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Declarative UI system.",
   "keywords": [
     "Roblox",
@@ -28,22 +28,22 @@
   },
   "dependencies": {
     "@quenty/acceltween": "^2.0.1",
-    "@quenty/brio": "^3.6.0",
-    "@quenty/instanceutils": "^3.6.0",
-    "@quenty/loader": "^3.2.0",
+    "@quenty/brio": "^3.7.0",
+    "@quenty/instanceutils": "^3.7.0",
+    "@quenty/loader": "^3.3.0",
     "@quenty/maid": "^2.0.2",
-    "@quenty/promise": "^3.4.0",
-    "@quenty/rx": "^3.6.0",
+    "@quenty/promise": "^3.5.0",
+    "@quenty/rx": "^3.7.0",
     "@quenty/signal": "^2.1.0",
-    "@quenty/spring": "^3.1.0",
+    "@quenty/spring": "^3.2.0",
     "@quenty/steputils": "^3.0.1",
     "@quenty/string": "^2.2.1",
-    "@quenty/valuebaseutils": "^3.6.0",
-    "@quenty/valueobject": "^3.6.0"
+    "@quenty/valuebaseutils": "^3.7.0",
+    "@quenty/valueobject": "^3.7.0"
   },
   "devDependencies": {
-    "@quenty/contentproviderutils": "^3.4.0",
-    "@quenty/playerthumbnailutils": "^3.5.0"
+    "@quenty/contentproviderutils": "^3.5.0",
+    "@quenty/playerthumbnailutils": "^3.6.0"
   },
-  "gitHead": "d910da8f5c7e9a55a8bf76d8efbe5632713dd0fe"
+  "gitHead": "5a3f3fb6c908fd3874f5ceacc70b404780275119"
 }

package/src/Shared/Blend/Blend.lua

@@ -145,7 +145,9 @@ function Blend.Computed(...)
 
 	if #args == 0 then
 		-- static value?
-		return Rx.start(compute)
+		return Observable.new(function(sub)
+			sub:Fire(compute())
+		end)
 	elseif #args == 1 then
 		return args[1]:Pipe({
 			Rx.map(compute)
@@ -643,12 +645,19 @@ function Blend._observeChildren(value)
 				-- Subscription is for lifetime of brio, so we do
 				-- not need to specifically add these results to the maid, and
 				-- risk memory leak of the maid with a lot of items in it.
-				maid:GiveTask(observe:Subscribe(sub:GetFireFailComplete()))
+				maid:GiveTask(observe:Subscribe(function(inst)
+					sub:Fire(inst)
+				end, function(...)
+					sub:Fail(...)
+				end, function()
+					-- completion should not result more than maid cleaning up
+					maid:DoCleaning()
+				end))
 
 				return maid
 			end
 
-			warn(("Unknown type in brio %q"):format(typeof(value)))
+			warn(("Unknown type in brio %q"):format(typeof(result)))
 			return nil
 		end)
 	end
@@ -676,12 +685,32 @@ function Blend._observeChildren(value)
 				end
 
 				local observe = Blend._observeChildren(result)
+
 				if observe then
-					maid:GiveTask(observe:Subscribe(sub:GetFireFailComplete()))
+					local innerMaid = Maid.new()
+
+					-- Note: I think this still memory leaks
+					innerMaid:GiveTask(observe:Subscribe(function(inst)
+						sub:Fire(inst)
+					end, function(...)
+						innerMaid:DoCleaning()
+						sub:Fail(...)
+					end, function()
+						innerMaid:DoCleaning()
+					end))
+
+					innerMaid:GiveTask(function()
+						maid[innerMaid] = nil
+					end)
+					maid[innerMaid] = innerMaid
 				else
-					warn(("Unknown type %q in observable"):format(typeof(result)))
+					warn(("Failed to convert %q into children"):format(tostring(result)))
 				end
-			end, sub:GetFailComplete())
+			end, function(...)
+				sub:Fire(...)
+			end, function()
+				-- Drop completion, other inner components may have completed.
+			end)
 
 			return maid
 		end)
@@ -694,7 +723,7 @@ function Blend._observeChildren(value)
 			if observe then
 				table.insert(observables, observe)
 			else
-				warn(("Unknown %q of %q"):format(tostring(key), typeof(item)))
+				warn(("Failed to convert [%s] %q into children"):format(tostring(key), tostring(item)))
 			end
 		end
 

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

@@ -9,6 +9,7 @@ local RunService = game:GetService("RunService")
 local Blend = require("Blend")
 local Maid = require("Maid")
 local ValueObject = require("ValueObject")
+local Rx = require("Rx")
 
 return function(target)
 	local maid = Maid.new()
@@ -48,6 +49,23 @@ return function(target)
 		[Blend.Children] = {
 			uiCornerValueObject;
 
+			Rx.NEVER;
+			Rx.EMPTY;
+
+			{
+				Blend.Single(Blend.Computed(percentVisible, function(visible)
+					if visible <= 0.5 then
+						return nil
+					else
+						return Blend.New "Frame" {
+							Size = UDim2.new(0, 100, 0, 100);
+							BackgroundTransparency = 0.5;
+						}
+					end
+				end));
+
+			};
+
 			{
 				Blend.Single(Blend.Computed(percentVisible, function(visible)
 					local results = {}