From 2baf56f505b89d1f8ec280df4d91e5cde9386825 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Mon, 7 Dec 2020 16:14:50 +0100 Subject: [PATCH] refactor(Chat): move suggestions ListModel into StatusChatInput StatusChatInput was relying on the suggestions ListModel, even though there was no guarantee that it would exist. This is more apparent when using the component in different context (e.g. Timeline/Status Updates). QML will throw a reference error in this case. --- ui/app/AppLayouts/Chat/ChatColumn.qml | 8 ++------ ui/shared/status/StatusChatInput.qml | 7 +++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml index b5c67eef73..afdb0475fe 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn.qml @@ -166,18 +166,14 @@ StackLayout { id: messageContextMenu } - ListModel { - id: suggestions - } - Connections { target: chatsModel onActiveChannelChanged: { chatInput.textInput.forceActiveFocus(Qt.MouseFocusReason) - suggestions.clear() + chatInput.suggestionsList.clear() const len = chatsModel.suggestionList.rowCount() for (let i = 0; i < len; i++) { - suggestions.append({ + chatInput.suggestionsList.append({ alias: chatsModel.suggestionList.rowData(i, "alias"), ensName: chatsModel.suggestionList.rowData(i, "ensName"), address: chatsModel.suggestionList.rowData(i, "address"), diff --git a/ui/shared/status/StatusChatInput.qml b/ui/shared/status/StatusChatInput.qml index 761cf8dbbb..14200b84df 100644 --- a/ui/shared/status/StatusChatInput.qml +++ b/ui/shared/status/StatusChatInput.qml @@ -41,6 +41,8 @@ Rectangle { property var fileUrls: [] property alias messageSound: sendMessageSound + property alias suggestionsList: suggestions + height: { if (extendedArea.visible) { return messageInput.height + extendedArea.height + Style.current.bigPadding @@ -367,6 +369,11 @@ Rectangle { messageInputField.forceActiveFocus(); } + ListModel { + id: suggestions + } + + FileDialog { id: imageDialog //% "Please choose an image"