sceyt-chat-react-uikit 1.7.8-beta.7 → 1.7.8-beta.9

package/components/AudioRecord/index.d.ts

@@ -11,5 +11,5 @@ interface AudioPlayerProps {
     channelId: string;
     maxRecordingDuration?: number;
 }
-declare const AudioRecord: React.FC<AudioPlayerProps>;
-export default AudioRecord;
+declare const _default: React.NamedExoticComponent<AudioPlayerProps>;
+export default _default;

package/index.js

@@ -12824,12 +12824,13 @@ var getChannelInviteKeysAC = function getChannelInviteKeysAC(channelId) {
     }
   };
 };
-var regenerateChannelInviteKeyAC = function regenerateChannelInviteKeyAC(channelId, key) {
+var regenerateChannelInviteKeyAC = function regenerateChannelInviteKeyAC(channelId, key, deletePermanently) {
   return {
     type: REGENERATE_CHANNEL_INVITE_KEY,
     payload: {
       channelId: channelId,
-      key: key
+      key: key,
+      deletePermanently: deletePermanently
     }
   };
 };
@@ -16370,7 +16371,7 @@ function getChannels(action) {
               try {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
-                    channelMessageMap[channel.id] = messages[0];
+                    channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
                     log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
@@ -16389,8 +16390,8 @@ function getChannels(action) {
       case 13:
         log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
-          if (channelMessageMap[channel.id]) {
-            channel.lastReactedMessage = channelMessageMap[channel.id];
+          if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
+            channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
           }
           return channel;
         });
@@ -18171,13 +18172,13 @@ function getChannelInviteKeys(action) {
   }, _marked30, null, [[0, 4]]);
 }
 function regenerateChannelInviteKey(action) {
-  var payload, channelId, key, channel, inviteKey, _t31;
+  var payload, channelId, key, deletePermanently, channel, inviteKey, _t31;
   return _regenerator().w(function (_context31) {
     while (1) switch (_context31.p = _context31.n) {
       case 0:
         _context31.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, key = payload.key;
+        channelId = payload.channelId, key = payload.key, deletePermanently = payload.deletePermanently;
         _context31.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
@@ -18192,7 +18193,8 @@ function regenerateChannelInviteKey(action) {
         _context31.n = 2;
         return effects.call(channel.regenerateInviteKey, {
           key: key,
-          channelId: channelId
+          channelId: channelId,
+          deletePermanently: deletePermanently
         });
       case 2:
         inviteKey = _context31.v;
@@ -41312,6 +41314,13 @@ function SvgRecordButton(props) {
 }
 
 var _templateObject$O, _templateObject2$J, _templateObject3$C, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$n;
+var fieldsObject = {
+  channelId: '',
+  currentRecordedFile: null,
+  recording: null,
+  recorder: null,
+  wavesurferContainer: null
+};
 var shouldDraw = false;
 var DEFAULT_MAX_RECORDING_DURATION = 600;
 var AudioRecord = function AudioRecord(_ref) {
@@ -41645,7 +41654,7 @@ var AudioRecord = function AudioRecord(_ref) {
     handleStopRecording();
     shouldDraw = false;
     var id = cId || channelId;
-    recorder.stop().getMp3().then(function (_ref4) {
+    recorder === null || recorder === void 0 ? void 0 : recorder.stop().getMp3().then(function (_ref4) {
       var buffer = _ref4[0],
         blob = _ref4[1];
       var file = new File(buffer, 'record.mp3', {
@@ -41765,6 +41774,30 @@ var AudioRecord = function AudioRecord(_ref) {
       }
     };
   }, [recording, maxRecordingDuration]);
+  React.useEffect(function () {
+    fieldsObject.channelId = channelId;
+  }, [channelId]);
+  React.useEffect(function () {
+    fieldsObject.recorder = recorder;
+  }, [recorder]);
+  React.useEffect(function () {
+    fieldsObject.currentRecordedFile = currentRecordedFile;
+  }, [currentRecordedFile]);
+  React.useEffect(function () {
+    fieldsObject.recording = recording;
+  }, [recording]);
+  React.useEffect(function () {
+    fieldsObject.wavesurferContainer = wavesurferContainer.current;
+  }, [wavesurferContainer.current]);
+  React.useEffect(function () {
+    return function () {
+      var _fieldsObject$current;
+      if (fieldsObject.channelId && (!fieldsObject.currentRecordedFile || !((_fieldsObject$current = fieldsObject.currentRecordedFile) !== null && _fieldsObject$current !== void 0 && _fieldsObject$current.file)) && fieldsObject.recorder && fieldsObject.recording) {
+        stopRecording(false, fieldsObject.channelId, true, fieldsObject.recorder, fieldsObject.wavesurferContainer);
+        handleStopRecording();
+      }
+    };
+  }, []);
   React.useEffect(function () {
     if (currentRecordedFile) {
       _initWaveSurfer();
@@ -41889,6 +41922,9 @@ var AudioRecord = function AudioRecord(_ref) {
     iconColor: accentColor
   }, showRecording || currentRecordedFile ? /*#__PURE__*/React__default.createElement(SvgSend, null) : /*#__PURE__*/React__default.createElement(SvgRecordButton, null)));
 };
+var AudioRecord$1 = /*#__PURE__*/React.memo(AudioRecord, function (prevProps, nextProps) {
+  return prevProps.channelId === nextProps.channelId && prevProps.showRecording === nextProps.showRecording && prevProps.maxRecordingDuration === nextProps.maxRecordingDuration;
+});
 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) {
   return props.recording && "width: 400px";
 });
@@ -42467,7 +42503,7 @@ function onError(error) {
 var prevActiveChannelId;
 var attachmentsUpdate = [];
 var SendMessageInput = function SendMessageInput(_ref3) {
-  var _pollOptions$choosePo;
+  var _pollOptions$choosePo, _getAudioRecordingFro;
   var handleAttachmentSelected = _ref3.handleAttachmentSelected,
     handleSendMessage = _ref3.handleSendMessage,
     _ref3$disabled = _ref3.disabled,
@@ -43583,7 +43619,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         document.body.removeAttribute('onbeforeunload');
       }
     }
-  }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes]);
+  }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes, messageToEdit]);
   useDidUpdate(function () {
     if (mentionedUsers && mentionedUsers.length) {
       setDraftMessageToMap(activeChannel.id, {
@@ -43898,7 +43934,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     onChange: handleFileUpload,
     multiple: true,
     type: 'file'
-  }), showRecording || getAudioRecordingFromMap(activeChannel.id) ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
+  }), (showRecording || getAudioRecordingFromMap(activeChannel.id)) && !messageToEdit ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
     className: 'message_input_wrapper',
     borderRadius: messageForReply || messageToEdit ? borderRadiusOnOpenedEditReplyMessage : borderRadius,
     ref: inputWrapperRef,
@@ -44021,7 +44057,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     ErrorBoundary: LexicalErrorBoundary
   }), floatingAnchorElem && !isSmallWidthViewport && allowTextEdit && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(FloatingTextFormatToolbarPlugin, {
     anchorElem: floatingAnchorElem
-  })))))))), sendMessageIsActive || !voiceMessage || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
+  })))))))), 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, {
     isCustomButton: CustomSendMessageButton,
     isActive: sendMessageIsActive,
     order: sendIconOrder,
@@ -44037,7 +44073,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     color: accentColor,
     iconColor: accentColor,
     activeColor: accentColor
-  }, /*#__PURE__*/React__default.createElement(AudioRecord, {
+  }, /*#__PURE__*/React__default.createElement(AudioRecord$1, {
     sendRecordedFile: sendRecordedFile,
     setShowRecording: setShowRecording,
     showRecording: showRecording,
@@ -45851,7 +45887,7 @@ function InviteLinkModal(_ref) {
   var handleConfirmReset = function handleConfirmReset() {
     var _channelInviteKeys$;
     setShowResetConfirm(false);
-    dispatch(regenerateChannelInviteKeyAC(channelId, (channelInviteKeys === null || channelInviteKeys === void 0 ? void 0 : (_channelInviteKeys$ = channelInviteKeys[0]) === null || _channelInviteKeys$ === void 0 ? void 0 : _channelInviteKeys$.key) || ''));
+    dispatch(regenerateChannelInviteKeyAC(channelId, (channelInviteKeys === null || channelInviteKeys === void 0 ? void 0 : (_channelInviteKeys$ = channelInviteKeys[0]) === null || _channelInviteKeys$ === void 0 ? void 0 : _channelInviteKeys$.key) || '', true));
   };
   React.useEffect(function () {
     if (channelId) {

package/index.modern.js

@@ -12823,12 +12823,13 @@ var getChannelInviteKeysAC = function getChannelInviteKeysAC(channelId) {
     }
   };
 };
-var regenerateChannelInviteKeyAC = function regenerateChannelInviteKeyAC(channelId, key) {
+var regenerateChannelInviteKeyAC = function regenerateChannelInviteKeyAC(channelId, key, deletePermanently) {
   return {
     type: REGENERATE_CHANNEL_INVITE_KEY,
     payload: {
       channelId: channelId,
-      key: key
+      key: key,
+      deletePermanently: deletePermanently
     }
   };
 };
@@ -16369,7 +16370,7 @@ function getChannels(action) {
               try {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
-                    channelMessageMap[channel.id] = messages[0];
+                    channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
                     log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
@@ -16388,8 +16389,8 @@ function getChannels(action) {
       case 13:
         log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
-          if (channelMessageMap[channel.id]) {
-            channel.lastReactedMessage = channelMessageMap[channel.id];
+          if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
+            channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
           }
           return channel;
         });
@@ -18170,13 +18171,13 @@ function getChannelInviteKeys(action) {
   }, _marked30, null, [[0, 4]]);
 }
 function regenerateChannelInviteKey(action) {
-  var payload, channelId, key, channel, inviteKey, _t31;
+  var payload, channelId, key, deletePermanently, channel, inviteKey, _t31;
   return _regenerator().w(function (_context31) {
     while (1) switch (_context31.p = _context31.n) {
       case 0:
         _context31.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, key = payload.key;
+        channelId = payload.channelId, key = payload.key, deletePermanently = payload.deletePermanently;
         _context31.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
@@ -18191,7 +18192,8 @@ function regenerateChannelInviteKey(action) {
         _context31.n = 2;
         return call(channel.regenerateInviteKey, {
           key: key,
-          channelId: channelId
+          channelId: channelId,
+          deletePermanently: deletePermanently
         });
       case 2:
         inviteKey = _context31.v;
@@ -41311,6 +41313,13 @@ function SvgRecordButton(props) {
 }
 
 var _templateObject$O, _templateObject2$J, _templateObject3$C, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$n;
+var fieldsObject = {
+  channelId: '',
+  currentRecordedFile: null,
+  recording: null,
+  recorder: null,
+  wavesurferContainer: null
+};
 var shouldDraw = false;
 var DEFAULT_MAX_RECORDING_DURATION = 600;
 var AudioRecord = function AudioRecord(_ref) {
@@ -41644,7 +41653,7 @@ var AudioRecord = function AudioRecord(_ref) {
     handleStopRecording();
     shouldDraw = false;
     var id = cId || channelId;
-    recorder.stop().getMp3().then(function (_ref4) {
+    recorder === null || recorder === void 0 ? void 0 : recorder.stop().getMp3().then(function (_ref4) {
       var buffer = _ref4[0],
         blob = _ref4[1];
       var file = new File(buffer, 'record.mp3', {
@@ -41764,6 +41773,30 @@ var AudioRecord = function AudioRecord(_ref) {
       }
     };
   }, [recording, maxRecordingDuration]);
+  useEffect(function () {
+    fieldsObject.channelId = channelId;
+  }, [channelId]);
+  useEffect(function () {
+    fieldsObject.recorder = recorder;
+  }, [recorder]);
+  useEffect(function () {
+    fieldsObject.currentRecordedFile = currentRecordedFile;
+  }, [currentRecordedFile]);
+  useEffect(function () {
+    fieldsObject.recording = recording;
+  }, [recording]);
+  useEffect(function () {
+    fieldsObject.wavesurferContainer = wavesurferContainer.current;
+  }, [wavesurferContainer.current]);
+  useEffect(function () {
+    return function () {
+      var _fieldsObject$current;
+      if (fieldsObject.channelId && (!fieldsObject.currentRecordedFile || !((_fieldsObject$current = fieldsObject.currentRecordedFile) !== null && _fieldsObject$current !== void 0 && _fieldsObject$current.file)) && fieldsObject.recorder && fieldsObject.recording) {
+        stopRecording(false, fieldsObject.channelId, true, fieldsObject.recorder, fieldsObject.wavesurferContainer);
+        handleStopRecording();
+      }
+    };
+  }, []);
   useEffect(function () {
     if (currentRecordedFile) {
       _initWaveSurfer();
@@ -41888,6 +41921,9 @@ var AudioRecord = function AudioRecord(_ref) {
     iconColor: accentColor
   }, showRecording || currentRecordedFile ? /*#__PURE__*/React__default.createElement(SvgSend, null) : /*#__PURE__*/React__default.createElement(SvgRecordButton, null)));
 };
+var AudioRecord$1 = /*#__PURE__*/memo(AudioRecord, function (prevProps, nextProps) {
+  return prevProps.channelId === nextProps.channelId && prevProps.showRecording === nextProps.showRecording && prevProps.maxRecordingDuration === nextProps.maxRecordingDuration;
+});
 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) {
   return props.recording && "width: 400px";
 });
@@ -42466,7 +42502,7 @@ function onError(error) {
 var prevActiveChannelId;
 var attachmentsUpdate = [];
 var SendMessageInput = function SendMessageInput(_ref3) {
-  var _pollOptions$choosePo;
+  var _pollOptions$choosePo, _getAudioRecordingFro;
   var handleAttachmentSelected = _ref3.handleAttachmentSelected,
     handleSendMessage = _ref3.handleSendMessage,
     _ref3$disabled = _ref3.disabled,
@@ -43582,7 +43618,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         document.body.removeAttribute('onbeforeunload');
       }
     }
-  }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes]);
+  }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes, messageToEdit]);
   useDidUpdate(function () {
     if (mentionedUsers && mentionedUsers.length) {
       setDraftMessageToMap(activeChannel.id, {
@@ -43897,7 +43933,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     onChange: handleFileUpload,
     multiple: true,
     type: 'file'
-  }), showRecording || getAudioRecordingFromMap(activeChannel.id) ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
+  }), (showRecording || getAudioRecordingFromMap(activeChannel.id)) && !messageToEdit ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
     className: 'message_input_wrapper',
     borderRadius: messageForReply || messageToEdit ? borderRadiusOnOpenedEditReplyMessage : borderRadius,
     ref: inputWrapperRef,
@@ -44020,7 +44056,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     ErrorBoundary: LexicalErrorBoundary
   }), floatingAnchorElem && !isSmallWidthViewport && allowTextEdit && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(FloatingTextFormatToolbarPlugin, {
     anchorElem: floatingAnchorElem
-  })))))))), sendMessageIsActive || !voiceMessage || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
+  })))))))), 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, {
     isCustomButton: CustomSendMessageButton,
     isActive: sendMessageIsActive,
     order: sendIconOrder,
@@ -44036,7 +44072,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     color: accentColor,
     iconColor: accentColor,
     activeColor: accentColor
-  }, /*#__PURE__*/React__default.createElement(AudioRecord, {
+  }, /*#__PURE__*/React__default.createElement(AudioRecord$1, {
     sendRecordedFile: sendRecordedFile,
     setShowRecording: setShowRecording,
     showRecording: showRecording,
@@ -45850,7 +45886,7 @@ function InviteLinkModal(_ref) {
   var handleConfirmReset = function handleConfirmReset() {
     var _channelInviteKeys$;
     setShowResetConfirm(false);
-    dispatch(regenerateChannelInviteKeyAC(channelId, (channelInviteKeys === null || channelInviteKeys === void 0 ? void 0 : (_channelInviteKeys$ = channelInviteKeys[0]) === null || _channelInviteKeys$ === void 0 ? void 0 : _channelInviteKeys$.key) || ''));
+    dispatch(regenerateChannelInviteKeyAC(channelId, (channelInviteKeys === null || channelInviteKeys === void 0 ? void 0 : (_channelInviteKeys$ = channelInviteKeys[0]) === null || _channelInviteKeys$ === void 0 ? void 0 : _channelInviteKeys$.key) || '', true));
   };
   useEffect(function () {
     if (channelId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.7.8-beta.7",
+  "version": "1.7.8-beta.9",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",