[0.69] Fix Color Customization Bug During High Contrast Mode (#10251)

* Meerge Package.json * Promote 0.69 to latest * Change files * Fix Change Files * Backport Text Patch Fix * Remove Unneeded * Remove Unneeded
microsoft · Jul 8, 2022 · b9e66ab · b9e66ab
1 parent fc76646
commit b9e66ab
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 6 deletions.
diff --git a/change/react-native-windows-0521218e-04c4-4409-8cb0-62e95a3e74a2.json b/change/react-native-windows-0521218e-04c4-4409-8cb0-62e95a3e74a2.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Enable Blob module with runtime option",
+  "packageName": "react-native-windows",
+  "email": "julio.rocha@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-93991d79-32d9-4ddb-b3e1-41652af70870.json b/change/react-native-windows-93991d79-32d9-4ddb-b3e1-41652af70870.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Stop using /fp:strict to build yoga.cpp",
+  "packageName": "react-native-windows",
+  "email": "hpratt@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/@react-native-windows/automation-channel/package.json b/packages/@react-native-windows/automation-channel/package.json
@@ -43,4 +43,4 @@
     "node": ">= 14"
   },
   "private": true
-}
+}
diff --git a/packages/@react-native-windows/tester/package.json b/packages/@react-native-windows/tester/package.json
@@ -37,4 +37,4 @@
   "engines": {
     "node": ">= 14"
   }
-}
+}
diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json
@@ -54,4 +54,4 @@
   "engines": {
     "node": ">= 14"
   }
-}
+}
diff --git a/packages/integration-test-app/package.json b/packages/integration-test-app/package.json
@@ -52,4 +52,4 @@
   "engines": {
     "node": ">= 14"
   }
-}
+}
diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -39,4 +39,4 @@
   "engines": {
     "node": ">= 14"
   }
-}
+}
diff --git a/packages/sample-apps/package.json b/packages/sample-apps/package.json
@@ -38,4 +38,4 @@
   "engines": {
     "node": ">= 14"
   }
-}
+}
diff --git a/vnext/Microsoft.ReactNative/Utils/PropertyUtils.h b/vnext/Microsoft.ReactNative/Utils/PropertyUtils.h
@@ -139,13 +139,20 @@ bool TryUpdateForeground(
     const std::string &propertyName,
     const winrt::Microsoft::ReactNative::JSValue &propertyValue) {
   if (propertyName == "color") {
+    auto uielement = element.try_as<xaml::UIElement>();
     if (IsValidColorValue(propertyValue)) {
       const auto brush = BrushFrom(propertyValue);
       element.Foreground(brush);
       UpdateControlForegroundResourceBrushes(element, brush);
+      if (uielement) {
+        uielement.HighContrastAdjustment(xaml::ElementHighContrastAdjustment::None);
+      }
     } else if (propertyValue.IsNull()) {
       element.ClearValue(T::ForegroundProperty());
       UpdateControlForegroundResourceBrushes(element, nullptr);
+      if (uielement) {
+        uielement.HighContrastAdjustment(xaml::ElementHighContrastAdjustment::Application);
+      }
     }
 
     return true;