status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/chat): Right click message actions dont work 

Fix the bug introduced by removing MessageContextMenu from Chat column. Added missing logic for edit message via MessageContextMenu

fixes #3223
This commit is contained in:
khushboo-dev-cpp 2021-08-19 15:04:52 +02:00 committed by Iuri Matias
parent d4de0c25a4
commit 82718a0e93
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/app/AppLayouts/Chat/ChatColumn.qml
View File

@ -23,7 +23,6 @@ Item {
id: chatColumnLayout id: chatColumnLayout
anchors.fill: parent anchors.fill: parent
property var messageContextMenu
property alias pinnedMessagesPopupComponent: pinnedMessagesPopupComponent property alias pinnedMessagesPopupComponent: pinnedMessagesPopupComponent
property int chatGroupsListViewCount: 0 property int chatGroupsListViewCount: 0
property bool isReply: false property bool isReply: false
@ -87,7 +86,7 @@ Item {
let isCommunity = chatsModel.communities.activeCommunity.active let isCommunity = chatsModel.communities.activeCommunity.active
let dataSource = isCommunity ? chatsModel.communities.activeCommunity.members : chatsModel.suggestionList let dataSource = isCommunity ? chatsModel.communities.activeCommunity.members : chatsModel.suggestionList
const len = dataSource.rowCount() const len = dataSource.rowCount()
for (let i = 0; i < len; i++) { for (let i = 0; i < len; i++) {
const contactAddr = dataSource.rowData(i, "address"); const contactAddr = dataSource.rowData(i, "address");
@ -341,7 +340,9 @@ Item {
sourceComponent: ChatMessages { sourceComponent: ChatMessages {
id: chatMessages id: chatMessages
messageList: messages messageList: messages
messageContextMenuInst: messageContextMenu messageContextMenuInst: MessageContextMenu {
reactionModel: EmojiReactions { }
}
Component.onCompleted: { Component.onCompleted: {
chatColumnLayout.userList = chatMessages.messageList.userList; chatColumnLayout.userList = chatMessages.messageList.userList;
} }
@ -684,7 +685,7 @@ Item {
toastMessage.open() toastMessage.open()
} }
onTransactionCompleted: { onTransactionCompleted: {
toastMessage.title = !success ? toastMessage.title = !success ?
//% "Could not buy Stickerpack" //% "Could not buy Stickerpack"
qsTrId("could-not-buy-stickerpack") qsTrId("could-not-buy-stickerpack")
: :

1
ui/app/AppLayouts/Chat/ChatColumn/Message.qml
View File

@ -214,6 +214,7 @@ Item {
messageContextMenu.isCurrentUser = isCurrentUser; messageContextMenu.isCurrentUser = isCurrentUser;
messageContextMenu.isRightClickOnImage = isRightClickOnImage messageContextMenu.isRightClickOnImage = isRightClickOnImage
messageContextMenu.imageSource = imageSource messageContextMenu.imageSource = imageSource
messageContextMenu.onClickEdit = function() {root.isEdit = true}
if (isReply) { if (isReply) {
let nickname = appMain.getUserNickname(repliedMessageAuthor) let nickname = appMain.getUserNickname(repliedMessageAuthor)

6
ui/app/AppLayouts/Chat/ChatColumn/UserList.qml
View File

@ -13,13 +13,17 @@ import "../components"
import "./samples/" import "./samples/"
import "./MessageComponents" import "./MessageComponents"
import "../ContactsColumn" import "../ContactsColumn"
import "../data"
Item { Item {
id: root id: root
anchors.fill: parent anchors.fill: parent
property var userList property var userList
property var currentTime property var currentTime
property var messageContextMenu property var messageContextMenu: MessageContextMenu {
id: quickActionMessageOptionsMenu
reactionModel: EmojiReactions { }
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent

8
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -41,7 +41,6 @@ StatusAppThreePanelLayout {
centerPanel: ChatColumn { centerPanel: ChatColumn {
id: chatColumn id: chatColumn
chatGroupsListViewCount: contactColumnLoader.item.chatGroupsListViewCount chatGroupsListViewCount: contactColumnLoader.item.chatGroupsListViewCount
messageContextMenu: quickActionMessageOptionsMenu
} }
showRightPanel: chatColumn.showUsers && (chatsModel.channelView.activeChannel.chatType !== Constants.chatTypeOneToOne) showRightPanel: chatColumn.showUsers && (chatsModel.channelView.activeChannel.chatType !== Constants.chatTypeOneToOne)
@ -54,7 +53,7 @@ StatusAppThreePanelLayout {
Component { Component {
id: userListComponent id: userListComponent
UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList; messageContextMenu: quickActionMessageOptionsMenu } UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList;}
} }
Component { Component {
@ -89,11 +88,6 @@ StatusAppThreePanelLayout {
} }
} }
MessageContextMenu {
id: quickActionMessageOptionsMenu
reactionModel: EmojiReactions { }
}
ConfirmationDialog { ConfirmationDialog {
id: removeContactConfirmationDialog id: removeContactConfirmationDialog
// % "Remove contact" // % "Remove contact"

1
ui/app/AppLayouts/Chat/components/MessageContextMenu.qml
View File

@ -238,7 +238,6 @@ StatusPopupMenu {
} else { } else {
showReplyArea() showReplyArea()
} }
messageContextMenu.closeParentPopup()
messageContextMenu.close() messageContextMenu.close()
} }
icon.name: "chat" icon.name: "chat"