react-native-windows 0.69.6 → 0.70.0-preview.1

package/Microsoft.ReactNative/IReactDispatcher.idl

@@ -53,5 +53,20 @@ namespace Microsoft.ReactNative
       "Generally you can use @IReactContext.JSDispatcher to get the value of this property for "
       "a specific React instance.")
     static IReactPropertyName JSDispatcherProperty { get; };
+
+    DOC_STRING(
+      "Gets the name of the `JSDispatcherTaskStartingEventName` property for the @IReactNotificationService.\n"
+      "This notification name is to be used with IReactNotificationService.")
+    static IReactPropertyName JSDispatcherTaskStartingEventName{ get; };
+
+    DOC_STRING(
+      "Gets the name of the `JSDispatcherIdleWaitStartingEventName` property for the @IReactNotificationService.\n"
+      "This notification name is to be used with IReactNotificationService.")
+    static IReactPropertyName JSDispatcherIdleWaitStartingEventName{ get; };
+
+    DOC_STRING(
+      "Gets the name of the `JSDispatcherIdleWaitCompletedEventName` property for the @IReactNotificationService.\n"
+      "This notification name is to be used with IReactNotificationService.")
+    static IReactPropertyName JSDispatcherIdleWaitCompletedEventName{ get; };
   }
 } // namespace ReactNative

package/Microsoft.ReactNative/IReactPropertyBag.cpp

@@ -191,6 +191,15 @@ IInspectable ReactPropertyBag::Set(IReactPropertyName const &propertyName, IInsp
   return result;
 }
 
+void ReactPropertyBag::CopyFrom(IReactPropertyBag const &other) noexcept {
+  std::scoped_lock lock{m_mutex};
+  auto otherImpl = winrt::get_self<ReactPropertyBag>(other);
+  std::scoped_lock otherLock{otherImpl->m_mutex};
+  for (auto const &entry : otherImpl->m_entries) {
+    m_entries.emplace(entry);
+  }
+}
+
 /*static*/ IReactPropertyNamespace ReactPropertyBagHelper::GlobalNamespace() noexcept {
   return ReactPropertyNamespace::GlobalNamespace().as<IReactPropertyNamespace>();
 }

package/Microsoft.ReactNative/IReactPropertyBag.h

@@ -3,6 +3,7 @@
 
 #pragma once
 #include "ReactPropertyBagHelper.g.h"
+#include <winrt/Windows.Foundation.Collections.h>
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
@@ -13,6 +14,8 @@ struct ReactPropertyBag : implements<ReactPropertyBag, IReactPropertyBag> {
   IInspectable GetOrCreate(IReactPropertyName const &name, ReactCreatePropertyValue const &createValue) noexcept;
   IInspectable Set(IReactPropertyName const &name, IInspectable const &value) noexcept;
 
+  void CopyFrom(IReactPropertyBag const &) noexcept;
+
  private:
   std::mutex m_mutex;
   std::map<IReactPropertyName, IInspectable> m_entries;

package/Microsoft.ReactNative/IReactPropertyBag.idl

@@ -62,6 +62,9 @@ namespace Microsoft.ReactNative
       "It returns null if the property did not exist.\n"
       "If the new value is null, then the property is removed.")
     Object Set(IReactPropertyName name, Object value);
+
+    DOC_STRING("Copies the properties from another property bag")
+    void CopyFrom(IReactPropertyBag other);
   }
 
   [webhosthidden]

package/Microsoft.ReactNative/JsiApi.cpp

@@ -63,6 +63,11 @@ struct PointerAccessor : facebook::jsi::Pointer {
     return {reinterpret_cast<uint64_t>(std::exchange(accessor.ptr_, nullptr))};
   }
 
+  static JsiBigIntRef MakeJsiBigIntData(facebook::jsi::BigInt &&bigInt) {
+    auto &&accessor = AsPointerAccessor(std::move(bigInt));
+    return {reinterpret_cast<uint64_t>(std::exchange(accessor.ptr_, nullptr))};
+  }
+
   static JsiStringRef MakeJsiStringData(facebook::jsi::String &&str) {
     auto &&accessor = AsPointerAccessor(std::move(str));
     return {reinterpret_cast<uint64_t>(std::exchange(accessor.ptr_, nullptr))};
@@ -101,6 +106,7 @@ struct PointerAccessor : facebook::jsi::Pointer {
 struct ValueAccessor {
   static JsiValueRef ToJsiValueData(facebook::jsi::Value const &value) noexcept {
     ValueAccessor const &accessor = reinterpret_cast<ValueAccessor const &>(value);
+    // TODO: JSIVALUECONVERSION - Use JsiValueKindHelper::ToJsiValueKind
     return {
         static_cast<JsiValueKind>(static_cast<int32_t>(accessor.m_kind)),
         *reinterpret_cast<uint64_t const *>(&accessor.m_data)};
@@ -108,12 +114,14 @@ struct ValueAccessor {
 
   static JsiValueRef MakeJsiValueData(facebook::jsi::Value &&value) {
     ValueAccessor &&accessor = reinterpret_cast<ValueAccessor &&>(value);
+    // TODO: JSIVALUECONVERSION - Use JsiValueKindHelper::ToJsiValueKind
     return {
         static_cast<JsiValueKind>(static_cast<int32_t>(std::exchange(accessor.m_kind, UndefinedKind))),
         *reinterpret_cast<uint64_t *>(&accessor.m_data)};
   }
 
  private:
+  // TODO: JSIVALUECONVERSION - Use FacebookJsiValueKind enum
   enum ValueKind { UndefinedKind } m_kind;
   double m_data;
 
@@ -133,6 +141,7 @@ struct RuntimeAccessor : facebook::jsi::Runtime {
 
   using facebook::jsi::Runtime::call;
   using facebook::jsi::Runtime::callAsConstructor;
+  using facebook::jsi::Runtime::cloneBigInt;
   using facebook::jsi::Runtime::cloneObject;
   using facebook::jsi::Runtime::clonePropNameID;
   using facebook::jsi::Runtime::cloneString;
@@ -182,6 +191,10 @@ struct RuntimeAccessor : facebook::jsi::Runtime {
     return *reinterpret_cast<facebook::jsi::Symbol const *>(ptr);
   }
 
+  static facebook::jsi::BigInt const &AsBigInt(facebook::jsi::Runtime::PointerValue const **ptr) noexcept {
+    return *reinterpret_cast<facebook::jsi::BigInt const *>(ptr);
+  }
+
   static facebook::jsi::String const &AsString(facebook::jsi::Runtime::PointerValue const **ptr) noexcept {
     return *reinterpret_cast<facebook::jsi::String const *>(ptr);
   }
@@ -207,6 +220,7 @@ struct RuntimeAccessor : facebook::jsi::Runtime {
   }
 
   static facebook::jsi::Value const *AsValue(JsiValueRef const &data) noexcept {
+    // TODO: JSIVALUECONVERSION
     return reinterpret_cast<facebook::jsi::Value const *>(&data);
   }
 
@@ -214,6 +228,10 @@ struct RuntimeAccessor : facebook::jsi::Runtime {
     return {reinterpret_cast<uint64_t>(pointerValue)};
   }
 
+  static JsiBigIntRef MakeJsiBigIntData(facebook::jsi::Runtime::PointerValue *pointerValue) {
+    return {reinterpret_cast<uint64_t>(pointerValue)};
+  }
+
   static JsiStringRef MakeJsiStringData(facebook::jsi::Runtime::PointerValue *pointerValue) {
     return {reinterpret_cast<uint64_t>(pointerValue)};
   }
@@ -232,10 +250,12 @@ struct RuntimeAccessor : facebook::jsi::Runtime {
   }
 
   static JsiValueRef const *AsJsiValueData(facebook::jsi::Value const *value) noexcept {
-    return reinterpret_cast<Microsoft::ReactNative::JsiValueRef const *>(value);
+    auto ref = ValueAccessor::ToJsiValueData(*value);
+    return &ref;
   }
 
   static facebook::jsi::Value &&ToValue(JsiValueRef &&value) noexcept {
+    // TODO: JSIVALUECONVERSION
     return reinterpret_cast<facebook::jsi::Value &&>(value);
   }
 
@@ -522,6 +542,13 @@ JsiSymbolRef JsiRuntime::CloneSymbol(JsiSymbolRef symbol) try {
   throw;
 }
 
+JsiBigIntRef JsiRuntime::CloneBigInt(JsiBigIntRef bigInt) try {
+  return PointerAccessor::MakeJsiBigIntData(m_runtimeAccessor->make<facebook::jsi::BigInt>(
+      m_runtimeAccessor->cloneBigInt(RuntimeAccessor::AsPointerValue(bigInt))));
+} catch (JSI_SET_ERROR) {
+  throw;
+}
+
 JsiStringRef JsiRuntime::CloneString(JsiStringRef str) try {
   return PointerAccessor::MakeJsiStringData(m_runtimeAccessor->make<facebook::jsi::String>(
       m_runtimeAccessor->cloneString(RuntimeAccessor::AsPointerValue(str))));
@@ -920,6 +947,14 @@ bool JsiRuntime::SymbolStrictEquals(JsiSymbolRef left, JsiSymbolRef right) try {
   throw;
 }
 
+bool JsiRuntime::BigIntStrictEquals(JsiBigIntRef left, JsiBigIntRef right) try {
+  auto leftPtr = RuntimeAccessor::AsPointerValue(left);
+  auto rightPtr = RuntimeAccessor::AsPointerValue(right);
+  return m_runtimeAccessor->strictEquals(RuntimeAccessor::AsBigInt(&leftPtr), RuntimeAccessor::AsBigInt(&rightPtr));
+} catch (JSI_SET_ERROR) {
+  throw;
+}
+
 bool JsiRuntime::StringStrictEquals(JsiStringRef left, JsiStringRef right) try {
   auto leftPtr = RuntimeAccessor::AsPointerValue(left);
   auto rightPtr = RuntimeAccessor::AsPointerValue(right);
@@ -949,6 +984,11 @@ void JsiRuntime::ReleaseSymbol(JsiSymbolRef const &symbolData) {
       RuntimeAccessor::make<facebook::jsi::Symbol>(reinterpret_cast<RuntimeAccessor::PointerValue *>(symbolData.Data));
 }
 
+void JsiRuntime::ReleaseBigInt(JsiBigIntRef const &bigIntData) {
+  auto bigInt =
+      RuntimeAccessor::make<facebook::jsi::BigInt>(reinterpret_cast<RuntimeAccessor::PointerValue *>(bigIntData.Data));
+}
+
 void JsiRuntime::ReleaseString(JsiStringRef const &stringData) {
   auto str =
       RuntimeAccessor::make<facebook::jsi::String>(reinterpret_cast<RuntimeAccessor::PointerValue *>(stringData.Data));

package/Microsoft.ReactNative/JsiApi.h

@@ -82,6 +82,7 @@ struct JsiRuntime : JsiRuntimeT<JsiRuntime> {
   bool IsInspectable();
 
   JsiSymbolRef CloneSymbol(JsiSymbolRef symbol);
+  JsiBigIntRef CloneBigInt(JsiBigIntRef bigInt);
   JsiStringRef CloneString(JsiStringRef str);
   JsiObjectRef CloneObject(JsiObjectRef obj);
   JsiPropertyIdRef ClonePropertyId(JsiPropertyIdRef propertyId);
@@ -142,11 +143,13 @@ struct JsiRuntime : JsiRuntimeT<JsiRuntime> {
   void PopScope(JsiScopeState scopeState);
 
   bool SymbolStrictEquals(JsiSymbolRef left, JsiSymbolRef right);
+  bool BigIntStrictEquals(JsiBigIntRef left, JsiBigIntRef right);
   bool StringStrictEquals(JsiStringRef left, JsiStringRef right);
   bool ObjectStrictEquals(JsiObjectRef left, JsiObjectRef right);
   bool InstanceOf(JsiObjectRef obj, JsiObjectRef constructor);
 
   void ReleaseSymbol(JsiSymbolRef const &symbol);
+  void ReleaseBigInt(JsiBigIntRef const &bigInt);
   void ReleaseString(JsiStringRef const &str);
   void ReleaseObject(JsiObjectRef const &obj);
   void ReleasePropertyId(JsiPropertyIdRef const &propertyId);

package/Microsoft.ReactNative/JsiApi.idl

@@ -50,7 +50,7 @@ namespace Microsoft.ReactNative
     void GetData(JsiByteArrayUser useBytes);
   };
 
-  // Type of the JavaScript value. It is currently matching the full JavaScript set of types except for the BigInt type.
+  // Type of the JavaScript value. It is currently matching the full JavaScript set of types.
   [experimental]
   DOC_STRING(
     "An experimental API. Do not use it directly. "
@@ -65,8 +65,10 @@ namespace Microsoft.ReactNative
     Boolean,
     Number,
     Symbol,
+    BigInt, // TODO: JSIVALUECONVERSION - This is where RN wants to put the new enum
     String,
     Object,
+    // BigInt, // TODO: JSIVALUECONVERSION - This is where we WANT to put the new enum
   };
 
   [experimental, webhosthidden]
@@ -94,6 +96,19 @@ namespace Microsoft.ReactNative
     UInt64 Data;
   };
 
+  [experimental]
+  DOC_STRING(
+    "An experimental API. Do not use it directly. "
+    "It may be removed or changed in a future version. Instead, use the JSI API that uses this API internally.\n"
+    "See the `ExecuteJsi` method in `JsiApiContext.h` of the `Microsoft.ReactNative.Cxx` shared project, "
+    "or the examples of the JSI-based TurboModules in the `Microsoft.ReactNative.IntegrationTests` project.\n"
+    "Note that the JSI is defined only for C++ code. We plan to add the .Net support in future.")
+  struct JsiBigIntRef
+  {
+    UInt64 Data;
+  };
+
+
   [experimental]
   DOC_STRING(
     "An experimental API. Do not use it directly. "
@@ -238,6 +253,7 @@ namespace Microsoft.ReactNative
     Boolean IsInspectable { get; };
 
     JsiSymbolRef CloneSymbol(JsiSymbolRef symbol);
+    JsiBigIntRef CloneBigInt (JsiBigIntRef bigInt);
     JsiStringRef CloneString(JsiStringRef str);
     JsiObjectRef CloneObject(JsiObjectRef obj);
     JsiPropertyIdRef ClonePropertyId(JsiPropertyIdRef propertyId);
@@ -297,12 +313,14 @@ namespace Microsoft.ReactNative
     void PopScope(JsiScopeState scopeState);
 
     Boolean SymbolStrictEquals(JsiSymbolRef left, JsiSymbolRef right);
+    Boolean BigIntStrictEquals(JsiBigIntRef left, JsiBigIntRef right);
     Boolean StringStrictEquals(JsiStringRef left, JsiStringRef right);
     Boolean ObjectStrictEquals(JsiObjectRef left, JsiObjectRef right);
 
     Boolean InstanceOf(JsiObjectRef obj, JsiObjectRef constructor);
 
     void ReleaseSymbol(JsiSymbolRef symbol);
+    void ReleaseBigInt(JsiBigIntRef bigInt);
     void ReleaseString(JsiStringRef str);
     void ReleaseObject(JsiObjectRef obj);
     void ReleasePropertyId(JsiPropertyIdRef propertyId);

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -115,7 +115,7 @@
         $(GeneratedFilesDir);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FOLLY_NO_CONFIG;NOMINMAX;_HAS_AUTO_PTR_ETC;_USE_MATH_DEFINES;RN_EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISABLE_XAML_GENERATED_MAIN;FOLLY_NO_CONFIG;NOMINMAX;_HAS_AUTO_PTR_ETC;_USE_MATH_DEFINES;RN_EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!--
         REACTWINDOWS_BUILD - building with REACTWINDOWS_API as dll exports
         OLD_CPPWINRT is a workaround to make target version to 19H1
@@ -184,6 +184,10 @@
     <ClInclude Include="Base\CoreNativeModules.h" />
     <ClInclude Include="Base\CxxReactIncludes.h" />
     <ClInclude Include="Base\FollyIncludes.h" />
+    <ClInclude Include="CoreAppPage.h">
+      <DependentUpon>CoreAppPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
     <ClInclude Include="ReactHost\JSCallInvokerScheduler.h" />
     <ClInclude Include="Utils\ShadowNodeTypeUtils.h" />
     <ClInclude Include="Utils\BatchingEventEmitter.h" />
@@ -427,6 +431,11 @@
     <ClCompile Include="ABIViewManager.cpp" />
     <ClCompile Include="Base\CoreNativeModules.cpp" />
     <ClCompile Include="Base\CoreUIManagers.cpp" />
+    <ClCompile Include="CoreAppPage.cpp">
+      <DependentUpon>CoreAppPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+    <ClCompile Include="CoreApp.cpp" />
     <ClCompile Include="Utils\BatchingEventEmitter.cpp" />
     <ClCompile Include="CxxReactUWP\JSBigString.cpp" />
     <ClCompile Include="DevMenuControl.cpp">
@@ -630,6 +639,10 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <Midl Include="CoreAppPage.idl">
+      <DependentUpon>CoreAppPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
     <Midl Include="DesktopWindowMessage.idl" />
     <Midl Include="DevMenuControl.idl">
       <DependentUpon>DevMenuControl.xaml</DependentUpon>
@@ -717,6 +730,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Page Include="CoreAppPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="DevMenuControl.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -772,4 +788,4 @@
       </ClCompile>
     </ItemGroup>
   </Target>
-</Project>
+</Project>

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters

@@ -215,9 +215,6 @@
     <ClCompile Include="Views\RawTextViewManager.cpp">
       <Filter>Views</Filter>
     </ClCompile>
-    <ClCompile Include="Views\ReactRootControl.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
     <ClCompile Include="Views\RefreshControlManager.cpp">
       <Filter>Views</Filter>
     </ClCompile>
@@ -302,7 +299,6 @@
     <ClCompile Include="GlyphViewManager.cpp">
       <Filter>Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Modules\ReactRootViewTagGenerator.cpp" />
     <ClCompile Include="Modules\PaperUIManagerModule.cpp" />
     <ClCompile Include="Views\PaperShadowNode.cpp" />
     <ClCompile Include="Views\ShadowNodeRegistry.cpp" />
@@ -337,6 +333,9 @@
       <Filter>Views\Text</Filter>
     </ClCompile>
     <ClCompile Include="ReactPointerEventArgs.cpp" />
+    <ClCompile Include="Views\FrameworkElementTransferProperties.cpp" />
+    <ClCompile Include="Views\ReactViewInstance.cpp" />
+    <ClCompile Include="CoreApp.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ABICxxModule.h" />
@@ -575,9 +574,6 @@
     <ClInclude Include="Views\RawTextViewManager.h">
       <Filter>Views</Filter>
     </ClInclude>
-    <ClInclude Include="Views\ReactRootControl.h">
-      <Filter>Views</Filter>
-    </ClInclude>
     <ClInclude Include="Views\RefreshControlManager.h">
       <Filter>Views</Filter>
     </ClInclude>
@@ -734,6 +730,8 @@
       <Filter>Views\Text</Filter>
     </ClInclude>
     <ClInclude Include="ReactPointerEventArgs.h" />
+    <ClInclude Include="Views\FrameworkElementTransferProperties.h" />
+    <ClInclude Include="Views\ReactViewInstance.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="IJSValueReader.idl" />
@@ -772,6 +770,7 @@
     <Midl Include="DocString.idl" />
     <Midl Include="DesktopWindowMessage.idl" />
     <Midl Include="ReactPointerEventArgs.idl" />
+    <Midl Include="ReactCoreInjection.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="microsoft.reactnative.def" />
@@ -826,5 +825,6 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="DevMenuControl.xaml" />
+    <Page Include="CoreAppPage.xaml" />
   </ItemGroup>
 </Project>

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeAccessibilityInfoSpec.g.h"
+#include "codegen/NativeAccessibilityInfoSpec.g.h"
 #include <NativeModules.h>
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Modules/AlertModule.cpp

@@ -68,20 +68,23 @@ void Alert::ProcessPendingAlertRequests() noexcept {
         const auto rootSize = xamlRoot.Size();
         const auto popupRoot = xaml::Media::VisualTreeHelper::GetParent(dialog);
         const auto nChildren = xaml::Media::VisualTreeHelper::GetChildrenCount(popupRoot);
-        if (nChildren == 2) {
-          // The first is supposed to be the smoke screen (Rectangle), and the second the content dialog
-          if (const auto smoke =
-                  xaml::Media::VisualTreeHelper::GetChild(popupRoot, 0).try_as<xaml::Shapes::Rectangle>()) {
-            const auto assertDialog =
-                xaml::Media::VisualTreeHelper::GetChild(popupRoot, 1).try_as<xaml::Controls::ContentDialog>();
-            if (assertDialog == dialog) {
-              smoke.Width(rootSize.Width);
-              smoke.Height(rootSize.Height);
-              dialog.Width(rootSize.Width);
-              dialog.Height(rootSize.Height);
-            }
+        xaml::Shapes::Rectangle smoke = nullptr;
+        xaml::Controls::ContentDialog assertDialog = nullptr;
+        for (int32_t i = 0; i < nChildren - 1; ++i) {
+          smoke = xaml::Media::VisualTreeHelper::GetChild(popupRoot, i).try_as<xaml::Shapes::Rectangle>();
+          assertDialog =
+              xaml::Media::VisualTreeHelper::GetChild(popupRoot, i + 1).try_as<xaml::Controls::ContentDialog>();
+          if (smoke && assertDialog == dialog) {
+            break;
           }
         }
+
+        if (smoke && assertDialog == dialog) {
+          smoke.Width(rootSize.Width);
+          smoke.Height(rootSize.Height);
+          dialog.Width(rootSize.Width);
+          dialog.Height(rootSize.Height);
+        }
       });
 
       dialog.Closed([=](auto &&, auto &&) { xamlRoot.Changed(rootChangedToken); });

package/Microsoft.ReactNative/Modules/AlertModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeDialogManagerWindowsSpec.g.h"
+#include "codegen/NativeDialogManagerWindowsSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>

package/Microsoft.ReactNative/Modules/AppStateModule.cpp

@@ -3,16 +3,20 @@
 
 #include "pch.h"
 #include "AppStateModule.h"
+#include <QuirkSettings.h>
 #include <Utils/Helpers.h>
 #include <XamlUtils.h>
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>
 #include "Unicode.h"
 
+using namespace winrt::Windows::UI::Core;
+
 namespace Microsoft::ReactNative {
 
 void AppState::Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
   m_context = reactContext;
-  m_active = true;
+  m_deactivated = false;
+  m_enteredBackground = false;
 
   // We need to register for notifications from the XAML thread.
   if (auto dispatcher = reactContext.UIDispatcher()) {
@@ -21,13 +25,15 @@ void AppState::Initialize(winrt::Microsoft::ReactNative::ReactContext const &rea
 
       if (!IsWinUI3Island() && currentApp != nullptr) {
 #ifndef USE_WINUI3
+        CoreWindow window = CoreWindow::GetForCurrentThread();
+
         m_enteredBackgroundRevoker = currentApp.EnteredBackground(
             winrt::auto_revoke,
             [weakThis = weak_from_this()](
                 winrt::IInspectable const & /*sender*/,
                 winrt::Windows::ApplicationModel::EnteredBackgroundEventArgs const & /*e*/) noexcept {
               if (auto strongThis = weakThis.lock()) {
-                strongThis->SetActive(false);
+                strongThis->SetEnteredBackground(true);
               }
             });
 
@@ -37,9 +43,27 @@ void AppState::Initialize(winrt::Microsoft::ReactNative::ReactContext const &rea
                 winrt::IInspectable const & /*sender*/,
                 winrt::Windows::ApplicationModel::LeavingBackgroundEventArgs const & /*e*/) noexcept {
               if (auto strongThis = weakThis.lock()) {
-                strongThis->SetActive(true);
+                strongThis->SetEnteredBackground(false);
               }
             });
+        if (window != nullptr &&
+            winrt::Microsoft::ReactNative::implementation::QuirkSettings::GetMapWindowDeactivatedToAppStateInactive(
+                m_context.Properties())) {
+          m_activatedEventRevoker = window.Activated(
+              winrt::auto_revoke,
+              [weakThis = weak_from_this()](
+                  winrt::Windows::UI::Core::CoreWindow /*sender*/,
+                  winrt::Windows::UI::Core::WindowActivatedEventArgs args) {
+                if (auto strongThis = weakThis.lock()) {
+                  if (args.WindowActivationState() ==
+                      winrt::Windows::UI::Core::CoreWindowActivationState::Deactivated) {
+                    strongThis->SetDeactivated(true);
+                  } else {
+                    strongThis->SetDeactivated(false);
+                  }
+                }
+              });
+        }
 #endif
       } else {
         assert(IsXamlIsland());
@@ -52,7 +76,7 @@ void AppState::GetCurrentAppState(
     std::function<void(AppStateChangeArgs const &)> const &success,
     std::function<void(React::JSValue const &)> const &error) noexcept {
   AppStateChangeArgs args;
-  args.app_state = m_active ? "active" : "background";
+  args.app_state = GetAppState();
   success(args);
 }
 
@@ -65,12 +89,24 @@ void AppState::RemoveListeners(double /*count*/) noexcept {
 }
 
 ReactNativeSpecs::AppStateSpec_Constants AppState::GetConstants() noexcept {
-  return {m_active ? "active" : "background"};
+  return {GetAppState()};
+}
+
+void AppState::SetDeactivated(bool deactivated) noexcept {
+  if (winrt::Microsoft::ReactNative::implementation::QuirkSettings::GetMapWindowDeactivatedToAppStateInactive(
+          m_context.Properties())) {
+    m_deactivated = deactivated;
+    m_context.JSDispatcher().Post([this]() { AppStateDidChange({GetAppState()}); });
+  }
+}
+
+void AppState::SetEnteredBackground(bool enteredBackground) noexcept {
+  m_enteredBackground = enteredBackground;
+  m_context.JSDispatcher().Post([this]() { AppStateDidChange({GetAppState()}); });
 }
 
-void AppState::SetActive(bool active) noexcept {
-  m_active = active;
-  m_context.JSDispatcher().Post([this]() { AppStateDidChange({m_active ? "active" : "background"}); });
+std::string AppState::GetAppState() noexcept {
+  return m_enteredBackground ? "background" : (m_deactivated ? "inactive" : "active");
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Modules/AppStateModule.h

@@ -2,11 +2,13 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeAppStateSpec.g.h"
+#include "codegen/NativeAppStateSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>
 
+#include <winrt/Windows.UI.Core.h>
+
 namespace Microsoft::ReactNative {
 
 REACT_MODULE(AppState)
@@ -35,15 +37,19 @@ struct AppState : public std::enable_shared_from_this<AppState> {
   std::function<void(AppStateChangeArgs const &)> AppStateDidChange;
 
  private:
-  void SetActive(bool active) noexcept;
+  void SetDeactivated(bool deactivated) noexcept;
+  void SetEnteredBackground(bool enteredBackground) noexcept;
+  std::string GetAppState() noexcept;
 
   std::mutex m_stateMutex;
-  std::atomic<bool> m_active;
+  std::atomic<bool> m_deactivated;
+  std::atomic<bool> m_enteredBackground;
   char const *m_lastState{nullptr};
   React::ReactContext m_context;
 #ifndef USE_WINUI3
   xaml::Application::EnteredBackground_revoker m_enteredBackgroundRevoker;
   xaml::Application::LeavingBackground_revoker m_leavingBackgroundRevoker;
+  winrt::Windows::UI::Core::CoreWindow::Activated_revoker m_activatedEventRevoker;
 #endif
 };
 

package/Microsoft.ReactNative/Modules/AppThemeModuleUwp.h

@@ -9,7 +9,7 @@
 #include <cxxreact/MessageQueueThread.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 
-#include "../../codegen/NativeAppThemeSpec.g.h"
+#include "codegen/NativeAppThemeSpec.g.h"
 #include <NativeModules.h>
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Modules/ClipboardModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeClipboardSpec.g.h"
+#include "codegen/NativeClipboardSpec.g.h"
 #include <NativeModules.h>
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Modules/DevSettingsModule.h

@@ -5,7 +5,7 @@
 #include <cxxreact/CxxModule.h>
 #include <functional/functor.h>
 
-#include "../../codegen/NativeDevSettingsSpec.g.h"
+#include "codegen/NativeDevSettingsSpec.g.h"
 #include <NativeModules.h>
 #include <ReactHost/React.h>
 

package/Microsoft.ReactNative/Modules/DeviceInfoModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeDeviceInfoSpec.g.h"
+#include "codegen/NativeDeviceInfoSpec.g.h"
 #include <NativeModules.h>
 #include <React.h>
 #include <ReactNotificationService.h>

package/Microsoft.ReactNative/Modules/I18nManagerModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeI18nManagerSpec.g.h"
+#include "codegen/NativeI18nManagerSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>

package/Microsoft.ReactNative/Modules/ImageViewManagerModule.cpp

@@ -45,7 +45,7 @@ winrt::fire_and_forget GetImageSizeAsync(
     bool needsDownload = (scheme == L"http") || (scheme == L"https");
     bool inlineData = scheme == L"data";
 
-    winrt::InMemoryRandomAccessStream memoryStream;
+    winrt::IRandomAccessStream memoryStream;
     if (needsDownload) {
       memoryStream = co_await GetImageStreamAsync(source);
     } else if (inlineData) {

package/Microsoft.ReactNative/Modules/ImageViewManagerModule.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../../codegen/NativeImageLoaderIOSSpec.g.h"
+#include "codegen/NativeImageLoaderIOSSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>