Skip to content

Commit e99156d

Browse files
jrainvillejrainville
committed
fix: code review fixes and fix rencent updating in hover menu
1 parent ef4bd6e commit e99156d

File tree

10 files changed

+252
-244
lines changed

10 files changed

+252
-244
lines changed

‎storybook/pages/MessageContextMenuViewPage.qml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import Storybook
1010
import utils
1111
import shared.views.chat
1212

13+
import SortFilterProxyModel
14+
1315
SplitView {
1416
id: root
1517

@@ -37,10 +39,9 @@ SplitView {
3739
closePolicy: Popup.NoAutoClose
3840

3941
messageId: "Oxdeadbeef"
40-
emojiModel: StatusQUtils.Emoji.emojiModel
41-
// Should still show only 5 emojis even if more are provided
42-
recentEmojis: ["1f9de", "1f6fa", "1f44d", "1f44e", "1f602", "1f622", "1f621"]
43-
skinColor: ""
42+
emojiModel: SortFilterProxyModel {
43+
sourceModel: StatusQUtils.Emoji.emojiModel
44+
}
4445
messageContentType: Constants.messageContentType.messageType
4546
chatType: Constants.chatType.oneToOne
4647
isDebugEnabled: isDebugEnabledCheckBox.checked

‎storybook/pages/StatusMessagePage.qml‎

Lines changed: 22 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -20,143 +20,39 @@ SplitView {
2020

2121
readonly property var exampleAlbum: [ModelsData.banners.coinbase, ModelsData.icons.status]
2222

23-
readonly property var messageWithReactions: [{
23+
readonly property var reactionsModels: ReactionsModels {}
24+
25+
readonly property var messageWithThreeReactions: [{
2426
timestamp: 1667937830123,
2527
senderId: "zq123456790",
2628
senderDisplayName: "Alice",
2729
contentType: StatusMessage.ContentType.Text,
28-
message: "This message has reactions",
30+
message: "This message has 3 reactions",
2931
isContact: true,
3032
isAReply: false,
3133
trustIndicator: StatusContactVerificationIcons.TrustedType.None,
3234
outgoingStatus: StatusMessage.OutgoingStatus.Delivered,
33-
reactionsModel: [
34-
{
35-
emoji: "😄",
36-
didIReactWithThisEmoji: true,
37-
numberOfReactions: 1,
38-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\"]"
39-
},
40-
{
41-
emoji: "🕵️‍♀",
42-
didIReactWithThisEmoji: false,
43-
numberOfReactions: 232,
44-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Bob\", \"John\"]"
45-
},
46-
{
47-
emoji: "😂",
48-
didIReactWithThisEmoji: true,
49-
numberOfReactions: 5,
50-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Sally\", \"Tom\", \"Eve\", \"Raj\"]"
51-
},
52-
{
53-
emoji: "❤️",
54-
didIReactWithThisEmoji: false,
55-
numberOfReactions: 8,
56-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Mia\", \"Noah\", \"Liam\", \"Olivia\", \"Ava\", \"Emma\", \"Lucas\", \"Zoe\"]"
57-
},
58-
{
59-
emoji: "👍",
60-
didIReactWithThisEmoji: true,
61-
numberOfReactions: 3,
62-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Ben\", \"Claire\"]"
63-
},
64-
{
65-
emoji: "🎉",
66-
didIReactWithThisEmoji: false,
67-
numberOfReactions: 4,
68-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Ivy\", \"Ken\", \"Lara\", \"Omar\"]"
69-
},
70-
{
71-
emoji: "😮",
72-
didIReactWithThisEmoji: false,
73-
numberOfReactions: 1,
74-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Zed\"]"
75-
},
76-
{
77-
emoji: "😢",
78-
didIReactWithThisEmoji: false,
79-
numberOfReactions: 2,
80-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Martha\", \"Gus\"]"
81-
},
82-
{
83-
emoji: "🔥",
84-
didIReactWithThisEmoji: true,
85-
numberOfReactions: 6,
86-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Alex\", \"Sam\", \"Nina\", \"Pax\", \"Rae\"]"
87-
},
88-
{
89-
emoji: "🙏",
90-
didIReactWithThisEmoji: false,
91-
numberOfReactions: 2,
92-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Hana\", \"Ike\"]"
93-
},
94-
{
95-
emoji: "😅",
96-
didIReactWithThisEmoji: true,
97-
numberOfReactions: 2,
98-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Pete\"]"
99-
},
100-
{
101-
emoji: "😎",
102-
didIReactWithThisEmoji: false,
103-
numberOfReactions: 3,
104-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Ruth\", \"Vik\", \"Jill\"]"
105-
},
106-
{
107-
emoji: "🤔",
108-
didIReactWithThisEmoji: false,
109-
numberOfReactions: 1,
110-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Oli\"]"
111-
},
112-
{
113-
emoji: "🤯",
114-
didIReactWithThisEmoji: true,
115-
numberOfReactions: 7,
116-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Abe\", \"Maya\", \"Noel\", \"Cory\", \"Lina\", \"Zara\"]"
117-
},
118-
{
119-
emoji: "🎶",
120-
didIReactWithThisEmoji: false,
121-
numberOfReactions: 2,
122-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Tess\", \"Bea\"]"
123-
},
124-
{
125-
emoji: "💯",
126-
didIReactWithThisEmoji: true,
127-
numberOfReactions: 9,
128-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Gabe\", \"Rin\", \"Seth\", \"Moe\", \"Luz\", \"Ira\", \"Noa\", \"Pam\"]"
129-
},
130-
{
131-
emoji: "👀",
132-
didIReactWithThisEmoji: false,
133-
numberOfReactions: 1,
134-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Kai\"]"
135-
},
136-
{
137-
emoji: "😜",
138-
didIReactWithThisEmoji: true,
139-
numberOfReactions: 3,
140-
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Dot\", \"Max\"]"
141-
},
142-
{
143-
emoji: "🥳",
144-
didIReactWithThisEmoji: false,
145-
numberOfReactions: 4,
146-
jsonArrayOfUsersReactedWithThisEmoji: "[\"June\", \"Fay\", \"Roy\", \"Skye\"]"
147-
},
148-
{
149-
emoji: "🤝",
150-
didIReactWithThisEmoji: false,
151-
numberOfReactions: 2,
152-
jsonArrayOfUsersReactedWithThisEmoji: "[\"Ivy\", \"Omar\"]"
153-
}
154-
155-
]
35+
reactionsModel: d.reactionsModels.threeReactions
15636
}]
37+
readonly property var messageWithTwentyReactions: [{
38+
timestamp: 1667937830125,
39+
senderId: "zq123456790",
40+
senderDisplayName: "Alice",
41+
contentType: StatusMessage.ContentType.Text,
42+
message: "This message has 20 reactions",
43+
isContact: true,
44+
isAReply: false,
45+
trustIndicator: StatusContactVerificationIcons.TrustedType.None,
46+
outgoingStatus: StatusMessage.OutgoingStatus.Delivered,
47+
reactionsModel: d.reactionsModels.twentyReactions
48+
}]
49+
15750

15851
readonly property var messagesModel: ListModel {
159-
Component.onCompleted: append(d.messageWithReactions)
52+
Component.onCompleted: {
53+
append(d.messageWithThreeReactions)
54+
append(d.messageWithTwentyReactions)
55+
}
16056

16157
ListElement {
16258
timestamp: 1656937930123

‎storybook/src/Models/ReactionsModels.qml‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
import QtQuick
2+
3+
4+
QtObject {
5+
readonly property var threeReactions: [
6+
{
7+
emoji: "😄",
8+
didIReactWithThisEmoji: true,
9+
numberOfReactions: 1,
10+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\"]"
11+
},
12+
{
13+
emoji: "🕵️‍♀",
14+
didIReactWithThisEmoji: false,
15+
numberOfReactions: 2,
16+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Bob\", \"John\"]"
17+
},
18+
{
19+
emoji: "😂",
20+
didIReactWithThisEmoji: true,
21+
numberOfReactions: 5,
22+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Sally\", \"Tom\", \"Eve\", \"Raj\"]"
23+
}
24+
25+
]
26+
readonly property var twentyReactions: [
27+
{
28+
emoji: "😄",
29+
didIReactWithThisEmoji: true,
30+
numberOfReactions: 1,
31+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\"]"
32+
},
33+
{
34+
emoji: "🕵️‍♀",
35+
didIReactWithThisEmoji: false,
36+
numberOfReactions: 232,
37+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Bob\", \"John\"]"
38+
},
39+
{
40+
emoji: "😂",
41+
didIReactWithThisEmoji: true,
42+
numberOfReactions: 5,
43+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Sally\", \"Tom\", \"Eve\", \"Raj\"]"
44+
},
45+
{
46+
emoji: "❤️",
47+
didIReactWithThisEmoji: false,
48+
numberOfReactions: 8,
49+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Mia\", \"Noah\", \"Liam\", \"Olivia\", \"Ava\", \"Emma\", \"Lucas\", \"Zoe\"]"
50+
},
51+
{
52+
emoji: "👍",
53+
didIReactWithThisEmoji: true,
54+
numberOfReactions: 3,
55+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Ben\", \"Claire\"]"
56+
},
57+
{
58+
emoji: "🎉",
59+
didIReactWithThisEmoji: false,
60+
numberOfReactions: 4,
61+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Ivy\", \"Ken\", \"Lara\", \"Omar\"]"
62+
},
63+
{
64+
emoji: "😮",
65+
didIReactWithThisEmoji: false,
66+
numberOfReactions: 1,
67+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Zed\"]"
68+
},
69+
{
70+
emoji: "😢",
71+
didIReactWithThisEmoji: false,
72+
numberOfReactions: 2,
73+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Martha\", \"Gus\"]"
74+
},
75+
{
76+
emoji: "🔥",
77+
didIReactWithThisEmoji: true,
78+
numberOfReactions: 6,
79+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Alex\", \"Sam\", \"Nina\", \"Pax\", \"Rae\"]"
80+
},
81+
{
82+
emoji: "🙏",
83+
didIReactWithThisEmoji: false,
84+
numberOfReactions: 2,
85+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Hana\", \"Ike\"]"
86+
},
87+
{
88+
emoji: "😅",
89+
didIReactWithThisEmoji: true,
90+
numberOfReactions: 2,
91+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Pete\"]"
92+
},
93+
{
94+
emoji: "😎",
95+
didIReactWithThisEmoji: false,
96+
numberOfReactions: 3,
97+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Ruth\", \"Vik\", \"Jill\"]"
98+
},
99+
{
100+
emoji: "🤔",
101+
didIReactWithThisEmoji: false,
102+
numberOfReactions: 1,
103+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Oli\"]"
104+
},
105+
{
106+
emoji: "🤯",
107+
didIReactWithThisEmoji: true,
108+
numberOfReactions: 7,
109+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Abe\", \"Maya\", \"Noel\", \"Cory\", \"Lina\", \"Zara\"]"
110+
},
111+
{
112+
emoji: "🎶",
113+
didIReactWithThisEmoji: false,
114+
numberOfReactions: 2,
115+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Tess\", \"Bea\"]"
116+
},
117+
{
118+
emoji: "💯",
119+
didIReactWithThisEmoji: true,
120+
numberOfReactions: 9,
121+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Gabe\", \"Rin\", \"Seth\", \"Moe\", \"Luz\", \"Ira\", \"Noa\", \"Pam\"]"
122+
},
123+
{
124+
emoji: "👀",
125+
didIReactWithThisEmoji: false,
126+
numberOfReactions: 1,
127+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Kai\"]"
128+
},
129+
{
130+
emoji: "😜",
131+
didIReactWithThisEmoji: true,
132+
numberOfReactions: 3,
133+
jsonArrayOfUsersReactedWithThisEmoji: "[\"You\", \"Dot\", \"Max\"]"
134+
},
135+
{
136+
emoji: "🥳",
137+
didIReactWithThisEmoji: false,
138+
numberOfReactions: 4,
139+
jsonArrayOfUsersReactedWithThisEmoji: "[\"June\", \"Fay\", \"Roy\", \"Skye\"]"
140+
},
141+
{
142+
emoji: "🤝",
143+
didIReactWithThisEmoji: false,
144+
numberOfReactions: 2,
145+
jsonArrayOfUsersReactedWithThisEmoji: "[\"Ivy\", \"Omar\"]"
146+
}
147+
148+
]
149+
// Component.onCompleted: append(data)
150+
}

‎storybook/src/Models/qmldir‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ LinkPreviewModel 1.0 LinkPreviewModel.qml
1414
LoginAccountsModel 1.0 LoginAccountsModel.qml
1515
MintedTokensModel 1.0 MintedTokensModel.qml
1616
ManageCollectiblesModel 1.0 ManageCollectiblesModel.qml
17+
ReactionsModels 1.0 ReactionsModels.qml
1718
RecipientModel 1.0 RecipientModel.qml
1819
SourceOfTokensModel 1.0 SourceOfTokensModel.qml
1920
TokenHoldersModel 1.0 TokenHoldersModel.qml

‎ui/StatusQ/src/StatusQ/Components/StatusMessage.qml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,8 @@ Control {
417417
Loader {
418418
active: root.hovered && root.quickActions.length > 0
419419
anchors.right: parent.right
420-
anchors.rightMargin: 20
421-
anchors.top: parent.top
422-
anchors.topMargin: -4
420+
anchors.rightMargin: Theme.padding
421+
anchors.top: root.top
423422
sourceComponent: StatusMessageQuickActions {
424423
items: root.quickActions
425424
}

‎ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusMessageEmojiReactions.qml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Flow {
2424
QtObject {
2525
id: d
2626

27-
readonly property string addReactionButtonName: "addReactionButton"
28-
2927
function lastTwoItems(nodes) {
3028
return nodes.join(qsTr(" and "));
3129
}
@@ -75,10 +73,10 @@ Flow {
7573
Control {
7674
id: reactionDelegate
7775

78-
topPadding: 3
79-
bottomPadding: 3
80-
leftPadding: 4
81-
rightPadding: 5
76+
topPadding: Theme.padding / 2.5
77+
bottomPadding: Theme.padding / 2.5
78+
leftPadding: Theme.padding / 2
79+
rightPadding: Theme.padding / 2
8280

8381
background: Rectangle {
8482
radius: 8
@@ -93,7 +91,7 @@ Flow {
9391
}
9492

9593
contentItem: Row {
96-
spacing: 4
94+
spacing: Theme.padding / 2
9795

9896
StatusBaseText {
9997
objectName: "emojiReaction"

0 commit comments

Comments
 (0)