Handle story cleanup properly

src/Components/Avatar.story.lua

@@ -38,7 +38,13 @@ return {
 			end
 		end)
 
-		local Instance = Scope:Frame {
+		Scope:innerScope({
+			function()
+				task.cancel(RandomizerThread)
+			end,
+		})
+
+		Scope:Frame {
 			Parent = Parent,
 			Padding = Scope:Computed(function(use)
 				return UDim.new(0, use(Theme.StrokeThickness["4"]))
@@ -97,8 +103,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
-			task.cancel(RandomizerThread)
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Badge.story.lua

@@ -24,7 +24,7 @@ return {
 
 		local NotificationCount = Scope:Value(0)
 
-		local CountLoop = task.spawn(function()
+		local CountThread = task.spawn(function()
 			while task.wait(0.08) do
 				if peek(NotificationCount) == 100 then
 					task.wait(3)
@@ -35,7 +35,13 @@ return {
 			end
 		end)
 
-		local Instance = Scope:Frame {
+		Scope:innerScope({
+			function()
+				task.cancel(CountThread)
+			end,
+		})
+
+		Scope:Frame {
 			Parent = Parent,
 			ListEnabled = true,
 			ListPadding = Scope:Computed(function(use)
@@ -90,8 +96,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
-			coroutine.close(CountLoop)
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Base.story.lua

@@ -11,7 +11,7 @@ return {
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 
-		local Instance = Scope:Base {
+		Scope:Base {
 			Parent = Parent,
 			ListEnabled = true,
 			Padding = Scope:Computed(function(use)
@@ -108,7 +108,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Button.story.lua

@@ -19,7 +19,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			ListEnabled = true,
 			ListPadding = Scope:Computed(function(use)
@@ -71,7 +71,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Card.story.lua

@@ -22,7 +22,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			Size = UDim2.fromOffset(300, 0),
 			AutomaticSize = Enum.AutomaticSize.Y,
@@ -63,7 +63,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Checkbox.lua

@@ -65,7 +65,7 @@ return function(Scope: Fusion.Scope<any>, Props: Props)
 		end
 	end)
 
-	return BaseButton(Util.CombineProps(Props, {
+	return Scope:BaseButton(Util.CombineProps(Props, {
 		Name = "Checkbox",
 		BackgroundColor3 = EffectiveColor,
 		BackgroundTransparency = Scope:Spring(

src/Components/Checkbox.story.lua

@@ -19,7 +19,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			Padding = Scope:Computed(function(use)
 				return UDim.new(0, use(Theme.StrokeThickness["1"]))
@@ -51,7 +51,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Divider.story.lua

@@ -20,7 +20,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			Size = UDim2.fromOffset(300, 0),
 			AutomaticSize = Enum.AutomaticSize.Y,
@@ -44,7 +44,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Heading.story.lua

@@ -20,7 +20,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			ListEnabled = true,
 			ListPadding = Scope:Computed(function(use)
@@ -39,7 +39,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Icon.story.lua

@@ -12,13 +12,13 @@ return {
 	story = function(Parent: GuiObject)
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 
-		local Instance = Scope:Icon {
+		Scope:Icon {
 			Parent = Parent,
 			Image = "rbxassetid://11560341132",
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/IconButton.story.lua

@@ -19,7 +19,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			Padding = Scope:Computed(function(use)
 				return UDim.new(0, use(Theme.StrokeThickness["1"]))
@@ -65,7 +65,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/IconText.story.lua

@@ -12,7 +12,7 @@ return {
 	story = function(Parent: GuiObject)
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 
-		local Instance = Scope:IconText {
+		Scope:IconText {
 			Parent = Parent,
 			Content = {
 				"Here's a shop icon: ",
@@ -25,7 +25,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Image.story.lua

@@ -18,7 +18,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			AutomaticSize = Enum.AutomaticSize.XY,
 			ListEnabled = true,
@@ -39,7 +39,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/MenuFrame.story.lua

@@ -20,7 +20,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			Padding = Scope:Computed(function(use)
 				return UDim.new(0, use(Theme.StrokeThickness["1"]))
@@ -44,7 +44,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/NumberSpinner.story.lua

@@ -37,7 +37,15 @@ return {
 			end
 		end)
 
-		local Instance = Scope:Frame {
+		Scope:innerScope({
+			function()
+				task.cancel(RandomizerThread)
+				task.cancel(RandomizerDecimalThread)
+				task.cancel(CountThread)
+			end,
+		})
+
+		Scope:Frame {
 			Parent = Parent,
 			Size = UDim2.fromOffset(300, 0),
 			AutomaticSize = Enum.AutomaticSize.Y,
@@ -62,10 +70,7 @@ return {
 		}
 
 		return function()
-			task.cancel(RandomizerThread)
-			task.cancel(RandomizerDecimalThread)
-			task.cancel(CountThread)
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/ProgressBar.story.lua

@@ -26,7 +26,20 @@ return {
 		local Progress = Scope:Value(0)
 		local Color = Scope:Value(Color3.fromRGB(255, 0, 0))
 
-		local Instance = Scope:Frame {
+		local ColorThread = task.spawn(function()
+			while task.wait(1) do
+				Progress:set(math.random(0, 1000) / 1000)
+				Color:set(ColorUtils.Rotate(peek(Color), 100))
+			end
+		end)
+
+		Scope:innerScope({
+			function()
+				task.cancel(ColorThread)
+			end,
+		})
+
+		Scope:Frame {
 			Parent = Parent,
 			ListEnabled = true,
 			ListHorizontalFlex = Enum.UIFlexAlignment.Fill,
@@ -186,15 +199,8 @@ return {
 			},
 		}
 
-		task.spawn(function()
-			while task.wait(1) do
-				Progress:set(math.random(0, 1000) / 1000)
-				Color:set(ColorUtils.Rotate(peek(Color), 100))
-			end
-		end)
-
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/ScrollingFrame.story.lua

@@ -12,15 +12,15 @@ return {
 	story = function(Parent: GuiObject)
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 
-		local Instance = Scope:ScrollingFrame {
+		Scope:ScrollingFrame {
 			Parent = Parent,
 			Size = UDim2.fromOffset(200, 200),
 			CanvasSize = UDim2.new(UDim.new(1, 0), UDim.new(0, 1000)),
 			AutomaticCanvasSize = Enum.AutomaticSize.None,
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/SwitchInput.story.lua

@@ -18,7 +18,7 @@ return {
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
 		local Theme: Themer.ThemeObject = Themer.Theme:now()
 
-		local Instance = Scope:Frame {
+		Scope:Frame {
 			Parent = Parent,
 			Padding = Scope:Computed(function(use)
 				return UDim.new(0, use(Theme.StrokeThickness["1"]))
@@ -37,7 +37,7 @@ return {
 		}
 
 		return function()
-			Instance:Destroy()
+			Scope:doCleanup()
 		end
 	end,
 }

src/Components/Text.story.lua

@@ -12,13 +12,12 @@ return {
 	story = function(Parent: GuiObject)
 		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Util) & typeof(Components)> = Scoped(Fusion, Util, Components)
 
-		local Instance = Scope:Text {
+		Scope:Text {
 			Parent = Parent,
 			Text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
 		}
 
 		return function()
-			Instance:Destroy()
 			Scope:doCleanup()
 		end
 	end,