Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <cxxreact/TraceSection.h>
#include <glog/logging.h>
#include <react/renderer/core/LayoutableShadowNode.h>
#include <react/renderer/uimanager/consistency/ShadowTreeRevisionProvider.h>
#include <react/utils/OnScopeExit.h>
#include <algorithm>
#include <unordered_set>
Expand Down Expand Up @@ -130,7 +131,7 @@ void ResizeObserverManager::connect(

runtimeScheduler.setResizeObserverDelegate(this);
uiManager.registerCommitHook(*this);
shadowTreeRegistry_ = &uiManager.getShadowTreeRegistry();
shadowTreeRevisionProvider_ = uiManager.getShadowTreeRevisionProvider();
commitHookRegistered_ = true;
}

Expand All @@ -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
Expand Down Expand Up @@ -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<const RootShadowNode>();
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <jsi/jsi.h>
#include <react/renderer/core/ShadowNodeFamily.h>
#include <react/renderer/mounting/ShadowTree.h>
#include <react/renderer/mounting/ShadowTreeRegistry.h>
#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
#include <react/renderer/runtimescheduler/RuntimeSchedulerResizeObserverDelegate.h>
#include <react/renderer/uimanager/UIManager.h>
Expand All @@ -29,6 +28,8 @@

namespace facebook::react {

class ShadowTreeRevisionProvider;

class ResizeObserverManager final : public UIManagerCommitHook, public RuntimeSchedulerResizeObserverDelegate {
public:
ResizeObserverManager();
Expand Down Expand Up @@ -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<ResizeObserverEntry> pendingEntries_;
mutable std::mutex pendingEntriesMutex_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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<ResizeObserverType>;
Expand Down Expand Up @@ -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(
<View
style={{width: 100, height: 50}}
ref={node => {
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<HostInstance>();
const sizes: Array<[number, number]> = [];
component Box(width: number) {
useLayoutEffect(() => {
const node = nullthrows(nodeRef.current);
observer.observe(node);
return () => observer.unobserve(node);
}, []);
return <View ref={nodeRef} style={{width, height: 50}} />;
}
Fantom.runTask(() => {
observer = new ResizeObserver(entries => {
const entry = entries[0];
sizes.push([
entry.contentRect.width,
entry.target.getBoundingClientRect().width,
]);
});
root.render(<Box width={100} />);
});
expect(sizes).toEqual([[100, 100]]);
Fantom.runTask(() => root.render(<Box width={200} />));
expect(sizes).toEqual([
[100, 100],
[200, 200],
]);
});

it('should deliver observations before a task scheduled from the same tick', () => {
const nodeRef = createRef<HostInstance>();
const root = Fantom.createRoot();
Expand Down
Loading