diff --git a/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp b/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp index abd3edee5f86ba24ea20f2a08ec7701e1f7aab25..ab19c50b5a1bb1190d533b85bc1060c7dc77d7e7 100644 --- a/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp +++ b/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp @@ -43,7 +43,6 @@ #include "core/components_ng/pattern/menu/menu_layout_property.h" #include "core/components_ng/pattern/menu/menu_pattern.h" #include "core/components_ng/pattern/menu/wrapper/menu_wrapper_pattern.h" -#include "core/components_ng/pattern/navrouter/navdestination_group_node.h" #include "core/components_ng/pattern/overlay/keyboard_base_pattern.h" #include "core/components_ng/pattern/overlay/keyboard_view.h" #include "core/components_ng/pattern/overlay/modal_presentation_pattern.h" @@ -1088,18 +1087,6 @@ bool OverlayManager::RemoveOverlay(bool isBackPressed, bool isPageRouter) if (InstanceOf(pattern)) { return RemoveMenu(overlay); } - do { - auto pipeline = PipelineContext::GetCurrentContext(); - CHECK_NULL_BREAK(pipeline); - auto navDestination = AceType::DynamicCast( - pipeline->FindNavDestinationNodeToHandleBack(overlay)); - CHECK_NULL_BREAK(navDestination); - auto backCallback = navDestination->GetNavDestinationBackButtonEvent(); - CHECK_NULL_BREAK(backCallback); - GestureEvent gestureEvent; - backCallback(gestureEvent); - return true; - } while(0); if (!modalStack_.empty()) { if (isPageRouter) { return RemoveAllModalInOverlay(); diff --git a/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp b/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp index 5033b3a8df0282f06e788046a11c96a8c5dba6ef..a5cc834972fad60c7c106fb0498db9e9f4dbe719 100644 --- a/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp +++ b/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp @@ -434,9 +434,4 @@ void PipelineBase::SetTextFieldManager(const RefPtr& manager) { textFieldManager_ = manager; } - -RefPtr NG::PipelineContext::FindNavDestinationNodeToHandleBack(const RefPtr& node) -{ - return nullptr; -} } // namespace OHOS::Ace