sceyt-chat-react-uikit 1.7.2-beta.7 → 1.7.2-beta.8

package/index.js

@@ -17845,16 +17845,14 @@ function sendTextMessage(action) {
       case 16:
         throw new Error('Connection required to send message');
       case 17:
+        store.dispatch(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
         _context4.n = 18;
-        return effects.put(scrollToNewMessageAC(true));
-      case 18:
-        _context4.n = 19;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        _context4.n = 22;
+      case 18:
+        _context4.n = 21;
         break;
-      case 20:
-        _context4.p = 20;
+      case 19:
+        _context4.p = 19;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -17864,23 +17862,23 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 21;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 21;
+        _context4.n = 20;
         return effects.put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 21:
-        _context4.n = 22;
+      case 20:
+        _context4.n = 21;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 20]]);
+  }, _marked2$2, null, [[3, 19]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
@@ -26417,21 +26415,15 @@ function ReactionsPopup(_ref) {
   var _useState = React.useState('all'),
     activeTabKey = _useState[0],
     setActiveTabKey = _useState[1];
-  var _useState2 = React.useState(''),
-    popupVerticalPosition = _useState2[0],
-    setPopupVerticalPosition = _useState2[1];
-  var _useState3 = React.useState(0),
-    popupHeight = _useState3[0],
-    setPopupHeight = _useState3[1];
-  var _useState4 = React.useState(0),
-    scoresHeight = _useState4[0],
-    setScoresHeight = _useState4[1];
-  var _useState5 = React.useState(false),
-    calculateSizes = _useState5[0],
-    setCalculateSizes = _useState5[1];
-  var _useState6 = React.useState(false),
-    closeIsApproved = _useState6[0],
-    setCloseIsApproved = _useState6[1];
+  var _useState2 = React.useState(0),
+    popupHeight = _useState2[0],
+    setPopupHeight = _useState2[1];
+  var _useState3 = React.useState(false),
+    calculateSizes = _useState3[0],
+    setCalculateSizes = _useState3[1];
+  var _useState4 = React.useState(false),
+    closeIsApproved = _useState4[0],
+    setCloseIsApproved = _useState4[1];
   var totalReactions = 0;
   if (reactionTotals) {
     reactionTotals.forEach(function (summery) {
@@ -26440,9 +26432,9 @@ function ReactionsPopup(_ref) {
   }
   var user = getClient().user;
   var dispatch = useDispatch();
-  var _useState7 = React.useState(false),
-    isScrolling = _useState7[0],
-    setIsScrolling = _useState7[1];
+  var _useState5 = React.useState(false),
+    isScrolling = _useState5[0],
+    setIsScrolling = _useState5[1];
   var handleReactionsListScroll = function handleReactionsListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100 && reactionsHasNext) {
       if (reactionsLoadingState === LOADING_STATE.LOADED) {
@@ -26471,20 +26463,23 @@ function ReactionsPopup(_ref) {
       dispatch(setReactionsListAC([], true));
     };
   }, [messageId]);
-  React.useEffect(function () {
+  var scoresHeight = React.useMemo(function () {
     var scoresElem = scoresRef.current;
     if (scoresElem) {
-      setScoresHeight(scoresElem.offsetHeight);
+      return scoresElem.offsetHeight;
     }
-  });
+    return 0;
+  }, [scoresRef]);
   React.useEffect(function () {
     if (!reactionTotals || !reactionTotals.length) {
       handleReactionsPopupClose();
     }
   }, [reactionTotals]);
+  var reactionsHeight = React.useMemo(function () {
+    return reactions.length * 50 + 45;
+  }, [reactions]);
   React.useEffect(function () {
     if (reactions && reactionsPrevLength < reactions.length) {
-      var reactionsHeight = reactions.length * 44 + 45;
       if (reactionsHeight > popupHeight) {
         setPopupHeight(reactionsHeight);
       }
@@ -26494,14 +26489,15 @@ function ReactionsPopup(_ref) {
     }
     if (reactions && reactions.length) {
       if (calculateSizes) {
-        var botPost = bottomPosition - messageInputHeight - 40;
-        var _reactionsHeight = reactions.length * 50 + 45;
-        setPopupHeight(_reactionsHeight);
-        setPopupVerticalPosition(botPost >= (_reactionsHeight > 320 ? 320 : _reactionsHeight) ? 'bottom' : 'top');
+        setPopupHeight(reactionsHeight);
         setCalculateSizes(false);
       }
     }
-  }, [reactions]);
+  }, [reactions, reactionsHeight]);
+  var popupVerticalPosition = React.useMemo(function () {
+    var botPost = bottomPosition - messageInputHeight - 40;
+    return botPost >= (reactionsHeight > 320 ? 320 : reactionsHeight) ? 'bottom' : 'top';
+  }, [bottomPosition, messageInputHeight, reactionsHeight]);
   return /*#__PURE__*/React__default.createElement(Container$d, {
     ref: popupRef,
     popupVerticalPosition: popupVerticalPosition,

package/index.modern.js

@@ -17824,16 +17824,14 @@ function sendTextMessage(action) {
       case 16:
         throw new Error('Connection required to send message');
       case 17:
+        store.dispatch(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
         _context4.n = 18;
-        return put(scrollToNewMessageAC(true));
-      case 18:
-        _context4.n = 19;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        _context4.n = 22;
+      case 18:
+        _context4.n = 21;
         break;
-      case 20:
-        _context4.p = 20;
+      case 19:
+        _context4.p = 19;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -17843,23 +17841,23 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 21;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 21;
+        _context4.n = 20;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 21:
-        _context4.n = 22;
+      case 20:
+        _context4.n = 21;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 20]]);
+  }, _marked2$2, null, [[3, 19]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
@@ -26396,21 +26394,15 @@ function ReactionsPopup(_ref) {
   var _useState = useState('all'),
     activeTabKey = _useState[0],
     setActiveTabKey = _useState[1];
-  var _useState2 = useState(''),
-    popupVerticalPosition = _useState2[0],
-    setPopupVerticalPosition = _useState2[1];
-  var _useState3 = useState(0),
-    popupHeight = _useState3[0],
-    setPopupHeight = _useState3[1];
-  var _useState4 = useState(0),
-    scoresHeight = _useState4[0],
-    setScoresHeight = _useState4[1];
-  var _useState5 = useState(false),
-    calculateSizes = _useState5[0],
-    setCalculateSizes = _useState5[1];
-  var _useState6 = useState(false),
-    closeIsApproved = _useState6[0],
-    setCloseIsApproved = _useState6[1];
+  var _useState2 = useState(0),
+    popupHeight = _useState2[0],
+    setPopupHeight = _useState2[1];
+  var _useState3 = useState(false),
+    calculateSizes = _useState3[0],
+    setCalculateSizes = _useState3[1];
+  var _useState4 = useState(false),
+    closeIsApproved = _useState4[0],
+    setCloseIsApproved = _useState4[1];
   var totalReactions = 0;
   if (reactionTotals) {
     reactionTotals.forEach(function (summery) {
@@ -26419,9 +26411,9 @@ function ReactionsPopup(_ref) {
   }
   var user = getClient().user;
   var dispatch = useDispatch();
-  var _useState7 = useState(false),
-    isScrolling = _useState7[0],
-    setIsScrolling = _useState7[1];
+  var _useState5 = useState(false),
+    isScrolling = _useState5[0],
+    setIsScrolling = _useState5[1];
   var handleReactionsListScroll = function handleReactionsListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100 && reactionsHasNext) {
       if (reactionsLoadingState === LOADING_STATE.LOADED) {
@@ -26450,20 +26442,23 @@ function ReactionsPopup(_ref) {
       dispatch(setReactionsListAC([], true));
     };
   }, [messageId]);
-  useEffect(function () {
+  var scoresHeight = useMemo(function () {
     var scoresElem = scoresRef.current;
     if (scoresElem) {
-      setScoresHeight(scoresElem.offsetHeight);
+      return scoresElem.offsetHeight;
     }
-  });
+    return 0;
+  }, [scoresRef]);
   useEffect(function () {
     if (!reactionTotals || !reactionTotals.length) {
       handleReactionsPopupClose();
     }
   }, [reactionTotals]);
+  var reactionsHeight = useMemo(function () {
+    return reactions.length * 50 + 45;
+  }, [reactions]);
   useEffect(function () {
     if (reactions && reactionsPrevLength < reactions.length) {
-      var reactionsHeight = reactions.length * 44 + 45;
       if (reactionsHeight > popupHeight) {
         setPopupHeight(reactionsHeight);
       }
@@ -26473,14 +26468,15 @@ function ReactionsPopup(_ref) {
     }
     if (reactions && reactions.length) {
       if (calculateSizes) {
-        var botPost = bottomPosition - messageInputHeight - 40;
-        var _reactionsHeight = reactions.length * 50 + 45;
-        setPopupHeight(_reactionsHeight);
-        setPopupVerticalPosition(botPost >= (_reactionsHeight > 320 ? 320 : _reactionsHeight) ? 'bottom' : 'top');
+        setPopupHeight(reactionsHeight);
         setCalculateSizes(false);
       }
     }
-  }, [reactions]);
+  }, [reactions, reactionsHeight]);
+  var popupVerticalPosition = useMemo(function () {
+    var botPost = bottomPosition - messageInputHeight - 40;
+    return botPost >= (reactionsHeight > 320 ? 320 : reactionsHeight) ? 'bottom' : 'top';
+  }, [bottomPosition, messageInputHeight, reactionsHeight]);
   return /*#__PURE__*/React__default.createElement(Container$d, {
     ref: popupRef,
     popupVerticalPosition: popupVerticalPosition,

package/package.json

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