react-native-windows 0.81.1 → 0.82.0-preview.1

package/Microsoft.ReactNative/Utils/KeyboardUtils.cpp

@@ -5,9 +5,7 @@
 
 #include <winrt/Windows.UI.Core.h>
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Input.h>
-#endif
 
 namespace Microsoft::ReactNative {
 
@@ -374,16 +372,7 @@ std::string FromVirtualKey(winrt::Windows::System::VirtualKey virtualKey, bool f
 }
 
 bool IsModifiedKeyPressed(winrt::CoreWindow const &coreWindow, winrt::Windows::System::VirtualKey virtualKey) {
-#ifndef USE_WINUI3
-#if USE_FABRIC
-  if (!coreWindow) {
-    return GetKeyState(static_cast<int>(virtualKey)) < 0;
-  }
-#endif
-  auto const &keyState = coreWindow.GetKeyState(virtualKey);
-#else
   auto const &keyState = winrt::Microsoft::UI::Input::InputKeyboardSource::GetKeyStateForCurrentThread(virtualKey);
-#endif // USE_WINUI3
   return (keyState & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
 }
 

package/Microsoft.ReactNative/Utils/ThemeUtils.cpp

@@ -4,10 +4,8 @@
 #include "pch.h"
 #include <Utils/ThemeUtils.h>
 
-#ifdef USE_FABRIC
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/HostPlatformColor.h>
-#endif
 #include <winuser.h>
 
 namespace Microsoft::ReactNative {
@@ -43,7 +41,6 @@ int CalculateColorBrightness(int r, int g, int b) noexcept {
       kColorBrightnessDivisor;
 }
 
-#ifdef USE_FABRIC
 bool isColorMeaningful(const facebook::react::SharedColor &color) noexcept {
   return facebook::react::isColorMeaningful(color);
 }
@@ -77,6 +74,5 @@ facebook::react::SharedColor GetCaretColor(
     return defaultCaretColor;
   }
 }
-#endif
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Utils/ThemeUtils.h

@@ -3,10 +3,8 @@
 
 #pragma once
 
-#include <winrt/Windows.UI.h>
-#ifdef USE_FABRIC
 #include <react/renderer/graphics/Color.h>
-#endif
+#include <winrt/Windows.UI.h>
 
 namespace Microsoft::ReactNative {
 
@@ -30,7 +28,6 @@ int CalculateColorBrightness(const winrt::Windows::UI::Color &color) noexcept;
 // Calculate brightness from RGB values
 int CalculateColorBrightness(int r, int g, int b) noexcept;
 
-#ifdef USE_FABRIC
 // Check if a color is meaningful (handles both PAPER and Fabric architectures)
 bool isColorMeaningful(const facebook::react::SharedColor &color) noexcept;
 
@@ -39,6 +36,5 @@ facebook::react::SharedColor GetCaretColor(
     const facebook::react::SharedColor &cursorColor,
     const facebook::react::SharedColor &foregroundColor,
     const facebook::react::SharedColor &backgroundColor) noexcept;
-#endif
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Utils/UwpPreparedScriptStore.h

@@ -38,8 +38,6 @@ class UwpPreparedScriptStore : public facebook::jsi::PreparedScriptStore {
   winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::StorageFile> m_byteCodeFileAsync;
 };
 
-// This is very similar to ByteArrayBuffer in ChakraJsiRuntime.h.
-// Defining this to avoid referencing types in chakra headers
 class ByteCodeBuffer final : public facebook::jsi::Buffer {
  public:
   size_t size() const override {

package/Microsoft.ReactNative/Utils/ValueUtils.cpp

@@ -4,8 +4,6 @@
 #include "pch.h"
 
 #include <CppWinRTIncludes.h>
-#include <UI.Xaml.Markup.h>
-#include <UI.Xaml.Media.h>
 #include <Utils/ValueUtils.h>
 #include <windows.foundation.h>
 #include <winrt/Windows.UI.ViewManagement.h>
@@ -49,147 +47,6 @@ struct ColorComp {
   }
 };
 
-xaml::Media::Brush BrushFromTheme(winrt::hstring resourceName) {
-  winrt::hstring xamlString =
-      L"<ResourceDictionary"
-      L"    xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'"
-      L"    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>"
-      L"  <SolidColorBrush"
-      L"      x:Key='" +
-      resourceName +
-      L"'"
-      L"      Color='{ThemeResource " +
-      resourceName +
-      "}' />"
-      L"</ResourceDictionary>";
-
-  auto dictionary{winrt::unbox_value<winrt::ResourceDictionary>(winrt::Markup::XamlReader::Load(xamlString))};
-
-  auto brush{winrt::unbox_value<xaml::Media::SolidColorBrush>(dictionary.Lookup(winrt::box_value(resourceName)))};
-  return brush;
-}
-
-struct BrushCache {
-  std::map<winrt::hstring, xaml::Media::Brush> m_map;
-  winrt::Windows::UI::ViewManagement::UISettings m_uiSettings{nullptr};
-  BrushCache() {
-    m_map = {
-        {L"SystemAccentColor", {nullptr}},
-        {L"SystemAccentColorLight1", {nullptr}},
-        {L"SystemAccentColorLight2", {nullptr}},
-        {L"SystemAccentColorLight3", {nullptr}},
-        {L"SystemAccentColorDark1", {nullptr}},
-        {L"SystemAccentColorDark2", {nullptr}},
-        {L"SystemAccentColorDark3", {nullptr}},
-        {L"SystemListAccentLowColor", {nullptr}},
-        {L"SystemListAccentMediumColor", {nullptr}},
-        {L"SystemListAccentHighColor", {nullptr}}};
-
-    m_uiSettings = winrt::Windows::UI::ViewManagement::UISettings();
-    auto dq = winrt::dispatching::DispatcherQueue::GetForCurrentThread();
-    m_uiSettings.ColorValuesChanged([this, dq](auto &&sender, auto &&args) {
-      dq.TryEnqueue([this]() {
-        for (auto &entry : m_map) {
-          winrt::IInspectable resource{winrt::Application::Current().Resources().Lookup(winrt::box_value(entry.first))};
-          if (auto oldSCBrush = entry.second.try_as<xaml::Media::SolidColorBrush>()) {
-            if (auto newSCBrush = resource.try_as<xaml::Media::SolidColorBrush>()) {
-              oldSCBrush.Color(newSCBrush.Color());
-            }
-          }
-          // Similar logic can be applied to copy Acrylic or Reveal brushes
-          /*
-          else if (auto oldAcBrush = entry.second.try_as<xaml::Media::AcrylicBrush>()) {
-            if (auto newAcBrush = resource.try_as<xaml::Media::AcrylicBrush>()) {
-              // ...
-            }
-          }
-          */
-        }
-      });
-    });
-  }
-
-  xaml::Media::Brush BrushFromResourceName(const std::vector<std::string> &resources) {
-    for (auto resource : resources) {
-      auto resourceName{winrt::to_hstring(resource)};
-      if (m_map.find(resourceName) != m_map.end()) {
-        if (auto brush = m_map.at(resourceName)) {
-          return brush;
-        }
-
-        auto brush = BrushFromTheme(resourceName);
-        return RegisterBrush(resourceName, brush);
-      }
-
-      const auto appResources{winrt::Application::Current().Resources()};
-      const auto boxedResourceName{winrt::box_value(resourceName)};
-      if (appResources.HasKey(boxedResourceName)) {
-        winrt::IInspectable resource{appResources.Lookup(boxedResourceName)};
-
-        if (auto brush = resource.try_as<xaml::Media::Brush>()) {
-          return RegisterBrush(resourceName, brush);
-        } else if (auto color = resource.try_as<winrt::Windows::UI::Color>()) {
-          auto brush = xaml::Media::SolidColorBrush(color.value());
-          return RegisterBrush(resourceName, brush);
-        }
-      }
-    }
-
-    assert(false && "Resource is not a Color or Brush");
-    return xaml::Media::SolidColorBrush(winrt::Colors::Transparent());
-  }
-
-  xaml::Media::Brush RegisterBrush(winrt::hstring resourceName, const xaml::Media::Brush &brush) {
-    if (auto scb = brush.try_as<xaml::Media::SolidColorBrush>()) {
-      auto scb2 = xaml::Media::SolidColorBrush{scb.Color()};
-      m_map.emplace(resourceName, scb2);
-      return scb2;
-    } else {
-      m_map.emplace(resourceName, brush);
-      return brush;
-    }
-  }
-};
-
-xaml::Media::Brush BrushFromColorObject(const std::string &resourceName) {
-  return BrushFromColorObject(std::vector<std::string>{resourceName});
-}
-
-xaml::Media::Brush BrushFromColorObject(const std::vector<std::string> &resourceNames) {
-  thread_local static BrushCache accentColorMap;
-
-  return accentColorMap.BrushFromResourceName(resourceNames);
-}
-
-xaml::Media::Brush BrushFromColorObject(const folly::dynamic &d) {
-  std::vector<std::string> resources;
-
-  auto value{d.find("windowsbrush")->second};
-  if (value.isArray()) {
-    for (const auto &resource : value) {
-      resources.emplace_back(resource.asString());
-    }
-  } else {
-    resources.emplace_back(value.asString());
-  }
-
-  return BrushFromColorObject(resources);
-}
-
-xaml::Media::Brush BrushFromColorObject(const winrt::Microsoft::ReactNative::JSValue &v) {
-  std::vector<std::string> resources;
-
-  if (v["windowsbrush"].Type() == winrt::Microsoft::ReactNative::JSValueType::Array) {
-    for (const auto &resource : v["windowsbrush"].AsArray()) {
-      resources.emplace_back(resource.AsString());
-    }
-  } else {
-    resources.emplace_back(v["windowsbrush"].AsString());
-  }
-
-  return BrushFromColorObject(resources);
-}
-
 winrt::Color ColorFromNumber(DWORD argb) noexcept {
   return xaml::FromArgb(GetAFromArgb(argb), GetRFromArgb(argb), GetGFromArgb(argb), GetBFromArgb(argb));
 }
@@ -207,108 +64,6 @@ REACTWINDOWS_API_(winrt::Color) ColorFrom(const winrt::Microsoft::ReactNative::J
   return ColorFromNumber(v.AsUInt32());
 }
 
-xaml::Media::SolidColorBrush SolidBrushFromColor(winrt::Color color) {
-  thread_local static std::map<winrt::Color, winrt::weak_ref<xaml::Media::SolidColorBrush>, ColorComp>
-      solidColorBrushCache;
-
-  if (solidColorBrushCache.count(color) != 0) {
-    if (auto brush = solidColorBrushCache[color].get()) {
-      return brush;
-    }
-  }
-
-  xaml::Media::SolidColorBrush brush(color);
-  solidColorBrushCache[color] = winrt::make_weak(brush);
-  return brush;
-}
-
-REACTWINDOWS_API_(xaml::Media::SolidColorBrush)
-SolidColorBrushFrom(const winrt::Microsoft::ReactNative::JSValue &v) {
-  if (v.Type() == winrt::Microsoft::ReactNative::JSValueType::Object) {
-    return BrushFromColorObject(v).as<xaml::Media::SolidColorBrush>();
-  }
-
-  return SolidBrushFromColor(ColorFrom(v));
-}
-
-REACTWINDOWS_API_(xaml::Media::SolidColorBrush)
-SolidColorBrushFrom(const folly::dynamic &d) {
-  if (d.isObject()) {
-    return BrushFromColorObject(d).as<xaml::Media::SolidColorBrush>();
-  }
-
-  return SolidBrushFromColor(ColorFrom(d));
-}
-
-REACTWINDOWS_API_(winrt::Brush) BrushFrom(const folly::dynamic &d) {
-  if (d.isObject()) {
-    return BrushFromColorObject(d);
-  }
-
-  return SolidColorBrushFrom(d);
-}
-
-REACTWINDOWS_API_(xaml::Media::Brush)
-BrushFrom(const winrt::Microsoft::ReactNative::JSValue &v) {
-  if (v.Type() == winrt::Microsoft::ReactNative::JSValueType::Object) {
-    return BrushFromColorObject(v);
-  }
-  return SolidColorBrushFrom(v);
-}
-
-REACTWINDOWS_API_(xaml::HorizontalAlignment)
-HorizontalAlignmentFrom(const folly::dynamic &d) {
-  auto valueString = d.asString();
-  if (valueString == "center")
-    return xaml::HorizontalAlignment::Center;
-  else if (valueString == "left")
-    return xaml::HorizontalAlignment::Left;
-  else if (valueString == "right")
-    return xaml::HorizontalAlignment::Right;
-  else if (valueString == "stretch")
-    return xaml::HorizontalAlignment::Stretch;
-
-  // ASSERT: Invalid value for VerticalAlignment. Shouldn't get this far.
-  assert(false);
-  return xaml::HorizontalAlignment::Stretch;
-}
-
-REACTWINDOWS_API_(xaml::VerticalAlignment)
-VerticalAlignmentFrom(const folly::dynamic &d) {
-  auto valueString = d.asString();
-  if (valueString == "bottom")
-    return xaml::VerticalAlignment::Bottom;
-  else if (valueString == "center")
-    return xaml::VerticalAlignment::Center;
-  else if (valueString == "stretch")
-    return xaml::VerticalAlignment::Stretch;
-  else if (valueString == "top")
-    return xaml::VerticalAlignment::Top;
-
-  // ASSERT: Invalid value for VerticalAlignment. Shouldn't get this far.
-  assert(false);
-  return xaml::VerticalAlignment::Stretch;
-}
-
-REACTWINDOWS_API_(winrt::DateTime)
-DateTimeFrom(int64_t timeInMilliSeconds, int64_t timeZoneOffsetInSeconds) {
-  auto timeInSeconds = (int64_t)timeInMilliSeconds / 1000;
-  time_t ttWithTimeZoneOffset = (time_t)(timeInSeconds + timeZoneOffsetInSeconds);
-  winrt::DateTime dateTime = winrt::clock::from_time_t(ttWithTimeZoneOffset);
-
-  return dateTime;
-}
-
-REACTWINDOWS_API_(folly::dynamic)
-DateTimeToDynamic(winrt::DateTime dateTime, int64_t timeZoneOffsetInSeconds) {
-  time_t ttInSeconds = winrt::clock::to_time_t(dateTime);
-  auto timeInUtc = ttInSeconds - timeZoneOffsetInSeconds;
-  auto ttInMilliseconds = (int64_t)timeInUtc * 1000;
-  auto strDateTime = folly::dynamic(std::to_string(ttInMilliseconds));
-
-  return strDateTime;
-}
-
 REACTWINDOWS_API_(std::wstring) asWStr(const folly::dynamic &d) {
   return Microsoft::Common::Unicode::Utf8ToUtf16(d.getString());
 }

package/Microsoft.ReactNative/Utils/ValueUtils.h

@@ -20,31 +20,8 @@ struct JSValue;
 
 namespace Microsoft::ReactNative {
 
-xaml::Media::Brush BrushFromColorObject(const std::string &resourceName);
-xaml::Media::Brush BrushFromColorObject(const std::vector<std::string> &resourceNames);
-xaml::Media::Brush BrushFromColorObject(const folly::dynamic &d);
-xaml::Media::Brush BrushFromColorObject(const winrt::Microsoft::ReactNative::JSValue &v);
-xaml::Media::SolidColorBrush SolidBrushFromColor(winrt::Windows::UI::Color color);
-
 REACTWINDOWS_API_(winrt::Windows::UI::Color) ColorFrom(const folly::dynamic &d);
 REACTWINDOWS_API_(winrt::Windows::UI::Color) ColorFrom(const winrt::Microsoft::ReactNative::JSValue &v);
-REACTWINDOWS_API_(xaml::Media::Brush) BrushFrom(const folly::dynamic &d);
-
-REACTWINDOWS_API_(xaml::Media::Brush)
-BrushFrom(const winrt::Microsoft::ReactNative::JSValue &v);
-
-REACTWINDOWS_API_(xaml::Media::SolidColorBrush)
-SolidColorBrushFrom(const folly::dynamic &d);
-REACTWINDOWS_API_(xaml::Media::SolidColorBrush)
-SolidColorBrushFrom(const winrt::Microsoft::ReactNative::JSValue &v);
-REACTWINDOWS_API_(xaml::VerticalAlignment)
-VerticalAlignmentFrom(const folly::dynamic &d);
-REACTWINDOWS_API_(xaml::HorizontalAlignment)
-HorizontalAlignmentFrom(const folly::dynamic &d);
-REACTWINDOWS_API_(winrt::Windows::Foundation::DateTime)
-DateTimeFrom(int64_t timeInMilliSeconds, int64_t timeZoneOffsetInSeconds);
-REACTWINDOWS_API_(folly::dynamic)
-DateTimeToDynamic(winrt::Windows::Foundation::DateTime dateTime, int64_t timeZoneOffsetInSeconds);
 
 REACTWINDOWS_API_(std::wstring) asWStr(const folly::dynamic &d);
 REACTWINDOWS_API_(winrt::hstring) asHstring(const folly::dynamic &d);

package/Microsoft.ReactNative/ViewProps.idl

@@ -20,9 +20,7 @@ namespace Microsoft.ReactNative {
   [experimental]
   runtimeclass Color {
     Windows.UI.Color AsWindowsColor(Microsoft.ReactNative.Composition.Theme theme);
-#ifdef USE_WINUI3
     Microsoft.UI.Composition.CompositionBrush AsBrush(Microsoft.ReactNative.Composition.Theme theme);
-#endif
 
     Boolean Equals(Color color);