Skip to content

Fix dirtied callback firing on removed children #1890

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

Open
YonahKarp wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

Fix dirtied callback firing on removed children #1890

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
16 changes: 14 additions & 2 deletions yoga/YGNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,13 @@ void YGNodeRemoveChild(
if (owner == childOwner) {
excludedChild->setLayout({}); // layout is no longer valid
excludedChild->setOwner(nullptr);
excludedChild->setDirty(true); // invalidate cache
// Mark dirty to invalidate cache, but suppress the dirtied callback
// since the node is being detached from the tree and should not
// propagate dirty signals through external callback mechanisms.
auto dirtiedFunc = excludedChild->getDirtiedFunc();
excludedChild->setDirtiedFunc(nullptr);
excludedChild->setDirty(true);
excludedChild->setDirtiedFunc(dirtiedFunc);
}
owner->markDirtyAndPropagate();
}
Expand All @@ -199,7 +205,13 @@ void YGNodeRemoveAllChildren(const YGNodeRef ownerRef) {
yoga::Node* oldChild = owner->getChild(i);
oldChild->setLayout({}); // layout is no longer valid
oldChild->setOwner(nullptr);
oldChild->setDirty(true); // invalidate cache
// Mark dirty to invalidate cache, but suppress the dirtied callback
// since the node is being detached from the tree and should not
// propagate dirty signals through external callback mechanisms.
auto dirtiedFunc = oldChild->getDirtiedFunc();
oldChild->setDirtiedFunc(nullptr);
oldChild->setDirty(true);
oldChild->setDirtiedFunc(dirtiedFunc);
}
owner->clearChildren();
owner->markDirtyAndPropagate();
Expand Down
Loading