sceyt-chat-react-uikit 1.9.1-beta.1 → 1.9.1-beta.3
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/components/SendMessageInput/MentionsPlugin/index.d.ts +2 -6
- package/index.js +77 -80
- package/index.modern.js +77 -80
- package/package.json +1 -1
|
@@ -8,19 +8,15 @@ export declare class MentionTypeaheadOption extends MenuOption {
|
|
|
8
8
|
avatarUrl?: string;
|
|
9
9
|
constructor(name: string, id: string, presence?: any, avatarUrl?: string);
|
|
10
10
|
}
|
|
11
|
-
export default function MentionsPlugin({ contactsMap, userId, getFromContacts, setMentionMember,
|
|
11
|
+
export default function MentionsPlugin({ contactsMap, userId, getFromContacts, setMentionMember, members, channelId }: {
|
|
12
12
|
contactsMap: IContactsMap;
|
|
13
13
|
userId: string;
|
|
14
14
|
getFromContacts?: boolean;
|
|
15
15
|
setMentionMember: (member: any) => void;
|
|
16
|
-
setMentionsIsOpen: (state: boolean) => void;
|
|
17
16
|
members: IMember[];
|
|
18
17
|
channelId?: string;
|
|
19
18
|
}): JSX.Element | null;
|
|
20
|
-
export declare const MentionsContainerWrapper: import("styled-components").StyledComponent<"div", any, {
|
|
21
|
-
mentionsIsOpen?: boolean | undefined;
|
|
22
|
-
ref?: any;
|
|
23
|
-
}, never>;
|
|
19
|
+
export declare const MentionsContainerWrapper: import("styled-components").StyledComponent<"div", any, {}, never>;
|
|
24
20
|
export declare const MemberItem: import("styled-components").StyledComponent<"li", any, {
|
|
25
21
|
isActiveItem?: boolean | undefined;
|
|
26
22
|
activeBackgroundColor: string;
|
package/index.js
CHANGED
|
@@ -13503,6 +13503,7 @@ function updateMessageStatusOnMap(channelId, newMarkers, isOwnMarker) {
|
|
|
13503
13503
|
var messageShouldBeUpdated = messagesMap[channelId][messageId];
|
|
13504
13504
|
if (messageShouldBeUpdated) {
|
|
13505
13505
|
var isExplicit = explicitIds.includes(messageId);
|
|
13506
|
+
if (!isExplicit && messageShouldBeUpdated.deliveryStatus === MESSAGE_DELIVERY_STATUS.PENDING) return;
|
|
13506
13507
|
if (!isExplicit && shouldSkipDeliveryStatusUpdate(newMarkers.name, messageShouldBeUpdated.deliveryStatus)) return;
|
|
13507
13508
|
var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(messageShouldBeUpdated, {
|
|
13508
13509
|
deliveryStatus: newMarkers.name,
|
|
@@ -14114,6 +14115,7 @@ var messageSlice = createSlice({
|
|
|
14114
14115
|
var inMap = !!markersMap[message.id];
|
|
14115
14116
|
var beforeMax = isForwardMarker && maxMarkerId !== null && !!message.id ? BigInt(message.id) <= maxMarkerId : false;
|
|
14116
14117
|
if (!inMap && !beforeMax) continue;
|
|
14118
|
+
if (!inMap && message.deliveryStatus === MESSAGE_DELIVERY_STATUS.PENDING) continue;
|
|
14117
14119
|
if (message.state !== 'Deleted') {
|
|
14118
14120
|
if (!inMap && shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) continue;
|
|
14119
14121
|
var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, {
|
|
@@ -25104,7 +25106,7 @@ var getResolvedChannelLastMessage$1 = function getResolvedChannelLastMessage(cha
|
|
|
25104
25106
|
};
|
|
25105
25107
|
function handleChannelMessageEvent(args, SceytChatClient) {
|
|
25106
25108
|
var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$attachments;
|
|
25107
|
-
var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, shouldUpdateLastMessage, shouldUpdateReduxLastMessage, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
|
|
25109
|
+
var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, shouldRetainStoredDeliveryStatus, resolvedDeliveryStatus, resolvedLastMessageUpdate, shouldUpdateLastMessage, shouldUpdateReduxLastMessage, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
|
|
25108
25110
|
return _regenerator().w(function (_context2) {
|
|
25109
25111
|
while (1) switch (_context2.n) {
|
|
25110
25112
|
case 0:
|
|
@@ -25131,9 +25133,11 @@ function handleChannelMessageEvent(args, SceytChatClient) {
|
|
|
25131
25133
|
return m.id === ((_storedChannel$lastMe5 = storedChannel.lastMessage) === null || _storedChannel$lastMe5 === void 0 ? void 0 : _storedChannel$lastMe5.id) || (storedChannel === null || storedChannel === void 0 ? void 0 : (_storedChannel$lastMe6 = storedChannel.lastMessage) === null || _storedChannel$lastMe6 === void 0 ? void 0 : _storedChannel$lastMe6.tid) === m.tid;
|
|
25132
25134
|
}) : false;
|
|
25133
25135
|
isSameLastMessage = (storedChannel === null || storedChannel === void 0 ? void 0 : storedChannel.lastMessage) && resolvedLastMessage && (resolvedLastMessage.id && storedChannel.lastMessage.id === resolvedLastMessage.id || resolvedLastMessage.tid && storedChannel.lastMessage.tid === resolvedLastMessage.tid);
|
|
25136
|
+
shouldRetainStoredDeliveryStatus = !!isSameLastMessage && shouldSkipDeliveryStatusUpdate(message.deliveryStatus, storedChannel.lastMessage.deliveryStatus);
|
|
25137
|
+
resolvedDeliveryStatus = shouldRetainStoredDeliveryStatus ? storedChannel.lastMessage.deliveryStatus : message.deliveryStatus;
|
|
25134
25138
|
resolvedLastMessageUpdate = isSameLastMessage ? _extends({}, storedChannel.lastMessage, {
|
|
25135
25139
|
id: message.id,
|
|
25136
|
-
deliveryStatus:
|
|
25140
|
+
deliveryStatus: resolvedDeliveryStatus,
|
|
25137
25141
|
state: MESSAGE_STATUS.UNMODIFIED
|
|
25138
25142
|
}) : resolvedLastMessage;
|
|
25139
25143
|
shouldUpdateLastMessage = lastMessageNeedsUpdate$1(storedChannel === null || storedChannel === void 0 ? void 0 : storedChannel.lastMessage, resolvedLastMessageUpdate);
|
|
@@ -25180,7 +25184,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
|
|
|
25180
25184
|
_context2.n = 5;
|
|
25181
25185
|
return effects.put(updateMessageAC(existingMessage.id || existingMessage.tid, _extends({}, existingMessage, {
|
|
25182
25186
|
id: message.id,
|
|
25183
|
-
deliveryStatus:
|
|
25187
|
+
deliveryStatus: resolvedDeliveryStatus,
|
|
25184
25188
|
state: MESSAGE_STATUS.UNMODIFIED
|
|
25185
25189
|
})));
|
|
25186
25190
|
case 5:
|
|
@@ -25203,7 +25207,9 @@ function handleChannelMessageEvent(args, SceytChatClient) {
|
|
|
25203
25207
|
}, 50);
|
|
25204
25208
|
}
|
|
25205
25209
|
case 10:
|
|
25206
|
-
addMessageToMap(channel.id, message
|
|
25210
|
+
addMessageToMap(channel.id, _extends({}, message, {
|
|
25211
|
+
deliveryStatus: resolvedDeliveryStatus
|
|
25212
|
+
}));
|
|
25207
25213
|
channelDataUpdate = _extends({
|
|
25208
25214
|
messageCount: channelForAdd.messageCount,
|
|
25209
25215
|
unread: channelForAdd.unread,
|
|
@@ -53715,7 +53721,6 @@ function MentionsContainer(_ref2) {
|
|
|
53715
53721
|
selectedIndex = _ref2.selectedIndex,
|
|
53716
53722
|
selectOptionAndCleanUp = _ref2.selectOptionAndCleanUp,
|
|
53717
53723
|
setHighlightedIndex = _ref2.setHighlightedIndex,
|
|
53718
|
-
setMentionsIsOpen = _ref2.setMentionsIsOpen,
|
|
53719
53724
|
channelId = _ref2.channelId,
|
|
53720
53725
|
alignLeft = _ref2.alignLeft,
|
|
53721
53726
|
handleLeftOffset = _ref2.handleLeftOffset;
|
|
@@ -53757,7 +53762,6 @@ function MentionsContainer(_ref2) {
|
|
|
53757
53762
|
};
|
|
53758
53763
|
}, [selectedIndex]);
|
|
53759
53764
|
React.useEffect(function () {
|
|
53760
|
-
setMentionsIsOpen(true);
|
|
53761
53765
|
var menuTimeOut = setTimeout(function () {
|
|
53762
53766
|
var menuElement = document.getElementById('typeahead-menu');
|
|
53763
53767
|
if (menuElement) {
|
|
@@ -53771,7 +53775,6 @@ function MentionsContainer(_ref2) {
|
|
|
53771
53775
|
menuElement.style.zIndex = '-1';
|
|
53772
53776
|
}
|
|
53773
53777
|
selectOptionAndCleanUp(null);
|
|
53774
|
-
setMentionsIsOpen(false);
|
|
53775
53778
|
};
|
|
53776
53779
|
}, []);
|
|
53777
53780
|
var handleScroll = React.useCallback(function (e) {
|
|
@@ -53821,7 +53824,6 @@ function MentionsPlugin(_ref3) {
|
|
|
53821
53824
|
userId = _ref3.userId,
|
|
53822
53825
|
getFromContacts = _ref3.getFromContacts,
|
|
53823
53826
|
setMentionMember = _ref3.setMentionMember,
|
|
53824
|
-
setMentionsIsOpen = _ref3.setMentionsIsOpen,
|
|
53825
53827
|
members = _ref3.members,
|
|
53826
53828
|
channelId = _ref3.channelId;
|
|
53827
53829
|
var _useLexicalComposerCo = LexicalComposerContext.useLexicalComposerContext(),
|
|
@@ -53895,7 +53897,6 @@ function MentionsPlugin(_ref3) {
|
|
|
53895
53897
|
return anchorElementRef.current ? (/*#__PURE__*/React__default.createElement(MentionsContainer, {
|
|
53896
53898
|
queryString: queryString,
|
|
53897
53899
|
options: options,
|
|
53898
|
-
setMentionsIsOpen: setMentionsIsOpen,
|
|
53899
53900
|
selectOptionAndCleanUp: selectOptionAndCleanUp,
|
|
53900
53901
|
selectedIndex: selectedIndex,
|
|
53901
53902
|
setHighlightedIndex: setHighlightedIndex,
|
|
@@ -56920,56 +56921,53 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
56920
56921
|
var _useState16 = React.useState(''),
|
|
56921
56922
|
browser = _useState16[0],
|
|
56922
56923
|
setBrowser = _useState16[1];
|
|
56923
|
-
var _useState17 = React.useState(
|
|
56924
|
-
|
|
56925
|
-
|
|
56926
|
-
var _useState18 = React.useState(),
|
|
56927
|
-
inputContainerHeight = _useState18[0],
|
|
56928
|
-
setInputContainerHeight = _useState18[1];
|
|
56924
|
+
var _useState17 = React.useState(),
|
|
56925
|
+
inputContainerHeight = _useState17[0],
|
|
56926
|
+
setInputContainerHeight = _useState17[1];
|
|
56929
56927
|
var selectedText = React.useRef(null);
|
|
56928
|
+
var _useState18 = React.useState(),
|
|
56929
|
+
typingTimout = _useState18[0],
|
|
56930
|
+
setTypingTimout = _useState18[1];
|
|
56930
56931
|
var _useState19 = React.useState(),
|
|
56931
|
-
|
|
56932
|
-
|
|
56933
|
-
var _useState20 = React.useState(),
|
|
56934
|
-
|
|
56935
|
-
|
|
56932
|
+
inTypingStateTimout = _useState19[0],
|
|
56933
|
+
setInTypingStateTimout = _useState19[1];
|
|
56934
|
+
var _useState20 = React.useState(false),
|
|
56935
|
+
inTypingState = _useState20[0],
|
|
56936
|
+
setInTypingState = _useState20[1];
|
|
56936
56937
|
var _useState21 = React.useState(false),
|
|
56937
|
-
|
|
56938
|
-
|
|
56938
|
+
sendMessageIsActive = _useState21[0],
|
|
56939
|
+
setSendMessageIsActive = _useState21[1];
|
|
56939
56940
|
var _useState22 = React.useState(false),
|
|
56940
|
-
|
|
56941
|
-
|
|
56942
|
-
var _useState23 = React.useState(
|
|
56943
|
-
|
|
56944
|
-
|
|
56945
|
-
var _useState24 = React.useState([]),
|
|
56946
|
-
attachments = _useState24[0],
|
|
56947
|
-
setAttachments = _useState24[1];
|
|
56941
|
+
isSendMessageInFlight = _useState22[0],
|
|
56942
|
+
setIsSendMessageInFlight = _useState22[1];
|
|
56943
|
+
var _useState23 = React.useState([]),
|
|
56944
|
+
attachments = _useState23[0],
|
|
56945
|
+
setAttachments = _useState23[1];
|
|
56948
56946
|
var attachmentsRef = React.useRef([]);
|
|
56947
|
+
var _useState24 = React.useState(false),
|
|
56948
|
+
forwardPopupOpen = _useState24[0],
|
|
56949
|
+
setForwardPopupOpen = _useState24[1];
|
|
56949
56950
|
var _useState25 = React.useState(false),
|
|
56950
|
-
|
|
56951
|
-
|
|
56951
|
+
deletePopupOpen = _useState25[0],
|
|
56952
|
+
setDeletePopupOpen = _useState25[1];
|
|
56952
56953
|
var _useState26 = React.useState(false),
|
|
56953
|
-
|
|
56954
|
-
|
|
56955
|
-
var _useState27 = React.useState(
|
|
56956
|
-
|
|
56957
|
-
|
|
56958
|
-
var _useState28 = React.useState('
|
|
56959
|
-
|
|
56960
|
-
|
|
56961
|
-
var _useState29 = React.useState(
|
|
56962
|
-
|
|
56963
|
-
|
|
56964
|
-
var _useState30 = React.useState(
|
|
56965
|
-
|
|
56966
|
-
|
|
56967
|
-
var _useState31 = React.useState(
|
|
56968
|
-
|
|
56969
|
-
|
|
56970
|
-
var _useState32 = React.useState(activeChannel.id || ''),
|
|
56971
|
-
composerChannelId = _useState32[0],
|
|
56972
|
-
setComposerChannelId = _useState32[1];
|
|
56954
|
+
isIncomingMessage = _useState26[0],
|
|
56955
|
+
setIsIncomingMessage = _useState26[1];
|
|
56956
|
+
var _useState27 = React.useState('.jpg,.jpeg,.png,.gif,.mp4,.mov,.avi,.wmv,.flv,.webm,.jfif'),
|
|
56957
|
+
mediaExtensions = _useState27[0],
|
|
56958
|
+
setMediaExtensions = _useState27[1];
|
|
56959
|
+
var _useState28 = React.useState(''),
|
|
56960
|
+
uploadErrorMessage = _useState28[0],
|
|
56961
|
+
setUploadErrorMessage = _useState28[1];
|
|
56962
|
+
var _useState29 = React.useState(false),
|
|
56963
|
+
viewOnce = _useState29[0],
|
|
56964
|
+
setViewOnce = _useState29[1];
|
|
56965
|
+
var _useState30 = React.useState(areDraftMessagesHydrated()),
|
|
56966
|
+
draftsHydrated = _useState30[0],
|
|
56967
|
+
setDraftsHydrated = _useState30[1];
|
|
56968
|
+
var _useState31 = React.useState(activeChannel.id || ''),
|
|
56969
|
+
composerChannelId = _useState31[0],
|
|
56970
|
+
setComposerChannelId = _useState31[1];
|
|
56973
56971
|
var typingOrRecordingIndicator = useSelector(typingOrRecordingIndicatorArraySelector(activeChannel.id));
|
|
56974
56972
|
var contactsMap = useSelector(contactsMapSelector);
|
|
56975
56973
|
var connectionStatus = useSelector(connectionStatusSelector, reactRedux.shallowEqual);
|
|
@@ -56993,36 +56991,36 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
56993
56991
|
setIsSendMessageInFlight(false);
|
|
56994
56992
|
});
|
|
56995
56993
|
};
|
|
56996
|
-
var
|
|
56997
|
-
realEditorState =
|
|
56998
|
-
setRealEditorState =
|
|
56999
|
-
var
|
|
57000
|
-
floatingAnchorElem =
|
|
57001
|
-
setFloatingAnchorElem =
|
|
56994
|
+
var _useState32 = React.useState(),
|
|
56995
|
+
realEditorState = _useState32[0],
|
|
56996
|
+
setRealEditorState = _useState32[1];
|
|
56997
|
+
var _useState33 = React.useState(null),
|
|
56998
|
+
floatingAnchorElem = _useState33[0],
|
|
56999
|
+
setFloatingAnchorElem = _useState33[1];
|
|
57000
|
+
var _useState34 = React.useState(false),
|
|
57001
|
+
isSmallWidthViewport = _useState34[0],
|
|
57002
|
+
setIsSmallWidthViewport = _useState34[1];
|
|
57002
57003
|
var _useState35 = React.useState(false),
|
|
57003
|
-
|
|
57004
|
-
|
|
57005
|
-
var _useState36 = React.useState(
|
|
57006
|
-
|
|
57007
|
-
|
|
57004
|
+
isScrolling = _useState35[0],
|
|
57005
|
+
setIsScrolling = _useState35[1];
|
|
57006
|
+
var _useState36 = React.useState(null),
|
|
57007
|
+
linkPreview = _useState36[0],
|
|
57008
|
+
setLinkPreview = _useState36[1];
|
|
57008
57009
|
var _useState37 = React.useState(null),
|
|
57009
|
-
|
|
57010
|
-
|
|
57011
|
-
var _useState38 = React.useState(
|
|
57012
|
-
|
|
57013
|
-
|
|
57014
|
-
var _useState39 = React.useState(
|
|
57015
|
-
|
|
57016
|
-
|
|
57010
|
+
detectedUrl = _useState37[0],
|
|
57011
|
+
setDetectedUrl = _useState37[1];
|
|
57012
|
+
var _useState38 = React.useState(new Set()),
|
|
57013
|
+
dismissedUrls = _useState38[0],
|
|
57014
|
+
setDismissedUrls = _useState38[1];
|
|
57015
|
+
var _useState39 = React.useState(false),
|
|
57016
|
+
isClosingPreview = _useState39[0],
|
|
57017
|
+
setIsClosingPreview = _useState39[1];
|
|
57017
57018
|
var _useState40 = React.useState(false),
|
|
57018
|
-
|
|
57019
|
-
|
|
57019
|
+
replyLinkPreviewImageFailed = _useState40[0],
|
|
57020
|
+
setReplyLinkPreviewImageFailed = _useState40[1];
|
|
57020
57021
|
var _useState41 = React.useState(false),
|
|
57021
|
-
|
|
57022
|
-
|
|
57023
|
-
var _useState42 = React.useState(false),
|
|
57024
|
-
linkPreviewImageFailed = _useState42[0],
|
|
57025
|
-
setLinkPreviewImageFailed = _useState42[1];
|
|
57022
|
+
linkPreviewImageFailed = _useState41[0],
|
|
57023
|
+
setLinkPreviewImageFailed = _useState41[1];
|
|
57026
57024
|
var addAttachmentByMenu = showChooseFileAttachment && showChooseMediaAttachment;
|
|
57027
57025
|
var linkify = new LinkifyIt();
|
|
57028
57026
|
var oGMetadata = useSelector(function (state) {
|
|
@@ -57292,7 +57290,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
57292
57290
|
});
|
|
57293
57291
|
}
|
|
57294
57292
|
}
|
|
57295
|
-
if (shouldSend
|
|
57293
|
+
if (shouldSend) {
|
|
57296
57294
|
if (isSendMessageInFlightRef.current) {
|
|
57297
57295
|
event.preventDefault();
|
|
57298
57296
|
event.stopPropagation();
|
|
@@ -58805,7 +58803,6 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
58805
58803
|
userId: user.id,
|
|
58806
58804
|
getFromContacts: getFromContacts,
|
|
58807
58805
|
members: activeChannelMembers,
|
|
58808
|
-
setMentionsIsOpen: setMentionsIsOpen,
|
|
58809
58806
|
channelId: activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.id
|
|
58810
58807
|
})), /*#__PURE__*/React__default.createElement(LexicalHistoryPlugin.HistoryPlugin, null), /*#__PURE__*/React__default.createElement(LexicalRichTextPlugin.RichTextPlugin, {
|
|
58811
58808
|
contentEditable: /*#__PURE__*/React__default.createElement("div", {
|
package/index.modern.js
CHANGED
|
@@ -13483,6 +13483,7 @@ function updateMessageStatusOnMap(channelId, newMarkers, isOwnMarker) {
|
|
|
13483
13483
|
var messageShouldBeUpdated = messagesMap[channelId][messageId];
|
|
13484
13484
|
if (messageShouldBeUpdated) {
|
|
13485
13485
|
var isExplicit = explicitIds.includes(messageId);
|
|
13486
|
+
if (!isExplicit && messageShouldBeUpdated.deliveryStatus === MESSAGE_DELIVERY_STATUS.PENDING) return;
|
|
13486
13487
|
if (!isExplicit && shouldSkipDeliveryStatusUpdate(newMarkers.name, messageShouldBeUpdated.deliveryStatus)) return;
|
|
13487
13488
|
var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(messageShouldBeUpdated, {
|
|
13488
13489
|
deliveryStatus: newMarkers.name,
|
|
@@ -14094,6 +14095,7 @@ var messageSlice = createSlice({
|
|
|
14094
14095
|
var inMap = !!markersMap[message.id];
|
|
14095
14096
|
var beforeMax = isForwardMarker && maxMarkerId !== null && !!message.id ? BigInt(message.id) <= maxMarkerId : false;
|
|
14096
14097
|
if (!inMap && !beforeMax) continue;
|
|
14098
|
+
if (!inMap && message.deliveryStatus === MESSAGE_DELIVERY_STATUS.PENDING) continue;
|
|
14097
14099
|
if (message.state !== 'Deleted') {
|
|
14098
14100
|
if (!inMap && shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) continue;
|
|
14099
14101
|
var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, {
|
|
@@ -25084,7 +25086,7 @@ var getResolvedChannelLastMessage$1 = function getResolvedChannelLastMessage(cha
|
|
|
25084
25086
|
};
|
|
25085
25087
|
function handleChannelMessageEvent(args, SceytChatClient) {
|
|
25086
25088
|
var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$attachments;
|
|
25087
|
-
var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, shouldUpdateLastMessage, shouldUpdateReduxLastMessage, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
|
|
25089
|
+
var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, shouldRetainStoredDeliveryStatus, resolvedDeliveryStatus, resolvedLastMessageUpdate, shouldUpdateLastMessage, shouldUpdateReduxLastMessage, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
|
|
25088
25090
|
return _regenerator().w(function (_context2) {
|
|
25089
25091
|
while (1) switch (_context2.n) {
|
|
25090
25092
|
case 0:
|
|
@@ -25111,9 +25113,11 @@ function handleChannelMessageEvent(args, SceytChatClient) {
|
|
|
25111
25113
|
return m.id === ((_storedChannel$lastMe5 = storedChannel.lastMessage) === null || _storedChannel$lastMe5 === void 0 ? void 0 : _storedChannel$lastMe5.id) || (storedChannel === null || storedChannel === void 0 ? void 0 : (_storedChannel$lastMe6 = storedChannel.lastMessage) === null || _storedChannel$lastMe6 === void 0 ? void 0 : _storedChannel$lastMe6.tid) === m.tid;
|
|
25112
25114
|
}) : false;
|
|
25113
25115
|
isSameLastMessage = (storedChannel === null || storedChannel === void 0 ? void 0 : storedChannel.lastMessage) && resolvedLastMessage && (resolvedLastMessage.id && storedChannel.lastMessage.id === resolvedLastMessage.id || resolvedLastMessage.tid && storedChannel.lastMessage.tid === resolvedLastMessage.tid);
|
|
25116
|
+
shouldRetainStoredDeliveryStatus = !!isSameLastMessage && shouldSkipDeliveryStatusUpdate(message.deliveryStatus, storedChannel.lastMessage.deliveryStatus);
|
|
25117
|
+
resolvedDeliveryStatus = shouldRetainStoredDeliveryStatus ? storedChannel.lastMessage.deliveryStatus : message.deliveryStatus;
|
|
25114
25118
|
resolvedLastMessageUpdate = isSameLastMessage ? _extends({}, storedChannel.lastMessage, {
|
|
25115
25119
|
id: message.id,
|
|
25116
|
-
deliveryStatus:
|
|
25120
|
+
deliveryStatus: resolvedDeliveryStatus,
|
|
25117
25121
|
state: MESSAGE_STATUS.UNMODIFIED
|
|
25118
25122
|
}) : resolvedLastMessage;
|
|
25119
25123
|
shouldUpdateLastMessage = lastMessageNeedsUpdate$1(storedChannel === null || storedChannel === void 0 ? void 0 : storedChannel.lastMessage, resolvedLastMessageUpdate);
|
|
@@ -25160,7 +25164,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
|
|
|
25160
25164
|
_context2.n = 5;
|
|
25161
25165
|
return put(updateMessageAC(existingMessage.id || existingMessage.tid, _extends({}, existingMessage, {
|
|
25162
25166
|
id: message.id,
|
|
25163
|
-
deliveryStatus:
|
|
25167
|
+
deliveryStatus: resolvedDeliveryStatus,
|
|
25164
25168
|
state: MESSAGE_STATUS.UNMODIFIED
|
|
25165
25169
|
})));
|
|
25166
25170
|
case 5:
|
|
@@ -25183,7 +25187,9 @@ function handleChannelMessageEvent(args, SceytChatClient) {
|
|
|
25183
25187
|
}, 50);
|
|
25184
25188
|
}
|
|
25185
25189
|
case 10:
|
|
25186
|
-
addMessageToMap(channel.id, message
|
|
25190
|
+
addMessageToMap(channel.id, _extends({}, message, {
|
|
25191
|
+
deliveryStatus: resolvedDeliveryStatus
|
|
25192
|
+
}));
|
|
25187
25193
|
channelDataUpdate = _extends({
|
|
25188
25194
|
messageCount: channelForAdd.messageCount,
|
|
25189
25195
|
unread: channelForAdd.unread,
|
|
@@ -53695,7 +53701,6 @@ function MentionsContainer(_ref2) {
|
|
|
53695
53701
|
selectedIndex = _ref2.selectedIndex,
|
|
53696
53702
|
selectOptionAndCleanUp = _ref2.selectOptionAndCleanUp,
|
|
53697
53703
|
setHighlightedIndex = _ref2.setHighlightedIndex,
|
|
53698
|
-
setMentionsIsOpen = _ref2.setMentionsIsOpen,
|
|
53699
53704
|
channelId = _ref2.channelId,
|
|
53700
53705
|
alignLeft = _ref2.alignLeft,
|
|
53701
53706
|
handleLeftOffset = _ref2.handleLeftOffset;
|
|
@@ -53737,7 +53742,6 @@ function MentionsContainer(_ref2) {
|
|
|
53737
53742
|
};
|
|
53738
53743
|
}, [selectedIndex]);
|
|
53739
53744
|
useEffect(function () {
|
|
53740
|
-
setMentionsIsOpen(true);
|
|
53741
53745
|
var menuTimeOut = setTimeout(function () {
|
|
53742
53746
|
var menuElement = document.getElementById('typeahead-menu');
|
|
53743
53747
|
if (menuElement) {
|
|
@@ -53751,7 +53755,6 @@ function MentionsContainer(_ref2) {
|
|
|
53751
53755
|
menuElement.style.zIndex = '-1';
|
|
53752
53756
|
}
|
|
53753
53757
|
selectOptionAndCleanUp(null);
|
|
53754
|
-
setMentionsIsOpen(false);
|
|
53755
53758
|
};
|
|
53756
53759
|
}, []);
|
|
53757
53760
|
var handleScroll = useCallback(function (e) {
|
|
@@ -53801,7 +53804,6 @@ function MentionsPlugin(_ref3) {
|
|
|
53801
53804
|
userId = _ref3.userId,
|
|
53802
53805
|
getFromContacts = _ref3.getFromContacts,
|
|
53803
53806
|
setMentionMember = _ref3.setMentionMember,
|
|
53804
|
-
setMentionsIsOpen = _ref3.setMentionsIsOpen,
|
|
53805
53807
|
members = _ref3.members,
|
|
53806
53808
|
channelId = _ref3.channelId;
|
|
53807
53809
|
var _useLexicalComposerCo = useLexicalComposerContext(),
|
|
@@ -53875,7 +53877,6 @@ function MentionsPlugin(_ref3) {
|
|
|
53875
53877
|
return anchorElementRef.current ? (/*#__PURE__*/React__default.createElement(MentionsContainer, {
|
|
53876
53878
|
queryString: queryString,
|
|
53877
53879
|
options: options,
|
|
53878
|
-
setMentionsIsOpen: setMentionsIsOpen,
|
|
53879
53880
|
selectOptionAndCleanUp: selectOptionAndCleanUp,
|
|
53880
53881
|
selectedIndex: selectedIndex,
|
|
53881
53882
|
setHighlightedIndex: setHighlightedIndex,
|
|
@@ -56900,56 +56901,53 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
56900
56901
|
var _useState16 = useState(''),
|
|
56901
56902
|
browser = _useState16[0],
|
|
56902
56903
|
setBrowser = _useState16[1];
|
|
56903
|
-
var _useState17 = useState(
|
|
56904
|
-
|
|
56905
|
-
|
|
56906
|
-
var _useState18 = useState(),
|
|
56907
|
-
inputContainerHeight = _useState18[0],
|
|
56908
|
-
setInputContainerHeight = _useState18[1];
|
|
56904
|
+
var _useState17 = useState(),
|
|
56905
|
+
inputContainerHeight = _useState17[0],
|
|
56906
|
+
setInputContainerHeight = _useState17[1];
|
|
56909
56907
|
var selectedText = useRef(null);
|
|
56908
|
+
var _useState18 = useState(),
|
|
56909
|
+
typingTimout = _useState18[0],
|
|
56910
|
+
setTypingTimout = _useState18[1];
|
|
56910
56911
|
var _useState19 = useState(),
|
|
56911
|
-
|
|
56912
|
-
|
|
56913
|
-
var _useState20 = useState(),
|
|
56914
|
-
|
|
56915
|
-
|
|
56912
|
+
inTypingStateTimout = _useState19[0],
|
|
56913
|
+
setInTypingStateTimout = _useState19[1];
|
|
56914
|
+
var _useState20 = useState(false),
|
|
56915
|
+
inTypingState = _useState20[0],
|
|
56916
|
+
setInTypingState = _useState20[1];
|
|
56916
56917
|
var _useState21 = useState(false),
|
|
56917
|
-
|
|
56918
|
-
|
|
56918
|
+
sendMessageIsActive = _useState21[0],
|
|
56919
|
+
setSendMessageIsActive = _useState21[1];
|
|
56919
56920
|
var _useState22 = useState(false),
|
|
56920
|
-
|
|
56921
|
-
|
|
56922
|
-
var _useState23 = useState(
|
|
56923
|
-
|
|
56924
|
-
|
|
56925
|
-
var _useState24 = useState([]),
|
|
56926
|
-
attachments = _useState24[0],
|
|
56927
|
-
setAttachments = _useState24[1];
|
|
56921
|
+
isSendMessageInFlight = _useState22[0],
|
|
56922
|
+
setIsSendMessageInFlight = _useState22[1];
|
|
56923
|
+
var _useState23 = useState([]),
|
|
56924
|
+
attachments = _useState23[0],
|
|
56925
|
+
setAttachments = _useState23[1];
|
|
56928
56926
|
var attachmentsRef = useRef([]);
|
|
56927
|
+
var _useState24 = useState(false),
|
|
56928
|
+
forwardPopupOpen = _useState24[0],
|
|
56929
|
+
setForwardPopupOpen = _useState24[1];
|
|
56929
56930
|
var _useState25 = useState(false),
|
|
56930
|
-
|
|
56931
|
-
|
|
56931
|
+
deletePopupOpen = _useState25[0],
|
|
56932
|
+
setDeletePopupOpen = _useState25[1];
|
|
56932
56933
|
var _useState26 = useState(false),
|
|
56933
|
-
|
|
56934
|
-
|
|
56935
|
-
var _useState27 = useState(
|
|
56936
|
-
|
|
56937
|
-
|
|
56938
|
-
var _useState28 = useState('
|
|
56939
|
-
|
|
56940
|
-
|
|
56941
|
-
var _useState29 = useState(
|
|
56942
|
-
|
|
56943
|
-
|
|
56944
|
-
var _useState30 = useState(
|
|
56945
|
-
|
|
56946
|
-
|
|
56947
|
-
var _useState31 = useState(
|
|
56948
|
-
|
|
56949
|
-
|
|
56950
|
-
var _useState32 = useState(activeChannel.id || ''),
|
|
56951
|
-
composerChannelId = _useState32[0],
|
|
56952
|
-
setComposerChannelId = _useState32[1];
|
|
56934
|
+
isIncomingMessage = _useState26[0],
|
|
56935
|
+
setIsIncomingMessage = _useState26[1];
|
|
56936
|
+
var _useState27 = useState('.jpg,.jpeg,.png,.gif,.mp4,.mov,.avi,.wmv,.flv,.webm,.jfif'),
|
|
56937
|
+
mediaExtensions = _useState27[0],
|
|
56938
|
+
setMediaExtensions = _useState27[1];
|
|
56939
|
+
var _useState28 = useState(''),
|
|
56940
|
+
uploadErrorMessage = _useState28[0],
|
|
56941
|
+
setUploadErrorMessage = _useState28[1];
|
|
56942
|
+
var _useState29 = useState(false),
|
|
56943
|
+
viewOnce = _useState29[0],
|
|
56944
|
+
setViewOnce = _useState29[1];
|
|
56945
|
+
var _useState30 = useState(areDraftMessagesHydrated()),
|
|
56946
|
+
draftsHydrated = _useState30[0],
|
|
56947
|
+
setDraftsHydrated = _useState30[1];
|
|
56948
|
+
var _useState31 = useState(activeChannel.id || ''),
|
|
56949
|
+
composerChannelId = _useState31[0],
|
|
56950
|
+
setComposerChannelId = _useState31[1];
|
|
56953
56951
|
var typingOrRecordingIndicator = useSelector(typingOrRecordingIndicatorArraySelector(activeChannel.id));
|
|
56954
56952
|
var contactsMap = useSelector(contactsMapSelector);
|
|
56955
56953
|
var connectionStatus = useSelector(connectionStatusSelector, shallowEqual);
|
|
@@ -56973,36 +56971,36 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
56973
56971
|
setIsSendMessageInFlight(false);
|
|
56974
56972
|
});
|
|
56975
56973
|
};
|
|
56976
|
-
var
|
|
56977
|
-
realEditorState =
|
|
56978
|
-
setRealEditorState =
|
|
56979
|
-
var
|
|
56980
|
-
floatingAnchorElem =
|
|
56981
|
-
setFloatingAnchorElem =
|
|
56974
|
+
var _useState32 = useState(),
|
|
56975
|
+
realEditorState = _useState32[0],
|
|
56976
|
+
setRealEditorState = _useState32[1];
|
|
56977
|
+
var _useState33 = useState(null),
|
|
56978
|
+
floatingAnchorElem = _useState33[0],
|
|
56979
|
+
setFloatingAnchorElem = _useState33[1];
|
|
56980
|
+
var _useState34 = useState(false),
|
|
56981
|
+
isSmallWidthViewport = _useState34[0],
|
|
56982
|
+
setIsSmallWidthViewport = _useState34[1];
|
|
56982
56983
|
var _useState35 = useState(false),
|
|
56983
|
-
|
|
56984
|
-
|
|
56985
|
-
var _useState36 = useState(
|
|
56986
|
-
|
|
56987
|
-
|
|
56984
|
+
isScrolling = _useState35[0],
|
|
56985
|
+
setIsScrolling = _useState35[1];
|
|
56986
|
+
var _useState36 = useState(null),
|
|
56987
|
+
linkPreview = _useState36[0],
|
|
56988
|
+
setLinkPreview = _useState36[1];
|
|
56988
56989
|
var _useState37 = useState(null),
|
|
56989
|
-
|
|
56990
|
-
|
|
56991
|
-
var _useState38 = useState(
|
|
56992
|
-
|
|
56993
|
-
|
|
56994
|
-
var _useState39 = useState(
|
|
56995
|
-
|
|
56996
|
-
|
|
56990
|
+
detectedUrl = _useState37[0],
|
|
56991
|
+
setDetectedUrl = _useState37[1];
|
|
56992
|
+
var _useState38 = useState(new Set()),
|
|
56993
|
+
dismissedUrls = _useState38[0],
|
|
56994
|
+
setDismissedUrls = _useState38[1];
|
|
56995
|
+
var _useState39 = useState(false),
|
|
56996
|
+
isClosingPreview = _useState39[0],
|
|
56997
|
+
setIsClosingPreview = _useState39[1];
|
|
56997
56998
|
var _useState40 = useState(false),
|
|
56998
|
-
|
|
56999
|
-
|
|
56999
|
+
replyLinkPreviewImageFailed = _useState40[0],
|
|
57000
|
+
setReplyLinkPreviewImageFailed = _useState40[1];
|
|
57000
57001
|
var _useState41 = useState(false),
|
|
57001
|
-
|
|
57002
|
-
|
|
57003
|
-
var _useState42 = useState(false),
|
|
57004
|
-
linkPreviewImageFailed = _useState42[0],
|
|
57005
|
-
setLinkPreviewImageFailed = _useState42[1];
|
|
57002
|
+
linkPreviewImageFailed = _useState41[0],
|
|
57003
|
+
setLinkPreviewImageFailed = _useState41[1];
|
|
57006
57004
|
var addAttachmentByMenu = showChooseFileAttachment && showChooseMediaAttachment;
|
|
57007
57005
|
var linkify = new LinkifyIt();
|
|
57008
57006
|
var oGMetadata = useSelector(function (state) {
|
|
@@ -57272,7 +57270,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
57272
57270
|
});
|
|
57273
57271
|
}
|
|
57274
57272
|
}
|
|
57275
|
-
if (shouldSend
|
|
57273
|
+
if (shouldSend) {
|
|
57276
57274
|
if (isSendMessageInFlightRef.current) {
|
|
57277
57275
|
event.preventDefault();
|
|
57278
57276
|
event.stopPropagation();
|
|
@@ -58785,7 +58783,6 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
58785
58783
|
userId: user.id,
|
|
58786
58784
|
getFromContacts: getFromContacts,
|
|
58787
58785
|
members: activeChannelMembers,
|
|
58788
|
-
setMentionsIsOpen: setMentionsIsOpen,
|
|
58789
58786
|
channelId: activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.id
|
|
58790
58787
|
})), /*#__PURE__*/React__default.createElement(HistoryPlugin, null), /*#__PURE__*/React__default.createElement(RichTextPlugin, {
|
|
58791
58788
|
contentEditable: /*#__PURE__*/React__default.createElement("div", {
|