diff --git a/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.cpp b/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.cpp index a6b05188a73b..3f1d9a4b5263 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -130,7 +131,7 @@ void ResizeObserverManager::connect( runtimeScheduler.setResizeObserverDelegate(this); uiManager.registerCommitHook(*this); - shadowTreeRegistry_ = &uiManager.getShadowTreeRegistry(); + shadowTreeRevisionProvider_ = uiManager.getShadowTreeRevisionProvider(); commitHookRegistered_ = true; } @@ -146,7 +147,7 @@ void ResizeObserverManager::disconnect( runtimeScheduler.setResizeObserverDelegate(nullptr); uiManager.unregisterCommitHook(*this); - shadowTreeRegistry_ = nullptr; + shadowTreeRevisionProvider_ = nullptr; // May run from inside `broadcastActiveResizeObservations` (a callback can // disconnect the last observer), which copies the callable before invoking @@ -316,15 +317,13 @@ ResizeObserverManager::gatherActiveResizeObservations(size_t depth) { GatherResult gatherResult; // Null once `disconnect` ran; nothing left to observe against. - if (candidateSurfaceIds.empty() || shadowTreeRegistry_ == nullptr) { + if (candidateSurfaceIds.empty() || shadowTreeRevisionProvider_ == nullptr) { return gatherResult; } for (auto surfaceId : candidateSurfaceIds) { - auto rootShadowNode = std::shared_ptr(); - shadowTreeRegistry_->visit(surfaceId, [&](const auto& shadowTree) { - rootShadowNode = shadowTree.getCurrentRevision().rootShadowNode; - }); + auto rootShadowNode = + shadowTreeRevisionProvider_->getCurrentRevision(surfaceId); if (rootShadowNode == nullptr) { // The surface was stopped, so its families are dead and can never report diff --git a/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.h b/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.h index 58c6fbf3438f..b811b2e2a12b 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.h +++ b/packages/react-native/ReactCommon/react/renderer/observers/resize/ResizeObserverManager.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -29,6 +28,8 @@ namespace facebook::react { +class ShadowTreeRevisionProvider; + class ResizeObserverManager final : public UIManagerCommitHook, public RuntimeSchedulerResizeObserverDelegate { public: ResizeObserverManager(); @@ -123,7 +124,7 @@ class ResizeObserverManager final : public UIManagerCommitHook, public RuntimeSc // tick, so it is safe to retain it as a raw pointer. // We need to retain it here because the RuntimeScheduler does not provide // it when calling `runResizeObservations`. - const ShadowTreeRegistry *shadowTreeRegistry_{nullptr}; + ShadowTreeRevisionProvider *shadowTreeRevisionProvider_{nullptr}; mutable std::vector pendingEntries_; mutable std::mutex pendingEntriesMutex_; diff --git a/packages/react-native/src/private/webapis/resizeobserver/__tests__/ResizeObserver-itest.js b/packages/react-native/src/private/webapis/resizeobserver/__tests__/ResizeObserver-itest.js index edb667d73ec1..28a47fac37c8 100644 --- a/packages/react-native/src/private/webapis/resizeobserver/__tests__/ResizeObserver-itest.js +++ b/packages/react-native/src/private/webapis/resizeobserver/__tests__/ResizeObserver-itest.js @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @fantom_flags enableResizeObserverByDefault:true + * @fantom_flags enableResizeObserverByDefault:true enableFabricCommitBranching:* * @flow strict-local * @format */ @@ -20,7 +20,7 @@ import {createShadowNodeReferenceCountingRef} from '../../../__tests__/utilities import * as Fantom from '@react-native/fantom'; import nullthrows from 'nullthrows'; import * as React from 'react'; -import {createRef} from 'react'; +import {createRef, useLayoutEffect} from 'react'; import {View} from 'react-native'; declare const ResizeObserver: Class; @@ -1562,6 +1562,61 @@ describe('ResizeObserver', () => { }); describe('delivery timing', () => { + it('should report the committed size when observing from a ref callback', () => { + const root = Fantom.createRoot(); + const sizes: Array<[number, number]> = []; + Fantom.runTask(() => { + observer = new ResizeObserver(entries => { + const entry = entries[0]; + sizes.push([ + entry.contentRect.width, + entry.target.getBoundingClientRect().width, + ]); + }); + root.render( + { + if (node != null) { + observer.observe(node); + } + }} + />, + ); + }); + expect(sizes).toEqual([[100, 100]]); + }); + + it('should report the committed size when observing from a layout effect', () => { + const root = Fantom.createRoot(); + const nodeRef = createRef(); + const sizes: Array<[number, number]> = []; + component Box(width: number) { + useLayoutEffect(() => { + const node = nullthrows(nodeRef.current); + observer.observe(node); + return () => observer.unobserve(node); + }, []); + return ; + } + Fantom.runTask(() => { + observer = new ResizeObserver(entries => { + const entry = entries[0]; + sizes.push([ + entry.contentRect.width, + entry.target.getBoundingClientRect().width, + ]); + }); + root.render(); + }); + expect(sizes).toEqual([[100, 100]]); + Fantom.runTask(() => root.render()); + expect(sizes).toEqual([ + [100, 100], + [200, 200], + ]); + }); + it('should deliver observations before a task scheduled from the same tick', () => { const nodeRef = createRef(); const root = Fantom.createRoot();