react-native-windows 0.66.4 → 0.66.5

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "react-native-windows",
   "entries": [
     {
-      "date": "Mon, 15 Nov 2021 16:09:26 GMT",
+      "date": "Mon, 22 Nov 2021 16:09:45 GMT",
+      "tag": "react-native-windows_v0.66.5",
+      "version": "0.66.5",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix C# Module Event invocation",
+            "author": "vmorozov@microsoft.com",
+            "commit": "f5e0d1f8184cabdf83784ad272f7b82680b117cf",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 15 Nov 2021 16:09:53 GMT",
       "tag": "react-native-windows_v0.66.4",
       "version": "0.66.4",
       "comments": {

package/CHANGELOG.md

@@ -1,18 +1,26 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 15 Nov 2021 16:09:26 GMT and should not be manually modified.
+This log was last generated on Mon, 22 Nov 2021 16:09:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.66.4
+## 0.66.5
 
-Mon, 15 Nov 2021 16:09:26 GMT
+Mon, 22 Nov 2021 16:09:45 GMT
 
 ### Patches
 
-- Fix crash loading bundle in win32 (julio.rocha@microsoft.com)
-- Drop ChakraCore dependency (#9056) (julio.rocha@microsoft.com)
+- Fix C# Module Event invocation (vmorozov@microsoft.com)
 
+## 0.66.4
+
+Mon, 15 Nov 2021 16:09:53 GMT
+
+### Patches
+
+- Fix crash loading bundle in win32 (julio.rocha@microsoft.com)
+- Drop ChakraCore dependency (#9056) (julio.rocha@microsoft.com)
+
 ## 0.66.3
 
 Mon, 01 Nov 2021 19:10:27 GMT

package/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.Module.cs

@@ -375,7 +375,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     {
       // generates:
       //   moduleBuilder.AddInitializer((IReactContext reactContext) =>
-      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => reactContext.EmitJsEvent("eventEmitterName", "eventName", arg0, arg1, ...);
+      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => new ReactContext(reactContext).EmitJsEvent("eventEmitterName", "eventName", arg0, arg1, ...);
       return InvocationStatement(
         MemberAccessExpression(ReactNativeNames.ModuleBuilder, ReactNativeNames.AddInitializer),
         ParenthesizedLambdaExpression(
@@ -389,7 +389,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     {
       // generates:
       //   moduleBuilder.AddInitializer((IReactContext reactContext) =>
-      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => reactContext.EmitJsFunction("moduleName", "eventName", arg0, arg1, ...);
+      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => new ReactContext(reactContext).EmitJsFunction("moduleName", "eventName", arg0, arg1, ...);
       return InvocationStatement(
         MemberAccessExpression(ReactNativeNames.ModuleBuilder, ReactNativeNames.AddInitializer),
         ParenthesizedLambdaExpression(
@@ -411,7 +411,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
           block: null,
           expressionBody: InvocationExpression(
             MemberAccessExpression(ReactNativeNames.Module, Identifier(initializer.Method.Name)),
-            ObjectCreationExpression(ReactTypes.ReactContext, IdentifierName((ReactNativeNames.ReactContextLocalName)))
+            ObjectCreationExpression(ReactTypes.ReactContext, IdentifierName(ReactNativeNames.ReactContextLocalName))
             )));
     }
 
@@ -420,7 +420,8 @@ namespace Microsoft.ReactNative.Managed.CodeGen
 
       var lambdaParams = new List<ParameterSyntax>(callback.CallbackParameters.Length);
       var arguments = new List<ArgumentSyntax>(callback.CallbackParameters.Length);
-      arguments.Add(Argument(IdentifierName(ReactNativeNames.WriterLocalName)));
+      arguments.Add(Argument(LiteralExpression(callback.CallbackContextName)));
+      arguments.Add(Argument(LiteralExpression(callback.Name)));
 
       for (int i = 0; i < callback.CallbackParameters.Length; i++)
       {
@@ -433,10 +434,10 @@ namespace Microsoft.ReactNative.Managed.CodeGen
 
       // generates:
       //  module.<callackName> = (ArgType0 arg0, ArgType1 arg0, ...) =>
-      //    reactContext.<contextCallbackMethod>(
+      //    new ReactContext(reactContext).<contextCallbackMethod>(
       //      eventEmitterName,
       //      eventName,
-      //      writer => writer.WriteArgs(arg0, arg1, ...)
+      //      arg0, arg1, ...
       //      )
       return
         AssignmentExpression(
@@ -446,16 +447,11 @@ namespace Microsoft.ReactNative.Managed.CodeGen
             parameterList: ParameterList(lambdaParams.ToArray()),
             block: null,
             expressionBody: InvocationExpression(
-              MemberAccessExpression(ReactNativeNames.ReactContextLocalName, contextCallbackMethod),
-              LiteralExpression(callback.CallbackContextName),
-              LiteralExpression(callback.Name),
-              ParenthesizedLambdaExpression(
-                parameterList: ParameterList(Parameter(ReactNativeNames.WriterLocalName)),
-                block: null,
-                expressionBody: InvocationExpression(
-                  MemberAccessExpression(ReactTypes.JSValueWriter, ReactNativeNames.WriteArgsMethodName),
-                  arguments
-                  )))));
+              MemberAccessExpression(
+                ObjectCreationExpression(ReactTypes.ReactContext, IdentifierName(ReactNativeNames.ReactContextLocalName)),
+                contextCallbackMethod),
+              arguments
+              )));
     }
 
     private string GetMethodReturnTypeFromStyle(ReactMethod.MethodReturnStyle returnStyle)

package/Microsoft.ReactNative.Managed.CodeGen/SyntaxHelpers.cs

@@ -38,20 +38,28 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       return InvocationStatement(SyntaxFactory.IdentifierName(methodName), arguments);
     }
 
-    internal static ExpressionSyntax MemberAccessExpression(SyntaxToken instance, SyntaxToken method)
+    internal static ExpressionSyntax MemberAccessExpression(ExpressionSyntax instance, SyntaxToken member)
+    {
+      return SyntaxFactory.MemberAccessExpression(
+        SyntaxKind.SimpleMemberAccessExpression,
+        instance,
+        SyntaxFactory.IdentifierName(member));
+    }
+
+    internal static ExpressionSyntax MemberAccessExpression(SyntaxToken instance, SyntaxToken member)
     {
       return SyntaxFactory.MemberAccessExpression(
         SyntaxKind.SimpleMemberAccessExpression,
         SyntaxFactory.IdentifierName(instance),
-        SyntaxFactory.IdentifierName(method));
+        SyntaxFactory.IdentifierName(member));
     }
 
-    internal static ExpressionSyntax MemberAccessExpression(ISymbol type, SyntaxToken method)
+    internal static ExpressionSyntax MemberAccessExpression(ISymbol type, SyntaxToken member)
     {
       return SyntaxFactory.MemberAccessExpression(
         SyntaxKind.SimpleMemberAccessExpression,
         type.ToTypeSyntax(),
-        SyntaxFactory.IdentifierName(method));
+        SyntaxFactory.IdentifierName(member));
     }
 
     internal static StatementSyntax LocalDeclarationStatement(ISymbol type, SyntaxToken variableName, ExpressionSyntax initializer)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.66.4",
+  "version": "0.66.5",
   "license": "MIT",
   "repository": {
     "type": "git",