Merge pull request #186 from microsoft/exportEventArgsTypes

Export event args types from Types.tsx as well so they can be mentioned in apps

Author: asklar

examplenuget/App.tsx

@@ -101,57 +101,10 @@ const App = () => {
             }}
           />
 
-          <Button
-            onTapped={a => {setShowState(ContentDialogState.Popup);}}
-            content="click to open a ContentDialog" />
+        <WinUI.ColorPicker onColorChanged={(e) => {
+          console.log(e.nativeEvent);
+        }} />
 
-          <ContentDialog
-            showState={showState}
-            defaultButton={ContentDialogButton.Close}
-            title="the title"
-            content="this is the content"
-            closeButtonText="close"
-            primaryButtonText="primary"
-            secondaryButtonText="secondary"
-            onPrimaryButtonClick={e => {
-              alert('primary');
-            }}
-            onSecondaryButtonClick={e => {
-              alert('secondary');
-            }}
-            onClosed={e => {
-              setShowState(ContentDialogState.Hidden)
-              alert(JSON.stringify(e.nativeEvent.args));
-            }}
-             />
-
-
-          <TextBlock
-            text="Hello"
-            onTapped={e => {
-              MenuFlyout.ShowAt(menu, {point: {x: parseInt(x), y: 42}});
-            }}
-            ref={t => {
-              _tbRef.current = t;
-            }}
-            onContextRequested={e => {
-              const tag = findNodeHandle(_tbRef.current);
-
-              const { point, returnValue } = e.nativeEvent.args.TryGetPosition(tag);
-              MenuFlyout.ShowAt(menu, { point: point });
-            }}
-            >
-            <MenuFlyout
-              ref={m => {
-                menu.current = m;
-              }}
-              >
-              <MenuFlyoutItem text="menu option" />
-            </MenuFlyout>
-          </TextBlock>
-          <WinUI.ColorPicker onColorChanged={e => {
-            alert(JSON.stringify(e.nativeEvent.args.newColor));
-          }} />
         </View>
       </ScrollView>
     </SafeAreaView>

package/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "react-native-xaml",
   "entries": [
+    {
+      "date": "Sun, 20 Feb 2022 03:58:46 GMT",
+      "tag": "react-native-xaml_v0.0.62",
+      "version": "0.0.62",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-xaml",
+            "comment": "Export event args types from Types.tsx as well so they can be mentioned in apps",
+            "commit": "7f9c7f907cf4ca407f0f8a5d41f83722d736f5f4"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 14 Feb 2022 08:09:35 GMT",
       "tag": "react-native-xaml_v0.0.61",

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - react-native-xaml
 
-This log was last generated on Mon, 14 Feb 2022 08:09:35 GMT and should not be manually modified.
+This log was last generated on Sun, 20 Feb 2022 03:58:46 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.0.62
+
+Sun, 20 Feb 2022 03:58:46 GMT
+
+### Patches
+
+- Export event args types from Types.tsx as well so they can be mentioned in apps (asklar@microsoft.com)
+
 ## 0.0.61
 
 Mon, 14 Feb 2022 08:09:35 GMT

package/Codegen/TSProps.cs

@@ -60,7 +60,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write("export namespace ");
+            this.Write("export namespace Native");
 
             #line 32 "C:\Users\asklar\source\repos\react-native-xaml\package\Codegen\TSProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ns));
@@ -74,7 +74,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write("export type ");
+            this.Write("export type Native");
 
             #line 34 "C:\Users\asklar\source\repos\react-native-xaml\package\Codegen\TSProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(Util.ToJsName(t)));
@@ -335,7 +335,7 @@ public virtual string TransformText()
             this.Write("?: (event: NativeSyntheticEvent<");
 
             #line 80 "C:\Users\asklar\source\repos\react-native-xaml\package\Codegen\TSProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(Util.GetEventArgsTSName(evt)));
+            this.Write(this.ToStringHelper.ToStringWithCulture(Util.GetEventArgsTSName(evt, "Native")));
 
             #line default
             #line hidden

package/Codegen/TSProps.tt

@@ -29,9 +29,9 @@ export type TypedEvent<TArgs> = {
 <# foreach (var t in Util.eventArgsTypes) { 
 	var ns = Util.GetTSNamespace(t);
 	if (ns != "") { #>
-export namespace <#= ns #> {
+export namespace Native<#= ns #> {
 <# } #>
-export type <#= Util.ToJsName(t) #> = {
+export type Native<#= Util.ToJsName(t) #> = {
 <#	foreach (var m in Util.GetEventArgsMethods(t.GetFullName())) { #>
   <#= m #>(<#= Util.GetEventArgsMethodArgs(t, m) #>): <#= Util.GetEventArgsMethodReturnType(t, m) #>
 <#  }
@@ -77,7 +77,7 @@ foreach (var prop in SyntheticProps.Where(p => type == p.DeclaringType)) { #>
   <#= Util.ToJsName(attachedDP) #>?: <#= Util.GetTypeScriptType(attachedDP) #>; // attached property
 <# }
   foreach (var evt in type.GetEvents()) { #>
-  on<#= evt.GetName() #>?: (event: NativeSyntheticEvent<<#= Util.GetEventArgsTSName(evt) #>>) => void;
+  on<#= evt.GetName() #>?: (event: NativeSyntheticEvent<<#= Util.GetEventArgsTSName(evt, "Native") #>>) => void;
 <# } 
   foreach (var evt in SyntheticEvents.Where(e => type == e.DeclaringType)) { #>
   on<#= evt.Name #>?: (event: NativeSyntheticEvent<<#= Util.GetTypeScriptType(evt) #>>) => void;