openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-03-04 23:30:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!39358 revert 'Pull Request !33419 foreach detach from main tree first'

Browse Source 
Merge pull request !39358 from lixingchi1/work_0731
This commit is contained in:
openharmony_ci 2024-07-31 13:43:39 +00:00 committed by Gitee
commit 2785b926a3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/core/components_ng/pattern/tabs/tab_content_node.cpp
View File

@ -53,6 +53,10 @@ void TabContentNode::OnDetachFromMainTree(bool recursive, PipelineContext* conte
auto deletedIdx = swiper->GetChildFlatIndex(GetId()).second;
auto currentIdx = swiperPattern->GetCurrentShownIndex();
// Removing currently shown tab, focus on first after that
if (currentIdx == deletedIdx) {
swiperPattern->GetSwiperController()->SwipeToWithoutAnimation(0);
}
TabContentModelNG::RemoveTabBarItem(Referenced::Claim(this));
// Removing tab before current, re-focus on the same tab with new index

80
frameworks/core/components_ng/syntax/for_each_node.cpp
View File

@ -83,61 +83,19 @@ void ForEachNode::CompareAndUpdateChildren()
// result of id gen function of previous render/re-render
// create a map for quicker find/search
std::unordered_set<std::string> oldIdsSet(tempIds_.begin(), tempIds_.end());
std::unordered_set<std::string> tempOldIdsSet(tempIds_.begin(), tempIds_.end());
// ForEachNode only includes children for newly created_ array items
// it does not include children of array items that were rendered on a previous
// render
std::list<RefPtr<UINode>> additionalChildComps;
auto& children = ModifyChildren();
std::swap(additionalChildComps, children);
// create map id -> Node
// old children
std::map<std::string, RefPtr<UINode>> oldNodeByIdMap;
MakeNodeMapById(tempChildren_, tempIds_, oldNodeByIdMap);
// swap new children to tempChildren, old children back to children
TraversingCheck();
std::swap(children, tempChildren_);
for (const auto& newId : ids_) {
auto oldIdIt = tempOldIdsSet.find(newId);
if (oldIdIt != tempOldIdsSet.end()) {
tempOldIdsSet.erase(oldIdIt);
}
}
for (const auto& oldId : tempOldIdsSet) {
auto iter = oldNodeByIdMap.find(oldId);
if (iter != oldNodeByIdMap.end()) {
// Remove and trigger all Detach callback.
RemoveChild(iter->second, true);
}
}
std::swap(additionalChildComps, tempChildren_);
std::swap(children, tempChildren_);
MappingChildWithId(oldIdsSet, additionalChildComps, oldNodeByIdMap);
ACE_SCOPED_TRACE("ForEachNode::Update Id[%d] preIds[%zu] newIds[%zu] tempOldIdsSet[%zu] additionalChildComps[%zu]",
GetId(), tempIds_.size(), ids_.size(), tempOldIdsSet.size(), additionalChildComps.size());
if (IsOnMainTree()) {
for (const auto& newChild : additionalChildComps) {
newChild->AttachToMainTree(false, GetContext());
}
}
tempChildren_.clear();
if (auto frameNode = GetParentFrameNode()) {
frameNode->ChildrenUpdatedFrom(0);
}
}
void ForEachNode::MappingChildWithId(std::unordered_set<std::string>& oldIdsSet,
std::list<RefPtr<UINode>>& additionalChildComps, std::map<std::string, RefPtr<UINode>>& oldNodeByIdMap)
{
int32_t additionalChildIndex = 0;
for (const auto& newId : ids_) {
auto oldIdIt = oldIdsSet.find(newId);
@ -158,8 +116,38 @@ void ForEachNode::MappingChildWithId(std::unordered_set<std::string>& oldIdsSet,
if (iter != oldNodeByIdMap.end() && iter->second) {
AddChild(iter->second, DEFAULT_NODE_SLOT, true);
}
oldIdsSet.erase(oldIdIt);
}
}
for (const auto& oldId : oldIdsSet) {
auto iter = oldNodeByIdMap.find(oldId);
if (iter != oldNodeByIdMap.end()) {
// Adding silently, so that upon removal
// node is a part the tree.
// OnDetachFromMainTree to be called while node
// still part of the tree, we need to find
// position in the tab tab for the tab.
AddChild(iter->second, DEFAULT_NODE_SLOT, true);
// Remove and trigger all Detach callback.
RemoveChild(iter->second, true);
}
}
ACE_SCOPED_TRACE("ForEachNode::Update Id[%d] preIds[%zu] newIds[%zu] oldIdsSet[%zu] additionalChildComps[%zu]",
GetId(), tempIds_.size(), ids_.size(), oldIdsSet.size(), additionalChildComps.size());
if (IsOnMainTree()) {
for (const auto& newChild : additionalChildComps) {
newChild->AttachToMainTree(false, GetContext());
}
}
tempChildren_.clear();
if (auto frameNode = GetParentFrameNode()) {
frameNode->ChildrenUpdatedFrom(0);
}
}
void ForEachNode::FlushUpdateAndMarkDirty()
@ -205,12 +193,6 @@ void ForEachNode::FinishRepeatRender(std::list<int32_t>& removedElmtId)
}
}
if (IsOnMainTree()) {
for (const auto& child : children) {
child->AttachToMainTree(false, GetContext());
}
}
tempChildren_.clear();
tempChildrenOfRepeat_.clear();

2
frameworks/core/components_ng/syntax/for_each_node.h
View File

@ -71,8 +71,6 @@ public:
RefPtr<FrameNode> GetFrameNode(int32_t index) override;
void InitDragManager(const RefPtr<UINode>& childNode);
void InitAllChildrenDragManager(bool init);
void MappingChildWithId(std::unordered_set<std::string>& oldIdsSet, std::list<RefPtr<UINode>>& additionalChildComps,
std::map<std::string, RefPtr<UINode>>& oldNodeByIdMap);
private:
std::list<std::string> ids_;