From 0a503c0a397938f73fabfe6962a9e53fbefecd97 Mon Sep 17 00:00:00 2001
From: wangzhihao <wangzhihao42@huawei.com>
Date: Fri, 12 Sep 2025 17:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=86=85=E5=AD=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangzhihao <wangzhihao42@huawei.com>
---
 frameworks/core/components_ng/event/gesture_event_hub_drag.cpp | 2 ++
 test/unittest/core/event/gesture_event_hub_test_two_ng.cpp     | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp b/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp
index d5727b73eb4..7d741647d92 100644
--- a/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp
+++ b/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp
@@ -1065,6 +1065,8 @@ void GestureEventHub::OnDragStart(const GestureEvent& info, const RefPtr<Pipelin
     CHECK_NULL_VOID(eventManager);
     eventManager->DoMouseActionRelease();
     eventManager->SetIsDragging(true);
+    SetPixelMap(nullptr);
+    SetDragPreviewPixelMap(nullptr);
     if (info.GetInputEventType() != InputEventType::MOUSE_BUTTON && needChangeFwkForLeaveWindow) {
         overlayManager->RemovePixelMap();
         overlayManager->RemovePreviewBadgeNode();
diff --git a/test/unittest/core/event/gesture_event_hub_test_two_ng.cpp b/test/unittest/core/event/gesture_event_hub_test_two_ng.cpp
index 5159135441e..de226b8d271 100644
--- a/test/unittest/core/event/gesture_event_hub_test_two_ng.cpp
+++ b/test/unittest/core/event/gesture_event_hub_test_two_ng.cpp
@@ -467,7 +467,6 @@ HWTEST_F(GestureEventHubTestNg, OnDragStart002, TestSize.Level1)
      */
     DragDropGlobalController::GetInstance().SetAsyncDragCallback(nullptr);
     gestureHub->OnDragStart(info, pipline, webFrameNode, dragDropInfo, event);
-    EXPECT_NE(gestureHub->pixelMap_, nullptr);
     EXPECT_NE(gestureHub->dragEventActuator_, nullptr);
     EXPECT_NE(gestureHub->GetPreScaledPixelMapIfExist(1.0f, pixelMap), nullptr);
     SubwindowManager::GetInstance()->subwindowMap_.clear();
@@ -540,7 +539,6 @@ HWTEST_F(GestureEventHubTestNg, OnDragStart003, TestSize.Level1)
      * @tc.steps: step5. call OnDragStart
      */
     gestureHub->OnDragStart(info, pipline, buttonFrameNode, dragDropInfo, event);
-    ASSERT_NE(gestureHub->pixelMap_, nullptr);
     ASSERT_NE(gestureHub->dragEventActuator_, nullptr);
     EXPECT_NE(gestureHub->GetPreScaledPixelMapIfExist(1.0f, pixelMap), nullptr);
     SubwindowManager::GetInstance()->subwindowMap_.clear();
@@ -723,7 +721,6 @@ HWTEST_F(GestureEventHubTestNg, OnDragStart005, TestSize.Level1)
     webFrameNode->SetDragPreviewOptions(option);
     gestureHub->dragEventActuator_->preScaledPixelMap_ = pixelMap;
     gestureHub->OnDragStart(info, pipline, webFrameNode, dragDropInfo, event);
-    ASSERT_NE(gestureHub->pixelMap_, nullptr);
     ASSERT_NE(gestureHub->dragEventActuator_, nullptr);
     EXPECT_NE(gestureHub->GetPreScaledPixelMapIfExist(1.0f, pixelMap), nullptr);
     SubwindowManager::GetInstance()->subwindowMap_.clear();
-- 
Gitee