Merge pull request #184 from microsoft/nullableProps

Nullable props

Author: asklar

package/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "react-native-xaml",
   "entries": [
+    {
+      "date": "Mon, 14 Feb 2022 08:09:35 GMT",
+      "tag": "react-native-xaml_v0.0.61",
+      "version": "0.0.61",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-xaml",
+            "comment": "Fix some prop types not being codegen'd because they are treated as nullable, like Color",
+            "commit": "1e6cfdc6ca137ba4c674c977d373c5b11f6d67ee"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 10 Feb 2022 17:17:17 GMT",
       "tag": "react-native-xaml_v0.0.60",

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - react-native-xaml
 
-This log was last generated on Thu, 10 Feb 2022 17:17:17 GMT and should not be manually modified.
+This log was last generated on Mon, 14 Feb 2022 08:09:35 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.0.61
+
+Mon, 14 Feb 2022 08:09:35 GMT
+
+### Patches
+
+- Fix some prop types not being codegen'd because they are treated as nullable, like Color (asklar@microsoft.com)
+
 ## 0.0.60
 
 Thu, 10 Feb 2022 17:17:17 GMT

package/Codegen/Util.cs

@@ -148,12 +148,18 @@ public static string GetCppWinRTType(MrType t)
             {
                 // MapStyle has a bug where it doesn't support coercion from int
             }
-            else if (t.IsEnum) return "int32_t";
-
+            else if (t.IsEnum) { return "int32_t"; }
+            else if (t.GetFullName() == "System.Nullable`1")
+            {
+                return GetCppWinRTType(t.GetGenericTypeParameters().First());
+            }
             if (primitiveTypes.ContainsKey(t.GetFullName()))
             {
                 return primitiveTypes[t.GetFullName()];
             }
+
+
+
             return $"winrt::{t.GetFullName().Replace(".", "::")}";
         }
 
@@ -229,6 +235,10 @@ private static ViewManagerPropertyType GetVMPropertyType(MrType propType)
                     return ViewManagerPropertyType.Number;
                 case "System.Object":
                     return ViewManagerPropertyType.Map;
+                case "System.Nullable`1":
+                    return GetVMPropertyType(propType.GetGenericTypeParameters().First());
+                case "Windows.UI.Color":
+                    return ViewManagerPropertyType.Map;
             }
 
             if (TypeMapping.TryGetValue(propType.GetFullName(), out var mapping)) {
@@ -342,7 +352,7 @@ private static string GetTypeScriptType(MrType propType)
                 case "Windows.Foundation.Point":
                     return "Point";
                 case "Windows.UI.Color":
-                    return "Color";
+                    return "Color | number";
             }
 
             if (TypeMapping.TryGetValue(propType.GetFullName(), out var mapping))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-xaml",
   "title": "React Native Xaml",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "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

@@ -29,8 +29,8 @@ export type BreadcrumbBarItemClickedEventArgs = {
 }
 export namespace WinUI {
 export type ColorChangedEventArgs = {
-  readonly newColor: Color;
-  readonly oldColor: Color;
+  readonly newColor: Color | number;
+  readonly oldColor: Color | number;
 }
 }
 export namespace WinUI {
@@ -351,8 +351,8 @@ export type CalendarDatePickerDateChangedEventArgs = {
 export type CalendarViewSelectedDatesChangedEventArgs = {
 }
 export type ColorChangedEventArgs = {
-  readonly newColor: Color;
-  readonly oldColor: Color;
+  readonly newColor: Color | number;
+  readonly oldColor: Color | number;
 }
 export type ComboBoxTextSubmittedEventArgs = {
   readonly handled: boolean;
@@ -727,6 +727,7 @@ export interface NativeBreadcrumbBarItemProps extends NativeContentControlProps
 export namespace NativeWinUI {
 export interface NativeColorPickerProps extends NativeControlProps {
   type: 'Microsoft.UI.Xaml.Controls.ColorPicker';
+  previousColor?: any;
   minValue?: number;
   minSaturation?: number;
   minHue?: number;
@@ -744,6 +745,7 @@ export interface NativeColorPickerProps extends NativeControlProps {
   isAlphaEnabled?: boolean;
   colorSpectrumShape?: Enums.WinUIEnums.ColorSpectrumShape;
   colorSpectrumComponents?: Enums.WinUIEnums.ColorSpectrumComponents;
+  color?: Color | number;
   onColorChanged?: (event: NativeSyntheticEvent<TypedEvent<WinUI.ColorChangedEventArgs>>) => void;
 }
 }
@@ -974,6 +976,7 @@ export interface NativeColorSpectrumProps extends NativeControlProps {
   maxSaturation?: number;
   maxHue?: number;
   components?: Enums.WinUIEnums.ColorSpectrumComponents;
+  color?: Color | number;
   onColorChanged?: (event: NativeSyntheticEvent<TypedEvent<WinUI.ColorChangedEventArgs>>) => void;
 }
 }
@@ -992,6 +995,7 @@ export interface NativeInfoBarPanelProps extends NativePanelProps {
 export namespace NativeWinUI {
 export interface NativeMonochromaticOverlayPresenterProps extends NativeGridProps {
   type: 'Microsoft.UI.Xaml.Controls.Primitives.MonochromaticOverlayPresenter';
+  replacementColor?: Color | number;
 }
 }
 export namespace NativeWinUI {
@@ -2371,6 +2375,7 @@ export interface NativeToggleButtonProps extends NativeButtonBaseProps {
         'Windows.UI.Xaml.Controls.InkToolbarRulerButton' |
         'Windows.UI.Xaml.Controls.InkToolbarStencilButton';
   isThreeState?: boolean;
+  isChecked?: any;
   onChecked?: (event: NativeSyntheticEvent<undefined>) => void;
   onIndeterminate?: (event: NativeSyntheticEvent<undefined>) => void;
   onUnchecked?: (event: NativeSyntheticEvent<undefined>) => void;
@@ -2559,6 +2564,7 @@ export interface NativeCheckBoxProps extends NativeToggleButtonProps {
 }
 export interface NativeColorPickerProps extends NativeControlProps {
   type: 'Windows.UI.Xaml.Controls.ColorPicker';
+  previousColor?: any;
   minValue?: number;
   minSaturation?: number;
   minHue?: number;
@@ -2576,6 +2582,7 @@ export interface NativeColorPickerProps extends NativeControlProps {
   isAlphaEnabled?: boolean;
   colorSpectrumShape?: Enums.ColorSpectrumShape;
   colorSpectrumComponents?: Enums.ColorSpectrumComponents;
+  color?: Color | number;
   onColorChanged?: (event: NativeSyntheticEvent<TypedEvent<ColorChangedEventArgs>>) => void;
 }
 export interface NativeSelectorProps extends NativeItemsControlProps {
@@ -2594,6 +2601,7 @@ export interface NativeSelectorProps extends NativeItemsControlProps {
   selectedValue?: object;
   selectedItem?: object;
   selectedIndex?: number;
+  isSynchronizedWithCurrentItem?: any;
   onSelectionChanged?: (event: NativeSyntheticEvent<undefined>) => void;
 }
 export interface NativeComboBoxProps extends NativeSelectorProps {
@@ -3123,6 +3131,7 @@ export interface NativeMediaElementProps extends NativeFrameworkElementProps {
   posterSource?: string;
   playbackRate?: number;
   autoPlay?: boolean;
+  audioStreamIndex?: any;
   isMuted?: boolean;
   audioDeviceType?: Enums.AudioDeviceType;
   audioCategory?: Enums.AudioCategory;
@@ -3419,6 +3428,7 @@ export interface NativeColorSpectrumProps extends NativeControlProps {
   maxSaturation?: number;
   maxHue?: number;
   components?: Enums.ColorSpectrumComponents;
+  color?: Color | number;
   onColorChanged?: (event: NativeSyntheticEvent<TypedEvent<ColorChangedEventArgs>>) => void;
 }
 export interface NativeCommandBarFlyoutCommandBarProps extends NativeCommandBarProps {
@@ -4042,6 +4052,7 @@ export interface NativeVirtualizingStackPanelProps extends NativeOrientedVirtual
 export interface NativeWebViewProps extends NativeFrameworkElementProps {
   type: 'Windows.UI.Xaml.Controls.WebView';
   source?: string;
+  defaultBackgroundColor?: Color | number;
   onLoadCompleted?: (event: NativeSyntheticEvent<undefined>) => void;
   onNavigationFailed?: (event: NativeSyntheticEvent<undefined>) => void;
   onScriptNotify?: (event: NativeSyntheticEvent<undefined>) => void;