Refactor UI Control linkage in the prefab previews to prevent bugs

Source/Editor/Editor.cs

@@ -290,7 +290,6 @@ namespace FlaxEditor
 
             StateMachine = new EditorStateMachine(this);
             Undo = new EditorUndo(this);
-            UIControl.FallbackParentGetDelegate += OnUIControlFallbackParentGet;
 
             if (newProject)
                 InitProject();
@@ -355,27 +354,6 @@ namespace FlaxEditor
             StateMachine.LoadingState.StartInitEnding(skipCompile);
         }
 
-        private ContainerControl OnUIControlFallbackParentGet(UIControl control)
-        {
-            // Check if prefab root control is this UIControl
-            var loadingPreview = Viewport.Previews.PrefabPreview.LoadingPreview;
-            var activePreviews = Viewport.Previews.PrefabPreview.ActivePreviews;
-            if (activePreviews != null)
-            {
-                foreach (var preview in activePreviews)
-                {
-                    if (preview == loadingPreview ||
-                        (preview.Instance != null && (preview.Instance == control || preview.Instance.HasActorInHierarchy(control))))
-                    {
-                        // Link it to the prefab preview to see it in the editor
-                        preview.customControlLinked = control;
-                        return preview;
-                    }
-                }
-            }
-            return null;
-        }
-
         internal void RegisterModule(EditorModule module)
         {
             Log("Register Editor module " + module);

Source/Editor/Viewport/Previews/PrefabPreview.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using FlaxEngine;
 using Object = FlaxEngine.Object;
 
@@ -13,19 +12,9 @@ namespace FlaxEditor.Viewport.Previews
     /// <seealso cref="AssetPreview" />
     public class PrefabPreview : AssetPreview
     {
-        /// <summary>
-        /// The currently spawned prefab instance owner. Used to link some actors such as UIControl to preview scene and view.
-        /// </summary>
-        internal static PrefabPreview LoadingPreview;
-
-        /// <summary>
-        /// The list of active prefab previews. Used to link some actors such as UIControl to preview scene and view.
-        /// </summary>
-        internal static List<PrefabPreview> ActivePreviews;
-
         private Prefab _prefab;
         private Actor _instance;
-        internal UIControl customControlLinked;
+        internal UIControl _uiControlLinked;
 
         /// <summary>
         /// Gets or sets the prefab asset to preview.
@@ -54,13 +43,10 @@ namespace FlaxEditor.Viewport.Previews
                     _prefab.WaitForLoaded();
 
                     // Spawn prefab
-                    LoadingPreview = this;
                     var instance = PrefabManager.SpawnPrefab(_prefab, null);
-                    LoadingPreview = null;
                     if (instance == null)
                     {
                         _prefab = null;
-                        ActivePreviews.Remove(this);
                         throw new Exception("Failed to spawn a prefab for the preview.");
                     }
 
@@ -84,11 +70,11 @@ namespace FlaxEditor.Viewport.Previews
                 if (_instance)
                 {
                     // Unlink UI control
-                    if (customControlLinked)
+                    if (_uiControlLinked)
                     {
-                        if (customControlLinked.Control?.Parent == this)
+                        if (_uiControlLinked.Control?.Parent == this)
-                            customControlLinked.Control.Parent = null;
+                            _uiControlLinked.Control.Parent = null;
-                        customControlLinked = null;
+                        _uiControlLinked = null;
                     }
 
                     // Remove for the preview
@@ -101,13 +87,27 @@ namespace FlaxEditor.Viewport.Previews
                 {
                     // Add to the preview
                     Task.AddCustomActor(_instance);
-
+                    UpdateLinkage();
-                    // Link UI canvases to the preview
-                    LinkCanvas(_instance);
                 }
             }
         }
 
+        private void UpdateLinkage()
+        {
+            // Link UI canvases to the preview (eg. after canvas added to the prefab)
+            LinkCanvas(_instance);
+
+            // Link UI control to the preview
+            if (_uiControlLinked == null &&
+                _instance is UIControl uiControl &&
+                uiControl.Control != null &&
+                uiControl.Control.Parent == null)
+            {
+                uiControl.Control.Parent = this;
+                _uiControlLinked = uiControl;
+            }
+        }
+
         private void LinkCanvas(Actor actor)
         {
             if (actor is UICanvas uiCanvas)
@@ -126,9 +126,6 @@ namespace FlaxEditor.Viewport.Previews
         public PrefabPreview(bool useWidgets)
         : base(useWidgets)
         {
-            if (ActivePreviews == null)
-                ActivePreviews = new List<PrefabPreview>();
-            ActivePreviews.Add(this);
         }
 
         /// <inheritdoc />
@@ -138,15 +135,15 @@ namespace FlaxEditor.Viewport.Previews
 
             if (_instance != null)
             {
-                // Link UI canvases to the preview (eg. after canvas added to the prefab)
+                UpdateLinkage();
-                LinkCanvas(_instance);
             }
         }
 
         /// <inheritdoc />
         public override void OnDestroy()
         {
-            ActivePreviews.Remove(this);
+            if (IsDisposing)
+                return;
             Prefab = null;
 
             base.OnDestroy();