Fix OnInstantiated callback not being called after injection in InstanceProvider (#98)

Author: TanTanDev

UnityProject/Assets/Plugins/Zenject/Source/Binding/Binders/Factory/FactoryFromBinderBase.cs

@@ -79,7 +79,7 @@ public ConditionCopyNonLazyBinder FromInstance(object instance)
             BindingUtil.AssertInstanceDerivesFromOrEqual(instance, AllParentTypes);
 
             ProviderFunc =
-                (container) => new InstanceProvider(ContractType, instance, container);
+                (container) => new InstanceProvider(ContractType, instance, container, null);
 
             return this;
         }

UnityProject/Assets/Plugins/Zenject/Source/Binding/Binders/FromBinders/FromBinder.cs

@@ -872,7 +872,7 @@ protected ScopeConcreteIdArgConditionCopyNonLazyBinder FromInstanceBase(object i
             BindInfo.MarkAsCreationBinding = false;
             SubFinalizer = new ScopableBindingFinalizer(
                 BindInfo,
-                (container, type) => new InstanceProvider(type, instance, container));
+                (container, type) => new InstanceProvider(type, instance, container, BindInfo.InstantiatedCallback));
 
             return new ScopeConcreteIdArgConditionCopyNonLazyBinder(BindInfo);
         }

UnityProject/Assets/Plugins/Zenject/Source/Main/DiContainer.cs

@@ -2871,7 +2871,7 @@ public IdScopeConcreteIdArgConditionCopyNonLazyBinder BindInstance<TContract>(TC
             statement.SetFinalizer(
                 new ScopableBindingFinalizer(
                     bindInfo,
-                    (container, type) => new InstanceProvider(type, instance, container)));
+                    (container, type) => new InstanceProvider(type, instance, container, bindInfo.InstantiatedCallback)));
 
             return new IdScopeConcreteIdArgConditionCopyNonLazyBinder(bindInfo);
         }

UnityProject/Assets/Plugins/Zenject/Source/Providers/InstanceProvider.cs

@@ -10,13 +10,15 @@ public class InstanceProvider : IProvider
         readonly object _instance;
         readonly Type _instanceType;
         readonly DiContainer _container;
+        readonly Action<InjectContext, object> _instantiateCallback;
 
         public InstanceProvider(
-            Type instanceType, object instance, DiContainer container)
+            Type instanceType, object instance, DiContainer container, Action<InjectContext, object> instantiateCallback)
         {
             _instanceType = instanceType;
             _instance = instance;
             _container = container;
+            _instantiateCallback = instantiateCallback;
         }
 
         public bool IsCached
@@ -42,7 +44,15 @@ public void GetAllInstancesWithInjectSplit(
 
             Assert.That(_instanceType.DerivesFromOrEqual(context.MemberType));
 
-            injectAction = () => _container.LazyInject(_instance);
+            injectAction = () =>
+            {
+                object instance = _container.LazyInject(_instance);
+
+                if (_instantiateCallback != null)
+                {
+                    _instantiateCallback(context, instance);
+                }
+            };
 
             buffer.Add(_instance);
         }