fusion 3.0 support

Author: PepeElToro41

package.json

@@ -41,6 +41,6 @@
 		"@rbxts/sift": "^0.0.6",
 		"@rbxts/signal": "^1.1.1",
 		"@rbxts/t": "^3.1.1",
-		"@rbxts/ui-labs": "2.2.0-test1"
+		"@rbxts/ui-labs": "^2.2.0-ts.1"
 	}
 }

src/UI/StoryPreview/PreviewController/Mounters/Functional.tsx

@@ -10,15 +10,15 @@ function Functional(props: MounterProps<"Functional">) {
 			.then((cleanup) => {
 				unmounter.current = cleanup;
 			})
-			.catch((err) => warn("UI-Labs: Function story errored when mounting. The cleanup function will not be executed: ", err));
+			.catch((err) => warn("UI Labs: Function story errored when mounting. The cleanup function will not be executed: ", err));
 		return () => {
 			if (unmounter.current) {
 				const [success, err] = pcall(unmounter.current);
 				if (!success) {
-					warn("UI-Labs: The cleanup function errored when unmounting. This may cause a memory leak: ", err);
+					warn("UI Labs: The cleanup function errored when unmounting. This may cause a memory leak: ", err);
 				}
 			} else {
-				warn("UI-Labs: The cleanup function was not found. This might be due to the story erroring. This may cause a memory leak.");
+				warn("UI Labs: The cleanup function was not found. This might be due to the story erroring. This may cause a memory leak.");
 			}
 		};
 	}, []);

src/UI/StoryPreview/PreviewController/Mounters/FusionLib/index.tsx

@@ -34,22 +34,29 @@ function FusionLib(props: MounterProps<"FusionLib">) {
 		const fusionProps: InferFusionProps<ConvertedControls> = GetProps({
 			controls: fusionValues,
 			target: props.MountFrame,
+			scope: Cast<Fusion3>(fusion),
 		});
 
 		const [success, value] = pcall(() => result.story(fusionProps));
 		if (!success) {
-			warn("UI-Labs: Fusion story errored when mounting. The cleanup function will not be executed: ", value);
+			warn("UI Labs: Fusion story errored when mounting. The cleanup function will not be executed: ", value);
 			return () => {
-				warn("UI-Labs: The cleanup function was not found. This might be due to the story erroring. This may cause a memory leak.");
+				warn("UI Labs: The cleanup function was not found. This might be due to the story erroring. This may cause a memory leak.");
 			};
 		}
-		return typeIs(value, "Instance") ? () => value.Destroy() : value;
+		return value ? (typeIs(value, "Instance") ? () => value.Destroy() : value) : undefined;
 	}, []);
 
 	useStoryUnmount(result, () => {
-		const [success, err] = pcall(cleanup);
-		if (!success) {
-			warn("UI-Labs: The cleanup function errored when unmounting. This may cause a memory leak: ", err);
+		if (cleanup) {
+			const [success, err] = pcall(cleanup);
+			if (!success) {
+				warn("UI Labs: The cleanup function errored when unmounting. This may cause a memory leak: ", err);
+			}
+		} else {
+			if (version === "Fusion2") {
+				warn("UI Labs: No cleanup function was returned for Fusion 2.0, there's no way to cleanup the story.");
+			}
 		}
 		if (version === "Fusion3") {
 			Cast<Fusion3>(fusion).doCleanup(fusion);

src/UI/StoryPreview/PreviewController/Mounters/Generic/index.tsx

@@ -38,7 +38,7 @@ function Generic(props: MounterProps<"Generic">) {
 			for (const listener of listeners.current) {
 				const [success, err] = pcall(() => listener(controlValues as InferControls<ReturnControls>, controlInfos));
 				if (!success) {
-					warn("UI-Labs: Generic Story listener errored when updating.", err);
+					warn("UI Labs: Generic Story listener errored when updating.", err);
 				}
 			}
 		},
@@ -54,9 +54,9 @@ function Generic(props: MounterProps<"Generic">) {
 		});
 		const [success, err] = pcall(() => result.render(storyProps));
 		if (!success) {
-			warn("UI-Labs: Generic story errored when mounting. The cleanup function will not be executed: ", err);
+			warn("UI Labs: Generic story errored when mounting. The cleanup function will not be executed: ", err);
 			return () => {
-				warn("UI-Labs: The cleanup function was not found. This might be due to the story erroring. This may cause a memory leak.");
+				warn("UI Labs: The cleanup function was not found. This might be due to the story erroring. This may cause a memory leak.");
 			};
 		}
 		return err;
@@ -71,7 +71,7 @@ function Generic(props: MounterProps<"Generic">) {
 		listeners.current = [];
 		const [success, err] = pcall(cleanup);
 		if (!success) {
-			warn("UI-Labs: The cleanup function errored when unmounting. This may cause a memory leak: ", err);
+			warn("UI Labs: The cleanup function errored when unmounting. This may cause a memory leak: ", err);
 		}
 	});
 

src/UI/StoryPreview/PreviewController/Utils.ts

@@ -8,7 +8,7 @@ export function useStoryUnmount(story: StoryBase, unmounter: () => void) {
 		if (story.cleanup) {
 			const [success, err] = pcall(story.cleanup);
 			if (!success) {
-				warn("UI-Labs: Error while running cleanup function: ", err);
+				warn("UI Labs: Error while running cleanup function: ", err);
 			}
 		}
 	});

src/UI/StoryPreview/PreviewController/index.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from "@rbxts/react";
+import React, { useEffect, useState } from "@rbxts/react";
 import { useProducer } from "@rbxts/react-reflex";
 import { useStoryRequire } from "UI/StoryPreview/PreviewController/StoryRequire";
 import { usePlugin } from "Hooks/Reflex/Use/Plugin";
@@ -48,7 +48,7 @@ function PreviewController(props: PreviewControllerProps) {
 		//Mounting story
 		if (result === undefined) return;
 		const check = CheckStory(result);
-		if (!check.Sucess) return warn("UI-Labs: " + check.Error);
+		if (!check.Sucess) return warn("UI Labs: " + check.Error);
 		mountFrame.Name = RemoveExtension(props.PreviewEntry.Module.Name, Configs.Extensions.Story);
 		const gotRenderer = MountStory(check.Type, props.PreviewEntry, check.Result, mountFrame);
 		setRenderer({ Key: tostring(newproxy()), MountType: check.Type, Renderer: gotRenderer });

yarn.lock

@@ -197,12 +197,10 @@
   resolved "https://registry.yarnpkg.com/@rbxts/types/-/types-1.0.791.tgz#8e8dbabc5044ec19b9c063ccf0bb487dcb9cfbc9"
   integrity sha512-kKivHGm9n12L7AlKUH7KfBI7dJTZaWs21rqTpzhcknn7mqjpkZxcn6RDaIIFl3x7mMnvUsJ5amVL25zd7xkTug==
 
-"@rbxts/ui-labs@2.2.0-test1":
-  version "2.2.0-test1"
-  resolved "https://registry.yarnpkg.com/@rbxts/ui-labs/-/ui-labs-2.2.0-test1.tgz#b1b275521c3cfe868c02ee4096110414e07d3bcf"
-  integrity sha512-N+38bvrMDZ39/uHcEObHkIpcejrYBKJGNUMZdS5m9V9xxS3HnzNr1axgnCzcdHra5S92bfFolP6rvG3rEUv8Hg==
-  dependencies:
-    "@rbxts/fusion" "^0.2.0"
+"@rbxts/ui-labs@^2.2.0-ts.1":
+  version "2.2.0-ts.1"
+  resolved "https://registry.yarnpkg.com/@rbxts/ui-labs/-/ui-labs-2.2.0-ts.1.tgz#e1a44de5fa69d3700813d7cb307b5592a44c1403"
+  integrity sha512-pRGI2bqakTdnmwA1+a7JaVZ9DLoBTCKg3Aw+BLzeVT9nd8ofKEzsOXBsLDJYmeECVRt3q8T0Is25wgd0tLxA/A==
 
 "@roblox-ts/luau-ast@=2.0.0":
   version "2.0.0"