From 45468bc6634e9ba5518c1373e4a2ff1e4ddb91db Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Fri, 2 Mar 2018 22:33:54 -0500
Subject: [PATCH 1/2] perf(PropertySetter): Use generic delegate approach for
 view managers

The recent work to avoid reflection for native modules can also be applied to native props for view managers (which also uses reflection). Avoiding reflection invoke saves quite a few cycles.

This change extracts the logic from ReflectionReactDelegateFactory to create the IGenericDelegate, and adds support for generic delegates where the instance isn't known up-front. We need this because the ViewManager responsible for creating all the PropertySetters only holds a reference to the ShadowNode type, not the ShadowNode instance itself.
---
 .../Bridge/GenericDelegate.cs                 |  70 ++++++
 .../Bridge/GenericDelegateTypes.cs            | 230 ++++++++++++++----
 .../Bridge/GenericDelegateTypes.tt            |  13 +-
 .../Bridge/ReflectionReactDelegateFactory.cs  |  48 +---
 .../ReactNative.Shared.projitems              |   1 +
 .../UIManager/PropertySetter.cs               |  77 +++---
 6 files changed, 313 insertions(+), 126 deletions(-)
 create mode 100644 ReactWindows/ReactNative.Shared/Bridge/GenericDelegate.cs

diff --git a/ReactWindows/ReactNative.Shared/Bridge/GenericDelegate.cs b/ReactWindows/ReactNative.Shared/Bridge/GenericDelegate.cs
new file mode 100644
index 00000000000..23762f6f69e
--- /dev/null
+++ b/ReactWindows/ReactNative.Shared/Bridge/GenericDelegate.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Reflection;
+
+namespace ReactNative.Bridge
+{
+    static class GenericDelegate
+    {
+        public static IGenericDelegate Create(MethodInfo method)
+        {
+            return (IGenericDelegate)Activator.CreateInstance(CreateDelegateType(method, false), method);
+        }
+
+        public static IGenericDelegate Create(object instance, MethodInfo method)
+        {
+            return (IGenericDelegate)Activator.CreateInstance(CreateDelegateType(method, true), instance, method);
+        }
+
+        private static Type CreateDelegateType(MethodInfo method, bool withInstance)
+        {
+            var methodParameters = method.GetParameters();
+            var hasReturnValue = method.ReturnType != typeof(void);
+            var maximumParameterCount = hasReturnValue ? GenericDelegateTypes.FuncTypes.Length : GenericDelegateTypes.ActionTypes.Length;
+
+            // If the number of arguments exceeds the number supported by generic delegates,
+            // return null. This will fall back to using reflection.
+            var thisArgumentCount = withInstance ? 0 : 1;
+            var argumentCount = methodParameters.Length + thisArgumentCount;
+            if (argumentCount > maximumParameterCount)
+            {
+                return null;
+            }
+
+            // Increment the generic arity for methods with return values.
+            var genericArity = hasReturnValue ? argumentCount + 1 : argumentCount;
+            var typeList = new Type[genericArity];
+
+            // Set the first generic parameter to the declaring type, if necessary
+            if (!withInstance)
+            {
+                typeList[0] = method.DeclaringType;
+            }
+
+            // Fill the generic type parameter list with method parameter types.
+            for (int t = thisArgumentCount; t < argumentCount; t++)
+            {
+                typeList[t] = methodParameters[t - thisArgumentCount].ParameterType;
+            }
+
+            // If the function has a return value, append it to the generic type parameters.
+            if (hasReturnValue)
+            {
+                typeList[argumentCount] = method.ReturnType;
+            }
+
+            // Get the appropriate generic delegate type.
+            var genericDelegateType = hasReturnValue
+                ? GenericDelegateTypes.FuncTypes[argumentCount]
+                : GenericDelegateTypes.ActionTypes[argumentCount];
+
+            // Close the generic type over the argument and return types, if necessary.
+            var delegateType = genericDelegateType;
+            if (genericArity > 0)
+            {
+                delegateType = genericDelegateType.MakeGenericType(typeList);
+            }
+
+            return delegateType;
+        }
+    }
+}
diff --git a/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.cs b/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.cs
index b0361030813..ecfce3fa508 100644
--- a/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.cs
+++ b/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.cs
@@ -1,7 +1,6 @@
 //
 // This file is generated by GenericDelegateTypes.tt
 //
-
 using System;
 using System.Reflection;
 
@@ -28,7 +27,6 @@ static class GenericDelegateTypes
             typeof(SignatureAction14<,,,,,,,,,,,,,>),
             typeof(SignatureAction15<,,,,,,,,,,,,,,>),
             typeof(SignatureAction16<,,,,,,,,,,,,,,,>),
-
         };
 
         public static Type[] FuncTypes =
@@ -50,23 +48,25 @@ static class GenericDelegateTypes
             typeof(SignatureFunc14<,,,,,,,,,,,,,,>),
             typeof(SignatureFunc15<,,,,,,,,,,,,,,,>),
             typeof(SignatureFunc16<,,,,,,,,,,,,,,,,>),
-
         };
 
         class SignatureAction0 : IGenericDelegate
         {
             Action _instancedDelegate;
 
+            public SignatureAction0(MethodInfo method)
+            {
+                _instancedDelegate = (Action)method.CreateDelegate(typeof(Action));
+            }
+
             public SignatureAction0(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action)method.CreateDelegate(typeof(Action), instance);
             }
 
-            public object DelegateTarget => _instancedDelegate.Target;
-
             public object Invoke(object[] args)
             {
-               _instancedDelegate();
+                _instancedDelegate();
                 return null;
             }
         }
@@ -75,31 +75,36 @@ class SignatureFunc0<TResult> : IGenericDelegate
         {
             Func<TResult> _instancedDelegate;
 
+            public SignatureFunc0(MethodInfo method)
+            {
+                _instancedDelegate = (Func<TResult>)method.CreateDelegate(typeof(Func<TResult>));
+            }
+
             public SignatureFunc0(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<TResult>)method.CreateDelegate(typeof(Func<TResult>), instance);
             }
 
-            public object DelegateTarget => _instancedDelegate.Target;
-
             public object Invoke(object[] args) =>
                 _instancedDelegate();
         }
-
         class SignatureAction1<T0> : IGenericDelegate
         {
             Action<T0> _instancedDelegate;
 
+            public SignatureAction1(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0>)method.CreateDelegate(typeof(Action<T0>));
+            }
+
             public SignatureAction1(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0>)method.CreateDelegate(typeof(Action<T0>), instance);
             }
 
-            public object DelegateTarget => _instancedDelegate.Target;
-
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0]);
+                _instancedDelegate((T0)args[0]);
                 return null;
             }
         }
@@ -108,6 +113,11 @@ class SignatureFunc1<T0, TResult> : IGenericDelegate
         {
             Func<T0, TResult> _instancedDelegate;
 
+            public SignatureFunc1(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, TResult>)method.CreateDelegate(typeof(Func<T0, TResult>));
+            }
+
             public SignatureFunc1(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, TResult>)method.CreateDelegate(typeof(Func<T0, TResult>), instance);
@@ -116,11 +126,15 @@ public SignatureFunc1(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0]);
         }
-
         class SignatureAction2<T0, T1> : IGenericDelegate
         {
             Action<T0, T1> _instancedDelegate;
 
+            public SignatureAction2(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1>)method.CreateDelegate(typeof(Action<T0, T1>));
+            }
+
             public SignatureAction2(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1>)method.CreateDelegate(typeof(Action<T0, T1>), instance);
@@ -128,7 +142,7 @@ public SignatureAction2(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1]);
+                _instancedDelegate((T0)args[0], (T1)args[1]);
                 return null;
             }
         }
@@ -137,6 +151,11 @@ class SignatureFunc2<T0, T1, TResult> : IGenericDelegate
         {
             Func<T0, T1, TResult> _instancedDelegate;
 
+            public SignatureFunc2(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, TResult>)method.CreateDelegate(typeof(Func<T0, T1, TResult>));
+            }
+
             public SignatureFunc2(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, TResult>)method.CreateDelegate(typeof(Func<T0, T1, TResult>), instance);
@@ -145,11 +164,15 @@ public SignatureFunc2(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1]);
         }
-
         class SignatureAction3<T0, T1, T2> : IGenericDelegate
         {
             Action<T0, T1, T2> _instancedDelegate;
 
+            public SignatureAction3(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2>)method.CreateDelegate(typeof(Action<T0, T1, T2>));
+            }
+
             public SignatureAction3(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2>)method.CreateDelegate(typeof(Action<T0, T1, T2>), instance);
@@ -157,7 +180,7 @@ public SignatureAction3(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2]);
                 return null;
             }
         }
@@ -166,6 +189,11 @@ class SignatureFunc3<T0, T1, T2, TResult> : IGenericDelegate
         {
             Func<T0, T1, T2, TResult> _instancedDelegate;
 
+            public SignatureFunc3(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, TResult>));
+            }
+
             public SignatureFunc3(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, TResult>), instance);
@@ -174,11 +202,15 @@ public SignatureFunc3(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2]);
         }
-
         class SignatureAction4<T0, T1, T2, T3> : IGenericDelegate
         {
             Action<T0, T1, T2, T3> _instancedDelegate;
 
+            public SignatureAction4(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3>));
+            }
+
             public SignatureAction4(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3>), instance);
@@ -186,7 +218,7 @@ public SignatureAction4(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3]);
                 return null;
             }
         }
@@ -195,6 +227,11 @@ class SignatureFunc4<T0, T1, T2, T3, TResult> : IGenericDelegate
         {
             Func<T0, T1, T2, T3, TResult> _instancedDelegate;
 
+            public SignatureFunc4(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, TResult>));
+            }
+
             public SignatureFunc4(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, TResult>), instance);
@@ -203,11 +240,15 @@ public SignatureFunc4(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3]);
         }
-
         class SignatureAction5<T0, T1, T2, T3, T4> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4> _instancedDelegate;
 
+            public SignatureAction5(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4>));
+            }
+
             public SignatureAction5(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4>), instance);
@@ -215,7 +256,7 @@ public SignatureAction5(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4]);
                 return null;
             }
         }
@@ -224,6 +265,11 @@ class SignatureFunc5<T0, T1, T2, T3, T4, TResult> : IGenericDelegate
         {
             Func<T0, T1, T2, T3, T4, TResult> _instancedDelegate;
 
+            public SignatureFunc5(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, TResult>));
+            }
+
             public SignatureFunc5(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, TResult>), instance);
@@ -232,11 +278,15 @@ public SignatureFunc5(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4]);
         }
-
         class SignatureAction6<T0, T1, T2, T3, T4, T5> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5> _instancedDelegate;
 
+            public SignatureAction6(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5>));
+            }
+
             public SignatureAction6(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5>), instance);
@@ -244,7 +294,7 @@ public SignatureAction6(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5]);
                 return null;
             }
         }
@@ -253,6 +303,11 @@ class SignatureFunc6<T0, T1, T2, T3, T4, T5, TResult> : IGenericDelegate
         {
             Func<T0, T1, T2, T3, T4, T5, TResult> _instancedDelegate;
 
+            public SignatureFunc6(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, TResult>));
+            }
+
             public SignatureFunc6(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, TResult>), instance);
@@ -261,11 +316,15 @@ public SignatureFunc6(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5]);
         }
-
         class SignatureAction7<T0, T1, T2, T3, T4, T5, T6> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6> _instancedDelegate;
 
+            public SignatureAction7(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6>));
+            }
+
             public SignatureAction7(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6>), instance);
@@ -273,7 +332,7 @@ public SignatureAction7(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6]);
                 return null;
             }
         }
@@ -282,6 +341,11 @@ class SignatureFunc7<T0, T1, T2, T3, T4, T5, T6, TResult> : IGenericDelegate
         {
             Func<T0, T1, T2, T3, T4, T5, T6, TResult> _instancedDelegate;
 
+            public SignatureFunc7(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, TResult>));
+            }
+
             public SignatureFunc7(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, TResult>), instance);
@@ -290,11 +354,15 @@ public SignatureFunc7(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6]);
         }
-
         class SignatureAction8<T0, T1, T2, T3, T4, T5, T6, T7> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7> _instancedDelegate;
 
+            public SignatureAction8(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7>));
+            }
+
             public SignatureAction8(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7>), instance);
@@ -302,7 +370,7 @@ public SignatureAction8(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7]);
                 return null;
             }
         }
@@ -311,6 +379,11 @@ class SignatureFunc8<T0, T1, T2, T3, T4, T5, T6, T7, TResult> : IGenericDelegate
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, TResult> _instancedDelegate;
 
+            public SignatureFunc8(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, TResult>));
+            }
+
             public SignatureFunc8(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, TResult>), instance);
@@ -319,11 +392,15 @@ public SignatureFunc8(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7]);
         }
-
         class SignatureAction9<T0, T1, T2, T3, T4, T5, T6, T7, T8> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8> _instancedDelegate;
 
+            public SignatureAction9(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8>));
+            }
+
             public SignatureAction9(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8>), instance);
@@ -331,7 +408,7 @@ public SignatureAction9(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8]);
                 return null;
             }
         }
@@ -340,6 +417,11 @@ class SignatureFunc9<T0, T1, T2, T3, T4, T5, T6, T7, T8, TResult> : IGenericDele
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, TResult> _instancedDelegate;
 
+            public SignatureFunc9(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, TResult>));
+            }
+
             public SignatureFunc9(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, TResult>), instance);
@@ -348,11 +430,15 @@ public SignatureFunc9(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8]);
         }
-
         class SignatureAction10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> _instancedDelegate;
 
+            public SignatureAction10(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>));
+            }
+
             public SignatureAction10(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>), instance);
@@ -360,7 +446,7 @@ public SignatureAction10(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9]);
                 return null;
             }
         }
@@ -369,6 +455,11 @@ class SignatureFunc10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult> : IGeneri
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult> _instancedDelegate;
 
+            public SignatureFunc10(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>));
+            }
+
             public SignatureFunc10(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>), instance);
@@ -377,11 +468,15 @@ public SignatureFunc10(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9]);
         }
-
         class SignatureAction11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> _instancedDelegate;
 
+            public SignatureAction11(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>));
+            }
+
             public SignatureAction11(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>), instance);
@@ -389,7 +484,7 @@ public SignatureAction11(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10]);
                 return null;
             }
         }
@@ -398,6 +493,11 @@ class SignatureFunc11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult> : IG
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult> _instancedDelegate;
 
+            public SignatureFunc11(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult>));
+            }
+
             public SignatureFunc11(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult>), instance);
@@ -406,11 +506,15 @@ public SignatureFunc11(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10]);
         }
-
         class SignatureAction12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> _instancedDelegate;
 
+            public SignatureAction12(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>));
+            }
+
             public SignatureAction12(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>), instance);
@@ -418,7 +522,7 @@ public SignatureAction12(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11]);
                 return null;
             }
         }
@@ -427,6 +531,11 @@ class SignatureFunc12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult> _instancedDelegate;
 
+            public SignatureFunc12(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>));
+            }
+
             public SignatureFunc12(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>), instance);
@@ -435,11 +544,15 @@ public SignatureFunc12(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11]);
         }
-
         class SignatureAction13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> _instancedDelegate;
 
+            public SignatureAction13(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>));
+            }
+
             public SignatureAction13(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>), instance);
@@ -447,7 +560,7 @@ public SignatureAction13(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12]);
                 return null;
             }
         }
@@ -456,6 +569,11 @@ class SignatureFunc13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TRe
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult> _instancedDelegate;
 
+            public SignatureFunc13(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>));
+            }
+
             public SignatureFunc13(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>), instance);
@@ -464,11 +582,15 @@ public SignatureFunc13(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12]);
         }
-
         class SignatureAction14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> _instancedDelegate;
 
+            public SignatureAction14(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>));
+            }
+
             public SignatureAction14(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>), instance);
@@ -476,7 +598,7 @@ public SignatureAction14(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13]);
                 return null;
             }
         }
@@ -485,6 +607,11 @@ class SignatureFunc14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult> _instancedDelegate;
 
+            public SignatureFunc14(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>));
+            }
+
             public SignatureFunc14(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>), instance);
@@ -493,11 +620,15 @@ public SignatureFunc14(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13]);
         }
-
         class SignatureAction15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> _instancedDelegate;
 
+            public SignatureAction15(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>));
+            }
+
             public SignatureAction15(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>), instance);
@@ -505,7 +636,7 @@ public SignatureAction15(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13], (T14)args[14]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13], (T14)args[14]);
                 return null;
             }
         }
@@ -514,6 +645,11 @@ class SignatureFunc15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult> _instancedDelegate;
 
+            public SignatureFunc15(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>));
+            }
+
             public SignatureFunc15(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>), instance);
@@ -522,11 +658,15 @@ public SignatureFunc15(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13], (T14)args[14]);
         }
-
         class SignatureAction16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> : IGenericDelegate
         {
             Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> _instancedDelegate;
 
+            public SignatureAction16(MethodInfo method)
+            {
+                _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>));
+            }
+
             public SignatureAction16(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>)method.CreateDelegate(typeof(Action<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>), instance);
@@ -534,7 +674,7 @@ public SignatureAction16(object instance, MethodInfo method)
 
             public object Invoke(object[] args)
             {
-               _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13], (T14)args[14], (T15)args[15]);
+                _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13], (T14)args[14], (T15)args[15]);
                 return null;
             }
         }
@@ -543,6 +683,11 @@ class SignatureFunc16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
         {
             Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult> _instancedDelegate;
 
+            public SignatureFunc16(MethodInfo method)
+            {
+                _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>));
+            }
+
             public SignatureFunc16(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>)method.CreateDelegate(typeof(Func<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>), instance);
@@ -551,6 +696,5 @@ public SignatureFunc16(object instance, MethodInfo method)
             public object Invoke(object[] args) =>
                 _instancedDelegate((T0)args[0], (T1)args[1], (T2)args[2], (T3)args[3], (T4)args[4], (T5)args[5], (T6)args[6], (T7)args[7], (T8)args[8], (T9)args[9], (T10)args[10], (T11)args[11], (T12)args[12], (T13)args[13], (T14)args[14], (T15)args[15]);
         }
-
     }
 }
diff --git a/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.tt b/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.tt
index 145793416bd..b04aa49fc66 100644
--- a/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.tt
+++ b/ReactWindows/ReactNative.Shared/Bridge/GenericDelegateTypes.tt
@@ -13,7 +13,7 @@ using System.Reflection;
 
 namespace ReactNative.Bridge
 {
-    static class GenericDelegateType
+    static class GenericDelegateTypes
     {
         public static Type[] ActionTypes =
         {
@@ -54,10 +54,16 @@ for (var i = 0; i <= maxArity; ++i)
         funcTypeParamsString = funcTypeParamsString + ", ";
     }
 #>
+
         class SignatureAction<#=i#><#=actionTypeParamsString#> : IGenericDelegate
         {
             Action<#=actionTypeParamsString#> _instancedDelegate;
 
+            public SignatureAction<#=i#>(MethodInfo method)
+            {
+                _instancedDelegate = (Action<#=actionTypeParamsString#>)method.CreateDelegate(typeof(Action<#=actionTypeParamsString#>));
+            }
+
             public SignatureAction<#=i#>(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Action<#=actionTypeParamsString#>)method.CreateDelegate(typeof(Action<#=actionTypeParamsString#>), instance);
@@ -74,6 +80,11 @@ for (var i = 0; i <= maxArity; ++i)
         {
             Func<<#=funcTypeParamsString#>TResult> _instancedDelegate;
 
+            public SignatureFunc<#=i#>(MethodInfo method)
+            {
+                _instancedDelegate = (Func<<#=funcTypeParamsString#>TResult>)method.CreateDelegate(typeof(Func<<#=funcTypeParamsString#>TResult>));
+            }
+
             public SignatureFunc<#=i#>(object instance, MethodInfo method)
             {
                 _instancedDelegate = (Func<<#=funcTypeParamsString#>TResult>)method.CreateDelegate(typeof(Func<<#=funcTypeParamsString#>TResult>), instance);
diff --git a/ReactWindows/ReactNative.Shared/Bridge/ReflectionReactDelegateFactory.cs b/ReactWindows/ReactNative.Shared/Bridge/ReflectionReactDelegateFactory.cs
index 0b0dafa8740..f3d40eb254b 100644
--- a/ReactWindows/ReactNative.Shared/Bridge/ReflectionReactDelegateFactory.cs
+++ b/ReactWindows/ReactNative.Shared/Bridge/ReflectionReactDelegateFactory.cs
@@ -31,7 +31,7 @@ public override Action<IReactInstance, JArray> Create(INativeModule module, Meth
             var extractors = CreateExtractors(module, method);
             var expectedArguments = extractors.Sum(e => e.ExpectedArguments);
             var extractFunctions = extractors.Select(e => e.ExtractFunction).ToList();
-            var genericDelegate = CreateGenericDelegate(module, method);
+            var genericDelegate = GenericDelegate.Create(module, method);
 
             return (reactInstance, arguments) => 
                 Invoke(
@@ -179,52 +179,6 @@ private static void Invoke(
             }
         }
 
-        static IGenericDelegate CreateGenericDelegate(object instance, MethodInfo method)
-        {
-            var methodParameters = method.GetParameters();
-            var hasReturnValue = method.ReturnType != typeof(void);
-            var maximumParameterCount = hasReturnValue ? GenericDelegateTypes.FuncTypes.Length : GenericDelegateTypes.ActionTypes.Length;
-
-            // If the number of arguments exceeds the number supported by generic delegates,
-            // return null. This will fall back to using reflection.
-            var argumentCount = methodParameters.Length;
-            if (argumentCount > maximumParameterCount)
-            {
-                return null;
-            }
-
-            // Increment the generic arity for methods with return values.
-            var genericArity = hasReturnValue ? argumentCount + 1 : argumentCount;
-            var typeList = new Type[genericArity];
-
-            // Fill the generic type parameter list with method parameter types.
-            for (int t = 0; t < argumentCount; t++)
-            {
-                typeList[t] = methodParameters[t].ParameterType;
-            }
-
-            // If the function has a return value, append it to the generic type parameters.
-            if (hasReturnValue)
-            {
-                typeList[argumentCount] = method.ReturnType;
-            }
-
-            // Get the appropriate generic delegate type.
-            var genericDelegateType = hasReturnValue
-                ? GenericDelegateTypes.FuncTypes[argumentCount]
-                : GenericDelegateTypes.ActionTypes[argumentCount];
-
-            // Close the generic type over the argument and return types, if necessary.
-            var delegateType = genericDelegateType;
-            if (genericArity > 0)
-            {
-                delegateType = genericDelegateType.MakeGenericType(typeList);
-            }
-
-            // Create the generic delegate instance.
-            return (IGenericDelegate)Activator.CreateInstance(delegateType, instance, method);
-        }
-
         private struct Result
         {
             public Result(int nextIndex, object value)
diff --git a/ReactWindows/ReactNative.Shared/ReactNative.Shared.projitems b/ReactWindows/ReactNative.Shared/ReactNative.Shared.projitems
index 289d96a3424..66942f10d4e 100644
--- a/ReactWindows/ReactNative.Shared/ReactNative.Shared.projitems
+++ b/ReactWindows/ReactNative.Shared/ReactNative.Shared.projitems
@@ -28,6 +28,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Animated\TransformAnimatedNode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Animated\ValueAnimatedNode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bridge\CompiledReactDelegateFactory.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bridge\GenericDelegate.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bridge\GenericDelegateTypes.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bridge\IAsyncCancelable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bridge\IAsyncDisposable.cs" />
diff --git a/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs b/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs
index fb239918d0d..6909391d322 100644
--- a/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs
+++ b/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs
@@ -1,7 +1,7 @@
+using ReactNative.Bridge;
 using ReactNative.UIManager.Annotations;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Reflection;
 using System.Threading;
 #if WINDOWS_UWP
@@ -47,6 +47,7 @@ abstract class PropertySetter : IPropertySetter
                 { typeof(bool), a => a.DefaultBoolean },
             };
 
+        private readonly IGenericDelegate _genericDelegate;
         private readonly ReactPropBaseAttribute _attribute;
         private readonly string _propertyType;
 
@@ -56,6 +57,8 @@ protected PropertySetter(MethodInfo method, string name, ReactPropBaseAttribute
             Name = name;
             PropertyType = GetPropertyType(method);
 
+            _genericDelegate = GenericDelegate.Create(method);
+
             _propertyType = attribute.CustomType == ReactPropBaseAttribute.UseDefaultType
                 ? GetPropertyType(PropertyType)
                 : attribute.CustomType;
@@ -84,7 +87,7 @@ public void UpdateShadowNodeProperty(ReactShadowNode shadowNode, ReactStylesDiff
             if (props == null)
                 throw new ArgumentNullException(nameof(props));
 
-            Invoke(shadowNode, GetShadowNodeArgs(props));
+            Invoke(GetShadowNodeArgs(shadowNode, props));
         }
 
         public void UpdateViewManagerProperty(IViewManager viewManager, DependencyObject view, ReactStylesDiffMap props)
@@ -94,15 +97,15 @@ public void UpdateViewManagerProperty(IViewManager viewManager, DependencyObject
             if (props == null)
                 throw new ArgumentNullException(nameof(props));
 
-            Invoke(viewManager, GetViewManagerArgs(view, props));
+            Invoke(GetViewManagerArgs(viewManager, view, props));
         }
 
-        protected virtual object[] GetShadowNodeArgs(ReactStylesDiffMap props)
+        protected virtual object[] GetShadowNodeArgs(ReactShadowNode shadowNode, ReactStylesDiffMap props)
         {
             throw new NotSupportedException(Invariant($"'{nameof(ReactShadowNode)}' properties cannot be changed with this setter."));
         }
 
-        protected virtual object[] GetViewManagerArgs(DependencyObject view, ReactStylesDiffMap props)
+        protected virtual object[] GetViewManagerArgs(IViewManager viewManager, DependencyObject view, ReactStylesDiffMap props)
         {
             throw new NotSupportedException($"'{nameof(IViewManager)}' properties cannot be changed with this setter.");
         }
@@ -124,15 +127,11 @@ protected object ExtractProperty(ReactStylesDiffMap props)
                 .ToObject(PropertyType);
         }
 
-        private void Invoke(object instance, object[] args)
+        private void Invoke(object[] args)
         {
             try
             {
-                Method.Invoke(instance, args);
-            }
-            catch (TargetInvocationException ex)
-            {
-                throw ex.InnerException;
+                _genericDelegate.Invoke(args);
             }
             finally
             {
@@ -215,7 +214,7 @@ public static IEnumerable<IPropertySetter> CreateViewManagerSetters(MethodInfo m
 
         class ViewManagerPropertySetter : PropertySetter
         {
-            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[2]);
+            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[3]);
 
             public ViewManagerPropertySetter(MethodInfo method, string name, ReactPropBaseAttribute attribute)
                 : base(method, name, attribute)
@@ -240,22 +239,24 @@ protected override Type GetPropertyType(MethodInfo method)
                 return parameters[1].ParameterType;
             }
 
-            protected override object[] GetViewManagerArgs(DependencyObject view, ReactStylesDiffMap props)
+            protected override object[] GetViewManagerArgs(IViewManager viewManager, DependencyObject view, ReactStylesDiffMap props)
             {
-                s_args.Value[0] = view;
-                s_args.Value[1] = ExtractProperty(props);
-                return s_args.Value;
+                var args = s_args.Value;
+                args[0] = viewManager;
+                args[1] = view;
+                args[2] = ExtractProperty(props);
+                return args;
             }
 
             protected override void OnInvoked()
             {
-                Array.Clear(s_args.Value, 0, 2);
+                Array.Clear(s_args.Value, 0, 3);
             }
         }
 
         class ViewManagerGroupPropertySetter : PropertySetter
         {
-            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[3]);
+            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[4]);
 
             private readonly int _index;
 
@@ -290,23 +291,25 @@ protected override Type GetPropertyType(MethodInfo method)
                 return parameters[2].ParameterType;
             }
 
-            protected override object[] GetViewManagerArgs(DependencyObject view, ReactStylesDiffMap props)
+            protected override object[] GetViewManagerArgs(IViewManager viewManager, DependencyObject view, ReactStylesDiffMap props)
             {
-                s_args.Value[0] = view;
-                s_args.Value[1] = _index;
-                s_args.Value[2] = ExtractProperty(props);
-                return s_args.Value;
+                var args = s_args.Value;
+                args[0] = viewManager;
+                args[1] = view;
+                args[2] = _index;
+                args[3] = ExtractProperty(props);
+                return args;
             }
 
             protected override void OnInvoked()
             {
-                Array.Clear(s_args.Value, 0, 3);
+                Array.Clear(s_args.Value, 0, 4);
             }
         }
 
         class ShadowNodePropertySetter : PropertySetter
         {
-            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[1]);
+            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[2]);
 
             public ShadowNodePropertySetter(MethodInfo method, string name, ReactPropBaseAttribute attribute)
                 : base(method, name, attribute)
@@ -325,21 +328,23 @@ protected override Type GetPropertyType(MethodInfo method)
                 return  parameters[0].ParameterType;
             }
 
-            protected override object[] GetShadowNodeArgs(ReactStylesDiffMap props)
+            protected override object[] GetShadowNodeArgs(ReactShadowNode shadowNode, ReactStylesDiffMap props)
             {
-                s_args.Value[0] = ExtractProperty(props);
-                return s_args.Value;
+                var args = s_args.Value;
+                args[0] = shadowNode;
+                args[1] = ExtractProperty(props);
+                return args;
             }
 
             protected override void OnInvoked()
             {
-                Array.Clear(s_args.Value, 0, 1);
+                Array.Clear(s_args.Value, 0, 2);
             }
         }
 
         class ShadowNodeGroupPropertySetter : PropertySetter
         {
-            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[2]);
+            private static ThreadLocal<object[]> s_args = new ThreadLocal<object[]>(() => new object[3]);
 
             private readonly int _index;
 
@@ -367,16 +372,18 @@ protected override Type GetPropertyType(MethodInfo method)
                 return parameters[1].ParameterType;
             }
 
-            protected override object[] GetShadowNodeArgs(ReactStylesDiffMap props)
+            protected override object[] GetShadowNodeArgs(ReactShadowNode shadowNode, ReactStylesDiffMap props)
             {
-                s_args.Value[0] = _index;
-                s_args.Value[1] = ExtractProperty(props);
-                return s_args.Value;
+                var args = s_args.Value;
+                args[0] = shadowNode;
+                args[1] = _index;
+                args[2] = ExtractProperty(props);
+                return args;
             }
 
             protected override void OnInvoked()
             {
-                Array.Clear(s_args.Value, 0, 2);
+                Array.Clear(s_args.Value, 0, 3);
             }
         }
     }

From 04062d7b34270a07cc6e4f986bea4e983ef5aa45 Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Fri, 2 Mar 2018 23:54:46 -0500
Subject: [PATCH 2/2] fix(PropertySetter): replace reflection behavior

Reflection invoke automatically converts null arguments to default struct values. We have to do something similar here when we avoid reflection invoke.
---
 .../ReactNative.Shared/UIManager/PropertySetter.cs       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs b/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs
index 6909391d322..b247382fc5a 100644
--- a/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs
+++ b/ReactWindows/ReactNative.Shared/UIManager/PropertySetter.cs
@@ -123,8 +123,15 @@ protected object ExtractProperty(ReactStylesDiffMap props)
                 return defaultFunc(_attribute);
             }
 
-            return props.GetProperty(Name)?
+            var prop = props.GetProperty(Name)?
                 .ToObject(PropertyType);
+
+            if (prop == null && PropertyType.GetTypeInfo().IsValueType)
+            {
+                return Activator.CreateInstance(PropertyType);
+            }
+
+            return prop;
         }
 
         private void Invoke(object[] args)