@viewberapp/chat 0.0.102 → 0.0.103
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/API.d.ts +1 -12
- package/dist/API.js +7 -16
- package/dist/API.js.map +1 -1
- package/dist/CachedChat.d.ts +8 -6
- package/dist/CachedChat.js +46 -51
- package/dist/CachedChat.js.map +1 -1
- package/dist/ChatSubscription.d.ts +2 -1
- package/dist/ChatSubscription.js +1 -1
- package/dist/ChatSubscription.js.map +1 -1
- package/dist/Message.d.ts +10 -16
- package/dist/Message.js +20 -8
- package/dist/Message.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/react/components/AdminMessage.js +1 -3
- package/dist/react/components/AdminMessage.js.map +1 -1
- package/dist/react/components/Message.d.ts +3 -2
- package/dist/react/components/Message.js +2 -1
- package/dist/react/components/Message.js.map +1 -1
- package/dist/react/components/MessageList.d.ts +2 -1
- package/dist/react/components/MessageList.js +11 -7
- package/dist/react/components/MessageList.js.map +1 -1
- package/dist/react/useChat.d.ts +2 -1
- package/dist/react/useChat.js.map +1 -1
- package/dist/util/getLatestMessage.d.ts +2 -1
- package/dist/util/getLatestMessage.js +9 -7
- package/dist/util/getLatestMessage.js.map +1 -1
- package/dist/util/index.d.ts +3 -2
- package/dist/util/index.js +4 -2
- package/dist/util/index.js.map +1 -1
- package/package.json +3 -3
package/dist/API.d.ts
CHANGED
|
@@ -36,18 +36,7 @@ export interface GetUserChatUnreadMessageCountParams {
|
|
|
36
36
|
appointmentIsConfirmedForViewing?: boolean;
|
|
37
37
|
}
|
|
38
38
|
export declare type StoreMessageReturnValue = {
|
|
39
|
-
message:
|
|
40
|
-
id: number;
|
|
41
|
-
chat_id: number;
|
|
42
|
-
message: string;
|
|
43
|
-
sender_id: number;
|
|
44
|
-
sender: {
|
|
45
|
-
id: number;
|
|
46
|
-
first_name: string;
|
|
47
|
-
};
|
|
48
|
-
is_admin_message: boolean;
|
|
49
|
-
created_at: string;
|
|
50
|
-
};
|
|
39
|
+
message: Message;
|
|
51
40
|
error?: undefined;
|
|
52
41
|
} | {
|
|
53
42
|
message?: undefined;
|
package/dist/API.js
CHANGED
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const axios_1 = __importDefault(require("axios"));
|
|
7
|
-
const cuid_1 = __importDefault(require("cuid"));
|
|
8
7
|
const Message_1 = __importDefault(require("./Message"));
|
|
9
8
|
class API {
|
|
10
9
|
constructor(params) {
|
|
@@ -82,18 +81,15 @@ class API {
|
|
|
82
81
|
}).then(response => {
|
|
83
82
|
this.debugApiResponse('storeMessage', response);
|
|
84
83
|
resolve({
|
|
85
|
-
message: {
|
|
84
|
+
message: new Message_1.default({
|
|
86
85
|
id: response.data.data.id,
|
|
87
|
-
|
|
86
|
+
chatId: response.data.data.chat_id,
|
|
88
87
|
message: response.data.data.message,
|
|
89
|
-
|
|
90
|
-
sender:
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
is_admin_message: response.data.data.is_admin_message,
|
|
95
|
-
created_at: response.data.data.created_at
|
|
96
|
-
}
|
|
88
|
+
senderId: response.data.data.sender_id,
|
|
89
|
+
sender: response.data.data.sender,
|
|
90
|
+
isAdminMessage: response.data.data.is_admin_message,
|
|
91
|
+
createdAt: new Date(response.data.data.created_at),
|
|
92
|
+
})
|
|
97
93
|
});
|
|
98
94
|
}).catch(err => {
|
|
99
95
|
var _a, _b, _c, _d, _e;
|
|
@@ -120,10 +116,8 @@ class API {
|
|
|
120
116
|
resolve({
|
|
121
117
|
messages: response.data.data.map((m) => new Message_1.default({
|
|
122
118
|
id: m.id,
|
|
123
|
-
clientId: (0, cuid_1.default)(),
|
|
124
119
|
chatId: m.chat_id,
|
|
125
120
|
message: m.message,
|
|
126
|
-
status: 'sent',
|
|
127
121
|
senderId: m.sender_id,
|
|
128
122
|
sender: m.sender,
|
|
129
123
|
isAdminMessage: m.is_admin_message,
|
|
@@ -171,9 +165,6 @@ class API {
|
|
|
171
165
|
});
|
|
172
166
|
});
|
|
173
167
|
this.markChatMessagesReadUpTo = (chatId, message) => new Promise((resolve, reject) => {
|
|
174
|
-
if (!message.id) {
|
|
175
|
-
return resolve({ error: undefined });
|
|
176
|
-
}
|
|
177
168
|
this.axios.post(this.markChatMessagesReadUpToRoute(chatId, message.id), undefined, {
|
|
178
169
|
headers: this.constructHeaders(),
|
|
179
170
|
}).then(response => {
|
package/dist/API.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":";;;;;AAAA,kDAA6C;
|
|
1
|
+
{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":"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"}
|
package/dist/CachedChat.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import Ably from 'ably';
|
|
2
2
|
import API from "./API";
|
|
3
3
|
import { Logger } from "./logger";
|
|
4
|
-
import ChatError from './ChatError';
|
|
5
4
|
import OnlineUser from "./OnlineUser";
|
|
6
|
-
import Message from "./Message";
|
|
7
5
|
import { ChannelStatus, ConnectionStatus, DebugOptions } from './Chat';
|
|
6
|
+
import PendingMessage from "./PendingMessage";
|
|
7
|
+
import Message from "./Message";
|
|
8
8
|
import ChatSubscription from "./ChatSubscription";
|
|
9
|
+
import ChatError from './ChatError';
|
|
9
10
|
export interface CachedChatParams {
|
|
10
11
|
id: number;
|
|
11
12
|
api: API;
|
|
@@ -18,7 +19,7 @@ export interface CachedChatParams {
|
|
|
18
19
|
export interface SendMessageOptions {
|
|
19
20
|
isAdminMessage: boolean;
|
|
20
21
|
}
|
|
21
|
-
export declare type Messages = Message[];
|
|
22
|
+
export declare type Messages = (Message | PendingMessage)[];
|
|
22
23
|
export declare type GetLatestMessagesStatus = 'initialized' | 'fetching' | 'success' | 'failed';
|
|
23
24
|
export default class CachedChat {
|
|
24
25
|
private id;
|
|
@@ -35,13 +36,14 @@ export default class CachedChat {
|
|
|
35
36
|
private debug;
|
|
36
37
|
constructor({ id, api, channel, connectionStatus, logger, debugLogger, debug }: CachedChatParams);
|
|
37
38
|
sendMessage(message: string, options?: SendMessageOptions): Promise<void>;
|
|
38
|
-
sendPendingMessage(pendingMessage:
|
|
39
|
+
sendPendingMessage(pendingMessage: PendingMessage): Promise<void>;
|
|
39
40
|
getLatestMessages(): void;
|
|
40
41
|
markMessagesReadUpTo(message: Message): Promise<{
|
|
41
42
|
error: ChatError | undefined;
|
|
42
43
|
}>;
|
|
43
|
-
addMessage(message: Message): void;
|
|
44
|
-
private
|
|
44
|
+
addMessage(message: Message | PendingMessage): void;
|
|
45
|
+
private replacePendingMessage;
|
|
46
|
+
private updatePendingMessageStatus;
|
|
45
47
|
addSubscription(subscription: ChatSubscription): void;
|
|
46
48
|
getConnectionStatus(): ConnectionStatus;
|
|
47
49
|
setConnectionStatus(status: ConnectionStatus): void;
|
package/dist/CachedChat.js
CHANGED
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
const Message_1 =
|
|
26
|
+
const uuid_1 = require("uuid");
|
|
27
|
+
const PendingMessage_1 = __importStar(require("./PendingMessage"));
|
|
28
|
+
const Message_1 = __importStar(require("./Message"));
|
|
9
29
|
class CachedChat {
|
|
10
30
|
constructor({ id, api, channel, connectionStatus, logger, debugLogger, debug }) {
|
|
11
31
|
this.getLatestMessagesStatus = 'initialized';
|
|
@@ -29,10 +49,8 @@ class CachedChat {
|
|
|
29
49
|
if (message.name === 'chat.message.created') {
|
|
30
50
|
this.addMessage(new Message_1.default({
|
|
31
51
|
id: message.data.id,
|
|
32
|
-
clientId: (0, cuid_1.default)(),
|
|
33
52
|
chatId: message.data.chat_id,
|
|
34
53
|
message: message.data.message,
|
|
35
|
-
status: 'sent',
|
|
36
54
|
senderId: message.data.sender_id,
|
|
37
55
|
sender: message.data.sender,
|
|
38
56
|
isAdminMessage: message.data.is_admin_message,
|
|
@@ -44,15 +62,11 @@ class CachedChat {
|
|
|
44
62
|
}
|
|
45
63
|
sendMessage(message, options) {
|
|
46
64
|
return new Promise((resolve, reject) => {
|
|
47
|
-
const pendingMessage = new
|
|
48
|
-
id:
|
|
49
|
-
clientId: (0, cuid_1.default)(),
|
|
50
|
-
chatId: this.id,
|
|
65
|
+
const pendingMessage = new PendingMessage_1.default({
|
|
66
|
+
id: (0, uuid_1.v4)(),
|
|
51
67
|
message,
|
|
52
68
|
status: 'initialized',
|
|
53
|
-
|
|
54
|
-
sender: undefined,
|
|
55
|
-
isAdminMessage: (options === null || options === void 0 ? void 0 : options.isAdminMessage) || false,
|
|
69
|
+
options,
|
|
56
70
|
createdAt: new Date
|
|
57
71
|
});
|
|
58
72
|
this.addMessage(pendingMessage);
|
|
@@ -64,41 +78,22 @@ class CachedChat {
|
|
|
64
78
|
}
|
|
65
79
|
sendPendingMessage(pendingMessage) {
|
|
66
80
|
return new Promise((resolve, reject) => {
|
|
67
|
-
if (!
|
|
81
|
+
if (!(0, PendingMessage_1.isPendingMessage)(pendingMessage) || pendingMessage.status === 'pending') {
|
|
68
82
|
return resolve();
|
|
69
83
|
}
|
|
70
|
-
this.
|
|
71
|
-
status: 'pending'
|
|
72
|
-
});
|
|
84
|
+
this.updatePendingMessageStatus(pendingMessage, 'pending');
|
|
73
85
|
this.fireMessagesEventOnEachNonCancelledSubscription();
|
|
74
|
-
this.api.storeMessage(this.id, pendingMessage.message, {
|
|
75
|
-
isAdminMessage: pendingMessage.isAdminMessage
|
|
76
|
-
}).then(({ message, error }) => {
|
|
86
|
+
this.api.storeMessage(this.id, pendingMessage.message, pendingMessage.options).then(({ message, error }) => {
|
|
77
87
|
if (error) {
|
|
78
|
-
this.
|
|
79
|
-
status: 'failed'
|
|
80
|
-
});
|
|
88
|
+
this.updatePendingMessageStatus(pendingMessage, 'failed');
|
|
81
89
|
this.fireMessagesEventOnEachNonCancelledSubscription();
|
|
82
90
|
return reject(new Error(error.message));
|
|
83
91
|
}
|
|
84
|
-
this.
|
|
85
|
-
id: message.id,
|
|
86
|
-
chatId: message.chat_id,
|
|
87
|
-
message: message.message,
|
|
88
|
-
status: 'sent',
|
|
89
|
-
senderId: message.sender_id,
|
|
90
|
-
sender: {
|
|
91
|
-
first_name: message.sender.first_name
|
|
92
|
-
},
|
|
93
|
-
isAdminMessage: message.is_admin_message,
|
|
94
|
-
createdAt: new Date(message.created_at)
|
|
95
|
-
});
|
|
92
|
+
this.replacePendingMessage(pendingMessage, message);
|
|
96
93
|
this.fireMessagesEventOnEachNonCancelledSubscription();
|
|
97
94
|
resolve();
|
|
98
95
|
}).catch(err => {
|
|
99
|
-
this.
|
|
100
|
-
status: 'failed'
|
|
101
|
-
});
|
|
96
|
+
this.updatePendingMessageStatus(pendingMessage, 'failed');
|
|
102
97
|
this.fireMessagesEventOnEachNonCancelledSubscription();
|
|
103
98
|
reject(err);
|
|
104
99
|
});
|
|
@@ -122,22 +117,16 @@ class CachedChat {
|
|
|
122
117
|
return this.api.markChatMessagesReadUpTo(this.id, message);
|
|
123
118
|
}
|
|
124
119
|
addMessage(message) {
|
|
125
|
-
if (message.
|
|
120
|
+
if (message instanceof PendingMessage_1.default) {
|
|
126
121
|
this.messages.push(message);
|
|
127
122
|
return;
|
|
128
123
|
}
|
|
129
124
|
let index = -1;
|
|
130
125
|
for (let i = (this.messages.length - 1); i >= 0; i--) {
|
|
131
|
-
|
|
132
|
-
if (!(0, util_1.isNil)(message.id)
|
|
133
|
-
&& !(0, util_1.isNil)(iteratedMessage.id)
|
|
134
|
-
&& iteratedMessage.id < message.id
|
|
135
|
-
&& index === -1) {
|
|
126
|
+
if ((0, Message_1.isMessageAnd)(this.messages[i], m => m.id < message.id) && index === -1) {
|
|
136
127
|
index = i;
|
|
137
128
|
}
|
|
138
|
-
if (
|
|
139
|
-
&& !(0, util_1.isNil)(iteratedMessage.id)
|
|
140
|
-
&& message.id === iteratedMessage.id) {
|
|
129
|
+
if ((0, Message_1.isMessageAnd)(this.messages[i], m => m.id === message.id)) {
|
|
141
130
|
return;
|
|
142
131
|
}
|
|
143
132
|
}
|
|
@@ -150,10 +139,16 @@ class CachedChat {
|
|
|
150
139
|
this.messages = this.messages.concat([]);
|
|
151
140
|
}
|
|
152
141
|
}
|
|
153
|
-
|
|
142
|
+
replacePendingMessage(pendingMessage, message) {
|
|
143
|
+
this.messages = this.messages.filter((m) => {
|
|
144
|
+
return m.id !== pendingMessage.id;
|
|
145
|
+
});
|
|
146
|
+
this.addMessage(message);
|
|
147
|
+
}
|
|
148
|
+
updatePendingMessageStatus(pendingMessage, status) {
|
|
154
149
|
this.messages = this.messages.map((m) => {
|
|
155
|
-
if (m.
|
|
156
|
-
return m.clone(
|
|
150
|
+
if ((0, PendingMessage_1.isPendingMessage)(m) && m.id === pendingMessage.id) {
|
|
151
|
+
return m.clone({ status });
|
|
157
152
|
}
|
|
158
153
|
return m;
|
|
159
154
|
});
|
package/dist/CachedChat.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedChat.js","sourceRoot":"","sources":["../src/CachedChat.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CachedChat.js","sourceRoot":"","sources":["../src/CachedChat.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import ChatError from "./ChatError";
|
|
|
3
3
|
import OnlineUser from "./OnlineUser";
|
|
4
4
|
import { ConnectionStatus, ChannelStatus } from "./Chat";
|
|
5
5
|
import CachedChat, { GetLatestMessagesStatus, Messages, SendMessageOptions } from "./CachedChat";
|
|
6
|
+
import PendingMessage from "./PendingMessage";
|
|
6
7
|
export declare type ChatSubscriptionStatus = 'active' | 'cancelled';
|
|
7
8
|
export interface ChatSubscriptionOptions {
|
|
8
9
|
status: ChatSubscriptionStatus;
|
|
@@ -63,7 +64,7 @@ export default class ChatSubscription {
|
|
|
63
64
|
getGetLatestMessagesStatus(): GetLatestMessagesStatus;
|
|
64
65
|
setGetLatestMessagesStatus(status: GetLatestMessagesStatus): void;
|
|
65
66
|
sendMessage(message: string, options?: SendMessageOptions): Promise<any>;
|
|
66
|
-
sendPendingMessage(pendingMessage:
|
|
67
|
+
sendPendingMessage(pendingMessage: PendingMessage): Promise<any>;
|
|
67
68
|
getLatestMessages(): void;
|
|
68
69
|
markMessagesReadUpTo(message: Message): Promise<{
|
|
69
70
|
error?: ChatError | undefined;
|
package/dist/ChatSubscription.js
CHANGED
|
@@ -69,7 +69,7 @@ class ChatSubscription {
|
|
|
69
69
|
if (!messages.length) {
|
|
70
70
|
return resolve({});
|
|
71
71
|
}
|
|
72
|
-
let latestMessage = (0, util_1.
|
|
72
|
+
let latestMessage = (0, util_1.getLatestMessage)(messages);
|
|
73
73
|
if ((0, util_1.isNil)(latestMessage)) {
|
|
74
74
|
return resolve({});
|
|
75
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatSubscription.js","sourceRoot":"","sources":["../src/ChatSubscription.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"ChatSubscription.js","sourceRoot":"","sources":["../src/ChatSubscription.ts"],"names":[],"mappings":"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"}
|
package/dist/Message.d.ts
CHANGED
|
@@ -1,31 +1,25 @@
|
|
|
1
1
|
export interface Sender {
|
|
2
2
|
first_name: string;
|
|
3
3
|
}
|
|
4
|
-
export declare type MessageStatus = 'initialized' | 'pending' | 'failed' | 'sent';
|
|
5
4
|
export default class Message {
|
|
6
|
-
readonly id: number
|
|
7
|
-
readonly clientId: string;
|
|
5
|
+
readonly id: number;
|
|
8
6
|
readonly chatId: number;
|
|
9
7
|
readonly message: string;
|
|
10
|
-
readonly
|
|
11
|
-
readonly
|
|
12
|
-
readonly sender: Sender | undefined;
|
|
8
|
+
readonly senderId: number;
|
|
9
|
+
readonly sender: Sender;
|
|
13
10
|
readonly isAdminMessage: boolean;
|
|
14
11
|
readonly createdAt: Date;
|
|
15
|
-
constructor({ id,
|
|
16
|
-
id: number
|
|
17
|
-
clientId: string;
|
|
12
|
+
constructor({ id, chatId, message, senderId, sender, isAdminMessage, createdAt }: {
|
|
13
|
+
id: number;
|
|
18
14
|
chatId: number;
|
|
19
15
|
message: string;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
sender: Sender | undefined;
|
|
16
|
+
senderId: number;
|
|
17
|
+
sender: Sender;
|
|
23
18
|
isAdminMessage: boolean;
|
|
24
19
|
createdAt: Date;
|
|
25
20
|
});
|
|
26
21
|
get isPendingMessage(): boolean;
|
|
27
|
-
clone(params: {
|
|
28
|
-
message?: string;
|
|
29
|
-
status?: MessageStatus;
|
|
30
|
-
}): Message;
|
|
31
22
|
}
|
|
23
|
+
export declare const isMessage: (m: unknown) => m is Message;
|
|
24
|
+
export declare const isMessageAnd: (m: unknown, then: (m: Message) => boolean) => boolean;
|
|
25
|
+
export declare const isMessageThen: (m: unknown, then: (m: Message) => void) => void;
|
package/dist/Message.js
CHANGED
|
@@ -1,24 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
3
|
+
exports.isMessageThen = exports.isMessageAnd = exports.isMessage = void 0;
|
|
4
4
|
class Message {
|
|
5
|
-
constructor({ id,
|
|
5
|
+
constructor({ id, chatId, message, senderId, sender, isAdminMessage, createdAt }) {
|
|
6
6
|
this.id = id;
|
|
7
|
-
this.clientId = clientId;
|
|
8
7
|
this.chatId = chatId;
|
|
9
8
|
this.message = message;
|
|
10
|
-
this.status = status;
|
|
11
9
|
this.senderId = senderId;
|
|
12
10
|
this.sender = sender;
|
|
13
11
|
this.isAdminMessage = isAdminMessage;
|
|
14
12
|
this.createdAt = createdAt;
|
|
15
13
|
}
|
|
16
14
|
get isPendingMessage() {
|
|
17
|
-
return
|
|
18
|
-
}
|
|
19
|
-
clone(params) {
|
|
20
|
-
return new Message(Object.assign({ id: this.id, clientId: this.clientId, chatId: this.chatId, message: this.message, status: this.status, senderId: this.senderId, sender: this.sender, isAdminMessage: this.isAdminMessage, createdAt: this.createdAt }, params));
|
|
15
|
+
return false;
|
|
21
16
|
}
|
|
22
17
|
}
|
|
23
18
|
exports.default = Message;
|
|
19
|
+
const isMessage = (m) => {
|
|
20
|
+
return m instanceof Message;
|
|
21
|
+
};
|
|
22
|
+
exports.isMessage = isMessage;
|
|
23
|
+
const isMessageAnd = (m, then) => {
|
|
24
|
+
if ((0, exports.isMessage)(m)) {
|
|
25
|
+
return then(m);
|
|
26
|
+
}
|
|
27
|
+
return false;
|
|
28
|
+
};
|
|
29
|
+
exports.isMessageAnd = isMessageAnd;
|
|
30
|
+
const isMessageThen = (m, then) => {
|
|
31
|
+
if ((0, exports.isMessage)(m)) {
|
|
32
|
+
then(m);
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
exports.isMessageThen = isMessageThen;
|
|
24
36
|
//# sourceMappingURL=Message.js.map
|
package/dist/Message.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Message.js","sourceRoot":"","sources":["../src/Message.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Message.js","sourceRoot":"","sources":["../src/Message.ts"],"names":[],"mappings":";;;AAIA,MAAqB,OAAO;IASxB,YAAY,EACR,EAAE,EACF,MAAM,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,cAAc,EACd,SAAS,EASZ;QACG,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,IAAW,gBAAgB;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAtCD,0BAsCC;AAEM,MAAM,SAAS,GAAG,CAAC,CAAU,EAAgB,EAAE;IAClD,OAAO,CAAC,YAAY,OAAO,CAAC;AAChC,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB;AAEM,MAAM,YAAY,GAAG,CAAC,CAAU,EAAE,IAA6B,EAAW,EAAE;IAC/E,IAAI,IAAA,iBAAS,EAAC,CAAC,CAAC,EAAE;QACd,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;KAClB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AALY,QAAA,YAAY,gBAKxB;AAEM,MAAM,aAAa,GAAG,CAAC,CAAU,EAAE,IAA0B,EAAQ,EAAE;IAC1E,IAAI,IAAA,iBAAS,EAAC,CAAC,CAAC,EAAE;QACd,IAAI,CAAC,CAAC,CAAC,CAAC;KACX;AACL,CAAC,CAAA;AAJY,QAAA,aAAa,iBAIzB"}
|
package/dist/index.d.ts
CHANGED
|
@@ -4,5 +4,5 @@ import useAppointmentChat from "./react/useAppointmentChat";
|
|
|
4
4
|
import { useRealtimeTotalUserUnreadChatMessages } from "./react/useRealtimeTotalUserUnreadChatMessages";
|
|
5
5
|
export { ConsoleLogger, RollbarLogger, NullLogger } from './logger';
|
|
6
6
|
export { Message, MessageRow, MessageList, AdminMessage, ConnectionAndChannelStatusLabel } from './react';
|
|
7
|
-
export { isNil,
|
|
7
|
+
export { isNil, getLatestMessage } from './util';
|
|
8
8
|
export { Chat, useChat, useAppointmentChat, useRealtimeTotalUserUnreadChatMessages };
|
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.useRealtimeTotalUserUnreadChatMessages = exports.useAppointmentChat = exports.useChat = exports.Chat = exports.
|
|
6
|
+
exports.useRealtimeTotalUserUnreadChatMessages = exports.useAppointmentChat = exports.useChat = exports.Chat = exports.getLatestMessage = exports.isNil = exports.ConnectionAndChannelStatusLabel = exports.AdminMessage = exports.MessageList = exports.MessageRow = exports.Message = exports.NullLogger = exports.RollbarLogger = exports.ConsoleLogger = void 0;
|
|
7
7
|
const Chat_1 = __importDefault(require("./Chat"));
|
|
8
8
|
exports.Chat = Chat_1.default;
|
|
9
9
|
const useChat_1 = __importDefault(require("./react/useChat"));
|
|
@@ -24,5 +24,5 @@ Object.defineProperty(exports, "AdminMessage", { enumerable: true, get: function
|
|
|
24
24
|
Object.defineProperty(exports, "ConnectionAndChannelStatusLabel", { enumerable: true, get: function () { return react_1.ConnectionAndChannelStatusLabel; } });
|
|
25
25
|
var util_1 = require("./util");
|
|
26
26
|
Object.defineProperty(exports, "isNil", { enumerable: true, get: function () { return util_1.isNil; } });
|
|
27
|
-
Object.defineProperty(exports, "
|
|
27
|
+
Object.defineProperty(exports, "getLatestMessage", { enumerable: true, get: function () { return util_1.getLatestMessage; } });
|
|
28
28
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AACb,kDAA0B;AAyBtB,eAzBG,cAAI,CAyBH;AAxBR,8DAAsC;AAyBlC,kBAzBG,iBAAO,CAyBH;AAxBX,oFAA4D;AAyBxD,6BAzBG,4BAAkB,CAyBH;AAxBtB,2GAAwG;AAyBpG,uHAzBK,+EAAsC,OAyBL;AAvB1C,mCAIkB;AAHd,uGAAA,aAAa,OAAA;AACb,uGAAA,aAAa,OAAA;AACb,oGAAA,UAAU,OAAA;AAGd,iCAMiB;AALb,gGAAA,OAAO,OAAA;AACP,mGAAA,UAAU,OAAA;AACV,oGAAA,WAAW,OAAA;AACX,qGAAA,YAAY,OAAA;AACZ,wHAAA,+BAA+B,OAAA;AAGnC,+BAGgB;AAFZ,6FAAA,KAAK,OAAA;AACL,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AACb,kDAA0B;AAyBtB,eAzBG,cAAI,CAyBH;AAxBR,8DAAsC;AAyBlC,kBAzBG,iBAAO,CAyBH;AAxBX,oFAA4D;AAyBxD,6BAzBG,4BAAkB,CAyBH;AAxBtB,2GAAwG;AAyBpG,uHAzBK,+EAAsC,OAyBL;AAvB1C,mCAIkB;AAHd,uGAAA,aAAa,OAAA;AACb,uGAAA,aAAa,OAAA;AACb,oGAAA,UAAU,OAAA;AAGd,iCAMiB;AALb,gGAAA,OAAO,OAAA;AACP,mGAAA,UAAU,OAAA;AACV,oGAAA,WAAW,OAAA;AACX,qGAAA,YAAY,OAAA;AACZ,wHAAA,+BAA+B,OAAA;AAGnC,+BAGgB;AAFZ,6FAAA,KAAK,OAAA;AACL,wGAAA,gBAAgB,OAAA"}
|
|
@@ -52,9 +52,7 @@ const AdminMessage = ({ message }) => {
|
|
|
52
52
|
};
|
|
53
53
|
return (React.createElement("div", { style: containerStyles },
|
|
54
54
|
React.createElement("div", { style: messageStyles, onClick: () => setDateTimeIsShowing(!dateTimeIsShowing) },
|
|
55
|
-
React.createElement("div", { style: senderLabelStyles }, message.sender
|
|
56
|
-
? (message.sender.first_name + '@viewber')
|
|
57
|
-
: 'viewber'),
|
|
55
|
+
React.createElement("div", { style: senderLabelStyles }, message.sender.first_name + '@viewber'),
|
|
58
56
|
React.createElement("div", { style: messageContentStyles }, message.message)),
|
|
59
57
|
dateTimeIsShowing && React.createElement(MessageDateTime_1.MessageDateTime, { date: message.createdAt, style: { display: 'block' } })));
|
|
60
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdminMessage.js","sourceRoot":"","sources":["../../../src/react/components/AdminMessage.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,uDAAoD;AAM7C,MAAM,YAAY,GAAG,CAAC,EAAC,OAAO,EAAoB,EAAE,EAAE;IACzD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,eAAe,GAAwB;QACzC,OAAO,EAAE,cAAc;QACvB,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,iBAAiB;KAC5B,CAAA;IAED,MAAM,aAAa,GAAwB;QACvC,YAAY,EAAE,UAAU;QACxB,MAAM,EAAE,gBAAgB;QACxB,KAAK,EAAE,MAAM;KAChB,CAAC;IAEF,MAAM,iBAAiB,GAAwB;QAC3C,eAAe,EAAE,SAAS;QAC1B,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,SAAS;QACnB,mBAAmB,EAAE,UAAU;QAC/B,oBAAoB,EAAE,UAAU;KACnC,CAAA;IAED,MAAM,oBAAoB,GAAwB;QAC9C,OAAO,EAAE,cAAc;KAC1B,CAAA;IAED,OAAO,CACH,6BAAK,KAAK,EAAE,eAAe;QACvB,6BAAK,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC,iBAAiB,CAAC;YAC9E,6BAAK,KAAK,EAAE,iBAAiB,IACxB,OAAO,CAAC,MAAM
|
|
1
|
+
{"version":3,"file":"AdminMessage.js","sourceRoot":"","sources":["../../../src/react/components/AdminMessage.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,uDAAoD;AAM7C,MAAM,YAAY,GAAG,CAAC,EAAC,OAAO,EAAoB,EAAE,EAAE;IACzD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,eAAe,GAAwB;QACzC,OAAO,EAAE,cAAc;QACvB,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,iBAAiB;KAC5B,CAAA;IAED,MAAM,aAAa,GAAwB;QACvC,YAAY,EAAE,UAAU;QACxB,MAAM,EAAE,gBAAgB;QACxB,KAAK,EAAE,MAAM;KAChB,CAAC;IAEF,MAAM,iBAAiB,GAAwB;QAC3C,eAAe,EAAE,SAAS;QAC1B,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,SAAS;QACnB,mBAAmB,EAAE,UAAU;QAC/B,oBAAoB,EAAE,UAAU;KACnC,CAAA;IAED,MAAM,oBAAoB,GAAwB;QAC9C,OAAO,EAAE,cAAc;KAC1B,CAAA;IAED,OAAO,CACH,6BAAK,KAAK,EAAE,eAAe;QACvB,6BAAK,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC,iBAAiB,CAAC;YAC9E,6BAAK,KAAK,EAAE,iBAAiB,IACxB,OAAO,CAAC,MAAM,CAAC,UAAU,GAAG,UAAU,CACrC;YACN,6BAAK,KAAK,EAAE,oBAAoB,IAC3B,OAAO,CAAC,OAAO,CACd,CACJ;QACL,iBAAiB,IAAI,oBAAC,iCAAe,IAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,GAAI,CAC3F,CACT,CAAA;AACL,CAAC,CAAA;AA1CY,QAAA,YAAY,gBA0CxB"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import MessageModel from "../../Message";
|
|
4
|
+
import PendingMessage from '../../PendingMessage';
|
|
4
5
|
export interface MessageProps {
|
|
5
|
-
message: MessageModel;
|
|
6
|
+
message: MessageModel | PendingMessage;
|
|
6
7
|
isCurrentUser: boolean;
|
|
7
8
|
failedPendingMessageIconClassName?: string;
|
|
8
9
|
failedPendingMessageDescriptionStyles?: React.CSSProperties;
|
|
9
10
|
failedPendingMessageDescriptionClassName?: string;
|
|
10
|
-
onFailedPendingMessageClick?: (pendingMessage:
|
|
11
|
+
onFailedPendingMessageClick?: (pendingMessage: PendingMessage) => void;
|
|
11
12
|
}
|
|
12
13
|
export declare const Message: {
|
|
13
14
|
({ message, isCurrentUser, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick }: MessageProps): JSX.Element;
|
|
@@ -29,11 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
exports.Message = void 0;
|
|
30
30
|
const React = __importStar(require("react"));
|
|
31
31
|
const prop_types_1 = __importDefault(require("prop-types"));
|
|
32
|
+
const PendingMessage_1 = require("../../PendingMessage");
|
|
32
33
|
const MessageDateTime_1 = require("./MessageDateTime");
|
|
33
34
|
const util_1 = require("../../util");
|
|
34
35
|
const Message = ({ message, isCurrentUser, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick }) => {
|
|
35
36
|
const [dateTimeIsShowing, setDateTimeIsShowing] = React.useState(false);
|
|
36
|
-
const isFailedPendingMessage = (
|
|
37
|
+
const isFailedPendingMessage = ((0, PendingMessage_1.isPendingMessage)(message)
|
|
37
38
|
&& message.status === 'failed');
|
|
38
39
|
const handleMessageClick = () => {
|
|
39
40
|
if (!isFailedPendingMessage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Message.js","sourceRoot":"","sources":["../../../src/react/components/Message.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,4DAAmC;AAEnC,uDAAoD;AACpD,qCAAmC;AAW5B,MAAM,OAAO,GAAG,CAAC,EACpB,OAAO,EACP,aAAa,EACb,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,2BAA2B,EAChB,EAAE,EAAE;IACf,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,sBAAsB,GAAG,CAC3B,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"Message.js","sourceRoot":"","sources":["../../../src/react/components/Message.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,4DAAmC;AAEnC,yDAAwE;AACxE,uDAAoD;AACpD,qCAAmC;AAW5B,MAAM,OAAO,GAAG,CAAC,EACpB,OAAO,EACP,aAAa,EACb,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,2BAA2B,EAChB,EAAE,EAAE;IACf,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,sBAAsB,GAAG,CAC3B,IAAA,iCAAgB,EAAC,OAAO,CAAC;WACtB,OAAO,CAAC,MAAM,KAAK,QAAQ,CACjC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC5B,IAAI,CAAC,sBAAsB,EAAE;YACzB,oBAAoB,CAAC,CAAC,iBAAiB,CAAC,CAAC;YACzC,OAAO;SACV;QACD,IAAI,2BAA2B,EAAE;YAC7B,2BAA2B,CAAC,OAAO,CAAC,CAAC;SACxC;IACL,CAAC,CAAA;IAED,MAAM,eAAe,GAAwB;QACzC,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,iBAAiB;KAC5B,CAAA;IAED,MAAM,aAAa,GAAwB;QACvC,OAAO,EAAE,cAAc;QACvB,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,aAAa;YAC1B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS;QACf,KAAK,EAAE,aAAa;YAChB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,SAAS;QACf,OAAO,EAAE,cAAc;KAC1B,CAAC;IAEF,OAAO,CACH,6BAAK,KAAK,EAAE,eAAe;QACvB;YACI,6BAAK,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB;gBAClD,kCAAO,OAAO,CAAC,OAAO,CAAQ,CAC5B;YACL,sBAAsB,IAAI,CAAC,IAAA,YAAK,EAAC,iCAAiC,CAAC;gBAChE,6BAAK,KAAK,EAAE,EAAC,OAAO,EAAE,cAAc,EAAC;oBACjC,2BAAG,SAAS,EAAE,iCAAiC,GAAI,CACjD;YAET,sBAAsB;gBACnB,6BAAK,SAAS,EAAE,wCAAwC,EAAE,KAAK,EAAE,qCAAqC,IAE9F,IAAA,YAAK,EAAC,2BAA2B,CAAC;oBAC9B,CAAC,CAAC,6BAA6B;oBAC/B,CAAC,CAAC,6CAA6C,CAErD;YAET,iBAAiB;gBACd;oBACI,oBAAC,iCAAe,IAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,GAAI,CACrE,CAER,CACJ,CACT,CAAA;AACL,CAAC,CAAA;AAvEY,QAAA,OAAO,WAuEnB;AAED,eAAO,CAAC,SAAS,GAAG;IAChB,OAAO,EAAE,oBAAS,CAAC,MAAM;IACzB,aAAa,EAAE,oBAAS,CAAC,IAAI;IAC7B,iCAAiC,EAAE,oBAAS,CAAC,MAAM;IACnD,qCAAqC,EAAE,oBAAS,CAAC,MAAM;IACvD,wCAAwC,EAAE,oBAAS,CAAC,MAAM;IAC1D,2BAA2B,EAAE,oBAAS,CAAC,IAAI;CAC9C,CAAA"}
|
|
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
|
|
|
3
3
|
import ChatError from '../../ChatError';
|
|
4
4
|
import MessageModel from '../../Message';
|
|
5
5
|
import { GetLatestMessagesStatus, Messages } from '../../CachedChat';
|
|
6
|
+
import PendingMessage from '../../PendingMessage';
|
|
6
7
|
export interface MessageListProps {
|
|
7
8
|
messages: Messages;
|
|
8
9
|
currentUserId: number;
|
|
@@ -11,7 +12,7 @@ export interface MessageListProps {
|
|
|
11
12
|
failedPendingMessageIconClassName?: string;
|
|
12
13
|
failedPendingMessageDescriptionStyles?: React.CSSProperties;
|
|
13
14
|
failedPendingMessageDescriptionClassName?: string;
|
|
14
|
-
onFailedPendingMessageClick?: (pendingMessage:
|
|
15
|
+
onFailedPendingMessageClick?: (pendingMessage: PendingMessage) => void;
|
|
15
16
|
getLatestMessagesStatus: GetLatestMessagesStatus;
|
|
16
17
|
markMessagesReadUpTo(message: MessageModel): Promise<{
|
|
17
18
|
error: ChatError | undefined;
|
|
@@ -32,6 +32,7 @@ const prop_types_1 = __importDefault(require("prop-types"));
|
|
|
32
32
|
const MessageRow_1 = require("./MessageRow");
|
|
33
33
|
const AdminMessage_1 = require("./AdminMessage");
|
|
34
34
|
const Message_1 = require("./Message");
|
|
35
|
+
const PendingMessage_1 = require("../../PendingMessage");
|
|
35
36
|
const util_1 = require("../../util");
|
|
36
37
|
const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messagesContainerClassName, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick, getLatestMessagesStatus, markMessagesReadUpTo, shouldMarkMessagesAsRead, loadingContent, retryContent, noMessagesContent, onMessagesMarkedAsRead, onRequestScrollToBottomOfMessagesScrollContainer }) => {
|
|
37
38
|
const [lastMessageMarkedAsReadUpTo, setLastMessageMarkedAsReadUpTo] = React.useState();
|
|
@@ -44,8 +45,8 @@ const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messa
|
|
|
44
45
|
if (!messages.length || !shouldMarkMessagesAsRead) {
|
|
45
46
|
return;
|
|
46
47
|
}
|
|
47
|
-
let latestMessage = (0, util_1.
|
|
48
|
-
if ((0, util_1.isNil)(latestMessage)
|
|
48
|
+
let latestMessage = (0, util_1.getLatestMessage)(messages);
|
|
49
|
+
if ((0, util_1.isNil)(latestMessage)) {
|
|
49
50
|
return;
|
|
50
51
|
}
|
|
51
52
|
if (((0, util_1.isNil)(lastMessageMarkedAsReadUpTo) || lastMessageMarkedAsReadUpTo < latestMessage.id)) {
|
|
@@ -72,14 +73,17 @@ const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messa
|
|
|
72
73
|
return (React.createElement("div", { id: messagesScrollContainerId, className: messagesContainerClassName, style: { maxHeight: '500px', overflowY: 'auto' } }, messages.length === 0
|
|
73
74
|
? noMessagesContent
|
|
74
75
|
: messages.map(message => {
|
|
75
|
-
if (message.
|
|
76
|
-
return (React.createElement(MessageRow_1.MessageRow, { key: message.
|
|
76
|
+
if ((0, PendingMessage_1.isPendingMessage)(message) || (!(0, PendingMessage_1.isPendingMessage)(message) && message.senderId === currentUserId)) {
|
|
77
|
+
return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: true },
|
|
78
|
+
React.createElement(Message_1.Message, { message: message, isCurrentUser: true, failedPendingMessageIconClassName: failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles: failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName: failedPendingMessageDescriptionClassName, onFailedPendingMessageClick: onFailedPendingMessageClick })));
|
|
79
|
+
}
|
|
80
|
+
else if (message.isAdminMessage) {
|
|
81
|
+
return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: false },
|
|
77
82
|
React.createElement(AdminMessage_1.AdminMessage, { message: message })));
|
|
78
83
|
}
|
|
79
84
|
else {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
React.createElement(Message_1.Message, { message: message, isCurrentUser: isCurrentUser, failedPendingMessageIconClassName: failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles: failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName: failedPendingMessageDescriptionClassName, onFailedPendingMessageClick: onFailedPendingMessageClick })));
|
|
85
|
+
return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: false },
|
|
86
|
+
React.createElement(Message_1.Message, { message: message, isCurrentUser: false })));
|
|
83
87
|
}
|
|
84
88
|
})));
|
|
85
89
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageList.js","sourceRoot":"","sources":["../../../src/react/components/MessageList.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,4DAAmC;AAInC,6CAA0C;AAC1C,iDAA8C;AAC9C,uCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"MessageList.js","sourceRoot":"","sources":["../../../src/react/components/MessageList.tsx"],"names":[],"mappings":"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"}
|
package/dist/react/useChat.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import OnlineUser from '../OnlineUser';
|
|
|
4
4
|
import { ConnectionStatus, ChannelStatus } from '../Chat';
|
|
5
5
|
import { GetLatestMessagesStatus, Messages } from '../CachedChat';
|
|
6
6
|
import { ChatSubscriptionStatus, ChatSubscriptionEventCallbackData } from '../ChatSubscription';
|
|
7
|
+
import PendingMessage from '../PendingMessage';
|
|
7
8
|
export interface UseChatOptions {
|
|
8
9
|
idType?: 'appointment';
|
|
9
10
|
onMessages?: OnMessagesCallback | undefined;
|
|
@@ -20,7 +21,7 @@ export interface UseChatReturnValue {
|
|
|
20
21
|
getLatestMessagesStatus: GetLatestMessagesStatus | undefined;
|
|
21
22
|
initialize: () => void;
|
|
22
23
|
sendMessage: (message: string) => Promise<any> | void;
|
|
23
|
-
sendPendingMessage: (pendingMessage:
|
|
24
|
+
sendPendingMessage: (pendingMessage: PendingMessage) => Promise<any> | void;
|
|
24
25
|
getLatestMessages: () => void;
|
|
25
26
|
markMessagesReadUpTo: (message: Message) => Promise<{
|
|
26
27
|
error?: ChatError | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../src/react/useChat.ts"],"names":[],"mappings":";;;;;AAAA,iCAA0C;AAG1C,yCAAsC;AAEtC,mDAAgE;AAChE,uDAAoD;
|
|
1
|
+
{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../src/react/useChat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import Message from "../Message";
|
|
2
|
-
|
|
2
|
+
import PendingMessage from "../PendingMessage";
|
|
3
|
+
export declare const getLatestMessage: (messages: (Message | PendingMessage)[]) => Message | undefined;
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getLatestMessage = void 0;
|
|
4
|
+
const Message_1 = require("../Message");
|
|
4
5
|
const isNil_1 = require("./isNil");
|
|
5
|
-
const
|
|
6
|
+
const getLatestMessage = (messages) => {
|
|
6
7
|
let latestMessage;
|
|
7
8
|
for (let i = 0, il = messages.length; i < il; i++) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
(0, Message_1.isMessageThen)(messages[i], message => {
|
|
10
|
+
if ((0, isNil_1.isNil)(latestMessage) || latestMessage.id < message.id) {
|
|
11
|
+
latestMessage = message;
|
|
12
|
+
}
|
|
13
|
+
});
|
|
12
14
|
}
|
|
13
15
|
return latestMessage;
|
|
14
16
|
};
|
|
15
|
-
exports.
|
|
17
|
+
exports.getLatestMessage = getLatestMessage;
|
|
16
18
|
//# sourceMappingURL=getLatestMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLatestMessage.js","sourceRoot":"","sources":["../../src/util/getLatestMessage.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getLatestMessage.js","sourceRoot":"","sources":["../../src/util/getLatestMessage.ts"],"names":[],"mappings":";;;AAAA,wCAAoD;AAEpD,mCAAgC;AAEzB,MAAM,gBAAgB,GAAG,CAAC,QAAoC,EAAqB,EAAE;IACxF,IAAI,aAAgC,CAAC;IAErC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,EAAE,GAAC,QAAQ,CAAC,MAAM,EAAC,CAAC,GAAC,EAAE,EAAC,CAAC,EAAE,EAAE;QACrC,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE;YACjC,IAAI,IAAA,aAAK,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE;gBACvD,aAAa,GAAG,OAAO,CAAC;aAC3B;QACL,CAAC,CAAC,CAAC;KACN;IAED,OAAO,aAAa,CAAC;AACzB,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B"}
|
package/dist/util/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { isNil } from "./isNil";
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import { groupMessages } from "./groupMessages";
|
|
3
|
+
import { getLatestMessage } from "./getLatestMessage";
|
|
4
|
+
export { isNil, groupMessages, getLatestMessage };
|
package/dist/util/index.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getLatestMessage = exports.groupMessages = exports.isNil = void 0;
|
|
4
4
|
const isNil_1 = require("./isNil");
|
|
5
5
|
Object.defineProperty(exports, "isNil", { enumerable: true, get: function () { return isNil_1.isNil; } });
|
|
6
|
+
const groupMessages_1 = require("./groupMessages");
|
|
7
|
+
Object.defineProperty(exports, "groupMessages", { enumerable: true, get: function () { return groupMessages_1.groupMessages; } });
|
|
6
8
|
const getLatestMessage_1 = require("./getLatestMessage");
|
|
7
|
-
Object.defineProperty(exports, "
|
|
9
|
+
Object.defineProperty(exports, "getLatestMessage", { enumerable: true, get: function () { return getLatestMessage_1.getLatestMessage; } });
|
|
8
10
|
//# sourceMappingURL=index.js.map
|
package/dist/util/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAK5B,sFALK,aAAK,OAKL;AAJT,mDAAgD;AAK5C,8FALK,6BAAa,OAKL;AAJjB,yDAAsD;AAKlD,iGALK,mCAAgB,OAKL"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@viewberapp/chat",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.103",
|
|
4
4
|
"description": "Viewber chat",
|
|
5
5
|
"author": "Jacob <jacob.chen@viewber.co.uk>",
|
|
6
6
|
"homepage": "https://bitbucket.org/ezadr/viewberjs#readme",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"url": "https://bitbucket.org/ezadr/viewberjs/issues"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"
|
|
32
|
+
"uuid": "^9.0.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/react": "^16.14.0",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"react": "^16.14.0",
|
|
43
43
|
"rollbar": "^2.25.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "570fec710c8aed57de3dfc5cc76907dff88b0ba6"
|
|
46
46
|
}
|