openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 15:10:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

文本选择右键菜单层级优化

Browse Source 
Signed-off-by: vincent <wangtao487@huawei.com>
Change-Id: I6557df5dc3f35653e9e42cec141386744d643c28
This commit is contained in:
vincent 2024-11-19 15:38:12 +08:00
parent 46cbdd5314
commit c7630eaf76
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frameworks/core/components_ng/manager/select_content_overlay/select_content_overlay_manager.cpp
View File

@ -331,7 +331,7 @@ void SelectContentOverlayManager::SwitchToHandleMode(HandleLevelMode mode, bool
return;
}
manager->DestroySelectOverlayNode(node);
manager->MountNodeToRoot(node, false);
manager->MountNodeToRoot(node, false, NodeType::HANDLE);
node->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
},
TaskExecutor::TaskType::UI, "SwitchToOverlayModeTask");
@ -457,7 +457,10 @@ void SelectContentOverlayManager::CreateNormalSelectOverlay(SelectOverlayInfo& i
auto manager = weak.Upgrade();
CHECK_NULL_VOID(manager);
if (node && node == manager->selectOverlayNode_) {
manager->MountNodeToRoot(node, animation);
CHECK_NULL_VOID(manager->shareOverlayInfo_);
auto nodeType =
manager->shareOverlayInfo_->isUsingMouse ? NodeType::RIGHT_CLICK_MENU : NodeType::HANDLE_WITH_MENU;
manager->MountNodeToRoot(node, animation, nodeType);
manager->NotifySelectOverlayShow(true);
}
},
@ -487,18 +490,19 @@ void SelectContentOverlayManager::CreateHandleLevelSelectOverlay(
if (!isMenuNodeValid || !isHandleNodeValid) {
return;
}
manager->MountNodeToRoot(menuNode, animation);
manager->MountNodeToRoot(menuNode, animation, NodeType::TOUCH_MENU);
if (mode == HandleLevelMode::EMBED) {
manager->MountNodeToCaller(handleNode, animation);
} else if (mode == HandleLevelMode::OVERLAY) {
manager->MountNodeToRoot(handleNode, animation);
manager->MountNodeToRoot(handleNode, animation, NodeType::HANDLE);
}
manager->NotifySelectOverlayShow(true);
},
TaskExecutor::TaskType::UI, "CreateHandleLevelSelectOverlay");
}
void SelectContentOverlayManager::MountNodeToRoot(const RefPtr<FrameNode>& overlayNode, bool animation)
void SelectContentOverlayManager::MountNodeToRoot(
const RefPtr<FrameNode>& overlayNode, bool animation, NodeType nodeType)
{
auto rootNode = GetSelectOverlayRoot();
CHECK_NULL_VOID(rootNode);
@ -506,25 +510,29 @@ void SelectContentOverlayManager::MountNodeToRoot(const RefPtr<FrameNode>& overl
auto slotIt = FindSelectOverlaySlot(rootNode, children);
auto index = static_cast<int32_t>(std::distance(children.begin(), slotIt));
auto slot = (index > 0) ? index : DEFAULT_NODE_SLOT;
bool isMeetSpecialNode = false;
std::vector<std::string> nodeTags = {
V2::KEYBOARD_ETS_TAG, // keep handle and menu node before keyboard node
V2::SELECT_OVERLAY_ETS_TAG, // keep handle node before menu node
V2::TEXTINPUT_ETS_TAG, // keep handle and menu node before magnifier
V2::SHEET_WRAPPER_TAG // keep handle and menu node before SheetWrapper
};
for (auto it = slotIt; it != children.end(); ++it) {
// get keyboard index to put selet_overlay before keyboard node
if ((*it)->GetTag() == V2::KEYBOARD_ETS_TAG) {
slot = std::min(slot, index);
break;
for (const auto& tag : nodeTags) {
if ((*it)->GetTag() == tag) {
slot = std::min(slot, index);
isMeetSpecialNode = true;
break;
}
}
// keep handle node before menu node
if ((*it)->GetTag() == V2::SELECT_OVERLAY_ETS_TAG) {
slot = index;
break;
}
// keep handle and menu node before magnifier
if ((*it)->GetTag() == V2::TEXTINPUT_ETS_TAG) {
slot = std::min(slot, index);
if (isMeetSpecialNode) {
break;
}
index++;
}
if (nodeType == NodeType::TOUCH_MENU || nodeType == NodeType::RIGHT_CLICK_MENU) {
slot = isMeetSpecialNode ? slot : index;
}
TAG_LOGI(AceLogTag::ACE_SELECT_OVERLAY, "MountNodeToRoot:%{public}s, id:%{public}d", rootNode->GetTag().c_str(),
rootNode->GetId());
overlayNode->MountToParent(rootNode, slot);

6
frameworks/core/components_ng/manager/select_content_overlay/select_content_overlay_manager.h
View File

@ -33,6 +33,10 @@ struct LegacyManagerCallbacks {
std::function<void()> selectionResetCallback;
};
enum class NodeType {
HANDLE, TOUCH_MENU, HANDLE_WITH_MENU, RIGHT_CLICK_MENU
};
class ACE_EXPORT SelectContentOverlayManager : public virtual AceType {
DECLARE_ACE_TYPE(SelectContentOverlayManager, AceType);
@ -108,7 +112,7 @@ private:
bool CloseInternal(int32_t holderId, bool animation, CloseReason reason);
void DestroySelectOverlayNode(const RefPtr<FrameNode>& node);
void DestroySelectOverlayNodeWithAnimation(const RefPtr<FrameNode>& node);
void MountNodeToRoot(const RefPtr<FrameNode>& overlayNode, bool animation);
void MountNodeToRoot(const RefPtr<FrameNode>& overlayNode, bool animation, NodeType nodeType);
void MountNodeToCaller(const RefPtr<FrameNode>& overlayNode, bool animation);
std::function<void()> MakeMenuCallback(OptionMenuActionId actionId, const SelectOverlayInfo& info);
SelectOverlayInfo BuildSelectOverlayInfo(int32_t requestCode);

2
test/unittest/core/manager/select_overlay_manager_test_ng.cpp
View File

@ -1764,7 +1764,7 @@ HWTEST_F(SelectOverlayManagerTestNg, MountNodeToRoot, TestSize.Level1)
*/
auto content = SelectContentOverlayManager(root_);
bool animation = true;
content.MountNodeToRoot(root_, animation);
content.MountNodeToRoot(root_, animation, NodeType::HANDLE);
EXPECT_EQ(content.selectionHoldId_, -1);
}