From 840e9bedb2b10e1f3213243a60fd3bf0635eba08 Mon Sep 17 00:00:00 2001
From: boatbomber <zack@boatbomber.com>
Date: Mon, 18 Sep 2023 17:44:14 -0400
Subject: [PATCH] Use GUIDs for ephemeral PluginWidgets (#784)

Because Roact will destroy and recreate a plugin widget if it unmounts
and remounts, Studio will complain about making a new widget with the
same ID as the old one.

The simplest solution is to just use GUIDs so we never have to worry
about this again. The ID is used internally for storing the widget's
dock state and other internal details, so we don't want *all* our
widgets to use GUIDs, only the ephemeral popup ones.
---
 plugin/src/App/Components/Studio/StudioPluginGui.lua | 4 +++-
 plugin/src/App/StatusPages/Confirming.lua            | 2 ++
 plugin/src/App/StatusPages/Connected.lua             | 1 +
 plugin/src/App/init.lua                              | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugin/src/App/Components/Studio/StudioPluginGui.lua b/plugin/src/App/Components/Studio/StudioPluginGui.lua
index 6b9910a91..236c93009 100644
--- a/plugin/src/App/Components/Studio/StudioPluginGui.lua
+++ b/plugin/src/App/Components/Studio/StudioPluginGui.lua
@@ -1,3 +1,5 @@
+local HttpService = game:GetService("HttpService")
+
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
 local Packages = Rojo.Packages
@@ -36,7 +38,7 @@ function StudioPluginGui:init()
 		minimumSize.Y
 	)
 
-	local pluginGui = self.props.plugin:CreateDockWidgetPluginGui(self.props.id, dockWidgetPluginGuiInfo)
+	local pluginGui = self.props.plugin:CreateDockWidgetPluginGui(if self.props.isEphemeral then HttpService:GenerateGUID(false) else self.props.id, dockWidgetPluginGuiInfo)
 
 	pluginGui.Name = self.props.id
 	pluginGui.Title = self.props.title
diff --git a/plugin/src/App/StatusPages/Confirming.lua b/plugin/src/App/StatusPages/Confirming.lua
index 74c814a1e..098c2dbdd 100644
--- a/plugin/src/App/StatusPages/Confirming.lua
+++ b/plugin/src/App/StatusPages/Confirming.lua
@@ -140,6 +140,7 @@ function ConfirmingPage:render()
 				id = "Rojo_ConfirmingSourceDiff",
 				title = "Source diff",
 				active = self.state.showingSourceDiff,
+				isEphemeral = true,
 
 				initDockState = Enum.InitialDockState.Float,
 				overridePreviousState = true,
@@ -182,6 +183,7 @@ function ConfirmingPage:render()
 					self.props.confirmData.serverInfo.projectName or "UNKNOWN"
 				),
 				active = true,
+				isEphemeral = true,
 
 				initDockState = Enum.InitialDockState.Float,
 				overridePreviousState = false,
diff --git a/plugin/src/App/StatusPages/Connected.lua b/plugin/src/App/StatusPages/Connected.lua
index 27f4e7ca4..b385b1c47 100644
--- a/plugin/src/App/StatusPages/Connected.lua
+++ b/plugin/src/App/StatusPages/Connected.lua
@@ -398,6 +398,7 @@ function ConnectedPage:render()
 				id = "Rojo_ConnectedSourceDiff",
 				title = "Source diff",
 				active = self.state.showingSourceDiff,
+				isEphemeral = true,
 
 				initDockState = Enum.InitialDockState.Float,
 				overridePreviousState = false,
diff --git a/plugin/src/App/init.lua b/plugin/src/App/init.lua
index 786b559ea..647c62e73 100644
--- a/plugin/src/App/init.lua
+++ b/plugin/src/App/init.lua
@@ -579,6 +579,7 @@ function App:render()
 					id = pluginName,
 					title = pluginName,
 					active = self.state.guiEnabled,
+					isEphemeral = false,
 
 					initDockState = Enum.InitialDockState.Right,
 					overridePreviousState = false,