react-native-windows 0.0.0-canary.705 → 0.0.0-canary.706

package/Microsoft.ReactNative/packages.lock.json

@@ -26,12 +26,9 @@
       },
       "Microsoft.UI.Xaml": {
         "type": "Direct",
-        "requested": "[2.8.0, )",
-        "resolved": "2.8.0",
-        "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==",
-        "dependencies": {
-          "Microsoft.Web.WebView2": "1.0.1264.42"
-        }
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       },
       "Microsoft.Windows.CppWinRT": {
         "type": "Direct",
@@ -49,11 +46,6 @@
         "resolved": "1.1.1",
         "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
       },
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
-      },
       "common": {
         "type": "Project"
       },
@@ -63,8 +55,8 @@
       "folly": {
         "type": "Project",
         "dependencies": {
-          "boost": "[1.76.0, )",
-          "fmt": "[1.0.0, )"
+          "Fmt": "[1.0.0, )",
+          "boost": "[1.76.0, )"
         }
       },
       "reactcommon": {
@@ -76,52 +68,59 @@
       }
     },
     "native,Version=v0.0/win10-arm": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       }
     },
     "native,Version=v0.0/win10-arm-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       }
     },
     "native,Version=v0.0/win10-arm64-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       }
     },
     "native,Version=v0.0/win10-x64": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       }
     },
     "native,Version=v0.0/win10-x64-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       }
     },
     "native,Version=v0.0/win10-x86": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       }
     },
     "native,Version=v0.0/win10-x86-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.7.0-prerelease.210913003, )",
+        "resolved": "2.7.0-prerelease.210913003",
+        "contentHash": "eLUEu31PenwzXowSTm/HPRaaEClPd0FKPLirfHLM84wH3nPDHX18l/ngHm1Ny2rnwVyc1cYngPjYEv6DOQmw1A=="
       }
     }
   }

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.705</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.706</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>3cf0d7ad6b48d94e1b56f3299ee516aac67e55f9</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>5b20e6f40a69f9fd0451b4d8426fe69b5c078537</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/{ViewEventEmitter.cpp → BaseViewEventEmitter.cpp}

@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ViewEventEmitter.h"
+#include "BaseViewEventEmitter.h"
 
 namespace facebook::react {
 
 #pragma mark - Accessibility
 
-void ViewEventEmitter::onAccessibilityAction(std::string const &name) const {
+void BaseViewEventEmitter::onAccessibilityAction(std::string const &name) const {
   dispatchEvent("accessibilityAction", [name](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
     payload.setProperty(runtime, "actionName", name);
@@ -19,21 +19,21 @@ void ViewEventEmitter::onAccessibilityAction(std::string const &name) const {
   });
 }
 
-void ViewEventEmitter::onAccessibilityTap() const {
+void BaseViewEventEmitter::onAccessibilityTap() const {
   dispatchEvent("accessibilityTap");
 }
 
-void ViewEventEmitter::onAccessibilityMagicTap() const {
+void BaseViewEventEmitter::onAccessibilityMagicTap() const {
   dispatchEvent("magicTap");
 }
 
-void ViewEventEmitter::onAccessibilityEscape() const {
+void BaseViewEventEmitter::onAccessibilityEscape() const {
   dispatchEvent("accessibilityEscape");
 }
 
 #pragma mark - Layout
 
-void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
+void BaseViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
   // A copy of a shared pointer (`layoutEventState_`) establishes shared
   // ownership that will be captured by lambda.
   auto layoutEventState = layoutEventState_;
@@ -54,7 +54,7 @@ void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
   //  - Ordering is preserved.
 
   {
-    std::lock_guard<std::mutex> guard(layoutEventState->mutex);
+    std::scoped_lock guard(layoutEventState->mutex);
 
     // If a *particular* `frame` was already dispatched to the JavaScript side,
     // no other work is required.
@@ -84,7 +84,7 @@ void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
         auto frame = Rect{};
 
         {
-          std::lock_guard<std::mutex> guard(layoutEventState->mutex);
+          std::scoped_lock guard(layoutEventState->mutex);
 
           layoutEventState->isDispatching = false;
 
@@ -115,12 +115,12 @@ void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
 }
 
 // [Windows]
-void ViewEventEmitter::onFocus() const {
+void BaseViewEventEmitter::onFocus() const {
   dispatchEvent("focus");
 }
 
 // [Windows]
-void ViewEventEmitter::onBlur() const {
+void BaseViewEventEmitter::onBlur() const {
   dispatchEvent("blur");
 }
 
@@ -139,7 +139,7 @@ static jsi::Value keyboardEventPayload(
 }
 
 // [Windows]
-void ViewEventEmitter::onKeyUp(KeyboardEvent const &event) const {
+void BaseViewEventEmitter::onKeyUp(KeyboardEvent const &event) const {
   dispatchEvent(
     "keyUp",
     [event](jsi::Runtime &runtime) {
@@ -148,7 +148,7 @@ void ViewEventEmitter::onKeyUp(KeyboardEvent const &event) const {
 }
 
 // [Windows]
-void ViewEventEmitter::onKeyDown(KeyboardEvent const &event) const {
+void BaseViewEventEmitter::onKeyDown(KeyboardEvent const &event) const {
     dispatchEvent(
     "keyDown",
     [event](jsi::Runtime &runtime) {

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/{ViewEventEmitter.h → BaseViewEventEmitter.h}

@@ -30,11 +30,9 @@ struct KeyboardEvent {
   std::string code{};
 };
 
-class ViewEventEmitter;
+class BaseViewEventEmitter;
 
-using SharedViewEventEmitter = std::shared_ptr<const ViewEventEmitter>;
-
-class ViewEventEmitter : public TouchEventEmitter {
+class BaseViewEventEmitter : public TouchEventEmitter {
  public:
   using TouchEventEmitter::TouchEventEmitter;
 

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/{ViewProps.cpp → BaseViewProps.cpp}

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ViewProps.h"
+#include "BaseViewProps.h"
 
 #include <algorithm>
 
@@ -18,14 +18,13 @@
 
 namespace facebook::react {
 
-ViewProps::ViewProps(
+BaseViewProps::BaseViewProps(
     const PropsParserContext &context,
-    ViewProps const &sourceProps,
+    BaseViewProps const &sourceProps,
     RawProps const &rawProps,
     bool shouldSetRawProps)
     : YogaStylableProps(context, sourceProps, rawProps, shouldSetRawProps),
       AccessibilityProps(context, sourceProps, rawProps),
-      HostPlatformViewProps(context, sourceProps, rawProps, shouldSetRawProps), // [Windows]
       opacity(
           CoreFeatures::enablePropIteratorSetter ? sourceProps.opacity
                                                  : convertRawProp(
@@ -191,74 +190,7 @@ ViewProps::ViewProps(
                     rawProps,
                     "removeClippedSubviews",
                     sourceProps.removeClippedSubviews,
-                    false))
-#ifdef ANDROID
-      ,
-      elevation(
-          CoreFeatures::enablePropIteratorSetter ? sourceProps.elevation
-                                                 : convertRawProp(
-                                                       context,
-                                                       rawProps,
-                                                       "elevation",
-                                                       sourceProps.elevation,
-                                                       {})),
-      nativeBackground(
-          CoreFeatures::enablePropIteratorSetter
-              ? sourceProps.nativeBackground
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "nativeBackgroundAndroid",
-                    sourceProps.nativeBackground,
-                    {})),
-      nativeForeground(
-          CoreFeatures::enablePropIteratorSetter
-              ? sourceProps.nativeForeground
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "nativeForegroundAndroid",
-                    sourceProps.nativeForeground,
-                    {})),
-      focusable(
-          CoreFeatures::enablePropIteratorSetter ? sourceProps.focusable
-                                                 : convertRawProp(
-                                                       context,
-                                                       rawProps,
-                                                       "focusable",
-                                                       sourceProps.focusable,
-                                                       {})),
-      hasTVPreferredFocus(
-          CoreFeatures::enablePropIteratorSetter
-              ? sourceProps.hasTVPreferredFocus
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "hasTVPreferredFocus",
-                    sourceProps.hasTVPreferredFocus,
-                    {})),
-      needsOffscreenAlphaCompositing(
-          CoreFeatures::enablePropIteratorSetter
-              ? sourceProps.needsOffscreenAlphaCompositing
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "needsOffscreenAlphaCompositing",
-                    sourceProps.needsOffscreenAlphaCompositing,
-                    {})),
-      renderToHardwareTextureAndroid(
-          CoreFeatures::enablePropIteratorSetter
-              ? sourceProps.renderToHardwareTextureAndroid
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "renderToHardwareTextureAndroid",
-                    sourceProps.renderToHardwareTextureAndroid,
-                    {}))
-
-#endif
-{
-}
+                    false)){}
 
 #define VIEW_EVENT_CASE(eventType)                      \
   case CONSTEXPR_RAW_PROPS_KEY_HASH("on" #eventType): { \
@@ -272,7 +204,7 @@ ViewProps::ViewProps(
     return;                                             \
   }
 
-void ViewProps::setProp(
+void BaseViewProps::setProp(
     const PropsParserContext &context,
     RawPropsPropNameHash hash,
     const char *propName,
@@ -282,9 +214,8 @@ void ViewProps::setProp(
   // reuse the same values.
   YogaStylableProps::setProp(context, hash, propName, value);
   AccessibilityProps::setProp(context, hash, propName, value);
-  HostPlatformViewProps::setProp(context, hash, propName, value); // [Windows]
 
-  static auto defaults = ViewProps{};
+  static auto defaults = BaseViewProps{};
 
   switch (hash) {
     RAW_SET_PROP_SWITCH_CASE_BASIC(opacity);
@@ -302,6 +233,7 @@ void ViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(onLayout);
     RAW_SET_PROP_SWITCH_CASE_BASIC(collapsable);
     RAW_SET_PROP_SWITCH_CASE_BASIC(removeClippedSubviews);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(experimental_layoutConformance);
     // events field
     VIEW_EVENT_CASE(PointerEnter);
     VIEW_EVENT_CASE(PointerEnterCapture);
@@ -331,15 +263,6 @@ void ViewProps::setProp(
     VIEW_EVENT_CASE(MouseEnter); // [Windows]
     VIEW_EVENT_CASE(MouseLeave); // [Windows]
 
-#ifdef ANDROID
-    RAW_SET_PROP_SWITCH_CASE_BASIC(elevation);
-    RAW_SET_PROP_SWITCH_CASE(nativeBackground, "nativeBackgroundAndroid");
-    RAW_SET_PROP_SWITCH_CASE(nativeForeground, "nativeForegroundAndroid");
-    RAW_SET_PROP_SWITCH_CASE_BASIC(focusable);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(hasTVPreferredFocus);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(needsOffscreenAlphaCompositing);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(renderToHardwareTextureAndroid);
-#endif
     // BorderRadii
     SET_CASCADED_RECTANGLE_CORNERS(borderRadii, "border", "Radius", value);
     SET_CASCADED_RECTANGLE_EDGES(borderColors, "border", "Color", value);
@@ -385,7 +308,7 @@ static BorderRadii ensureNoOverlap(BorderRadii const &radii, Size const &size) {
   };
 }
 
-BorderMetrics ViewProps::resolveBorderMetrics(
+BorderMetrics BaseViewProps::resolveBorderMetrics(
     LayoutMetrics const &layoutMetrics) const {
   auto isRTL =
       bool{layoutMetrics.layoutDirection == LayoutDirection::RightToLeft};
@@ -417,33 +340,27 @@ BorderMetrics ViewProps::resolveBorderMetrics(
   };
 }
 
-bool ViewProps::getClipsContentToBounds() const {
+bool BaseViewProps::getClipsContentToBounds() const {
   return yogaStyle.overflow() != YGOverflowVisible;
 }
 
-#ifdef ANDROID
-bool ViewProps::getProbablyMoreHorizontalThanVertical_DEPRECATED() const {
-  return yogaStyle.flexDirection() == YGFlexDirectionRow;
-}
-#endif
-
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE
-SharedDebugStringConvertibleList ViewProps::getDebugProps() const {
-  const auto &defaultViewProps = ViewProps();
+SharedDebugStringConvertibleList BaseViewProps::getDebugProps() const {
+  const auto &defaultBaseViewProps = BaseViewProps();
 
   return AccessibilityProps::getDebugProps() +
       YogaStylableProps::getDebugProps() +
       SharedDebugStringConvertibleList{
           debugStringConvertibleItem(
-              "opacity", opacity, defaultViewProps.opacity),
+              "opacity", opacity, defaultBaseViewProps.opacity),
           debugStringConvertibleItem(
               "backgroundColor",
               backgroundColor,
-              defaultViewProps.backgroundColor),
+              defaultBaseViewProps.backgroundColor),
           debugStringConvertibleItem(
-              "zIndex", zIndex, defaultViewProps.zIndex.value_or(0)),
+              "zIndex", zIndex, defaultBaseViewProps.zIndex.value_or(0)),
       };
 }
 #endif

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/{ViewProps.h → BaseViewProps.h}

@@ -9,7 +9,6 @@
 
 #include <react/renderer/components/view/AccessibilityProps.h>
 #include <react/renderer/components/view/YogaStylableProps.h>
-#include <react/renderer/components/view/HostPlatformViewProps.h> // [Windows]
 #include <react/renderer/components/view/primitives.h>
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/Props.h>
@@ -21,16 +20,14 @@
 
 namespace facebook::react {
 
-class ViewProps;
+class BaseViewProps;
 
-using SharedViewProps = std::shared_ptr<ViewProps const>;
-
-class ViewProps : public YogaStylableProps, public AccessibilityProps, public HostPlatformViewProps  { // [Windows] added HostPlatformViewProps
+class BaseViewProps : public YogaStylableProps, public AccessibilityProps{
  public:
-  ViewProps() = default;
-  ViewProps(
+  BaseViewProps() = default;
+  BaseViewProps(
       const PropsParserContext &context,
-      ViewProps const &sourceProps,
+      BaseViewProps const &sourceProps,
       RawProps const &rawProps,
       bool shouldSetRawProps = true);
 
@@ -80,6 +77,8 @@ class ViewProps : public YogaStylableProps, public AccessibilityProps, public Ho
 
   bool removeClippedSubviews{false};
 
+  LayoutConformance experimental_layoutConformance{};
+
   Float elevation{}; /* Android-only */
 
 #ifdef ANDROID

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/TouchEventEmitter.cpp

@@ -11,22 +11,6 @@ namespace facebook::react {
 
 #pragma mark - Touches
 
-static void setTouchPayloadOnObject(
-    jsi::Object &object,
-    jsi::Runtime &runtime,
-    Touch const &touch) {
-  object.setProperty(runtime, "locationX", touch.offsetPoint.x);
-  object.setProperty(runtime, "locationY", touch.offsetPoint.y);
-  object.setProperty(runtime, "pageX", touch.pagePoint.x);
-  object.setProperty(runtime, "pageY", touch.pagePoint.y);
-  object.setProperty(runtime, "screenX", touch.screenPoint.x);
-  object.setProperty(runtime, "screenY", touch.screenPoint.y);
-  object.setProperty(runtime, "identifier", touch.identifier);
-  object.setProperty(runtime, "target", touch.target);
-  object.setProperty(runtime, "timestamp", touch.timestamp * 1000);
-  object.setProperty(runtime, "force", touch.force);
-}
-
 static jsi::Value touchesPayload(
     jsi::Runtime &runtime,
     Touches const &touches) {

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/ViewShadowNode.cpp

@@ -7,6 +7,7 @@
 
 #include "ViewShadowNode.h"
 #include <react/config/ReactNativeConfig.h>
+#include <react/renderer/components/view/HostPlatformViewTraitsInitializer.h>
 #include <react/renderer/components/view/primitives.h>
 #include <react/utils/CoreFeatures.h>
 
@@ -54,28 +55,16 @@ void ViewShadowNode::initialize() noexcept {
       viewProps.accessibilityElementsHidden ||
       viewProps.accessibilityViewIsModal ||
       viewProps.importantForAccessibility != ImportantForAccessibility::Auto ||
-      viewProps.removeClippedSubviews;
+      viewProps.removeClippedSubviews ||
+      HostPlatformViewTraitsInitializer::formsStackingContext(viewProps);
 
-#ifdef ANDROID
-  formsStackingContext = formsStackingContext || viewProps.elevation != 0;
-#endif
-
-  formsStackingContext = formsStackingContext || HostPlatformViewProps::requiresFormsStackingContext(viewProps); // [Windows]
+  formsStackingContext = formsStackingContext || WindowsViewProps::requiresFormsStackingContext(viewProps); // [Windows]
 
   bool formsView = formsStackingContext ||
       isColorMeaningful(viewProps.backgroundColor) ||
       !(viewProps.yogaStyle.border() == YGStyle::Edges{}) ||
-      !viewProps.testId.empty();
-
-  formsView = formsView || HostPlatformViewProps::requiresFormsView(viewProps); // [Windows]
-
-#ifdef ANDROID
-  formsView = formsView || viewProps.nativeBackground.has_value() ||
-      viewProps.nativeForeground.has_value() || viewProps.focusable ||
-      viewProps.hasTVPreferredFocus ||
-      viewProps.needsOffscreenAlphaCompositing ||
-      viewProps.renderToHardwareTextureAndroid;
-#endif
+      !viewProps.testId.empty() ||
+      HostPlatformViewTraitsInitializer::formsView(viewProps);
 
   if (formsView) {
     traits_.set(ShadowNodeTraits::Trait::FormsView);
@@ -89,9 +78,7 @@ void ViewShadowNode::initialize() noexcept {
     traits_.unset(ShadowNodeTraits::Trait::FormsStackingContext);
   }
 
-#ifdef ANDROID
-  traits_.set(ShadowNodeTraits::Trait::AndroidMapBufferPropsSupported);
-#endif
+  traits_.set(HostPlatformViewTraitsInitializer::extraTraits());
 }
 
 } // namespace facebook::react