From fa3578083a57b300cf6e7be78f6ec30b2a43a28c Mon Sep 17 00:00:00 2001 From: yihao_lin Date: Thu, 24 Jul 2025 14:34:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=B5=E5=85=A5=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yihao_lin Change-Id: I301b8e431148b563e322e93a4b4c5a3bfe28f30a --- .../core/components_ng/event/focus_hub.cpp | 34 +++---------------- .../core/components_ng/event/focus_hub.h | 14 ++------ 2 files changed, 7 insertions(+), 41 deletions(-) diff --git a/frameworks/core/components_ng/event/focus_hub.cpp b/frameworks/core/components_ng/event/focus_hub.cpp index 248ef810688..6b85d61aacd 100644 --- a/frameworks/core/components_ng/event/focus_hub.cpp +++ b/frameworks/core/components_ng/event/focus_hub.cpp @@ -16,7 +16,6 @@ #include "core/components_ng/event/focus_hub.h" #include "base/log/dump_log.h" -#include "base/utils/multi_thread.h" #include "core/components/theme/app_theme.h" #include "core/components_ng/pattern/scrollable/scrollable_pattern.h" #include "core/components_ng/pattern/scrollable/scrollable_utils.h" @@ -35,7 +34,6 @@ namespace OHOS::Ace::NG { constexpr uint32_t DELAY_TIME_FOR_RESET_UEC = 50; -constexpr auto DEFAULT_FOCUS_PRIORITY = FocusPriority::AUTO; namespace { template bool AnyOfUINode(const RefPtr& node, const std::function&)>& operation) @@ -506,12 +504,11 @@ void FocusHub::LostSelfFocus() void FocusHub::RemoveSelf(BlurReason reason) { - auto frameNode = GetFrameNode(); - FREE_NODE_CHECK(frameNode, RemoveSelf, reason); if (SystemProperties::GetDebugEnabled()) { TAG_LOGD(AceLogTag::ACE_FOCUS, "%{public}s/" SEC_PLD(%{public}d) " remove self focus.", GetFrameName().c_str(), SEC_PARAM(GetFrameId())); } + auto frameNode = GetFrameNode(); CHECK_NULL_VOID(frameNode); auto focusView = frameNode->GetPattern(); auto* pipeline = frameNode->GetContext(); @@ -2699,15 +2696,6 @@ bool FocusHub::IsNestingFocusGroup() return false; } -std::string FocusHub::FocusPriorityToString(FocusPriority src) -{ - switch (src) { - case FocusPriority::PREVIOUS : return "FocusPriority.PREVIOUS"; - case FocusPriority::PRIOR : return "FocusPriority.PRIOR"; - default: return "FocusPriority.AUTO"; - } -} - void FocusHub::ToJsonValue( const RefPtr& hub, std::unique_ptr& json, const InspectorFilter& filter) { @@ -2726,14 +2714,10 @@ void FocusHub::ToJsonValue( } bool enabled = true; - bool defaultFocus = DEFAULT_FOCUS_DEFAULT_FOCUS; - bool groupDefaultFocus = DEFAULT_FOCUS_IS_GROUP_DEFAULT; - bool focusOnTouch = DEFAULT_FOCUS_ON_TOUCH; - int32_t tabIndex = DEFAULT_FOCUS_TAB_INDEX; - std::string focusScopeId = ""; - bool isGroup = DEFAULT_FOCUS_IS_GROUP; - bool arrowKeyStepOut = DEFAULT_FOCUS_ARROW_KEY_STEP_OUT; - std::string focusPriority = FocusPriorityToString(DEFAULT_FOCUS_PRIORITY); + bool defaultFocus = false; + bool groupDefaultFocus = false; + bool focusOnTouch = false; + int32_t tabIndex = 0; std::unique_ptr focusBox = nullptr; bool tabStop = false; if (hub) { @@ -2743,10 +2727,6 @@ void FocusHub::ToJsonValue( focusOnTouch = hub->IsFocusOnTouch().value_or(false); tabIndex = hub->GetTabIndex(); focusBox = FocusBox::ToJsonValue(hub->box_); - focusScopeId = hub->GetFocusScopeId(); - isGroup = hub->GetIsFocusGroup(); - arrowKeyStepOut = hub->GetArrowKeyStepOut(); - focusPriority = FocusPriorityToString(hub->GetFocusPriority()); tabStop = hub->IsTabStop(); } json->PutExtAttr("enabled", enabled, filter); @@ -2755,10 +2735,6 @@ void FocusHub::ToJsonValue( json->PutExtAttr("focusOnTouch", focusOnTouch, filter); json->PutExtAttr("tabIndex", tabIndex, filter); json->PutExtAttr("focusBox", focusBox, filter); - json->PutExtAttr("focusScopeId", focusScopeId.c_str(), filter); - json->PutExtAttr("isGroup", isGroup, filter); - json->PutExtAttr("arrowStepOut", arrowKeyStepOut, filter); - json->PutExtAttr("focusScopePriority", focusPriority.c_str(), filter); json->PutExtAttr("tabStop", tabStop, filter); } diff --git a/frameworks/core/components_ng/event/focus_hub.h b/frameworks/core/components_ng/event/focus_hub.h index 57a4e3933bd..fd98f78690b 100644 --- a/frameworks/core/components_ng/event/focus_hub.h +++ b/frameworks/core/components_ng/event/focus_hub.h @@ -36,11 +36,7 @@ constexpr int32_t MASK_FOCUS_STEP_VERTICAL = 0x01; constexpr int32_t MASK_FOCUS_STEP_FORWARD = 0x10; constexpr int32_t MASK_FOCUS_STEP_TAB = 0x5; constexpr auto DEFAULT_FOCUS_IS_GROUP = false; -constexpr auto DEFAULT_FOCUS_ON_TOUCH = false; -constexpr auto DEFAULT_FOCUS_IS_GROUP_DEFAULT = false; -constexpr auto DEFAULT_FOCUS_DEFAULT_FOCUS = false; constexpr auto DEFAULT_FOCUS_ARROW_KEY_STEP_OUT = true; -constexpr auto DEFAULT_FOCUS_TAB_INDEX = 0; enum class FocusNodeType : int32_t { DEFAULT = 0, @@ -649,7 +645,7 @@ public: int32_t GetTabIndex() const { - return focusCallbackEvents_ ? focusCallbackEvents_->tabIndex_ : DEFAULT_FOCUS_TAB_INDEX; + return focusCallbackEvents_ ? focusCallbackEvents_->tabIndex_ : 0; } void SetTabIndex(int32_t tabIndex) { @@ -828,11 +824,6 @@ public: return isGroup_; } - bool GetArrowKeyStepOut() const - { - return arrowKeyStepOut_; - } - bool GetIsFocusScope() const { return isFocusScope_; @@ -980,7 +971,6 @@ private: void DumpFocusScopeTreeInJson(int32_t depth); bool SkipFocusMoveBeforeRemove(); - static std::string FocusPriorityToString(FocusPriority src); bool IsArrowKeyStepOut(FocusStep moveStep); @@ -1023,7 +1013,7 @@ private: std::string focusScopeId_; bool isFocusScope_ { false }; - bool isGroup_ { DEFAULT_FOCUS_IS_GROUP }; + bool isGroup_ { false }; FocusPriority focusPriority_ = FocusPriority::AUTO; bool arrowKeyStepOut_ { true }; bool isSwitchByEnter_ { false }; -- Gitee