From 3f458e6c025b8d8da1a796e519b62e3fd5aa1221 Mon Sep 17 00:00:00 2001
From: hct95 <hct95@noreply.gitcode.com>
Date: Sat, 13 Sep 2025 17:34:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DpostInputEvent=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=B7=B3=E5=8D=95600?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hct95 <hechentao@huawei.com>
---
 frameworks/core/common/event_manager.cpp      |  5 ++-
 .../manager/post_event/post_event_manager.cpp |  6 +++-
 .../manager/post_event_manager_test_ng.cpp    | 33 +++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/frameworks/core/common/event_manager.cpp b/frameworks/core/common/event_manager.cpp
index 68b59d87ce6..6506b38fb6a 100644
--- a/frameworks/core/common/event_manager.cpp
+++ b/frameworks/core/common/event_manager.cpp
@@ -1050,6 +1050,7 @@ void EventManager::CleanHoverStatusForDragBegin()
     if (!AceApplicationInfo::GetInstance().GreatOrEqualTargetAPIVersion(PlatformVersion::VERSION_TWELVE)) {
         return;
     }
+    isDragCancelPending_ = true;
     TAG_LOGD(AceLogTag::ACE_DRAG, "Clean mouse status for drag begin.");
     MouseEvent falsifyEvent = lastMouseEvent_;
     TouchTestResult testResult;
@@ -1063,6 +1064,7 @@ void EventManager::CleanHoverStatusForDragBegin()
     }
     mouseTestResults_.clear();
     pressMouseTestResultsMap_[{ lastMouseEvent_.id, lastMouseEvent_.button }].clear();
+    isDragCancelPending_ = false;
 }
 
 void EventManager::RegisterDragTouchEventListener(
@@ -1623,7 +1625,8 @@ bool EventManager::DispatchMouseEventInLessAPI13(const MouseEvent& event)
 void EventManager::DispatchMouseEventToPressResults(const MouseEvent& event, const MouseTestResult& targetResults,
     MouseTestResult& handledResults, bool& isStopPropagation)
 {
-    for (const auto& mouseTarget : targetResults) {
+    auto targetPressResults = targetResults;
+    for (const auto& mouseTarget : targetPressResults) {
         if (!mouseTarget) {
             continue;
         }
diff --git a/frameworks/core/components_ng/manager/post_event/post_event_manager.cpp b/frameworks/core/components_ng/manager/post_event/post_event_manager.cpp
index 61e2fd7925c..d5122a00b53 100644
--- a/frameworks/core/components_ng/manager/post_event/post_event_manager.cpp
+++ b/frameworks/core/components_ng/manager/post_event/post_event_manager.cpp
@@ -101,7 +101,11 @@ bool PostEventManager::PostMouseEvent(const RefPtr<NG::UINode>& uiNode, MouseEve
     CHECK_NULL_RETURN(pipelineContext, false);
     mouseEvent.passThrough = true;
     passThroughResult_ = false;
-    pipelineContext->OnMouseEvent(mouseEvent, frameNode);
+    auto eventManager = pipelineContext->GetEventManager();
+    CHECK_NULL_RETURN(eventManager, false);
+    if (!eventManager->IsDragCancelPending()) {
+        pipelineContext->OnMouseEvent(mouseEvent, frameNode);
+    }
     mouseEvent.passThrough = false;
     targetNode_.Reset();
     return passThroughResult_;
diff --git a/test/unittest/core/manager/post_event_manager_test_ng.cpp b/test/unittest/core/manager/post_event_manager_test_ng.cpp
index e3c8f747307..52d34d0965c 100644
--- a/test/unittest/core/manager/post_event_manager_test_ng.cpp
+++ b/test/unittest/core/manager/post_event_manager_test_ng.cpp
@@ -1112,4 +1112,37 @@ HWTEST_F(PostEventManagerTestNg, ClearPostInputActionsTest001, TestSize.Level1)
     postEventManager_->ClearPostInputActions(UInode, touchUpEvent.id);
     EXPECT_TRUE(postEventManager_->postInputEventAction_.empty());
 }
+
+/**
+ * @tc.name: PostMouseEventTest002
+ * @tc.desc: test PostMouseEvent func.
+ * @tc.type: FUNC
+ */
+HWTEST_F(PostEventManagerTestNg, PostMouseEventTest002, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1. construct a FrameNode and set gesture.
+     */
+    Init();
+
+    /**
+     * @tc.steps: step2. test PostMouseEvent.
+     */
+    auto frameNode = AceType::MakeRefPtr<FrameNode>(ROOT_TAG, -1, AceType::MakeRefPtr<Pattern>(), true);
+    auto uiNode = AceType::DynamicCast<NG::UINode>(frameNode);
+    MouseEvent mouseEvent;
+    mouseEvent.touchEventId = 1;
+    auto pipelineContext = PipelineContext::GetCurrentContextSafelyWithCheck();
+    ASSERT_NE(pipelineContext, nullptr);
+    pipelineContext->eventManager_ = AceType::MakeRefPtr<EventManager>();
+    ASSERT_NE(pipelineContext->eventManager_, nullptr);
+    pipelineContext->eventManager_->isDragCancelPending_ = false;
+    postEventManager_->passThroughResult_ = true;
+    postEventManager_->PostMouseEvent(uiNode, std::move(mouseEvent));
+    pipelineContext->eventManager_->isDragCancelPending_ = true;
+    MouseEvent mouseEventEx;
+    mouseEventEx.touchEventId = 2;
+    postEventManager_->PostMouseEvent(uiNode, std::move(mouseEventEx));
+    EXPECT_FALSE(postEventManager_->passThroughResult_);
+}
 } // namespace OHOS::Ace::NG
-- 
Gitee