Exposes Container.ProjectContainer static getter

Author: gustavopsantos

Assets/Reflex/Core/Container.cs

@@ -12,6 +12,7 @@ namespace Reflex.Core
 {
     public sealed class Container : IDisposable
     {
+        public static Container ProjectContainer { get; internal set; } 
         public string Name { get; }
         public Container Parent { get; }
         internal List<Container> Children { get; } = new();

Assets/Reflex/Editor/DebuggingWindow/ReflexDebuggerWindow.cs

@@ -194,7 +194,7 @@ private void BuildDataRecursively(MyTreeElement parent, Container container)
         private IList<MyTreeElement> GetData()
         {
             var root = new MyTreeElement("Root", -1, ++_id, ContainerIcon, () => string.Empty, Array.Empty<string>(), string.Empty, null, string.Empty);
-            BuildDataRecursively(root, UnityInjector.ProjectContainer);
+            BuildDataRecursively(root, Container.ProjectContainer);
 
             var list = new List<MyTreeElement>();
             TreeElementUtility.TreeToList(root, list);

Assets/Reflex/Injectors/UnityInjector.cs

@@ -16,7 +16,6 @@ namespace Reflex.Injectors
     internal static class UnityInjector
     {
         internal static Action<Scene, SceneScope> OnSceneLoaded;
-        internal static Container ProjectContainer { get; private set; }
         internal static Dictionary<Scene, Container> ContainersPerScene { get; } = new();
         internal static Dictionary<Scene, Container> SceneContainerParentOverride { get; } = new();
         internal static Dictionary<Scene, Action<ContainerBuilder>> ScenePreInstaller { get; } = new();
@@ -26,12 +25,12 @@ private static void BeforeAwakeOfFirstSceneOnly()
         {
             ReportReflexDebuggerStatus();
             ResetStaticState();
-            ProjectContainer = CreateProjectContainer();
+            Container.ProjectContainer = CreateProjectContainer();
 
             void InjectScene(Scene scene, SceneScope sceneScope)
             {
                 ReflexLogger.Log($"Scene {scene.name} ({scene.GetHashCode()}) loaded", LogLevel.Development);
-                var sceneContainer = CreateSceneContainer(scene, ProjectContainer, sceneScope);
+                var sceneContainer = CreateSceneContainer(scene, Container.ProjectContainer, sceneScope);
                 ContainersPerScene.Add(scene, sceneContainer);
                 SceneInjector.Inject(scene, sceneContainer);
             }
@@ -48,8 +47,8 @@ void DisposeScene(Scene scene)
 
             void DisposeProject()
             {
-                ProjectContainer?.Dispose();
-                ProjectContainer = null;
+                Container.ProjectContainer?.Dispose();
+                Container.ProjectContainer = null;
 
                 // Unsubscribe from static events ensuring that Reflex works with domain reloading set to false
                 OnSceneLoaded -= InjectScene;
@@ -105,7 +104,7 @@ private static Container CreateSceneContainer(Scene scene, Container projectCont
         private static void ResetStaticState()
         {
             OnSceneLoaded = null;
-            ProjectContainer = null;
+            Container.ProjectContainer = null;
             ContainersPerScene.Clear();
             SceneContainerParentOverride.Clear();
             ScenePreInstaller.Clear();