sceyt-chat-react-uikit 1.8.9-beta.7 → 1.8.9-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.
Files changed (3) hide show
  1. package/index.js +24 -20
  2. package/index.modern.js +24 -20
  3. package/package.json +1 -1
package/index.js CHANGED
@@ -12613,6 +12613,15 @@ var removeAudioRecordingFromMap = function removeAudioRecordingFromMap(channelId
12613
12613
  delete audioRecordingMap[channelId];
12614
12614
  };
12615
12615
  var setDraftMessageToMap = function setDraftMessageToMap(channelId, draftMessage) {
12616
+ var _draftMessage$attachm, _draftMessage$text, _draftMessage$editMes;
12617
+ var hasAttachments = !!((_draftMessage$attachm = draftMessage.attachments) !== null && _draftMessage$attachm !== void 0 && _draftMessage$attachm.length);
12618
+ var hasComposeText = !draftMessage.messageToEdit && !!((_draftMessage$text = draftMessage.text) !== null && _draftMessage$text !== void 0 && _draftMessage$text.trim());
12619
+ var editText = ((_draftMessage$editMes = draftMessage.editMessageText) === null || _draftMessage$editMes === void 0 ? void 0 : _draftMessage$editMes.trim()) || '';
12620
+ var hasChangedEdit = !!draftMessage.messageToEdit && !!editText && (draftMessage.editMessageText !== draftMessage.messageToEdit.body || JSON.stringify(draftMessage.editBodyAttributes || []) !== JSON.stringify(draftMessage.messageToEdit.bodyAttributes || []));
12621
+ if (!hasComposeText && !hasAttachments && !hasChangedEdit) {
12622
+ removeDraftMessageFromMap(channelId);
12623
+ return;
12624
+ }
12616
12625
  draftMessagesMap[channelId] = draftMessage;
12617
12626
  Promise.resolve(persistDraft(channelId, draftMessage))["catch"](function () {
12618
12627
  return undefined;
@@ -53825,6 +53834,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53825
53834
  return;
53826
53835
  }
53827
53836
  if (messageToEdit) {
53837
+ var _getDraftMessageFromM;
53828
53838
  var persistedEditText = editMessageText || messageToEdit.body || '';
53829
53839
  var normalizeAttrs = function normalizeAttrs(attrs) {
53830
53840
  return !attrs || attrs.length === 0 ? [] : attrs;
@@ -53833,13 +53843,18 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53833
53843
  var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(messageBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
53834
53844
  var canSubmitEdit = !!editMessageText.trim() && (hasTextChanged || hasAttributesChanged);
53835
53845
  setSendMessageIsActive(canSubmitEdit);
53836
- setDraftMessageToMap(activeChannel.id, {
53837
- text: persistedEditText || 'Edit message',
53838
- mentionedUsers: mentionedUsers,
53839
- messageToEdit: messageToEdit,
53840
- editMessageText: persistedEditText,
53841
- editBodyAttributes: messageBodyAttributes
53842
- });
53846
+ if (canSubmitEdit) {
53847
+ setDraftMessageToMap(activeChannel.id, {
53848
+ text: persistedEditText,
53849
+ mentionedUsers: mentionedUsers,
53850
+ messageToEdit: messageToEdit,
53851
+ editMessageText: persistedEditText,
53852
+ editBodyAttributes: messageBodyAttributes
53853
+ });
53854
+ } else if ((_getDraftMessageFromM = getDraftMessageFromMap(activeChannel.id)) !== null && _getDraftMessageFromM !== void 0 && _getDraftMessageFromM.messageToEdit) {
53855
+ removeDraftMessageFromMap(activeChannel.id);
53856
+ dispatch(setChannelDraftMessageIsRemovedAC(activeChannel.id));
53857
+ }
53843
53858
  return;
53844
53859
  }
53845
53860
  if (messageText.trim() || editMessageText !== null && editMessageText !== void 0 && editMessageText.trim() && editMessageText && (editMessageText === null || editMessageText === void 0 ? void 0 : editMessageText.trim()) !== (messageToEdit === null || messageToEdit === void 0 ? void 0 : messageToEdit.body) || attachments.length) {
@@ -53882,15 +53897,6 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53882
53897
  setListenerIsAdded(true);
53883
53898
  document.body.setAttribute('onbeforeunload', "return () => 'reload?'");
53884
53899
  }
53885
- } else if (messageForReply || draftMessage !== null && draftMessage !== void 0 && draftMessage.messageForReply) {
53886
- setDraftMessageToMap(activeChannel.id, {
53887
- text: '',
53888
- mentionedUsers: (draftMessage === null || draftMessage === void 0 ? void 0 : draftMessage.mentionedUsers) || mentionedUsers,
53889
- messageForReply: messageForReply || (draftMessage === null || draftMessage === void 0 ? void 0 : draftMessage.messageForReply),
53890
- bodyAttributes: messageBodyAttributes,
53891
- attachments: [],
53892
- viewOnce: false
53893
- });
53894
53900
  } else if (draftMessage) {
53895
53901
  if (restoredDraftChannelIdRef.current && restoredDraftChannelIdRef.current !== activeChannel.id) {
53896
53902
  return;
@@ -53960,18 +53966,16 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53960
53966
  }
53961
53967
  });
53962
53968
  useDidUpdate(function () {
53963
- var _draftMessagesMap$act;
53964
- var persistedReply = (_draftMessagesMap$act = draftMessagesMap[activeChannel.id]) === null || _draftMessagesMap$act === void 0 ? void 0 : _draftMessagesMap$act.messageForReply;
53965
53969
  if (isNavigatingChannelRef.current) {
53966
53970
  isNavigatingChannelRef.current = false;
53967
53971
  return;
53968
53972
  }
53969
- var hasDraftContent = !!(messageText.trim() || attachments.length || messageForReply || persistedReply);
53973
+ var hasDraftContent = !!(messageText.trim() || attachments.length);
53970
53974
  if (hasDraftContent) {
53971
53975
  setDraftMessageToMap(activeChannel.id, {
53972
53976
  text: messageText,
53973
53977
  mentionedUsers: mentionedUsers,
53974
- messageForReply: messageForReply || persistedReply,
53978
+ messageForReply: messageForReply,
53975
53979
  bodyAttributes: messageBodyAttributes,
53976
53980
  attachments: attachments,
53977
53981
  viewOnce: viewOnce
package/index.modern.js CHANGED
@@ -12593,6 +12593,15 @@ var removeAudioRecordingFromMap = function removeAudioRecordingFromMap(channelId
12593
12593
  delete audioRecordingMap[channelId];
12594
12594
  };
12595
12595
  var setDraftMessageToMap = function setDraftMessageToMap(channelId, draftMessage) {
12596
+ var _draftMessage$attachm, _draftMessage$text, _draftMessage$editMes;
12597
+ var hasAttachments = !!((_draftMessage$attachm = draftMessage.attachments) !== null && _draftMessage$attachm !== void 0 && _draftMessage$attachm.length);
12598
+ var hasComposeText = !draftMessage.messageToEdit && !!((_draftMessage$text = draftMessage.text) !== null && _draftMessage$text !== void 0 && _draftMessage$text.trim());
12599
+ var editText = ((_draftMessage$editMes = draftMessage.editMessageText) === null || _draftMessage$editMes === void 0 ? void 0 : _draftMessage$editMes.trim()) || '';
12600
+ var hasChangedEdit = !!draftMessage.messageToEdit && !!editText && (draftMessage.editMessageText !== draftMessage.messageToEdit.body || JSON.stringify(draftMessage.editBodyAttributes || []) !== JSON.stringify(draftMessage.messageToEdit.bodyAttributes || []));
12601
+ if (!hasComposeText && !hasAttachments && !hasChangedEdit) {
12602
+ removeDraftMessageFromMap(channelId);
12603
+ return;
12604
+ }
12596
12605
  draftMessagesMap[channelId] = draftMessage;
12597
12606
  Promise.resolve(persistDraft(channelId, draftMessage))["catch"](function () {
12598
12607
  return undefined;
@@ -53805,6 +53814,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53805
53814
  return;
53806
53815
  }
53807
53816
  if (messageToEdit) {
53817
+ var _getDraftMessageFromM;
53808
53818
  var persistedEditText = editMessageText || messageToEdit.body || '';
53809
53819
  var normalizeAttrs = function normalizeAttrs(attrs) {
53810
53820
  return !attrs || attrs.length === 0 ? [] : attrs;
@@ -53813,13 +53823,18 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53813
53823
  var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(messageBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
53814
53824
  var canSubmitEdit = !!editMessageText.trim() && (hasTextChanged || hasAttributesChanged);
53815
53825
  setSendMessageIsActive(canSubmitEdit);
53816
- setDraftMessageToMap(activeChannel.id, {
53817
- text: persistedEditText || 'Edit message',
53818
- mentionedUsers: mentionedUsers,
53819
- messageToEdit: messageToEdit,
53820
- editMessageText: persistedEditText,
53821
- editBodyAttributes: messageBodyAttributes
53822
- });
53826
+ if (canSubmitEdit) {
53827
+ setDraftMessageToMap(activeChannel.id, {
53828
+ text: persistedEditText,
53829
+ mentionedUsers: mentionedUsers,
53830
+ messageToEdit: messageToEdit,
53831
+ editMessageText: persistedEditText,
53832
+ editBodyAttributes: messageBodyAttributes
53833
+ });
53834
+ } else if ((_getDraftMessageFromM = getDraftMessageFromMap(activeChannel.id)) !== null && _getDraftMessageFromM !== void 0 && _getDraftMessageFromM.messageToEdit) {
53835
+ removeDraftMessageFromMap(activeChannel.id);
53836
+ dispatch(setChannelDraftMessageIsRemovedAC(activeChannel.id));
53837
+ }
53823
53838
  return;
53824
53839
  }
53825
53840
  if (messageText.trim() || editMessageText !== null && editMessageText !== void 0 && editMessageText.trim() && editMessageText && (editMessageText === null || editMessageText === void 0 ? void 0 : editMessageText.trim()) !== (messageToEdit === null || messageToEdit === void 0 ? void 0 : messageToEdit.body) || attachments.length) {
@@ -53862,15 +53877,6 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53862
53877
  setListenerIsAdded(true);
53863
53878
  document.body.setAttribute('onbeforeunload', "return () => 'reload?'");
53864
53879
  }
53865
- } else if (messageForReply || draftMessage !== null && draftMessage !== void 0 && draftMessage.messageForReply) {
53866
- setDraftMessageToMap(activeChannel.id, {
53867
- text: '',
53868
- mentionedUsers: (draftMessage === null || draftMessage === void 0 ? void 0 : draftMessage.mentionedUsers) || mentionedUsers,
53869
- messageForReply: messageForReply || (draftMessage === null || draftMessage === void 0 ? void 0 : draftMessage.messageForReply),
53870
- bodyAttributes: messageBodyAttributes,
53871
- attachments: [],
53872
- viewOnce: false
53873
- });
53874
53880
  } else if (draftMessage) {
53875
53881
  if (restoredDraftChannelIdRef.current && restoredDraftChannelIdRef.current !== activeChannel.id) {
53876
53882
  return;
@@ -53940,18 +53946,16 @@ var SendMessageInput = function SendMessageInput(_ref3) {
53940
53946
  }
53941
53947
  });
53942
53948
  useDidUpdate(function () {
53943
- var _draftMessagesMap$act;
53944
- var persistedReply = (_draftMessagesMap$act = draftMessagesMap[activeChannel.id]) === null || _draftMessagesMap$act === void 0 ? void 0 : _draftMessagesMap$act.messageForReply;
53945
53949
  if (isNavigatingChannelRef.current) {
53946
53950
  isNavigatingChannelRef.current = false;
53947
53951
  return;
53948
53952
  }
53949
- var hasDraftContent = !!(messageText.trim() || attachments.length || messageForReply || persistedReply);
53953
+ var hasDraftContent = !!(messageText.trim() || attachments.length);
53950
53954
  if (hasDraftContent) {
53951
53955
  setDraftMessageToMap(activeChannel.id, {
53952
53956
  text: messageText,
53953
53957
  mentionedUsers: mentionedUsers,
53954
- messageForReply: messageForReply || persistedReply,
53958
+ messageForReply: messageForReply,
53955
53959
  bodyAttributes: messageBodyAttributes,
53956
53960
  attachments: attachments,
53957
53961
  viewOnce: viewOnce
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sceyt-chat-react-uikit",
3
- "version": "1.8.9-beta.7",
3
+ "version": "1.8.9-beta.8",
4
4
  "description": "Interactive React UI Components for Sceyt Chat.",
5
5
  "author": "Sceyt",
6
6
  "license": "MIT",