Fixes scene container disposal

Assets/Reflex/Scripts/Extensions/SceneExtensions.cs

@@ -1,4 +1,7 @@
-using UnityEngine.SceneManagement;
+using System;
+using Reflex.Scripts.Utilities;
+using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace Reflex
 {
@@ -19,5 +22,14 @@ internal static bool TryFindAtRootObjects<T>(this Scene scene, out T finding)
             finding = default;
             return false;
         }
+
+        internal static void OnUnload(this Scene scene, Action callback)
+        {
+            var gameObject = new GameObject("SceneUnloadHook");
+            gameObject.hideFlags = HideFlags.HideInHierarchy;
+            SceneManager.MoveGameObjectToScene(gameObject, scene);
+            var hook = gameObject.AddComponent<MonoBehaviourEventHook>();
+            hook.OnDestroyEvent += () => callback?.Invoke();
+        }
     }
 }

Assets/Reflex/Scripts/Injectors/SceneInjector.cs

@@ -15,14 +15,7 @@ internal static void Inject(Scene scene, ContainerStack containerStack)
 				var container = containerStack.PushNew();
 				sceneContext.InstallBindings(container);
 				container.InstantiateNonLazySingletons();
-
-				void DisposeScopedContainer(Scene _)
-				{
-					containerStack.Pop().Dispose();
-					SceneManager.sceneUnloaded -= DisposeScopedContainer;
-				}
-
-				SceneManager.sceneUnloaded += DisposeScopedContainer;
+				scene.OnUnload(() => containerStack.Pop().Dispose());
 			}
 
 			foreach (var monoBehaviour in GetEveryMonoBehaviourAtScene(scene))

Assets/Reflex/Scripts/Utilities/MonoBehaviourEventHook.cs

@@ -0,0 +1,15 @@
+using System;
+using UnityEngine;
+
+namespace Reflex.Scripts.Utilities
+{
+    public class MonoBehaviourEventHook : MonoBehaviour
+    {
+        public event Action OnDestroyEvent;
+
+        private void OnDestroy()
+        {
+            OnDestroyEvent?.Invoke();
+        }
+    }
+}

Assets/Reflex/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.gustavopsantos.reflex",
   "displayName": "Reflex",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "unity": "2019.3",
   "description": "Minimal dependency injection framework for Unity",
   "keywords": ["Dependency Injection", "IoC", "DI", "DI Container"],

ProjectSettings/EditorBuildSettings.asset

@@ -6,9 +6,9 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/SceneContextSandbox/Scenes/SceneOne.unity
+    path: Assets/Reflex.Sandbox/Scenes/SceneOne.unity
     guid: f528ad3d355a5ef488f900115329f198
   - enabled: 1
-    path: Assets/SceneContextSandbox/Scenes/SceneTwo.unity
+    path: Assets/Reflex.Sandbox/Scenes/SceneTwo.unity
     guid: 5fb3905581a42cd4bbf5694b5942af33
   m_configObjects: {}

README.md

@@ -78,7 +78,7 @@ Reflex is an [Dependency Injection](https://stackify.com/dependency-injection/)
 
 ### Install via UPM (using Git URL)
 ```json
-"com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#2.0.1"
+"com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#2.0.2"
 ```
 
 ### Install manually (using .unitypackage)