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

package/components/Channel/index.d.ts

@@ -49,6 +49,10 @@ interface IChannelProps {
     doNotShowMessageDeliveryTypes: string[];
     showPhoneNumber?: boolean;
     channelListWidth?: number;
+    getCustomIconOnAvatar?: (args: {
+        channel: IChannel;
+        user: IUser;
+    }) => any;
 }
 declare const Channel: React.FC<IChannelProps>;
 export default Channel;

package/components/ChannelList/index.d.ts

@@ -78,6 +78,7 @@ interface IChannelListProps {
     getCustomLatestMessage?: (lastMessage: IMessage, typingOrRecording: any, draftMessageText: any, textSecondary: string, channel: IChannel, channelLastMessageFontSize: string, channelLastMessageHeight: string, isDirectChannel: boolean, textPrimary: string, messageAuthorRef: any, contactsMap: {
         [key: string]: IContact;
     }, getFromContacts: boolean, warningColor: string, user: IUser, MessageText: any) => any;
+    getCustomIconOnAvatar?: (channel: IChannel, user: IUser) => any;
     doNotShowMessageDeliveryTypes?: string[];
     showPhoneNumber?: boolean;
     channelListWidth?: number;

package/index.js

@@ -29740,7 +29740,8 @@ var Channel = function Channel(_ref3) {
     getCustomLatestMessage = _ref3.getCustomLatestMessage,
     doNotShowMessageDeliveryTypes = _ref3.doNotShowMessageDeliveryTypes,
     showPhoneNumber = _ref3.showPhoneNumber,
-    channelListWidth = _ref3.channelListWidth;
+    channelListWidth = _ref3.channelListWidth,
+    getCustomIconOnAvatar = _ref3.getCustomIconOnAvatar;
   var _useColor = useColors(),
     accentColor = _useColor[THEME_COLORS.ACCENT],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -29940,7 +29941,10 @@ var Channel = function Channel(_ref3) {
   })), isDirectChannel && directChannelUser && hideUserPresence && (hideUserPresence(directChannelUser) ? '' : directChannelUser.presence && directChannelUser.presence.state === USER_PRESENCE_STATUS.ONLINE) && (/*#__PURE__*/React__default.createElement(UserStatus, {
     backgroundColor: onlineStatus,
     borderColor: background
-  })))), channelListWidth === undefined || channelListWidth >= 280 ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(ChannelInfo, {
+  })))), getCustomIconOnAvatar ? getCustomIconOnAvatar({
+    channel: channel,
+    user: user
+  }) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null), channelListWidth === undefined || channelListWidth >= 280 ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(ChannelInfo, {
     avatar: showAvatar,
     isMuted: channel.muted,
     isPinned: !!channel.pinnedAt,
@@ -32296,6 +32300,7 @@ var ChannelList = function ChannelList(_ref2) {
     searchedChannelsTitleFontSize = _ref2.searchedChannelsTitleFontSize,
     searchChannelsPadding = _ref2.searchChannelsPadding,
     getCustomLatestMessage = _ref2.getCustomLatestMessage,
+    getCustomIconOnAvatar = _ref2.getCustomIconOnAvatar,
     _ref2$doNotShowMessag = _ref2.doNotShowMessageDeliveryTypes,
     doNotShowMessageDeliveryTypes = _ref2$doNotShowMessag === void 0 ? ['system'] : _ref2$doNotShowMessag,
     _ref2$showPhoneNumber = _ref2.showPhoneNumber,
@@ -32634,7 +32639,8 @@ var ChannelList = function ChannelList(_ref2) {
       getCustomLatestMessage: getCustomLatestMessage,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber,
-      channelListWidth: channelListWidth
+      channelListWidth: channelListWidth,
+      getCustomIconOnAvatar: getCustomIconOnAvatar
     })));
   }), channelsLoading === LOADING_STATE.LOADING && channelsHasNext && (/*#__PURE__*/React__default.createElement(ChannelSkeletonList, {
     color: surface1,
@@ -32674,6 +32680,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber,
       channelListWidth: channelListWidth
@@ -32746,6 +32753,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -32796,6 +32804,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -32842,6 +32851,7 @@ var ChannelList = function ChannelList(_ref2) {
       key: channel.id,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -32880,6 +32890,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -43787,6 +43798,7 @@ function useChatController(_ref5) {
   var visibleUnreadReportedRef = React.useRef(new Set());
   var restoreRef = React.useRef(null);
   var lastBootKeyRef = React.useRef(null);
+  var pendingBootScrolledRef = React.useRef(false);
   var highlightedItemIdRef = React.useRef(null);
   var highlightTimeoutRef = React.useRef(null);
   var unreadRestoreCompletedRef = React.useRef(false);
@@ -44985,6 +44997,7 @@ function useChatController(_ref5) {
     currentJumpIdRef.current += 1;
     activeChannelIdRef.current = channel.id;
     lastBootKeyRef.current = null;
+    pendingBootScrolledRef.current = false;
     restoreRef.current = null;
     windowLoadScopeRef.current = null;
     activeEdgeIntentRef.current = null;
@@ -45081,13 +45094,26 @@ function useChatController(_ref5) {
       return;
     }
     if (!lastBootKeyRef.current) {
-      lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
-      var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
-      restoreRef.current = unreadScrollTo && unreadMessageId ? {
-        mode: 'reveal-unread-separator'
-      } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
-        mode: 'to-bottom'
-      };
+      var hasConfirmedMessages = messages.some(function (m) {
+        return !!m.id;
+      });
+      if (hasConfirmedMessages) {
+        lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
+        pendingBootScrolledRef.current = false;
+        var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
+        restoreRef.current = unreadScrollTo && unreadMessageId ? {
+          mode: 'reveal-unread-separator'
+        } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
+          mode: 'to-bottom'
+        };
+      } else if (!pendingBootScrolledRef.current) {
+        pendingBootScrolledRef.current = true;
+        if (!restoreRef.current) {
+          restoreRef.current = {
+            mode: 'to-bottom'
+          };
+        }
+      }
     }
     var restoreState = restoreRef.current;
     if (!restoreState) {

package/index.modern.js

@@ -29739,7 +29739,8 @@ var Channel = function Channel(_ref3) {
     getCustomLatestMessage = _ref3.getCustomLatestMessage,
     doNotShowMessageDeliveryTypes = _ref3.doNotShowMessageDeliveryTypes,
     showPhoneNumber = _ref3.showPhoneNumber,
-    channelListWidth = _ref3.channelListWidth;
+    channelListWidth = _ref3.channelListWidth,
+    getCustomIconOnAvatar = _ref3.getCustomIconOnAvatar;
   var _useColor = useColors(),
     accentColor = _useColor[THEME_COLORS.ACCENT],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -29939,7 +29940,10 @@ var Channel = function Channel(_ref3) {
   })), isDirectChannel && directChannelUser && hideUserPresence && (hideUserPresence(directChannelUser) ? '' : directChannelUser.presence && directChannelUser.presence.state === USER_PRESENCE_STATUS.ONLINE) && (/*#__PURE__*/React__default.createElement(UserStatus, {
     backgroundColor: onlineStatus,
     borderColor: background
-  })))), channelListWidth === undefined || channelListWidth >= 280 ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(ChannelInfo, {
+  })))), getCustomIconOnAvatar ? getCustomIconOnAvatar({
+    channel: channel,
+    user: user
+  }) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null), channelListWidth === undefined || channelListWidth >= 280 ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(ChannelInfo, {
     avatar: showAvatar,
     isMuted: channel.muted,
     isPinned: !!channel.pinnedAt,
@@ -32295,6 +32299,7 @@ var ChannelList = function ChannelList(_ref2) {
     searchedChannelsTitleFontSize = _ref2.searchedChannelsTitleFontSize,
     searchChannelsPadding = _ref2.searchChannelsPadding,
     getCustomLatestMessage = _ref2.getCustomLatestMessage,
+    getCustomIconOnAvatar = _ref2.getCustomIconOnAvatar,
     _ref2$doNotShowMessag = _ref2.doNotShowMessageDeliveryTypes,
     doNotShowMessageDeliveryTypes = _ref2$doNotShowMessag === void 0 ? ['system'] : _ref2$doNotShowMessag,
     _ref2$showPhoneNumber = _ref2.showPhoneNumber,
@@ -32633,7 +32638,8 @@ var ChannelList = function ChannelList(_ref2) {
       getCustomLatestMessage: getCustomLatestMessage,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber,
-      channelListWidth: channelListWidth
+      channelListWidth: channelListWidth,
+      getCustomIconOnAvatar: getCustomIconOnAvatar
     })));
   }), channelsLoading === LOADING_STATE.LOADING && channelsHasNext && (/*#__PURE__*/React__default.createElement(ChannelSkeletonList, {
     color: surface1,
@@ -32673,6 +32679,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber,
       channelListWidth: channelListWidth
@@ -32745,6 +32752,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -32795,6 +32803,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -32841,6 +32850,7 @@ var ChannelList = function ChannelList(_ref2) {
       key: channel.id,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -32879,6 +32889,7 @@ var ChannelList = function ChannelList(_ref2) {
       contactsMap: contactsMap,
       setSelectedChannel: setSelectedChannel,
       getCustomLatestMessage: getCustomLatestMessage,
+      getCustomIconOnAvatar: getCustomIconOnAvatar,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
     }));
@@ -43786,6 +43797,7 @@ function useChatController(_ref5) {
   var visibleUnreadReportedRef = useRef(new Set());
   var restoreRef = useRef(null);
   var lastBootKeyRef = useRef(null);
+  var pendingBootScrolledRef = useRef(false);
   var highlightedItemIdRef = useRef(null);
   var highlightTimeoutRef = useRef(null);
   var unreadRestoreCompletedRef = useRef(false);
@@ -44984,6 +44996,7 @@ function useChatController(_ref5) {
     currentJumpIdRef.current += 1;
     activeChannelIdRef.current = channel.id;
     lastBootKeyRef.current = null;
+    pendingBootScrolledRef.current = false;
     restoreRef.current = null;
     windowLoadScopeRef.current = null;
     activeEdgeIntentRef.current = null;
@@ -45080,13 +45093,26 @@ function useChatController(_ref5) {
       return;
     }
     if (!lastBootKeyRef.current) {
-      lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
-      var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
-      restoreRef.current = unreadScrollTo && unreadMessageId ? {
-        mode: 'reveal-unread-separator'
-      } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
-        mode: 'to-bottom'
-      };
+      var hasConfirmedMessages = messages.some(function (m) {
+        return !!m.id;
+      });
+      if (hasConfirmedMessages) {
+        lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
+        pendingBootScrolledRef.current = false;
+        var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
+        restoreRef.current = unreadScrollTo && unreadMessageId ? {
+          mode: 'reveal-unread-separator'
+        } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
+          mode: 'to-bottom'
+        };
+      } else if (!pendingBootScrolledRef.current) {
+        pendingBootScrolledRef.current = true;
+        if (!restoreRef.current) {
+          restoreRef.current = {
+            mode: 'to-bottom'
+          };
+        }
+      }
     }
     var restoreState = restoreRef.current;
     if (!restoreState) {

package/package.json

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