Merge pull request #195 from asklar/colorhelper

Remove implicit dependency on ColorHelper

Author: asklar

package/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "react-native-xaml",
   "entries": [
+    {
+      "date": "Wed, 13 Apr 2022 21:16:52 GMT",
+      "tag": "react-native-xaml_v0.0.63",
+      "version": "0.0.63",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-xaml",
+            "comment": "Remove implicit dependency on ColorHelper",
+            "commit": "265e4a0f46b1e00d5aaddb428384e9b4f8168b43"
+          }
+        ]
+      }
+    },
     {
       "date": "Sun, 20 Feb 2022 03:58:46 GMT",
       "tag": "react-native-xaml_v0.0.62",

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - react-native-xaml
 
-This log was last generated on Sun, 20 Feb 2022 03:58:46 GMT and should not be manually modified.
+This log was last generated on Wed, 13 Apr 2022 21:16:52 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.0.63
+
+Wed, 13 Apr 2022 21:16:52 GMT
+
+### Patches
+
+- Remove implicit dependency on ColorHelper (asklar@microsoft.com)
+
 ## 0.0.62
 
 Sun, 20 Feb 2022 03:58:46 GMT

package/package.json

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

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               62
+#define VERSION_BUILD               63

package/windows/ReactNativeXaml/Styling.cpp

@@ -4,6 +4,11 @@
 /// from RNW ValueUtils.cpp
 #pragma region Copied from RNW ValueUtils.cpp
 namespace ColorUtils {
+
+  inline winrt::Windows::UI::Color FromArgb(uint8_t a, uint8_t r, uint8_t g, uint8_t b) {
+      return winrt::Windows::UI::Color{ a, r, g, b };
+  }
+
   struct ColorComp {
     bool operator()(const winrt::Windows::UI::Color& lhs, const winrt::Windows::UI::Color& rhs) const {
       return (
@@ -42,7 +47,7 @@ namespace ColorUtils {
 
 
   winrt::Windows::UI::Color ColorFromNumber(DWORD argb) {
-    return winrt::ColorHelper::FromArgb(GetAFromArgb(argb), GetRFromArgb(argb), GetGFromArgb(argb), GetBFromArgb(argb));
+    return FromArgb(GetAFromArgb(argb), GetRFromArgb(argb), GetGFromArgb(argb), GetBFromArgb(argb));
   }
 
   winrt::Windows::UI::Color ColorFrom(const winrt::Microsoft::ReactNative::JSValue& v) {