Merge pull request #36 from asklar/enumConst

Use ints for XAML Enums
microsoft · Mar 8, 2021 · 9054dcb · 9054dcb
2 parents d2be58e + eab5c5b
commit 9054dcb
Show file tree

Hide file tree

Showing 19 changed files with 1,863 additions and 2,424 deletions.
diff --git a/example/App.tsx b/example/App.tsx
@@ -33,6 +33,7 @@ NativeXamlControl,
 MenuFlyoutItem,
 TextBox,
 // BlankUserControl,
+ClickMode,
 } from 'react-native-xaml'; // Would be from 'react-native-xaml' outside of this repo;
 
 const Section = ({children, title}): Node => {
@@ -84,7 +85,9 @@ const App: () => Node = () => {
           }}>
               {/* <BlankUserControl  onHappened={(arg) => alert(JSON.stringify(arg.nativeEvent)) } /> */}
                   <Button content={{ string: `Last selected option = ${option} ${count}` }} foreground="red"
-                      onClick={(a) => { alert(JSON.stringify(a.nativeEvent)); setCount(count + 1); setIsOpen(true); }} />
+                      onClick={(a) => { alert(JSON.stringify(a.nativeEvent)); setCount(count + 1); setIsOpen(true); }}
+                      clickMode={ClickMode.Release}
+                      />
                   {/*<StackPanel orientation="horizontal">*/}
                   {/*    <HyperlinkButton content={{ string: "Click me!" }} onClick={(args) => {*/}
                   {/*        alert(`clicked! Native event args: ${JSON.stringify(args.nativeEvent)}`);*/}

diff --git a/package/Codegen/Codegen.csproj b/package/Codegen/Codegen.csproj
@@ -15,10 +15,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="EnumConverters.cs">
+    <Compile Update="TSEnums.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>EnumConverters.tt</DependentUpon>
+      <DependentUpon>TSEnums.tt</DependentUpon>
     </Compile>
     <Compile Update="TSProps.cs">
       <DesignTime>True</DesignTime>
@@ -48,9 +48,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="EnumConverters.tt">
+    <None Update="TSEnums.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>EnumConverters.cs</LastGenOutput>
+      <LastGenOutput>TSEnums.cs</LastGenOutput>
     </None>
     <None Update="TSProps.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>

diff --git a/package/Codegen/EnumConverters.tt b/package/Codegen/EnumConverters.tt
diff --git a/package/Codegen/Program.cs b/package/Codegen/Program.cs
@@ -167,8 +167,8 @@ private void DumpTypes()
             var propertiesGen = new TypeProperties(properties).TransformText();
             UpdateFile(Path.Join(generatedDirPath, "TypeProperties.g.h"), propertiesGen);
 
-            var enumConvertersGen = new EnumConverters().TransformText();
-            UpdateFile(Path.Join(generatedDirPath, "EnumConverters.g.cpp"), enumConvertersGen);
+            var tsEnumsGen = new TSEnums().TransformText();
+            UpdateFile(Path.Join(packageSrcPath, "Enums.ts"), tsEnumsGen);
 
             var eventsGen = new TypeEvents(events).TransformText();
             UpdateFile(Path.Join(generatedDirPath, "TypeEvents.g.h"), eventsGen);