Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lazy initalize layout aniamtions in the Commit Hook #6586

Merged
merged 4 commits into from
Oct 10, 2024
Merged

Lazy initalize layout aniamtions in the Commit Hook #6586

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecf6b18
Lazy initalize layout aniamtions in Commit Hook
bartlomiejbloniarz Oct 10, 2024
c05f863
Switch to currentMaxSurfaceId
bartlomiejbloniarz Oct 10, 2024
148a2ab
forgor
bartlomiejbloniarz Oct 10, 2024
65d952e
Update packages/react-native-reanimated/Common/cpp/reanimated/Fabric/…
bartlomiejbloniarz Oct 10, 2024
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
21 changes: 19 additions & 2 deletions packages/react-native-reanimated/Common/cpp/reanimated/Fabric/ReanimatedCommitHook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ namespace reanimated {

ReanimatedCommitHook::ReanimatedCommitHook(
const std::shared_ptr<PropsRegistry> &propsRegistry,
const std::shared_ptr<UIManager> &uiManager)
: propsRegistry_(propsRegistry), uiManager_(uiManager) {
const std::shared_ptr<UIManager> &uiManager,
const std::shared_ptr<LayoutAnimationsProxy> &layoutAnimationsProxy)
: propsRegistry_(propsRegistry),
uiManager_(uiManager),
layoutAnimationsProxy_(layoutAnimationsProxy) {
uiManager_->registerCommitHook(*this);
}

Expand All @@ -28,6 +31,20 @@ RootShadowNode::Unshared ReanimatedCommitHook::shadowTreeWillCommit(
ShadowTree const &,
RootShadowNode::Shared const &,
RootShadowNode::Unshared const &newRootShadowNode) noexcept {
auto surfaceId = newRootShadowNode->getSurfaceId();

{
auto lock = std::unique_lock<std::mutex>(mutex_);
if (surfaceId > currentMaxSurfaceId_) {
uiManager_->getShadowTreeRegistry().enumerate(
[this](const ShadowTree &shadowTree, bool &stop) {
shadowTree.getMountingCoordinator()->setMountingOverrideDelegate(
layoutAnimationsProxy_);
});
currentMaxSurfaceId_ = surfaceId;
}
}

auto reaShadowNode =
std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
newRootShadowNode);
Expand Down
10 changes: 9 additions & 1 deletion packages/react-native-reanimated/Common/cpp/reanimated/Fabric/ReanimatedCommitHook.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#ifdef RCT_NEW_ARCH_ENABLED

#include <reanimated/Fabric/PropsRegistry.h>
#include <reanimated/LayoutAnimations/LayoutAnimationsProxy.h>

#include <react/renderer/uimanager/UIManagerCommitHook.h>

Expand All @@ -15,7 +16,8 @@ class ReanimatedCommitHook : public UIManagerCommitHook {
public:
ReanimatedCommitHook(
const std::shared_ptr<PropsRegistry> &propsRegistry,
const std::shared_ptr<UIManager> &uiManager);
const std::shared_ptr<UIManager> &uiManager,
const std::shared_ptr<LayoutAnimationsProxy> &layoutAnimationsProxy);

~ReanimatedCommitHook() noexcept override;

Expand Down Expand Up @@ -44,6 +46,12 @@ class ReanimatedCommitHook : public UIManagerCommitHook {
std::shared_ptr<PropsRegistry> propsRegistry_;

std::shared_ptr<UIManager> uiManager_;

std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy_;

SurfaceId currentMaxSurfaceId_ = -1;

std::mutex mutex_;
bartlomiejbloniarz marked this conversation as resolved.
Show resolved Hide resolved
};

} // namespace reanimated
Expand Down
14 changes: 5 additions & 9 deletions ...es/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,15 +852,15 @@ void NativeReanimatedModule::initializeFabric(
const std::shared_ptr<UIManager> &uiManager) {
uiManager_ = uiManager;

initializeLayoutAnimations();
initializeLayoutAnimationsProxy();

mountHook_ =
std::make_shared<ReanimatedMountHook>(propsRegistry_, uiManager_);
commitHook_ =
std::make_shared<ReanimatedCommitHook>(propsRegistry_, uiManager_);
commitHook_ = std::make_shared<ReanimatedCommitHook>(
propsRegistry_, uiManager_, layoutAnimationsProxy_);
}

void NativeReanimatedModule::initializeLayoutAnimations() {
void NativeReanimatedModule::initializeLayoutAnimationsProxy() {
uiManager_->setAnimationDelegate(nullptr);
auto scheduler = reinterpret_cast<Scheduler *>(uiManager_->getDelegate());
auto componentDescriptorRegistry =
Expand All @@ -876,13 +876,9 @@ void NativeReanimatedModule::initializeLayoutAnimations() {
scheduler->getContextContainer(),
uiWorkletRuntime_->getJSIRuntime(),
uiScheduler_);
uiManager_->getShadowTreeRegistry().enumerate(
[this](const ShadowTree &shadowTree, bool &stop) {
shadowTree.getMountingCoordinator()->setMountingOverrideDelegate(
layoutAnimationsProxy_);
});
}
}

#endif // RCT_NEW_ARCH_ENABLED

jsi::Value NativeReanimatedModule::subscribeForKeyboardEvents(
Expand Down
2 changes: 1 addition & 1 deletion ...ages/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {

void initializeFabric(const std::shared_ptr<UIManager> &uiManager);

void initializeLayoutAnimations();
void initializeLayoutAnimationsProxy();

std::string obtainPropFromShadowNode(
jsi::Runtime &rt,
Expand Down
Loading