From 53a6391209c58ac47eb33aede9af88da910b3eaf Mon Sep 17 00:00:00 2001
From: lancer <591320480@qq.com>
Date: Sun, 24 Apr 2022 19:53:44 +0800
Subject: [PATCH] fixed 62fda2a from
 https://gitee.com/shengu_lancer/ace_engine_lite/pulls/535 Description: fix
 bug in func RemoveChild IssueNo:
 https://gitee.com/openharmony/ace_engine_lite/issues/I54FS6 Feature or
 Bugfix: Bugfix Binary Source:No Signed-off-by: lancer <haoshuo@huawei.com>

---
 frameworks/src/core/components/component.cpp | 6 +-----
 frameworks/src/core/components/component.h   | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/frameworks/src/core/components/component.cpp b/frameworks/src/core/components/component.cpp
index 3369e25..5213ae0 100755
--- a/frameworks/src/core/components/component.cpp
+++ b/frameworks/src/core/components/component.cpp
@@ -1746,11 +1746,7 @@ void Component::RemoveChild(Component *childNode)
         return;
     }
 
-    // the head itself is the last one
-    if (temp == childHead_) {
-        childHead_ = nullptr;
-    }
-    temp->SetNextSibling(nullptr);
+    temp->SetNextSibling(childNode->GetNextSibling());
     childNode->SetNextSibling(nullptr);
     childNode->SetParent(nullptr);
     parentView->Remove(childNativeView);
diff --git a/frameworks/src/core/components/component.h b/frameworks/src/core/components/component.h
index 77c393b..820da70 100755
--- a/frameworks/src/core/components/component.h
+++ b/frameworks/src/core/components/component.h
@@ -184,17 +184,17 @@ public:
     virtual void LayoutChildren() {}
     static void BuildViewTree(Component *currComponent, Component *parent, ConstrainedParameter &parentParameter);
 
-    const Component *GetParent() const
+    Component *GetParent() const
     {
         return parent_;
     }
 
-    const Component *GetChildHead() const
+    Component *GetChildHead() const
     {
         return childHead_;
     }
 
-    const Component *GetNextSibling() const
+    Component *GetNextSibling() const
     {
         return nextSibling_;
     }