From 24bf460e9f3494cab7f11e58b86f3d708e76620e Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Wed, 5 May 2021 20:25:25 +0300 Subject: [PATCH] fix: use ChatDocumentHandler.AutoCompletionType enum instead of string to chose delegates --- imports/NeoChat/Component/ChatBox/ChatBar.qml | 4 +--- imports/NeoChat/Component/ChatBox/CompletionMenu.qml | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml index 97c4f3834..707216550 100644 --- a/imports/NeoChat/Component/ChatBox/ChatBar.qml +++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml @@ -215,14 +215,12 @@ ToolBar { return; } + completionMenu.completionType = completionInfo.type if (completionInfo.type === ChatDocumentHandler.User) { - completionMenu.completionType = "username" completionMenu.model = currentRoom.getUsers(completionInfo.keyword); } else if (completionInfo.type === ChatDocumentHandler.Command) { - completionMenu.completionType = "command" completionMenu.model = CommandModel.filterModel(completionInfo.keyword); } else { - completionMenu.completionType = "emoji" completionMenu.model = EmojiModel.filterModel(completionInfo.keyword); } diff --git a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml index 929e23b05..6f65b514d 100644 --- a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml +++ b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml @@ -25,7 +25,7 @@ Popup { property string currentDisplayText: currentItem && currentItem.displayName ? currentItem.displayName : "" property string currentUserId: currentItem && currentItem.id ? currentItem.id : "" - property string completionType: "" + property int completionType: ChatDocumentHandler.Emoji property int beginPosition: 0 property int endPosition: 0 @@ -50,11 +50,11 @@ Popup { id: completionListView implicitWidth: contentWidth delegate: { - if (completionType === "emoji") { + if (completionType === ChatDocumentHandler.Emoji) { emojiDelegate - } else if (completionType === "command") { + } else if (completionType === ChatDocumentHandler.Command) { commandDelegate - } else if (completionType === "username") { + } else if (completionType === ChatDocumentHandler.User) { usernameDelegate } }