sceyt-chat-react-uikit 1.7.8-beta.6 → 1.7.8-beta.8
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/AudioRecord/index.d.ts +2 -2
- package/index.js +57 -16
- package/index.modern.js +57 -16
- package/package.json +1 -1
|
@@ -11,5 +11,5 @@ interface AudioPlayerProps {
|
|
|
11
11
|
channelId: string;
|
|
12
12
|
maxRecordingDuration?: number;
|
|
13
13
|
}
|
|
14
|
-
declare const
|
|
15
|
-
export default
|
|
14
|
+
declare const _default: React.NamedExoticComponent<AudioPlayerProps>;
|
|
15
|
+
export default _default;
|
package/index.js
CHANGED
|
@@ -16370,7 +16370,7 @@ function getChannels(action) {
|
|
|
16370
16370
|
try {
|
|
16371
16371
|
return Promise.resolve(new Promise(function (resolve) {
|
|
16372
16372
|
channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
|
|
16373
|
-
channelMessageMap[channel.id] = messages[0];
|
|
16373
|
+
channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
|
|
16374
16374
|
log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
|
|
16375
16375
|
resolve(true);
|
|
16376
16376
|
})["catch"](function (e) {
|
|
@@ -16389,8 +16389,8 @@ function getChannels(action) {
|
|
|
16389
16389
|
case 13:
|
|
16390
16390
|
log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
|
|
16391
16391
|
mappedChannels = mappedChannels.map(function (channel) {
|
|
16392
|
-
if (channelMessageMap[channel.id]) {
|
|
16393
|
-
channel.lastReactedMessage = channelMessageMap[channel.id];
|
|
16392
|
+
if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
|
|
16393
|
+
channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
|
|
16394
16394
|
}
|
|
16395
16395
|
return channel;
|
|
16396
16396
|
});
|
|
@@ -19168,6 +19168,10 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
|
|
|
19168
19168
|
_context.n = 7;
|
|
19169
19169
|
break;
|
|
19170
19170
|
case 6:
|
|
19171
|
+
if (!(channel !== null && channel !== void 0 && channel.id)) {
|
|
19172
|
+
_context.n = 7;
|
|
19173
|
+
break;
|
|
19174
|
+
}
|
|
19171
19175
|
_context.n = 7;
|
|
19172
19176
|
return effects.put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
|
|
19173
19177
|
case 7:
|
|
@@ -38504,7 +38508,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38504
38508
|
if (unreadScrollTo) {
|
|
38505
38509
|
return Promise.resolve();
|
|
38506
38510
|
}
|
|
38507
|
-
if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING) {
|
|
38511
|
+
if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING && channel !== null && channel !== void 0 && channel.id) {
|
|
38508
38512
|
dispatch(getMessagesAC(channel, true));
|
|
38509
38513
|
}
|
|
38510
38514
|
if (target.scrollTop <= -50) {
|
|
@@ -38593,7 +38597,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38593
38597
|
nextDisableRef.current = false;
|
|
38594
38598
|
}, 1000 + positiveValue * 0.1);
|
|
38595
38599
|
}
|
|
38596
|
-
} else {
|
|
38600
|
+
} else if (channel !== null && channel !== void 0 && channel.id) {
|
|
38597
38601
|
dispatch(getMessagesAC(channel, undefined, messageId, undefined, true, 'smooth', true));
|
|
38598
38602
|
}
|
|
38599
38603
|
return Promise.resolve();
|
|
@@ -38777,7 +38781,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38777
38781
|
prevDisableRef.current = false;
|
|
38778
38782
|
shouldLoadMessagesRef.current = '';
|
|
38779
38783
|
loadingRef.current = false;
|
|
38780
|
-
if (channel.backToLinkedChannel) {
|
|
38784
|
+
if (channel.backToLinkedChannel && channel !== null && channel !== void 0 && channel.id) {
|
|
38781
38785
|
var visibleMessages = getVisibleMessagesMap();
|
|
38782
38786
|
var visibleMessagesIds = Object.keys(visibleMessages);
|
|
38783
38787
|
var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
|
|
@@ -38787,7 +38791,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38787
38791
|
if (!channel.isLinkedChannel) {
|
|
38788
38792
|
clearVisibleMessagesMap();
|
|
38789
38793
|
}
|
|
38790
|
-
if (channel) {
|
|
38794
|
+
if (channel && channel !== null && channel !== void 0 && channel.id) {
|
|
38791
38795
|
dispatch(getMessagesAC(channel, undefined, undefined, undefined, true));
|
|
38792
38796
|
}
|
|
38793
38797
|
if (channel.id) {
|
|
@@ -38956,7 +38960,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38956
38960
|
setScrollIntoView(true);
|
|
38957
38961
|
var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId) || null;
|
|
38958
38962
|
var newLastDisplayedMessageId = channel.lastDisplayedMessageId;
|
|
38959
|
-
if (!lastReadMessageNode) {
|
|
38963
|
+
if (!lastReadMessageNode && channel.lastDisplayedMessageId && channel.lastDisplayedMessageId !== '0') {
|
|
38960
38964
|
for (var index = 0; index < messages.length; index++) {
|
|
38961
38965
|
var message = messages[index];
|
|
38962
38966
|
if (channel.lastDisplayedMessageId >= message.id && (messages.length < index + 2 || channel.lastDisplayedMessageId <= messages[index + 1].id)) {
|
|
@@ -38965,6 +38969,9 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38965
38969
|
break;
|
|
38966
38970
|
}
|
|
38967
38971
|
}
|
|
38972
|
+
} else if (!lastReadMessageNode && (!channel.lastDisplayedMessageId || channel.lastDisplayedMessageId === '0') && messages !== null && messages !== void 0 && messages.length) {
|
|
38973
|
+
newLastDisplayedMessageId = messages[0].id;
|
|
38974
|
+
lastReadMessageNode = document.getElementById(newLastDisplayedMessageId);
|
|
38968
38975
|
}
|
|
38969
38976
|
if (lastReadMessageNode && scrollElement) {
|
|
38970
38977
|
dispatch(scrollToNewMessageAC(false));
|
|
@@ -41305,6 +41312,13 @@ function SvgRecordButton(props) {
|
|
|
41305
41312
|
}
|
|
41306
41313
|
|
|
41307
41314
|
var _templateObject$O, _templateObject2$J, _templateObject3$C, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$n;
|
|
41315
|
+
var fieldsObject = {
|
|
41316
|
+
channelId: '',
|
|
41317
|
+
currentRecordedFile: null,
|
|
41318
|
+
recording: null,
|
|
41319
|
+
recorder: null,
|
|
41320
|
+
wavesurferContainer: null
|
|
41321
|
+
};
|
|
41308
41322
|
var shouldDraw = false;
|
|
41309
41323
|
var DEFAULT_MAX_RECORDING_DURATION = 600;
|
|
41310
41324
|
var AudioRecord = function AudioRecord(_ref) {
|
|
@@ -41638,7 +41652,7 @@ var AudioRecord = function AudioRecord(_ref) {
|
|
|
41638
41652
|
handleStopRecording();
|
|
41639
41653
|
shouldDraw = false;
|
|
41640
41654
|
var id = cId || channelId;
|
|
41641
|
-
recorder.stop().getMp3().then(function (_ref4) {
|
|
41655
|
+
recorder === null || recorder === void 0 ? void 0 : recorder.stop().getMp3().then(function (_ref4) {
|
|
41642
41656
|
var buffer = _ref4[0],
|
|
41643
41657
|
blob = _ref4[1];
|
|
41644
41658
|
var file = new File(buffer, 'record.mp3', {
|
|
@@ -41758,6 +41772,30 @@ var AudioRecord = function AudioRecord(_ref) {
|
|
|
41758
41772
|
}
|
|
41759
41773
|
};
|
|
41760
41774
|
}, [recording, maxRecordingDuration]);
|
|
41775
|
+
React.useEffect(function () {
|
|
41776
|
+
fieldsObject.channelId = channelId;
|
|
41777
|
+
}, [channelId]);
|
|
41778
|
+
React.useEffect(function () {
|
|
41779
|
+
fieldsObject.recorder = recorder;
|
|
41780
|
+
}, [recorder]);
|
|
41781
|
+
React.useEffect(function () {
|
|
41782
|
+
fieldsObject.currentRecordedFile = currentRecordedFile;
|
|
41783
|
+
}, [currentRecordedFile]);
|
|
41784
|
+
React.useEffect(function () {
|
|
41785
|
+
fieldsObject.recording = recording;
|
|
41786
|
+
}, [recording]);
|
|
41787
|
+
React.useEffect(function () {
|
|
41788
|
+
fieldsObject.wavesurferContainer = wavesurferContainer.current;
|
|
41789
|
+
}, [wavesurferContainer.current]);
|
|
41790
|
+
React.useEffect(function () {
|
|
41791
|
+
return function () {
|
|
41792
|
+
var _fieldsObject$current;
|
|
41793
|
+
if (fieldsObject.channelId && (!fieldsObject.currentRecordedFile || !((_fieldsObject$current = fieldsObject.currentRecordedFile) !== null && _fieldsObject$current !== void 0 && _fieldsObject$current.file)) && fieldsObject.recorder && fieldsObject.recording) {
|
|
41794
|
+
stopRecording(false, fieldsObject.channelId, true, fieldsObject.recorder, fieldsObject.wavesurferContainer);
|
|
41795
|
+
handleStopRecording();
|
|
41796
|
+
}
|
|
41797
|
+
};
|
|
41798
|
+
}, []);
|
|
41761
41799
|
React.useEffect(function () {
|
|
41762
41800
|
if (currentRecordedFile) {
|
|
41763
41801
|
_initWaveSurfer();
|
|
@@ -41882,6 +41920,9 @@ var AudioRecord = function AudioRecord(_ref) {
|
|
|
41882
41920
|
iconColor: accentColor
|
|
41883
41921
|
}, showRecording || currentRecordedFile ? /*#__PURE__*/React__default.createElement(SvgSend, null) : /*#__PURE__*/React__default.createElement(SvgRecordButton, null)));
|
|
41884
41922
|
};
|
|
41923
|
+
var AudioRecord$1 = /*#__PURE__*/React.memo(AudioRecord, function (prevProps, nextProps) {
|
|
41924
|
+
return prevProps.channelId === nextProps.channelId && prevProps.showRecording === nextProps.showRecording && prevProps.maxRecordingDuration === nextProps.maxRecordingDuration;
|
|
41925
|
+
});
|
|
41885
41926
|
var Container$l = styled__default.div(_templateObject$O || (_templateObject$O = _taggedTemplateLiteralLoose(["\n width: 32px;\n position: relative;\n display: flex;\n align-items: center;\n justify-content: flex-end;\n ", ";\n transition: all 0.3s ease-in-out;\n"])), function (props) {
|
|
41886
41927
|
return props.recording && "width: 400px";
|
|
41887
41928
|
});
|
|
@@ -42460,7 +42501,7 @@ function onError(error) {
|
|
|
42460
42501
|
var prevActiveChannelId;
|
|
42461
42502
|
var attachmentsUpdate = [];
|
|
42462
42503
|
var SendMessageInput = function SendMessageInput(_ref3) {
|
|
42463
|
-
var _pollOptions$choosePo;
|
|
42504
|
+
var _pollOptions$choosePo, _getAudioRecordingFro;
|
|
42464
42505
|
var handleAttachmentSelected = _ref3.handleAttachmentSelected,
|
|
42465
42506
|
handleSendMessage = _ref3.handleSendMessage,
|
|
42466
42507
|
_ref3$disabled = _ref3.disabled,
|
|
@@ -43576,7 +43617,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
43576
43617
|
document.body.removeAttribute('onbeforeunload');
|
|
43577
43618
|
}
|
|
43578
43619
|
}
|
|
43579
|
-
}, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes]);
|
|
43620
|
+
}, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes, messageToEdit]);
|
|
43580
43621
|
useDidUpdate(function () {
|
|
43581
43622
|
if (mentionedUsers && mentionedUsers.length) {
|
|
43582
43623
|
setDraftMessageToMap(activeChannel.id, {
|
|
@@ -43891,7 +43932,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
43891
43932
|
onChange: handleFileUpload,
|
|
43892
43933
|
multiple: true,
|
|
43893
43934
|
type: 'file'
|
|
43894
|
-
}), showRecording || getAudioRecordingFromMap(activeChannel.id) ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
|
|
43935
|
+
}), (showRecording || getAudioRecordingFromMap(activeChannel.id)) && !messageToEdit ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
|
|
43895
43936
|
className: 'message_input_wrapper',
|
|
43896
43937
|
borderRadius: messageForReply || messageToEdit ? borderRadiusOnOpenedEditReplyMessage : borderRadius,
|
|
43897
43938
|
ref: inputWrapperRef,
|
|
@@ -44014,7 +44055,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
44014
44055
|
ErrorBoundary: LexicalErrorBoundary
|
|
44015
44056
|
}), floatingAnchorElem && !isSmallWidthViewport && allowTextEdit && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(FloatingTextFormatToolbarPlugin, {
|
|
44016
44057
|
anchorElem: floatingAnchorElem
|
|
44017
|
-
})))))))), sendMessageIsActive || !voiceMessage || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
|
|
44058
|
+
})))))))), sendMessageIsActive || !voiceMessage && !((_getAudioRecordingFro = getAudioRecordingFromMap(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.id)) !== null && _getAudioRecordingFro !== void 0 && _getAudioRecordingFro.file) || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
|
|
44018
44059
|
isCustomButton: CustomSendMessageButton,
|
|
44019
44060
|
isActive: sendMessageIsActive,
|
|
44020
44061
|
order: sendIconOrder,
|
|
@@ -44030,7 +44071,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
44030
44071
|
color: accentColor,
|
|
44031
44072
|
iconColor: accentColor,
|
|
44032
44073
|
activeColor: accentColor
|
|
44033
|
-
}, /*#__PURE__*/React__default.createElement(AudioRecord, {
|
|
44074
|
+
}, /*#__PURE__*/React__default.createElement(AudioRecord$1, {
|
|
44034
44075
|
sendRecordedFile: sendRecordedFile,
|
|
44035
44076
|
setShowRecording: setShowRecording,
|
|
44036
44077
|
showRecording: showRecording,
|
|
@@ -48277,7 +48318,7 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
|
|
|
48277
48318
|
});
|
|
48278
48319
|
}
|
|
48279
48320
|
}
|
|
48280
|
-
} else {
|
|
48321
|
+
} else if (channel !== null && channel !== void 0 && channel.id) {
|
|
48281
48322
|
dispatch(getMessagesAC(channel, true, messageId, undefined, false, 'smooth', true));
|
|
48282
48323
|
}
|
|
48283
48324
|
return Promise.resolve();
|
|
@@ -48466,7 +48507,7 @@ var MessagesScrollToUnreadMentionsButton = function MessagesScrollToUnreadMentio
|
|
|
48466
48507
|
repliedMessage.classList.remove('highlight');
|
|
48467
48508
|
}, 1500);
|
|
48468
48509
|
}
|
|
48469
|
-
} else {
|
|
48510
|
+
} else if (channel !== null && channel !== void 0 && channel.id) {
|
|
48470
48511
|
dispatch(getMessagesAC(channel, undefined, messageId));
|
|
48471
48512
|
}
|
|
48472
48513
|
return Promise.resolve();
|
package/index.modern.js
CHANGED
|
@@ -16369,7 +16369,7 @@ function getChannels(action) {
|
|
|
16369
16369
|
try {
|
|
16370
16370
|
return Promise.resolve(new Promise(function (resolve) {
|
|
16371
16371
|
channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
|
|
16372
|
-
channelMessageMap[channel.id] = messages[0];
|
|
16372
|
+
channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
|
|
16373
16373
|
log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
|
|
16374
16374
|
resolve(true);
|
|
16375
16375
|
})["catch"](function (e) {
|
|
@@ -16388,8 +16388,8 @@ function getChannels(action) {
|
|
|
16388
16388
|
case 13:
|
|
16389
16389
|
log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
|
|
16390
16390
|
mappedChannels = mappedChannels.map(function (channel) {
|
|
16391
|
-
if (channelMessageMap[channel.id]) {
|
|
16392
|
-
channel.lastReactedMessage = channelMessageMap[channel.id];
|
|
16391
|
+
if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
|
|
16392
|
+
channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
|
|
16393
16393
|
}
|
|
16394
16394
|
return channel;
|
|
16395
16395
|
});
|
|
@@ -19167,6 +19167,10 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
|
|
|
19167
19167
|
_context.n = 7;
|
|
19168
19168
|
break;
|
|
19169
19169
|
case 6:
|
|
19170
|
+
if (!(channel !== null && channel !== void 0 && channel.id)) {
|
|
19171
|
+
_context.n = 7;
|
|
19172
|
+
break;
|
|
19173
|
+
}
|
|
19170
19174
|
_context.n = 7;
|
|
19171
19175
|
return put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
|
|
19172
19176
|
case 7:
|
|
@@ -38503,7 +38507,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38503
38507
|
if (unreadScrollTo) {
|
|
38504
38508
|
return Promise.resolve();
|
|
38505
38509
|
}
|
|
38506
|
-
if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING) {
|
|
38510
|
+
if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING && channel !== null && channel !== void 0 && channel.id) {
|
|
38507
38511
|
dispatch(getMessagesAC(channel, true));
|
|
38508
38512
|
}
|
|
38509
38513
|
if (target.scrollTop <= -50) {
|
|
@@ -38592,7 +38596,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38592
38596
|
nextDisableRef.current = false;
|
|
38593
38597
|
}, 1000 + positiveValue * 0.1);
|
|
38594
38598
|
}
|
|
38595
|
-
} else {
|
|
38599
|
+
} else if (channel !== null && channel !== void 0 && channel.id) {
|
|
38596
38600
|
dispatch(getMessagesAC(channel, undefined, messageId, undefined, true, 'smooth', true));
|
|
38597
38601
|
}
|
|
38598
38602
|
return Promise.resolve();
|
|
@@ -38776,7 +38780,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38776
38780
|
prevDisableRef.current = false;
|
|
38777
38781
|
shouldLoadMessagesRef.current = '';
|
|
38778
38782
|
loadingRef.current = false;
|
|
38779
|
-
if (channel.backToLinkedChannel) {
|
|
38783
|
+
if (channel.backToLinkedChannel && channel !== null && channel !== void 0 && channel.id) {
|
|
38780
38784
|
var visibleMessages = getVisibleMessagesMap();
|
|
38781
38785
|
var visibleMessagesIds = Object.keys(visibleMessages);
|
|
38782
38786
|
var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
|
|
@@ -38786,7 +38790,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38786
38790
|
if (!channel.isLinkedChannel) {
|
|
38787
38791
|
clearVisibleMessagesMap();
|
|
38788
38792
|
}
|
|
38789
|
-
if (channel) {
|
|
38793
|
+
if (channel && channel !== null && channel !== void 0 && channel.id) {
|
|
38790
38794
|
dispatch(getMessagesAC(channel, undefined, undefined, undefined, true));
|
|
38791
38795
|
}
|
|
38792
38796
|
if (channel.id) {
|
|
@@ -38955,7 +38959,7 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38955
38959
|
setScrollIntoView(true);
|
|
38956
38960
|
var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId) || null;
|
|
38957
38961
|
var newLastDisplayedMessageId = channel.lastDisplayedMessageId;
|
|
38958
|
-
if (!lastReadMessageNode) {
|
|
38962
|
+
if (!lastReadMessageNode && channel.lastDisplayedMessageId && channel.lastDisplayedMessageId !== '0') {
|
|
38959
38963
|
for (var index = 0; index < messages.length; index++) {
|
|
38960
38964
|
var message = messages[index];
|
|
38961
38965
|
if (channel.lastDisplayedMessageId >= message.id && (messages.length < index + 2 || channel.lastDisplayedMessageId <= messages[index + 1].id)) {
|
|
@@ -38964,6 +38968,9 @@ var MessageList = function MessageList(_ref2) {
|
|
|
38964
38968
|
break;
|
|
38965
38969
|
}
|
|
38966
38970
|
}
|
|
38971
|
+
} else if (!lastReadMessageNode && (!channel.lastDisplayedMessageId || channel.lastDisplayedMessageId === '0') && messages !== null && messages !== void 0 && messages.length) {
|
|
38972
|
+
newLastDisplayedMessageId = messages[0].id;
|
|
38973
|
+
lastReadMessageNode = document.getElementById(newLastDisplayedMessageId);
|
|
38967
38974
|
}
|
|
38968
38975
|
if (lastReadMessageNode && scrollElement) {
|
|
38969
38976
|
dispatch(scrollToNewMessageAC(false));
|
|
@@ -41304,6 +41311,13 @@ function SvgRecordButton(props) {
|
|
|
41304
41311
|
}
|
|
41305
41312
|
|
|
41306
41313
|
var _templateObject$O, _templateObject2$J, _templateObject3$C, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$n;
|
|
41314
|
+
var fieldsObject = {
|
|
41315
|
+
channelId: '',
|
|
41316
|
+
currentRecordedFile: null,
|
|
41317
|
+
recording: null,
|
|
41318
|
+
recorder: null,
|
|
41319
|
+
wavesurferContainer: null
|
|
41320
|
+
};
|
|
41307
41321
|
var shouldDraw = false;
|
|
41308
41322
|
var DEFAULT_MAX_RECORDING_DURATION = 600;
|
|
41309
41323
|
var AudioRecord = function AudioRecord(_ref) {
|
|
@@ -41637,7 +41651,7 @@ var AudioRecord = function AudioRecord(_ref) {
|
|
|
41637
41651
|
handleStopRecording();
|
|
41638
41652
|
shouldDraw = false;
|
|
41639
41653
|
var id = cId || channelId;
|
|
41640
|
-
recorder.stop().getMp3().then(function (_ref4) {
|
|
41654
|
+
recorder === null || recorder === void 0 ? void 0 : recorder.stop().getMp3().then(function (_ref4) {
|
|
41641
41655
|
var buffer = _ref4[0],
|
|
41642
41656
|
blob = _ref4[1];
|
|
41643
41657
|
var file = new File(buffer, 'record.mp3', {
|
|
@@ -41757,6 +41771,30 @@ var AudioRecord = function AudioRecord(_ref) {
|
|
|
41757
41771
|
}
|
|
41758
41772
|
};
|
|
41759
41773
|
}, [recording, maxRecordingDuration]);
|
|
41774
|
+
useEffect(function () {
|
|
41775
|
+
fieldsObject.channelId = channelId;
|
|
41776
|
+
}, [channelId]);
|
|
41777
|
+
useEffect(function () {
|
|
41778
|
+
fieldsObject.recorder = recorder;
|
|
41779
|
+
}, [recorder]);
|
|
41780
|
+
useEffect(function () {
|
|
41781
|
+
fieldsObject.currentRecordedFile = currentRecordedFile;
|
|
41782
|
+
}, [currentRecordedFile]);
|
|
41783
|
+
useEffect(function () {
|
|
41784
|
+
fieldsObject.recording = recording;
|
|
41785
|
+
}, [recording]);
|
|
41786
|
+
useEffect(function () {
|
|
41787
|
+
fieldsObject.wavesurferContainer = wavesurferContainer.current;
|
|
41788
|
+
}, [wavesurferContainer.current]);
|
|
41789
|
+
useEffect(function () {
|
|
41790
|
+
return function () {
|
|
41791
|
+
var _fieldsObject$current;
|
|
41792
|
+
if (fieldsObject.channelId && (!fieldsObject.currentRecordedFile || !((_fieldsObject$current = fieldsObject.currentRecordedFile) !== null && _fieldsObject$current !== void 0 && _fieldsObject$current.file)) && fieldsObject.recorder && fieldsObject.recording) {
|
|
41793
|
+
stopRecording(false, fieldsObject.channelId, true, fieldsObject.recorder, fieldsObject.wavesurferContainer);
|
|
41794
|
+
handleStopRecording();
|
|
41795
|
+
}
|
|
41796
|
+
};
|
|
41797
|
+
}, []);
|
|
41760
41798
|
useEffect(function () {
|
|
41761
41799
|
if (currentRecordedFile) {
|
|
41762
41800
|
_initWaveSurfer();
|
|
@@ -41881,6 +41919,9 @@ var AudioRecord = function AudioRecord(_ref) {
|
|
|
41881
41919
|
iconColor: accentColor
|
|
41882
41920
|
}, showRecording || currentRecordedFile ? /*#__PURE__*/React__default.createElement(SvgSend, null) : /*#__PURE__*/React__default.createElement(SvgRecordButton, null)));
|
|
41883
41921
|
};
|
|
41922
|
+
var AudioRecord$1 = /*#__PURE__*/memo(AudioRecord, function (prevProps, nextProps) {
|
|
41923
|
+
return prevProps.channelId === nextProps.channelId && prevProps.showRecording === nextProps.showRecording && prevProps.maxRecordingDuration === nextProps.maxRecordingDuration;
|
|
41924
|
+
});
|
|
41884
41925
|
var Container$l = styled.div(_templateObject$O || (_templateObject$O = _taggedTemplateLiteralLoose(["\n width: 32px;\n position: relative;\n display: flex;\n align-items: center;\n justify-content: flex-end;\n ", ";\n transition: all 0.3s ease-in-out;\n"])), function (props) {
|
|
41885
41926
|
return props.recording && "width: 400px";
|
|
41886
41927
|
});
|
|
@@ -42459,7 +42500,7 @@ function onError(error) {
|
|
|
42459
42500
|
var prevActiveChannelId;
|
|
42460
42501
|
var attachmentsUpdate = [];
|
|
42461
42502
|
var SendMessageInput = function SendMessageInput(_ref3) {
|
|
42462
|
-
var _pollOptions$choosePo;
|
|
42503
|
+
var _pollOptions$choosePo, _getAudioRecordingFro;
|
|
42463
42504
|
var handleAttachmentSelected = _ref3.handleAttachmentSelected,
|
|
42464
42505
|
handleSendMessage = _ref3.handleSendMessage,
|
|
42465
42506
|
_ref3$disabled = _ref3.disabled,
|
|
@@ -43575,7 +43616,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
43575
43616
|
document.body.removeAttribute('onbeforeunload');
|
|
43576
43617
|
}
|
|
43577
43618
|
}
|
|
43578
|
-
}, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes]);
|
|
43619
|
+
}, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes, messageToEdit]);
|
|
43579
43620
|
useDidUpdate(function () {
|
|
43580
43621
|
if (mentionedUsers && mentionedUsers.length) {
|
|
43581
43622
|
setDraftMessageToMap(activeChannel.id, {
|
|
@@ -43890,7 +43931,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
43890
43931
|
onChange: handleFileUpload,
|
|
43891
43932
|
multiple: true,
|
|
43892
43933
|
type: 'file'
|
|
43893
|
-
}), showRecording || getAudioRecordingFromMap(activeChannel.id) ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
|
|
43934
|
+
}), (showRecording || getAudioRecordingFromMap(activeChannel.id)) && !messageToEdit ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
|
|
43894
43935
|
className: 'message_input_wrapper',
|
|
43895
43936
|
borderRadius: messageForReply || messageToEdit ? borderRadiusOnOpenedEditReplyMessage : borderRadius,
|
|
43896
43937
|
ref: inputWrapperRef,
|
|
@@ -44013,7 +44054,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
44013
44054
|
ErrorBoundary: LexicalErrorBoundary
|
|
44014
44055
|
}), floatingAnchorElem && !isSmallWidthViewport && allowTextEdit && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(FloatingTextFormatToolbarPlugin, {
|
|
44015
44056
|
anchorElem: floatingAnchorElem
|
|
44016
|
-
})))))))), sendMessageIsActive || !voiceMessage || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
|
|
44057
|
+
})))))))), sendMessageIsActive || !voiceMessage && !((_getAudioRecordingFro = getAudioRecordingFromMap(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.id)) !== null && _getAudioRecordingFro !== void 0 && _getAudioRecordingFro.file) || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
|
|
44017
44058
|
isCustomButton: CustomSendMessageButton,
|
|
44018
44059
|
isActive: sendMessageIsActive,
|
|
44019
44060
|
order: sendIconOrder,
|
|
@@ -44029,7 +44070,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
|
|
|
44029
44070
|
color: accentColor,
|
|
44030
44071
|
iconColor: accentColor,
|
|
44031
44072
|
activeColor: accentColor
|
|
44032
|
-
}, /*#__PURE__*/React__default.createElement(AudioRecord, {
|
|
44073
|
+
}, /*#__PURE__*/React__default.createElement(AudioRecord$1, {
|
|
44033
44074
|
sendRecordedFile: sendRecordedFile,
|
|
44034
44075
|
setShowRecording: setShowRecording,
|
|
44035
44076
|
showRecording: showRecording,
|
|
@@ -48276,7 +48317,7 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
|
|
|
48276
48317
|
});
|
|
48277
48318
|
}
|
|
48278
48319
|
}
|
|
48279
|
-
} else {
|
|
48320
|
+
} else if (channel !== null && channel !== void 0 && channel.id) {
|
|
48280
48321
|
dispatch(getMessagesAC(channel, true, messageId, undefined, false, 'smooth', true));
|
|
48281
48322
|
}
|
|
48282
48323
|
return Promise.resolve();
|
|
@@ -48465,7 +48506,7 @@ var MessagesScrollToUnreadMentionsButton = function MessagesScrollToUnreadMentio
|
|
|
48465
48506
|
repliedMessage.classList.remove('highlight');
|
|
48466
48507
|
}, 1500);
|
|
48467
48508
|
}
|
|
48468
|
-
} else {
|
|
48509
|
+
} else if (channel !== null && channel !== void 0 && channel.id) {
|
|
48469
48510
|
dispatch(getMessagesAC(channel, undefined, messageId));
|
|
48470
48511
|
}
|
|
48471
48512
|
return Promise.resolve();
|