Skip injection for Component no inherit MonoBehaviour

hadashiA · Jan 28, 2021 · 97e29bc · 97e29bc
1 parent 5091d39
commit 97e29bc
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/ContainerBuilderUnityExtensions.cs b/VContainer/Assets/VContainer/Runtime/Unity/ContainerBuilderUnityExtensions.cs
@@ -73,17 +73,23 @@ public static RegistrationBuilder RegisterEntryPoint<T>(this IContainerBuilder b
             return registrationBuilder.AsImplementedInterfaces();
         }
 
-        public static RegistrationBuilder RegisterComponent(this IContainerBuilder builder, MonoBehaviour component)
+        public static RegistrationBuilder RegisterComponent(this IContainerBuilder builder, Component component)
         {
-            var registrationBuilder = builder.RegisterInstance(component).As(typeof(MonoBehaviour), component.GetType());
-            builder.RegisterBuildCallback(container => container.Inject(component));
+            var registrationBuilder = builder.RegisterInstance(component);
+            if (component is MonoBehaviour monoBehaviour)
+            {
+                builder.RegisterBuildCallback(container => container.Inject(monoBehaviour));
+            }
             return registrationBuilder;
         }
 
         public static RegistrationBuilder RegisterComponent<TInterface>(this IContainerBuilder builder, TInterface component)
         {
-            var registrationBuilder = builder.RegisterInstance(component).As(typeof(MonoBehaviour), typeof(TInterface));
-            builder.RegisterBuildCallback(container => container.Inject(component));
+            var registrationBuilder = builder.RegisterInstance(component);
+            if (component is MonoBehaviour monoBehaviour)
+            {
+                builder.RegisterBuildCallback(container => container.Inject(monoBehaviour));
+            }
             return registrationBuilder;
         }
 
@@ -106,8 +112,11 @@ public static RegistrationBuilder RegisterComponentInHierarchy<T>(this IContaine
                 throw new VContainerException(typeof(T), $"Component {typeof(T)} is not in this scene {scene.path}");
             }
 
-            var registrationBuilder = builder.RegisterInstance(component).As(typeof(MonoBehaviour), typeof(T));
-            builder.RegisterBuildCallback(container => container.Inject(component));
+            var registrationBuilder = builder.RegisterInstance(component).As(typeof(T));
+            if (component is MonoBehaviour monoBehaviour)
+            {
+                builder.RegisterBuildCallback(container => container.Inject(monoBehaviour));
+            }
             return registrationBuilder;
         }