Skip to content

Avoid shared_mutex re-entrancy for setNativeProps_DEPRECATED #43777

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

Closed
rozele wants to merge 1 commit into from
Closed

Avoid shared_mutex re-entrancy for setNativeProps_DEPRECATED #43777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,12 @@ ShadowNode::Shared UIManager::getNewestCloneOfShadowNode(
shadowNode.getSurfaceId(), [&](const ShadowTree& shadowTree) {
ancestorShadowNode = shadowTree.getCurrentRevision().rootShadowNode;
});
return getNewestCloneOfShadowNodeFromAncestor(shadowNode, ancestorShadowNode);
}

ShadowNode::Shared UIManager::getNewestCloneOfShadowNodeFromAncestor(
const ShadowNode& shadowNode,
const ShadowNode::Shared& ancestorShadowNode) const {
if (!ancestorShadowNode) {
return nullptr;
}
Expand Down Expand Up @@ -427,6 +432,8 @@ void UIManager::setNativeProps_DEPRECATED(
family.getSurfaceId(), [&](const ShadowTree& shadowTree) {
// The lambda passed to `commit` may be executed multiple times.
// We need to create fresh copy of the `RawProps` object each time.
auto ancestorShadowNode =
shadowTree.getCurrentRevision().rootShadowNode;
shadowTree.commit(
[&](RootShadowNode const& oldRootShadowNode) {
auto rootNode = oldRootShadowNode.cloneTree(
Expand All @@ -438,7 +445,9 @@ void UIManager::setNativeProps_DEPRECATED(
family.getSurfaceId(), *contextContainer_.get()};
auto props = componentDescriptor.cloneProps(
propsParserContext,
getNewestCloneOfShadowNode(*shadowNode)->getProps(),
getNewestCloneOfShadowNodeFromAncestor(
*shadowNode, ancestorShadowNode)
->getProps(),
RawProps(rawProps));

return oldShadowNode.clone({/* .props = */ props});
Expand Down
4 changes: 4 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@ class UIManager final : public ShadowTreeDelegate {
const jsi::Value& successCallback,
const jsi::Value& failureCallback) const;

ShadowNode::Shared getNewestCloneOfShadowNodeFromAncestor(
const ShadowNode& shadowNode,
const ShadowNode::Shared& ancestorShadowNode) const;

SharedComponentDescriptorRegistry componentDescriptorRegistry_;
UIManagerDelegate* delegate_{};
UIManagerAnimationDelegate* animationDelegate_{nullptr};
Expand Down