@viewberapp/chat 0.0.85 → 0.0.87
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/Chat.js +53 -22
- package/dist/Chat.js.map +1 -1
- package/dist/react/components/Message.d.ts +17 -2
- package/dist/react/components/Message.js +40 -3
- package/dist/react/components/Message.js.map +1 -1
- package/dist/react/components/MessageList.d.ts +10 -1
- package/dist/react/components/MessageList.js +6 -2
- package/dist/react/components/MessageList.js.map +1 -1
- package/package.json +2 -2
package/dist/Chat.js
CHANGED
|
@@ -41,6 +41,7 @@ const CachedChat_1 = __importDefault(require("./CachedChat"));
|
|
|
41
41
|
const logger_1 = require("./logger");
|
|
42
42
|
const ChatSubscription_1 = __importDefault(require("./ChatSubscription"));
|
|
43
43
|
const jwtTokenChanged_1 = require("./util/jwtTokenChanged");
|
|
44
|
+
const util_1 = require("./util");
|
|
44
45
|
const Chat = (function () {
|
|
45
46
|
let initialized = false;
|
|
46
47
|
let axios;
|
|
@@ -103,6 +104,9 @@ const Chat = (function () {
|
|
|
103
104
|
for (const chatId in chats) {
|
|
104
105
|
if (Object.prototype.hasOwnProperty.call(chats, chatId)) {
|
|
105
106
|
const chat = chats[chatId];
|
|
107
|
+
if ((0, util_1.isNil)(chat)) {
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
106
110
|
chat.cancelAllSubscriptions();
|
|
107
111
|
delete chats[chatId];
|
|
108
112
|
chat.detachChannel(function (err) {
|
|
@@ -115,13 +119,9 @@ const Chat = (function () {
|
|
|
115
119
|
api = makeApi();
|
|
116
120
|
};
|
|
117
121
|
const get = (id) => new Promise((resolve, reject) => {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
return resolve({ error: {
|
|
122
|
-
message: err.toString(),
|
|
123
|
-
code: 'error'
|
|
124
|
-
} });
|
|
122
|
+
getChat(id).then(({ chat, isFirstFetch, error }) => {
|
|
123
|
+
if (error) {
|
|
124
|
+
return resolve({ error });
|
|
125
125
|
}
|
|
126
126
|
const subscription = new ChatSubscription_1.default(chat, {
|
|
127
127
|
status: 'active',
|
|
@@ -134,6 +134,12 @@ const Chat = (function () {
|
|
|
134
134
|
chat.getLatestMessages();
|
|
135
135
|
}
|
|
136
136
|
resolve({ subscription });
|
|
137
|
+
}).catch(err => {
|
|
138
|
+
return resolve({ error: {
|
|
139
|
+
message: 'Failed to resolve the chat',
|
|
140
|
+
code: 'error',
|
|
141
|
+
error: err
|
|
142
|
+
} });
|
|
137
143
|
});
|
|
138
144
|
});
|
|
139
145
|
const appointment = (appointmentId) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -154,27 +160,52 @@ const Chat = (function () {
|
|
|
154
160
|
} };
|
|
155
161
|
}
|
|
156
162
|
});
|
|
157
|
-
const getChat = (chatId) => {
|
|
158
|
-
let isFirstFetch = false;
|
|
163
|
+
const getChat = (chatId) => new Promise((resolve, reject) => {
|
|
159
164
|
if (!(chatId.toString() in chats)) {
|
|
160
|
-
chats[chatId] =
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
165
|
+
chats[chatId] = undefined;
|
|
166
|
+
ably.auth.authorize(function (err, tokenDetails) {
|
|
167
|
+
if (err) {
|
|
168
|
+
return resolve({ error: {
|
|
169
|
+
message: err.toString(),
|
|
170
|
+
code: 'error'
|
|
171
|
+
} });
|
|
172
|
+
}
|
|
173
|
+
let chat = new CachedChat_1.default({
|
|
174
|
+
id: chatId,
|
|
175
|
+
api,
|
|
176
|
+
channel: ably.channels.get(getChannelName(chatId)),
|
|
177
|
+
connectionStatus,
|
|
178
|
+
logger
|
|
179
|
+
});
|
|
180
|
+
chats[chatId] = chat;
|
|
181
|
+
return resolve({
|
|
182
|
+
chat,
|
|
183
|
+
isFirstFetch: true
|
|
184
|
+
});
|
|
166
185
|
});
|
|
167
|
-
isFirstFetch = true;
|
|
168
186
|
}
|
|
169
|
-
|
|
170
|
-
chat
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
187
|
+
else {
|
|
188
|
+
let chat = chats[chatId];
|
|
189
|
+
if (!(0, util_1.isNil)(chat)) {
|
|
190
|
+
return resolve({
|
|
191
|
+
chat,
|
|
192
|
+
isFirstFetch: true
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
return resolve({ error: {
|
|
197
|
+
message: 'Error resolving to the chat.',
|
|
198
|
+
code: 'error'
|
|
199
|
+
} });
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
});
|
|
174
203
|
const handleAblyConnectionStateChange = (event) => {
|
|
175
204
|
connectionStatus = event.current;
|
|
176
205
|
Object.values(chats).forEach(chat => {
|
|
177
|
-
|
|
206
|
+
if (!(0, util_1.isNil)(chat)) {
|
|
207
|
+
chat.setConnectionStatus(connectionStatus);
|
|
208
|
+
}
|
|
178
209
|
});
|
|
179
210
|
};
|
|
180
211
|
const makeApi = () => new API_1.default({
|
package/dist/Chat.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chat.js","sourceRoot":"","sources":["../src/Chat.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,gDAAgD;AAEhD,8DAAsC;AAEtC,qCAAiD;AACjD,0EAAkD;AAClD,4DAAyD;
|
|
1
|
+
{"version":3,"file":"Chat.js","sourceRoot":"","sources":["../src/Chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,23 @@
|
|
|
1
|
-
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import PropTypes from 'prop-types';
|
|
2
3
|
import MessageModel from "../../Message";
|
|
3
4
|
import PendingMessage from '../../PendingMessage';
|
|
4
5
|
export interface MessageProps {
|
|
5
6
|
message: MessageModel | PendingMessage;
|
|
6
7
|
isCurrentUser: boolean;
|
|
8
|
+
failedPendingMessageIconClassName?: string;
|
|
9
|
+
failedPendingMessageDescriptionStyles?: React.CSSProperties;
|
|
10
|
+
failedPendingMessageDescriptionClassName?: string;
|
|
11
|
+
onFailedPendingMessageClick?: (pendingMessage: PendingMessage) => void;
|
|
7
12
|
}
|
|
8
|
-
export declare const Message:
|
|
13
|
+
export declare const Message: {
|
|
14
|
+
({ message, isCurrentUser, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick }: MessageProps): JSX.Element;
|
|
15
|
+
propTypes: {
|
|
16
|
+
message: PropTypes.Requireable<object>;
|
|
17
|
+
isCurrentUser: PropTypes.Requireable<boolean>;
|
|
18
|
+
failedPendingMessageIconClassName: PropTypes.Requireable<string>;
|
|
19
|
+
failedPendingMessageDescriptionStyles: PropTypes.Requireable<object>;
|
|
20
|
+
failedPendingMessageDescriptionClassName: PropTypes.Requireable<string>;
|
|
21
|
+
onFailedPendingMessageClick: PropTypes.Requireable<(...args: any[]) => any>;
|
|
22
|
+
};
|
|
23
|
+
};
|
|
@@ -22,18 +22,36 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
29
|
exports.Message = void 0;
|
|
27
30
|
const React = __importStar(require("react"));
|
|
31
|
+
const prop_types_1 = __importDefault(require("prop-types"));
|
|
32
|
+
const PendingMessage_1 = require("../../PendingMessage");
|
|
28
33
|
const MessageDateTime_1 = require("./MessageDateTime");
|
|
29
|
-
const
|
|
34
|
+
const util_1 = require("../../util");
|
|
35
|
+
const Message = ({ message, isCurrentUser, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick }) => {
|
|
30
36
|
const [dateTimeIsShowing, setDateTimeIsShowing] = React.useState(false);
|
|
37
|
+
const isFailedPendingMessage = ((0, PendingMessage_1.isPendingMessage)(message)
|
|
38
|
+
&& message.status === 'failed');
|
|
39
|
+
const handleMessageClick = () => {
|
|
40
|
+
if (!isFailedPendingMessage) {
|
|
41
|
+
setDateTimeIsShowing(!dateTimeIsShowing);
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
if (onFailedPendingMessageClick) {
|
|
45
|
+
onFailedPendingMessageClick(message);
|
|
46
|
+
}
|
|
47
|
+
};
|
|
31
48
|
const containerStyles = {
|
|
32
49
|
display: 'inline-block',
|
|
33
50
|
maxWidth: '80%',
|
|
34
51
|
margin: '0.125rem 0.5rem'
|
|
35
52
|
};
|
|
36
53
|
const messageStyles = {
|
|
54
|
+
display: 'inline-block',
|
|
37
55
|
borderRadius: '0.675rem',
|
|
38
56
|
backgroundColor: isCurrentUser
|
|
39
57
|
? '#218aff'
|
|
@@ -44,8 +62,27 @@ const Message = ({ message, isCurrentUser }) => {
|
|
|
44
62
|
padding: '0.25rem 1rem',
|
|
45
63
|
};
|
|
46
64
|
return (React.createElement("div", { style: containerStyles },
|
|
47
|
-
React.createElement("div",
|
|
48
|
-
|
|
65
|
+
React.createElement("div", null,
|
|
66
|
+
React.createElement("div", { style: messageStyles, onClick: handleMessageClick },
|
|
67
|
+
React.createElement("span", null, message.message)),
|
|
68
|
+
isFailedPendingMessage && !(0, util_1.isNil)(failedPendingMessageIconClassName) &&
|
|
69
|
+
React.createElement("div", { style: { display: 'inline-block' } },
|
|
70
|
+
React.createElement("i", { className: failedPendingMessageIconClassName })),
|
|
71
|
+
isFailedPendingMessage &&
|
|
72
|
+
React.createElement("div", { className: failedPendingMessageDescriptionClassName, style: failedPendingMessageDescriptionStyles }, (0, util_1.isNil)(onFailedPendingMessageClick)
|
|
73
|
+
? 'This message failed to send'
|
|
74
|
+
: 'This message failed to send. Click to retry'),
|
|
75
|
+
dateTimeIsShowing &&
|
|
76
|
+
React.createElement("div", null,
|
|
77
|
+
React.createElement(MessageDateTime_1.MessageDateTime, { date: message.createdAt, style: { display: 'block' } })))));
|
|
49
78
|
};
|
|
50
79
|
exports.Message = Message;
|
|
80
|
+
exports.Message.propTypes = {
|
|
81
|
+
message: prop_types_1.default.object,
|
|
82
|
+
isCurrentUser: prop_types_1.default.bool,
|
|
83
|
+
failedPendingMessageIconClassName: prop_types_1.default.string,
|
|
84
|
+
failedPendingMessageDescriptionStyles: prop_types_1.default.object,
|
|
85
|
+
failedPendingMessageDescriptionClassName: prop_types_1.default.string,
|
|
86
|
+
onFailedPendingMessageClick: prop_types_1.default.func
|
|
87
|
+
};
|
|
51
88
|
//# sourceMappingURL=Message.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Message.js","sourceRoot":"","sources":["../../../src/react/components/Message.tsx"],"names":[],"mappings":"
|
|
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,KAAK;QACf,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,11 +3,16 @@ 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;
|
|
9
10
|
messagesScrollContainerId: string;
|
|
10
11
|
messagesContainerClassName?: string;
|
|
12
|
+
failedPendingMessageIconClassName?: string;
|
|
13
|
+
failedPendingMessageDescriptionStyles?: React.CSSProperties;
|
|
14
|
+
failedPendingMessageDescriptionClassName?: string;
|
|
15
|
+
onFailedPendingMessageClick?: (pendingMessage: PendingMessage) => void;
|
|
11
16
|
getLatestMessagesStatus: GetLatestMessagesStatus;
|
|
12
17
|
markMessagesReadUpTo(message: MessageModel): Promise<{
|
|
13
18
|
error: ChatError | undefined;
|
|
@@ -20,12 +25,16 @@ export interface MessageListProps {
|
|
|
20
25
|
onRequestScrollToBottomOfMessagesScrollContainer: () => void;
|
|
21
26
|
}
|
|
22
27
|
export declare const MessageList: {
|
|
23
|
-
({ messages, currentUserId, messagesScrollContainerId, messagesContainerClassName, getLatestMessagesStatus, markMessagesReadUpTo, shouldMarkMessagesAsRead, loadingContent, retryContent, noMessagesContent, onMessagesMarkedAsRead, onRequestScrollToBottomOfMessagesScrollContainer }: MessageListProps): React.ReactNode;
|
|
28
|
+
({ messages, currentUserId, messagesScrollContainerId, messagesContainerClassName, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick, getLatestMessagesStatus, markMessagesReadUpTo, shouldMarkMessagesAsRead, loadingContent, retryContent, noMessagesContent, onMessagesMarkedAsRead, onRequestScrollToBottomOfMessagesScrollContainer }: MessageListProps): React.ReactNode;
|
|
24
29
|
propTypes: {
|
|
25
30
|
messages: PropTypes.Validator<(object | null | undefined)[]>;
|
|
26
31
|
currentUserId: PropTypes.Validator<number>;
|
|
27
32
|
messagesScrollContainerId: PropTypes.Validator<string>;
|
|
28
33
|
messagesContainerClassName: PropTypes.Requireable<string>;
|
|
34
|
+
failedPendingMessageIconClassName: PropTypes.Requireable<string>;
|
|
35
|
+
failedPendingMessageDescriptionStyles: PropTypes.Requireable<object>;
|
|
36
|
+
failedPendingMessageDescriptionClassName: PropTypes.Requireable<string>;
|
|
37
|
+
onFailedPendingMessageClick: PropTypes.Requireable<(...args: any[]) => any>;
|
|
29
38
|
getLatestMessagesStatus: PropTypes.Requireable<string>;
|
|
30
39
|
markMessagesReadUpTo: PropTypes.Validator<(...args: any[]) => any>;
|
|
31
40
|
shouldMarkMessagesAsRead: PropTypes.Validator<boolean>;
|
|
@@ -34,7 +34,7 @@ const AdminMessage_1 = require("./AdminMessage");
|
|
|
34
34
|
const Message_1 = require("./Message");
|
|
35
35
|
const PendingMessage_1 = require("../../PendingMessage");
|
|
36
36
|
const util_1 = require("../../util");
|
|
37
|
-
const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messagesContainerClassName, getLatestMessagesStatus, markMessagesReadUpTo, shouldMarkMessagesAsRead, loadingContent, retryContent, noMessagesContent, onMessagesMarkedAsRead, onRequestScrollToBottomOfMessagesScrollContainer }) => {
|
|
37
|
+
const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messagesContainerClassName, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick, getLatestMessagesStatus, markMessagesReadUpTo, shouldMarkMessagesAsRead, loadingContent, retryContent, noMessagesContent, onMessagesMarkedAsRead, onRequestScrollToBottomOfMessagesScrollContainer }) => {
|
|
38
38
|
const [lastMessageMarkedAsReadUpTo, setLastMessageMarkedAsReadUpTo] = React.useState();
|
|
39
39
|
React.useEffect(() => {
|
|
40
40
|
if (getLatestMessagesStatus === 'success') {
|
|
@@ -75,7 +75,7 @@ const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messa
|
|
|
75
75
|
: messages.map(message => {
|
|
76
76
|
if ((0, PendingMessage_1.isPendingMessage)(message) || (!(0, PendingMessage_1.isPendingMessage)(message) && message.senderId === currentUserId)) {
|
|
77
77
|
return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: true },
|
|
78
|
-
React.createElement(Message_1.Message, { message: message, isCurrentUser: true })));
|
|
78
|
+
React.createElement(Message_1.Message, { message: message, isCurrentUser: true, failedPendingMessageIconClassName: failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles: failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName: failedPendingMessageDescriptionClassName, onFailedPendingMessageClick: onFailedPendingMessageClick })));
|
|
79
79
|
}
|
|
80
80
|
else if (message.isAdminMessage) {
|
|
81
81
|
return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: false },
|
|
@@ -93,6 +93,10 @@ exports.MessageList.propTypes = {
|
|
|
93
93
|
currentUserId: prop_types_1.default.number.isRequired,
|
|
94
94
|
messagesScrollContainerId: prop_types_1.default.string.isRequired,
|
|
95
95
|
messagesContainerClassName: prop_types_1.default.string,
|
|
96
|
+
failedPendingMessageIconClassName: prop_types_1.default.string,
|
|
97
|
+
failedPendingMessageDescriptionStyles: prop_types_1.default.object,
|
|
98
|
+
failedPendingMessageDescriptionClassName: prop_types_1.default.string,
|
|
99
|
+
onFailedPendingMessageClick: prop_types_1.default.func,
|
|
96
100
|
getLatestMessagesStatus: prop_types_1.default.oneOf(['initialized', 'fetching', 'success', 'failed']),
|
|
97
101
|
markMessagesReadUpTo: prop_types_1.default.func.isRequired,
|
|
98
102
|
shouldMarkMessagesAsRead: prop_types_1.default.bool.isRequired,
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,4DAAmC;AAInC,6CAA0C;AAC1C,iDAA8C;AAC9C,uCAAoC;AACpC,yDAAwE;AACxE,qCAAqD;AAqB9C,MAAM,WAAW,GAAG,CAAC,EACxB,QAAQ,EACR,aAAa,EACb,yBAAyB,EACzB,0BAA0B,EAC1B,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,2BAA2B,EAC3B,uBAAuB,EACvB,oBAAoB,EACpB,wBAAwB,EACxB,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,sBAAsB,EACtB,gDAAgD,EACjC,EAAE,EAAE;IACnB,MAAM,CAAC,2BAA2B,EAAE,8BAA8B,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAoB,CAAC;IAIzG,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,uBAAuB,KAAK,SAAS,EAAE;YACvC,gDAAgD,EAAE,CAAC;SACtD;IACL,CAAC,EAAE,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAGxC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QAGjB,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,wBAAwB,EAAE;YAC/C,OAAO;SACV;QAGD,IAAI,aAAa,GAAG,IAAA,uBAAgB,EAAC,QAAQ,CAAC,CAAC;QAG/C,IAAI,IAAA,YAAK,EAAC,aAAa,CAAC,EAAE;YACtB,OAAO;SACV;QAGD,IAAI,CAAC,IAAA,YAAK,EAAC,2BAA2B,CAAC,IAAI,2BAA2B,GAAG,aAAa,CAAC,EAAE,CAAC,EAAE;YACxF,oBAAoB,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;oBACf,8BAA8B,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,EAAE,CAAC,CAAC;oBAClD,IAAI,sBAAsB,EAAE;wBACxB,sBAAsB,EAAE,CAAC;qBAC5B;iBACJ;YACL,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAEd,CAAC,CAAC,CAAC;SACN;IACL,CAAC,EAAE,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAEzC,IAAI,uBAAuB,KAAK,QAAQ,EAAE;QACtC,OAAO,YAAY,CAAC;KACvB;SAAM,IACH,CAAC,uBAAuB;WACrB,uBAAuB,KAAK,aAAa;WACzC,uBAAuB,KAAK,UAAU;WACtC,uBAAuB,KAAK,SAAS,EAC1C;QACE,OAAO,cAAc,CAAC;KACzB;IAED,OAAO,CACH,6BAAK,EAAE,EAAE,yBAAyB,EAAE,SAAS,EAAE,0BAA0B,EAAE,KAAK,EAAE,EAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAC,IACpH,QAAQ,CAAC,MAAM,KAAK,CAAC;QAClB,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACrB,IAAI,IAAA,iCAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAA,iCAAgB,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,aAAa,CAAC,EAAE;gBACjG,OAAO,CACH,oBAAC,uBAAU,IAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI;oBAC5C,oBAAC,iBAAO,IACJ,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,IAAI,EACnB,iCAAiC,EAAE,iCAAiC,EACpE,qCAAqC,EAAE,qCAAqC,EAC5E,wCAAwC,EAAE,wCAAwC,EAClF,2BAA2B,EAAE,2BAA2B,GAC1D,CACO,CAChB,CAAC;aACL;iBAAM,IAAI,OAAO,CAAC,cAAc,EAAE;gBAC/B,OAAO,CACH,oBAAC,uBAAU,IAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK;oBAC7C,oBAAC,2BAAY,IAAC,OAAO,EAAE,OAAO,GAAI,CACzB,CAChB,CAAC;aACL;iBAAM;gBACH,OAAO,CACH,oBAAC,uBAAU,IAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK;oBAC7C,oBAAC,iBAAO,IAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,GAAI,CAC1C,CAChB,CAAC;aACL;QACL,CAAC,CAAC,CAEJ,CACT,CAAC;AACN,CAAC,CAAA;AAzGY,QAAA,WAAW,eAyGvB;AAED,mBAAW,CAAC,SAAS,GAAG;IACpB,QAAQ,EAAE,oBAAS,CAAC,OAAO,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,UAAU;IACxD,aAAa,EAAE,oBAAS,CAAC,MAAM,CAAC,UAAU;IAC1C,yBAAyB,EAAE,oBAAS,CAAC,MAAM,CAAC,UAAU;IACtD,0BAA0B,EAAE,oBAAS,CAAC,MAAM;IAC5C,iCAAiC,EAAE,oBAAS,CAAC,MAAM;IACnD,qCAAqC,EAAE,oBAAS,CAAC,MAAM;IACvD,wCAAwC,EAAE,oBAAS,CAAC,MAAM;IAC1D,2BAA2B,EAAE,oBAAS,CAAC,IAAI;IAC3C,uBAAuB,EAAE,oBAAS,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC1F,oBAAoB,EAAE,oBAAS,CAAC,IAAI,CAAC,UAAU;IAC/C,wBAAwB,EAAE,oBAAS,CAAC,IAAI,CAAC,UAAU;IACnD,cAAc,EAAE,oBAAS,CAAC,IAAI,CAAC,UAAU;IACzC,YAAY,EAAE,oBAAS,CAAC,IAAI,CAAC,UAAU;IACvC,iBAAiB,EAAE,oBAAS,CAAC,IAAI,CAAC,UAAU;IAC5C,gDAAgD,EAAE,oBAAS,CAAC,IAAI,CAAC,UAAU;CAC9E,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@viewberapp/chat",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.87",
|
|
4
4
|
"description": "Viewber chat",
|
|
5
5
|
"author": "Jacob <jacob.chen@viewber.co.uk>",
|
|
6
6
|
"homepage": "https://bitbucket.org/ezadr/viewberjs#readme",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"react": "^16.14.0",
|
|
43
43
|
"rollbar": "^2.25.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "ff6e477cb0b1f08053412aa83e3f4155e87179ff"
|
|
46
46
|
}
|