From ec5e3e4164549e8aabb565fc107a241ebcf2eace Mon Sep 17 00:00:00 2001
From: yangfan229 <yangfan229@huawei.com>
Date: Tue, 24 Jun 2025 22:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=94=BBundefined=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=85=9C=E5=BA=95=E4=BF=9D=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangfan229 <yangfan229@huawei.com>
Change-Id: Ieb4e88c69b6f502f4a905fd8c919e874186bd938
---
 .../view_context/view_context_model_ng.cpp       | 16 ++++++++++++++++
 .../pattern/view_context/view_context_model_ng.h |  5 +++++
 frameworks/core/pipeline/pipeline_base.h         |  5 +++++
 3 files changed, 26 insertions(+)

diff --git a/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.cpp b/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.cpp
index 1c259e38697..0ea94bf61b0 100644
--- a/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.cpp
+++ b/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.cpp
@@ -19,6 +19,8 @@
 #include "core/pipeline_ng/pipeline_context.h"
 
 namespace OHOS::Ace::NG {
+thread_local std::set<FrameNode*> ViewContextModelNG::pendingAnimationNodes_;
+
 void ViewContextModelNG::closeAnimation(const AnimationOption& option, bool needFlush)
 {
     NG::ViewStackProcessor::GetInstance()->SetImplicitAnimationOption(option);
@@ -29,7 +31,19 @@ void ViewContextModelNG::closeAnimation(const AnimationOption& option, bool need
     CHECK_NULL_VOID(container);
     auto pipelineContext = AceType::DynamicCast<PipelineContext>(container->GetPipelineContext());
     CHECK_NULL_VOID(pipelineContext);
+    auto frameNode = NG::ViewStackProcessor::GetInstance()->GetMainFrameNode();
+    if (!pipelineContext->HasPendingAnimation()) {
+        if (pendingAnimationNodes_.find(frameNode) != pendingAnimationNodes_.end()) {
+            ACE_SCOPED_TRACE("Close current nested animation");
+            TAG_LOGW(AceLogTag::ACE_ANIMATION, "Animation nested. Try to close current animation.");
+            AnimationUtils::CloseImplicitAnimation();
+            pendingAnimationNodes_.erase(frameNode);
+        }
+    }
     pipelineContext->CloseFrontendAnimation();
+    if (pendingAnimationNodes_.find(frameNode) != pendingAnimationNodes_.end()) {
+        pendingAnimationNodes_.erase(frameNode);
+    }
 }
 
 void ViewContextModelNG::openAnimation(const AnimationOption& option)
@@ -41,7 +55,9 @@ void ViewContextModelNG::openAnimation(const AnimationOption& option)
     CHECK_NULL_VOID(container);
     auto pipelineContext = AceType::DynamicCast<PipelineContext>(container->GetPipelineContext());
     CHECK_NULL_VOID(pipelineContext);
+    auto frameNode = NG::ViewStackProcessor::GetInstance()->GetMainFrameNode();
     pipelineContext->OpenFrontendAnimation(option, option.GetCurve(), option.GetOnFinishEvent());
+    pendingAnimationNodes_.emplace(frameNode);
     bool isDirtyLayoutNodesEmpty = pipelineContext->IsDirtyLayoutNodesEmpty();
     bool isDirtyPropertyNodesEmpty = pipelineContext->IsDirtyPropertyNodesEmpty();
     if (option.GetIteration() == ANIMATION_REPEAT_INFINITE && !pipelineContext->IsLayouting()
diff --git a/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.h b/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.h
index c8fdfec28a5..13c37a63fb0 100644
--- a/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.h
+++ b/frameworks/core/components_ng/pattern/view_context/view_context_model_ng.h
@@ -16,6 +16,8 @@
 #ifndef FOUNDATION_ACE_FRAMEWORKS_CORE_COMPONENTS_NG_PATTERN_FORM_FORM_MODEL_NG_H
 #define FOUNDATION_ACE_FRAMEWORKS_CORE_COMPONENTS_NG_PATTERN_FORM_FORM_MODEL_NG_H
 
+#include <set>
+
 #include "core/components_ng/pattern/overlay/overlay_manager.h"
 #include "core/components_ng/pattern/view_context/view_context_model.h"
 
@@ -36,6 +38,9 @@ public:
         const RefPtr<NG::FrameNode>& sheetContentNode, const NG::SheetStyle& sheetStyle, bool isPartialUpdate,
         int32_t currentInstanceId) override;
     int32_t CloseBindSheet(const RefPtr<NG::FrameNode>& sheetContentNode, int32_t currentInstanceId) override;
+
+private:
+    static thread_local std::set<FrameNode*> pendingAnimationNodes_;
 };
 } // namespace OHOS::Ace::NG
 #endif // FOUNDATION_ACE_FRAMEWORKS_CORE_COMPONENTS_NG_PATTERN_FORM_FORM_MODEL_NG_H
diff --git a/frameworks/core/pipeline/pipeline_base.h b/frameworks/core/pipeline/pipeline_base.h
index 238974859ac..25491ebde48 100644
--- a/frameworks/core/pipeline/pipeline_base.h
+++ b/frameworks/core/pipeline/pipeline_base.h
@@ -164,6 +164,11 @@ public:
     void StartImplicitAnimation(const AnimationOption& operation, const RefPtr<Curve>& curve,
         const std::function<void()>& finishCallback = nullptr, const std::optional<int32_t>& count = std::nullopt);
 
+    bool HasPendingAnimation() const
+    {
+        return !pendingFrontendAnimation_.empty();
+    }
+
     void PrepareCloseImplicitAnimation();
 
     bool CloseImplicitAnimation();
-- 
Gitee