Skip to content

Commit 726c9fc

Browse files
authored
Merge pull request #54 from sendbird/feat/mention
[UIKIT-2643] Feat/mention
2 parents c3124a4 + 52e8ef0 commit 726c9fc

File tree

55 files changed

+1625
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1625
-157
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
node-version: [16]
20+
node-version: [16.x]
2121
steps:
2222
- uses: actions/checkout@v3
2323
- name: Use Node.js ${{ matrix.node-version }}
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848
strategy:
4949
matrix:
50-
node-version: [16]
50+
node-version: [16.x]
5151
steps:
5252
- uses: actions/checkout@v3
5353
- name: Use Node.js ${{ matrix.node-version }}
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070
strategy:
7171
matrix:
72-
node-version: [16, 18]
72+
node-version: [16.x, 18.x]
7373
steps:
7474
- uses: actions/checkout@v3
7575
- name: Use Node.js ${{ matrix.node-version }}
@@ -91,7 +91,7 @@ jobs:
9191
runs-on: ubuntu-latest
9292
strategy:
9393
matrix:
94-
node-version: [16]
94+
node-version: [16.x]
9595
steps:
9696
- uses: actions/checkout@v3
9797
- name: Use Node.js ${{ matrix.node-version }}
@@ -113,7 +113,7 @@ jobs:
113113
runs-on: ubuntu-latest
114114
strategy:
115115
matrix:
116-
node-version: [16]
116+
node-version: [16.x]
117117
steps:
118118
- uses: actions/checkout@v3
119119
- name: Use Node.js ${{ matrix.node-version }}

packages/uikit-chat-hooks/src/channel/useGroupChannelMessages/useGroupChannelMessagesWithCollection.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
7777
updateNextMessages(messages, false, sdk.currentUser.userId);
7878
},
7979
onMessagesUpdated: (_, __, messages) => {
80+
// NOTE: admin message is not added via onMessagesAdded handler, not checked yet is this a bug.
81+
if (_.source === MessageEventSource.EVENT_MESSAGE_RECEIVED) {
82+
const nextMessageIds = nextMessages.map((it) => it.messageId);
83+
const nonAddedMessagesFromReceivedEvent = messages.filter(
84+
(it) => nextMessageIds.indexOf(it.messageId) === -1,
85+
);
86+
updateNextMessages(nonAddedMessagesFromReceivedEvent, false, sdk.currentUser.userId);
87+
}
88+
8089
// NOTE: v4 MESSAGE_RECEIVED is called twice from onMessagesAdded and onMessagesUpdated when receiving new message.
8190
// This is not intended behavior but not bugs.
8291
if (_.source !== MessageEventSource.EVENT_MESSAGE_RECEIVED) {

packages/uikit-react-native-foundation/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"scripts": {
1717
"test": "jest",
1818
"build": "bob build",
19-
"clean": "del lib"
19+
"clean": "del lib",
20+
"generate-icons": "node src/assets/bundle-icons.js"
2021
},
2122
"keywords": [
2223
"react-native",
749 Bytes
Loading
1.44 KB
Loading
2.13 KB
Loading
910 Bytes
Loading
1.71 KB
Loading
2.58 KB
Loading

packages/uikit-react-native-foundation/src/assets/icon/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ const IconAssets = {
4444
'play': require('./icon-play.png'),
4545
'plus': require('./icon-plus.png'),
4646
'question': require('./icon-question.png'),
47+
'radio-off': require('./icon-radio-off.png'),
48+
'radio-on': require('./icon-radio-on.png'),
4749
'refresh': require('./icon-refresh.png'),
4850
'remove': require('./icon-remove.png'),
4951
'reply-filled': require('./icon-reply-filled.png'),

0 commit comments

Comments
 (0)