Revert D65085733 (#51520)

Summary:
Pull Request resolved: #51520
Changelog: [Internal] - revert Intersection Observer `root` due to bug

Reviewed By: lunaleaps

Differential Revision: D75186289

fbshipit-source-id: d644b1ef3261996596af6a243076f7172d500167

Author: generatedunixname89002005232357

packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap

@@ -9607,7 +9607,6 @@ exports[`public API should not change unintentionally src/private/webapis/inters
   observer: IntersectionObserver
 ) => mixed;
 export interface IntersectionObserverInit {
-  root?: ?ReactNativeElement;
   threshold?: number | $ReadOnlyArray<number>;
   rnRootThreshold?: number | $ReadOnlyArray<number>;
 }

packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.cpp

@@ -70,20 +70,12 @@ jsi::Object NativeIntersectionObserver::observeV2(
   auto shadowNode =
       shadowNodeFromValue(runtime, std::move(options.targetShadowNode));
   auto shadowNodeFamily = shadowNode->getFamilyShared();
-
-  std::optional<ShadowNodeFamily::Shared> observationRootShadowNodeFamily;
-  if (options.rootShadowNode.isObject()) {
-    observationRootShadowNodeFamily =
-        shadowNodeFromValue(runtime, options.rootShadowNode)->getFamilyShared();
-  }
-
   auto thresholds = options.thresholds;
   auto rootThresholds = options.rootThresholds;
   auto& uiManager = getUIManagerFromRuntime(runtime);
 
   intersectionObserverManager_.observe(
       intersectionObserverId,
-      observationRootShadowNodeFamily,
       shadowNodeFamily,
       thresholds,
       rootThresholds,

packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.h

@@ -22,8 +22,6 @@ using NativeIntersectionObserverObserveOptions =
     NativeIntersectionObserverNativeIntersectionObserverObserveOptions<
         // intersectionObserverId
         NativeIntersectionObserverIntersectionObserverId,
-        // rootShadowNode
-        jsi::Value,
         // targetShadowNode
         jsi::Object,
         // thresholds

packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp

@@ -16,41 +16,17 @@ namespace facebook::react {
 
 IntersectionObserver::IntersectionObserver(
     IntersectionObserverObserverId intersectionObserverId,
-    std::optional<ShadowNodeFamily::Shared> observationRootShadowNodeFamily,
     ShadowNodeFamily::Shared targetShadowNodeFamily,
     std::vector<Float> thresholds,
     std::optional<std::vector<Float>> rootThresholds)
     : intersectionObserverId_(intersectionObserverId),
-      observationRootShadowNodeFamily_(
-          std::move(observationRootShadowNodeFamily)),
       targetShadowNodeFamily_(std::move(targetShadowNodeFamily)),
       thresholds_(std::move(thresholds)),
       rootThresholds_(std::move(rootThresholds)) {}
 
-static std::shared_ptr<const ShadowNode> getShadowNode(
-    const ShadowNodeFamily::AncestorList& ancestors) {
-  if (ancestors.empty()) {
-    return nullptr;
-  }
-
-  const auto& lastAncestor = ancestors.back();
-  const ShadowNode& parentNode = lastAncestor.first.get();
-  int childIndex = lastAncestor.second;
-
-  const std::shared_ptr<const ShadowNode>& childNode =
-      parentNode.getChildren().at(childIndex);
-  return childNode;
-}
-
-static Rect getRootNodeBoundingRect(const RootShadowNode& rootShadowNode) {
-  const auto layoutableRootShadowNode =
-      dynamic_cast<const LayoutableShadowNode*>(&rootShadowNode);
-
-  react_native_assert(
-      layoutableRootShadowNode != nullptr &&
-      "RootShadowNode instances must always inherit from LayoutableShadowNode.");
-
-  auto layoutMetrics = layoutableRootShadowNode->getLayoutMetrics();
+static Rect getRootBoundingRect(
+    const LayoutableShadowNode& layoutableRootShadowNode) {
+  auto layoutMetrics = layoutableRootShadowNode.getLayoutMetrics();
 
   if (layoutMetrics == EmptyLayoutMetrics ||
       layoutMetrics.displayType == DisplayType::None) {
@@ -59,12 +35,13 @@ static Rect getRootNodeBoundingRect(const RootShadowNode& rootShadowNode) {
 
   // Apply the transform to translate the root view to its location in the
   // viewport.
-  return layoutMetrics.frame * layoutableRootShadowNode->getTransform();
+  return layoutMetrics.frame * layoutableRootShadowNode.getTransform();
 }
 
-static Rect getBoundingRect(const ShadowNodeFamily::AncestorList& ancestors) {
+static Rect getTargetBoundingRect(
+    const ShadowNodeFamily::AncestorList& targetAncestors) {
   auto layoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics(
-      ancestors,
+      targetAncestors,
       {/* .includeTransform = */ true,
        /* .includeViewportOffset = */ true});
   return layoutMetrics == EmptyLayoutMetrics ? Rect{} : layoutMetrics.frame;
@@ -86,7 +63,7 @@ static Rect getClippedTargetBoundingRect(
 static Rect computeIntersection(
     const Rect& rootBoundingRect,
     const Rect& targetBoundingRect,
-    const ShadowNodeFamily::AncestorList& targetToRootAncestors) {
+    const ShadowNodeFamily::AncestorList& targetAncestors) {
   auto absoluteIntersectionRect =
       Rect::intersect(rootBoundingRect, targetBoundingRect);
 
@@ -102,15 +79,10 @@ static Rect computeIntersection(
     return {};
   }
 
-  // Coordinates of the target after clipping the parts hidden by a parent,
-  // until till the root (e.g.: in scroll views, or in views with a parent with
-  // overflow: hidden)
-  auto clippedTargetFromRoot =
-      getClippedTargetBoundingRect(targetToRootAncestors);
-
-  auto clippedTargetBoundingRect = Rect{
-      rootBoundingRect.origin + clippedTargetFromRoot.origin,
-      clippedTargetFromRoot.size};
+  // Coordinates of the target after clipping the parts hidden by a parent
+  // (e.g.: in scroll views, or in views with a parent with overflow: hidden)
+  auto clippedTargetBoundingRect =
+      getClippedTargetBoundingRect(targetAncestors);
 
   return Rect::intersect(rootBoundingRect, clippedTargetBoundingRect);
 }
@@ -133,34 +105,23 @@ std::optional<IntersectionObserverEntry>
 IntersectionObserver::updateIntersectionObservation(
     const RootShadowNode& rootShadowNode,
     double time) {
-  bool hasCustomRoot = observationRootShadowNodeFamily_.has_value();
-
-  auto rootAncestors = hasCustomRoot
-      ? observationRootShadowNodeFamily_.value()->getAncestors(rootShadowNode)
-      : ShadowNodeFamily::AncestorList{};
+  const auto layoutableRootShadowNode =
+      dynamic_cast<const LayoutableShadowNode*>(&rootShadowNode);
 
-  // Absolute coordinates of the root
-  auto rootBoundingRect = hasCustomRoot
-      ? getBoundingRect(rootAncestors)
-      : getRootNodeBoundingRect(rootShadowNode);
+  react_native_assert(
+      layoutableRootShadowNode != nullptr &&
+      "RootShadowNode instances must always inherit from LayoutableShadowNode.");
 
   auto targetAncestors = targetShadowNodeFamily_->getAncestors(rootShadowNode);
 
-  // Absolute coordinates of the target
-  auto targetBoundingRect = getBoundingRect(targetAncestors);
-
-  if ((hasCustomRoot && rootAncestors.empty()) || targetAncestors.empty()) {
-    // If observation root or target is not a descendant of `rootShadowNode`
-    return setNotIntersectingState(
-        rootBoundingRect, targetBoundingRect, {}, time);
-  }
+  // Absolute coordinates of the root
+  auto rootBoundingRect = getRootBoundingRect(*layoutableRootShadowNode);
 
-  auto targetToRootAncestors = hasCustomRoot
-      ? targetShadowNodeFamily_->getAncestors(*getShadowNode(rootAncestors))
-      : targetAncestors;
+  // Absolute coordinates of the target
+  auto targetBoundingRect = getTargetBoundingRect(targetAncestors);
 
   auto intersectionRect = computeIntersection(
-      rootBoundingRect, targetBoundingRect, targetToRootAncestors);
+      rootBoundingRect, targetBoundingRect, targetAncestors);
 
   Float targetBoundingRectArea =
       targetBoundingRect.size.width * targetBoundingRect.size.height;

packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.h

@@ -40,7 +40,6 @@ class IntersectionObserver {
  public:
   IntersectionObserver(
       IntersectionObserverObserverId intersectionObserverId,
-      std::optional<ShadowNodeFamily::Shared> observationRootShadowNodeFamily,
       ShadowNodeFamily::Shared targetShadowNodeFamily,
       std::vector<Float> thresholds,
       std::optional<std::vector<Float>> rootThresholds = std::nullopt);
@@ -82,7 +81,6 @@ class IntersectionObserver {
       double time);
 
   IntersectionObserverObserverId intersectionObserverId_;
-  std::optional<ShadowNodeFamily::Shared> observationRootShadowNodeFamily_;
   ShadowNodeFamily::Shared targetShadowNodeFamily_;
   std::vector<Float> thresholds_;
   std::optional<std::vector<Float>> rootThresholds_;

packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp

@@ -39,8 +39,6 @@ IntersectionObserverManager::IntersectionObserverManager() = default;
 
 void IntersectionObserverManager::observe(
     IntersectionObserverObserverId intersectionObserverId,
-    const std::optional<ShadowNodeFamily::Shared>&
-        observationRootShadowNodeFamily,
     const ShadowNodeFamily::Shared& shadowNodeFamily,
     std::vector<Float> thresholds,
     std::optional<std::vector<Float>> rootThresholds,
@@ -60,7 +58,6 @@ void IntersectionObserverManager::observe(
     auto& observers = observersBySurfaceId_[surfaceId];
     observers.emplace_back(std::make_unique<IntersectionObserver>(
         intersectionObserverId,
-        observationRootShadowNodeFamily,
         shadowNodeFamily,
         std::move(thresholds),
         std::move(rootThresholds)));

packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.h

@@ -27,7 +27,6 @@ class IntersectionObserverManager final
 
   void observe(
       IntersectionObserverObserverId intersectionObserverId,
-      const std::optional<ShadowNodeFamily::Shared>& observationRootShadowNode,
       const ShadowNodeFamily::Shared& shadowNode,
       std::vector<Float> thresholds,
       std::optional<std::vector<Float>> rootThresholds,

packages/react-native/src/private/webapis/intersectionobserver/IntersectionObserver.js

@@ -23,7 +23,7 @@ export type IntersectionObserverCallback = (
 ) => mixed;
 
 export interface IntersectionObserverInit {
-  root?: ?ReactNativeElement;
+  // root?: ReactNativeElement, // This option exists on the Web but it's not currently supported in React Native.
   // rootMargin?: string, // This option exists on the Web but it's not currently supported in React Native.
   threshold?: number | $ReadOnlyArray<number>;
 
@@ -67,7 +67,6 @@ export default class IntersectionObserver {
   _observationTargets: Set<ReactNativeElement> = new Set();
   _intersectionObserverId: ?IntersectionObserverId;
   _rootThresholds: $ReadOnlyArray<number> | null;
-  _root: ReactNativeElement | null;
 
   constructor(
     callback: IntersectionObserverCallback,
@@ -86,18 +85,16 @@ export default class IntersectionObserver {
     }
 
     // $FlowExpectedError[prop-missing] it's not typed in React Native but exists on Web.
-    if (options?.rootMargin != null) {
+    if (options?.root != null) {
       throw new TypeError(
-        "Failed to construct 'IntersectionObserver': rootMargin is not supported",
+        "Failed to construct 'IntersectionObserver': root is not supported",
       );
     }
 
-    if (
-      options?.root != null &&
-      !(options?.root instanceof ReactNativeElement)
-    ) {
+    // $FlowExpectedError[prop-missing] it's not typed in React Native but exists on Web.
+    if (options?.rootMargin != null) {
       throw new TypeError(
-        "Failed to construct 'IntersectionObserver': Failed to read the 'root' property from 'IntersectionObserverInit': The provided value is not of type '(null or ReactNativeElement)",
+        "Failed to construct 'IntersectionObserver': rootMargin is not supported",
       );
     }
 
@@ -108,7 +105,6 @@ export default class IntersectionObserver {
       options?.threshold,
       this._rootThresholds != null, // only provide default if no rootThreshold
     );
-    this._root = options?.root ?? null;
   }
 
   /**
@@ -120,7 +116,7 @@ export default class IntersectionObserver {
    * NOTE: This cannot currently be configured and `root` is always `null`.
    */
   get root(): ReactNativeElement | null {
-    return this._root;
+    return null;
   }
 
   /**
@@ -187,7 +183,6 @@ export default class IntersectionObserver {
 
     const didStartObserving = IntersectionObserverManager.observe({
       intersectionObserverId: this._getOrCreateIntersectionObserverId(),
-      root: this._root,
       target,
     });