Skip to content

Optimize Shadow Tree cloning #6214

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

Merged
bartlomiejbloniarz merged 16 commits into from
Jul 29, 2024
Merged

Optimize Shadow Tree cloning #6214

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
774213f
Update cloning
bartlomiejbloniarz Jul 4, 2024
ecfd0a2
Change indices set to vector
bartlomiejbloniarz Jul 4, 2024
71c93ac
Run formatting
bartlomiejbloniarz Jul 4, 2024
7c4b194
Use using
bartlomiejbloniarz Jul 5, 2024
4439da8
Use unique_ptr
bartlomiejbloniarz Jul 5, 2024
94babdd
Use const wherever possible
bartlomiejbloniarz Jul 8, 2024
2c24875
Run format
bartlomiejbloniarz Jul 8, 2024
326e8ed
Merge branch 'main' into @bartlomiejbloniarz/improve-shadow-tree-cloning
bartlomiejbloniarz Jul 17, 2024
59145d8
Add PropsWrapper
bartlomiejbloniarz Jul 17, 2024
f09a4b3
Format
bartlomiejbloniarz Jul 17, 2024
416a620
Use template
bartlomiejbloniarz Jul 18, 2024
1604889
Undo template and fix RawProps reusing
bartlomiejbloniarz Jul 18, 2024
272782b
Format
bartlomiejbloniarz Jul 18, 2024
d58ddfc
Remove PropsWrapper.h
bartlomiejbloniarz Jul 22, 2024
a8e7ff0
Restore surfaceId assert
bartlomiejbloniarz Jul 22, 2024
f6ee24d
Reformat ShadowTreeCloner
bartlomiejbloniarz Jul 22, 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
2 changes: 1 addition & 1 deletion packages/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitHook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RootShadowNode::Unshared ReanimatedCommitHook::shadowTreeWillCommit(
// ShadowTree not commited by Reanimated, apply updates from PropsRegistry

auto rootNode = newRootShadowNode->ShadowNode::clone(ShadowNodeFragment{});
PropsMap propsMap;
PropsMap<FollyDynamicPropsWrapper> propsMap;

{
auto lock = propsRegistry_->createLock();
Expand Down
14 changes: 12 additions & 2 deletions packages/react-native-reanimated/Common/cpp/Fabric/ShadowTreeCloner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

namespace reanimated {

template<Derived T>
ShadowNode::Unshared cloneShadowTreeWithNewPropsRecursive(
const ChildrenMap &childrenMap,
const ShadowNode::Shared &shadowNode,
const PropsMap &propsMap) {
const PropsMap<T> &propsMap) {
const auto family = &shadowNode->getFamily();
const auto affectedChildrenIt = childrenMap.find(family);
const auto propsIt = propsMap.find(family);
Expand Down Expand Up @@ -42,9 +43,10 @@ ShadowNode::Unshared cloneShadowTreeWithNewPropsRecursive(
return result;
}

template<Derived T>
ShadowNode::Unshared cloneShadowTreeWithNewProps(
const ShadowNode::Shared &oldRootNode,
const PropsMap &propsMap) {
const PropsMap<T> &propsMap) {
ChildrenMap childrenMap;

for (auto &[family, _] : propsMap) {
Expand All @@ -68,6 +70,14 @@ ShadowNode::Unshared cloneShadowTreeWithNewProps(
childrenMap, oldRootNode, propsMap);
}

template ShadowNode::Unshared cloneShadowTreeWithNewProps(
const ShadowNode::Shared &oldRootNode,
const PropsMap<JsiValuePropsWrapper> &propsMap);

template ShadowNode::Unshared cloneShadowTreeWithNewProps(
const ShadowNode::Shared &oldRootNode,
const PropsMap<FollyDynamicPropsWrapper> &propsMap);

} // namespace reanimated

#endif // RCT_NEW_ARCH_ENABLED
11 changes: 9 additions & 2 deletions packages/react-native-reanimated/Common/cpp/Fabric/ShadowTreeCloner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/uimanager/UIManager.h>

#include <type_traits>
#include <memory>
#include <unordered_map>
#include <vector>
Expand All @@ -15,12 +16,18 @@ using namespace react;

namespace reanimated {

using PropsMap = std::unordered_map<const ShadowNodeFamily *, std::vector<std::unique_ptr<PropsWrapper>>>;
template<class T>
concept Derived = std::is_base_of_v<PropsWrapper, T>;

template<Derived T>
using PropsMap = std::unordered_map<const ShadowNodeFamily *, std::vector<std::unique_ptr<T>>>;
Comment thread
bartlomiejbloniarz marked this conversation as resolved.
Outdated

using ChildrenMap = std::unordered_map<const ShadowNodeFamily *, std::vector<int>>;

template<Derived T>
ShadowNode::Unshared cloneShadowTreeWithNewProps(
const ShadowNode::Shared &oldRootNode,
const PropsMap &propsMap);
const PropsMap<T> &propsMap);

} // namespace reanimated

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-reanimated/Common/cpp/NativeModules/NativeReanimatedModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ void NativeReanimatedModule::performOperations() {
shadowTree.commit(
[&](RootShadowNode const &oldRootShadowNode)
-> RootShadowNode::Unshared {
PropsMap propsMap;
PropsMap<JsiValuePropsWrapper> propsMap;
auto rootNode =
oldRootShadowNode.ShadowNode::clone(ShadowNodeFragment{});
for (auto &[shadowNode, props] : copiedOperationsQueue) {
Expand Down