use hydrate for fusion stories

Author: PepeElToro41

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

@@ -1,23 +1,26 @@
-import React, { useRef } from "@rbxts/react";
-import { useEffect } from "@rbxts/react";
-import { MounterProps } from ".";
-import { FastSpawn, UILabsWarn, YCall } from "Utils/MiscUtils";
+import React, { useEffect, useRef } from "@rbxts/react";
 import { WARNING_STORY_TYPES, WARNINGS } from "Plugin/Warnings";
+import { FastSpawn, UILabsWarn, YCall } from "Utils/MiscUtils";
+import { MounterProps } from ".";
 
 const FUNCTIONAL_ERR = WARNING_STORY_TYPES.Functional;
 
 function Functional(props: MounterProps<"Functional">) {
 	const unmounter = useRef<() => void>();
 
 	useEffect(() => {
-		unmounter.current = YCall(props.Result, props.MountFrame, (didYield, err) => {
-			print("ERR", err);
-			if (didYield) {
-				UILabsWarn(WARNINGS.Yielding.format(FUNCTIONAL_ERR));
-			} else {
-				UILabsWarn(WARNINGS.StoryError.format(FUNCTIONAL_ERR), err);
+		unmounter.current = YCall(
+			props.Result,
+			props.MountFrame,
+			(didYield, err) => {
+				print("ERR", err);
+				if (didYield) {
+					UILabsWarn(WARNINGS.Yielding.format(FUNCTIONAL_ERR));
+				} else {
+					UILabsWarn(WARNINGS.StoryError.format(FUNCTIONAL_ERR), err);
+				}
 			}
-		});
+		);
 	}, []);
 
 	props.UnmountSignal.Connect(() => {

src/UI/StoryPreview/PreviewController/Mounters/FusionLib/Utils.ts

@@ -1,5 +1,9 @@
 import Fusion from "@rbxts/fusion";
-import { CreateControlStates, InferFusionControls, UpdateControlStates } from "@rbxts/ui-labs";
+import {
+	CreateControlStates,
+	InferFusionControls,
+	UpdateControlStates
+} from "@rbxts/ui-labs";
 import { ConvertedControls } from "@rbxts/ui-labs/src/ControlTypings/Typing";
 import { Cast } from "Utils/MiscUtils";
 
@@ -15,13 +19,21 @@ export function GetFusionVersion(fusion: typeof Fusion) {
 	}
 }
 
-export function CreateFusionValues(fusion: typeof Fusion, controls: ConvertedControls, controlValues: ParametrizedControls) {
+export function CreateFusionValues(
+	fusion: typeof Fusion,
+	controls: ConvertedControls,
+	controlValues: ParametrizedControls
+) {
 	return CreateControlStates(controls, controlValues, (value) => {
 		return fusion.Value(value);
 	}) as InferFusionControls<ConvertedControls>;
 }
 
-export function CreateFusion3Values(fusion: Fusion3, controls: ConvertedControls, controlValues: ParametrizedControls) {
+export function CreateFusion3Values(
+	fusion: Fusion3,
+	controls: ConvertedControls,
+	controlValues: ParametrizedControls
+) {
 	return CreateControlStates(controls, controlValues, (value) => {
 		return fusion.Value(value);
 	}) as InferFusionControls<ConvertedControls>;
@@ -30,9 +42,14 @@ export function CreateFusion3Values(fusion: Fusion3, controls: ConvertedControls
 export function UpdateFusionValues(
 	values: InferFusionControls<ConvertedControls>,
 	controls: ConvertedControls,
-	controlValues: ParametrizedControls,
+	controlValues: ParametrizedControls
 ) {
-	UpdateControlStates(values, controls, controlValues, (value: Fusion.Value<any>, update) => {
-		return value.set(update);
-	});
+	UpdateControlStates(
+		values,
+		controls,
+		controlValues,
+		(value: Fusion.Value<any>, update) => {
+			return value.set(update);
+		}
+	);
 }

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

@@ -81,17 +81,19 @@ function FusionLib(props: MounterProps<"FusionLib">) {
 			}
 		});
 		if (value) {
-			if (typeIs(value, "Instance")) {
+			if (typeIs(value, "function")) {
+				return value;
+			} else {
 				if (version === "Fusion3") {
 					const scope = Cast<Fusion3>(fusion);
 					scope.Hydrate(props.MountFrame)({
 						[fusion.Children]: value
 					});
 				} else {
-					return () => value.Destroy();
+					fusion.Hydrate(props.MountFrame)({
+						[fusion.Children]: value
+					});
 				}
-			} else {
-				return value;
 			}
 		} else {
 			return undefined;