Restore ContentDialogClosed event (#228)

* restore OnContentDialogClosed since we need the return value from the show operation

* Change files

* update package.json

* Update package/Codegen/Program.cs

Author: asklar

package/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "react-native-xaml",
   "entries": [
+    {
+      "date": "Sun, 25 Sep 2022 05:36:46 GMT",
+      "tag": "react-native-xaml_v0.0.70",
+      "version": "0.0.70",
+      "comments": {
+        "patch": [
+          {
+            "author": "[email protected]",
+            "package": "react-native-xaml",
+            "comment": "restore OnContentDialogClosed since we need the return value from the show operation",
+            "commit": "f1462114e7a7edc5202503d29e52064331890b6e"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 13 Sep 2022 21:38:24 GMT",
       "tag": "react-native-xaml_v0.0.69",

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - react-native-xaml
 
-This log was last generated on Tue, 13 Sep 2022 21:38:24 GMT and should not be manually modified.
+This log was last generated on Sun, 25 Sep 2022 05:36:46 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.0.70
+
+Sun, 25 Sep 2022 05:36:46 GMT
+
+### Patches
+
+- restore OnContentDialogClosed since we need the return value from the show operation ([email protected])
+
 ## 0.0.69
 
 Tue, 13 Sep 2022 21:38:24 GMT

package/Codegen/Program.cs

@@ -225,12 +225,24 @@ private void DumpTypes(Version version)
                 var typeName = val.Substring(0, val.LastIndexOf('.'));
                 var eventName = val.Substring(val.LastIndexOf('.') + 1);
 
-                syntheticEvents.Add(new SyntheticProperty()
+                if (context.TryFindMrType(GetTypeNameFromJson(entry.Value), out var ptype))
                 {
-                    Name = eventName,
-                    DeclaringType = context.GetType(typeName),
-                    FakePropertyType = entry.Value.GetString(),
-                });
+                    syntheticEvents.Add(new SyntheticProperty()
+                    {
+                        Name = eventName,
+                        DeclaringType = context.GetType(typeName),
+                        PropertyType = ptype,
+                    });
+                }
+                else
+                {
+                    syntheticEvents.Add(new SyntheticProperty()
+                    {
+                        Name = eventName,
+                        DeclaringType = context.GetType(typeName),
+                        FakePropertyType = entry.Value.ToString()
+                    });
+                }
             }
 
 

package/Codegen/Windows.UI.Xaml.json

@@ -103,6 +103,7 @@
     }
   ],
   "syntheticEvents": {
+      "$xaml.Controls.ContentDialog.ContentDialogClosed": "$xaml.Controls.ContentDialogResult"
   },
   "propNameMapping": {
     "$xaml.Input.KeyboardAccelerator.Key": "virtualKey",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-xaml",
   "title": "React Native Xaml",
-  "version": "0.0.69",
+  "version": "0.0.70",
   "description": "Allows using XAML directly, inside of a React Native Windows app",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

package/src/Props.ts

@@ -2710,6 +2710,7 @@ export interface NativeContentDialogProps extends NativeContentControlProps {
   onPrimaryButtonClick?: (event: NativeSyntheticEvent<TypedEvent<NativeContentDialogButtonClickEventArgs>>) => void;
   onSecondaryButtonClick?: (event: NativeSyntheticEvent<TypedEvent<NativeContentDialogButtonClickEventArgs>>) => void;
   onCloseButtonClick?: (event: NativeSyntheticEvent<TypedEvent<NativeContentDialogButtonClickEventArgs>>) => void;
+  onContentDialogClosed?: (event: NativeSyntheticEvent<Enums.ContentDialogResult>) => void;
 }
 export interface NativeContentPresenterProps extends NativeFrameworkElementProps {
   type: 'Windows.UI.Xaml.Controls.ContentPresenter' |

package/windows/ReactNativeXaml/Codegen/TypeEvents.g.h

@@ -4345,9 +4345,10 @@ __declspec(noinline) void DispatchTheEvent(const EventAttachInfo& eai, const win
     }
     return winrt::event_token{0};
   } },
+  {"ContentDialogClosed", nullptr /* synthetic event */},
 };
 
-static_assert(ARRAYSIZE(EventInfo::xamlEventMap) == 330);
+static_assert(ARRAYSIZE(EventInfo::xamlEventMap) == 331);
 
 void JsEvent(winrt::Microsoft::ReactNative::IJSValueWriter const& constantWriter, std::wstring topName, std::wstring onName) {
     constantWriter.WritePropertyName(topName);

package/windows/ReactNativeXaml/Codegen/Version.g.h

@@ -7,4 +7,4 @@ THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT MODIFY MANUALLY
 #define VERSION_MAJOR               0
 #define VERSION_MINOR               0
 #define VERSION_REVISION            0
-#define VERSION_BUILD               69
+#define VERSION_BUILD               70

package/windows/ReactNativeXaml/XamlMetadata.cpp

@@ -236,6 +236,16 @@ void SetShowState_ContentDialog(const xaml::DependencyObject& dobj, const xaml::
     case 3: // Hidden
       return cd.Hide();
     }
+    op.Completed([cd, context](const IAsyncOperation<ContentDialogResult>& operation, const AsyncStatus& asyncStatus) {
+      if (asyncStatus == AsyncStatus::Completed) {
+        auto result = static_cast<int32_t>(operation.GetResults());
+
+        XamlUIService::FromContext(context).DispatchEvent(cd, L"topContentDialogClosed",
+          [result](const winrt::Microsoft::ReactNative::IJSValueWriter& evtDataWriter) {
+            evtDataWriter.WriteInt64(result);
+          });
+      }
+      });
   }
 }