sceyt-chat-react-uikit 1.8.9-beta.16 → 1.8.9-beta.18

package/components/SendMessageInput/sendMessageUtils.d.ts

@@ -1 +1,11 @@
 export declare const hasSendableTextOrPoll: (messageText: string, isPoll: boolean) => boolean;
+export declare const DEFAULT_MEDIA_EXTENSIONS: string[];
+export declare const isDefaultSupportedMediaMimeType: (mimeType: string) => boolean;
+declare type MediaAttachmentValidationOptions = {
+    allowedExtensions?: string[];
+    sizeLimitKb?: number;
+    invalidTypeMessage?: string;
+    sizeLimitMessage?: string;
+};
+export declare const getMediaAttachmentValidationError: (file: Pick<File, 'name' | 'size'>, { allowedExtensions, sizeLimitKb, invalidTypeMessage, sizeLimitMessage }: MediaAttachmentValidationOptions) => string | null;
+export {};

package/index.js

@@ -46854,6 +46854,10 @@ function useChatController(_ref5) {
   var highlightTimeoutRef = React.useRef(null);
   var unreadRestoreCompletedRef = React.useRef(false);
   var previousUnreadScrollToRef = React.useRef(unreadScrollTo);
+  var unreadScrollToRef = React.useRef(unreadScrollTo);
+  var tabIsActiveRef = React.useRef(tabIsActive);
+  var hasNextMessagesRef = React.useRef(hasNextMessages);
+  var needsVisibleUnreadCheckRef = React.useRef(false);
   var historyLoadArmedRef = React.useRef(true);
   var latestLoadArmedRef = React.useRef(true);
   var pendingNewestCountRef = React.useRef(0);
@@ -46965,6 +46969,9 @@ function useChatController(_ref5) {
     visibleMessagesMapRef.current = visibleMessagesMap;
     channelRef.current = channel;
     connectionStatusRef.current = connectionStatus;
+    unreadScrollToRef.current = unreadScrollTo;
+    tabIsActiveRef.current = tabIsActive;
+    hasNextMessagesRef.current = hasNext;
   });
   var oldestConfirmedMessage = getFirstConfirmedMessage(messages);
   var newestConfirmedMessage = getLastConfirmedMessage(messages);
@@ -46998,6 +47005,7 @@ function useChatController(_ref5) {
     });
   }, [channel.id, messages]);
   var hasNext = hasNextMessages || (newestConfirmedMessage ? hasNextContiguousInMap(channel.id, newestConfirmedMessage) : false) || (newestConfirmedMessageId && (_channel$lastMessage = channel.lastMessage) !== null && _channel$lastMessage !== void 0 && _channel$lastMessage.id ? compareMessageIds(channel.lastMessage.id, newestConfirmedMessageId) > 0 : false) || hiddenPendingTailExists;
+  hasNextMessagesRef.current = hasNext;
   var isScrollInteractionActive = React.useCallback(function () {
     return Date.now() - lastScrollActivityAtRef.current < SCROLL_IDLE_MS;
   }, []);
@@ -47102,21 +47110,32 @@ function useChatController(_ref5) {
     }, lockDuration);
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = React.useCallback(function () {
-    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
+    if (pendingVisibleUnreadFrameRef.current !== null) {
+      return;
+    }
+    if (unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+      needsVisibleUnreadCheckRef.current = true;
       return;
     }
+    var scheduledChannelId = channel.id;
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
       pendingVisibleUnreadFrameRef.current = null;
+      var currentChannel = channelRef.current;
+      if (currentChannel.id !== scheduledChannelId || unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+        needsVisibleUnreadCheckRef.current = true;
+        return;
+      }
       var container = scrollRef.current;
       if (!container) {
         return;
       }
-      var unreadStartIndex = getUnreadTrackingStartIndex(messages);
+      var currentMessages = messagesRef.current;
+      var unreadStartIndex = getUnreadTrackingStartIndex(currentMessages);
       if (unreadStartIndex < 0) {
         return;
       }
-      var candidateUnreadMessages = messages.slice(unreadStartIndex);
-      var pinnedToLatestWithoutMorePages = !hasNext && isPinnedToLatest(container);
+      var candidateUnreadMessages = currentMessages.slice(unreadStartIndex);
+      var pinnedToLatestWithoutMorePages = !hasNextMessagesRef.current && isPinnedToLatest(container);
       var containerRect = pinnedToLatestWithoutMorePages ? null : container.getBoundingClientRect();
       var visibleUnreadMessages = candidateUnreadMessages.map(function (message) {
         if (visibleUnreadReportedRef.current.has(message.id)) {
@@ -47137,16 +47156,17 @@ function useChatController(_ref5) {
       var ids = visibleUnreadMessages.filter(isUnreadIncomingMessage).map(function (message) {
         return message.id;
       });
-      if (!ids.length || !channel.id || !channel.newMessageCount) {
+      if (!ids.length || !currentChannel.id || !currentChannel.newMessageCount) {
         return;
       }
       ids.forEach(function (id) {
         visibleUnreadReportedRef.current.add(id);
       });
+      needsVisibleUnreadCheckRef.current = false;
       registerLocallyReadUnreadMessages(ids.length);
-      dispatch(markMessagesAsReadAC(channel.id, ids));
+      dispatch(markMessagesAsReadAC(currentChannel.id, ids));
     });
-  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo, tabIsActive]);
+  }, [channel.id, dispatch, registerLocallyReadUnreadMessages]);
   var timelineItems = React.useMemo(function () {
     var unreadStartIndex = getUnreadDividerIndex(messages, unreadMessageId);
     return messages.flatMap(function (message, index) {
@@ -48574,8 +48594,15 @@ function useChatController(_ref5) {
     if (!previousUnreadScrollTo || unreadScrollTo) {
       return;
     }
+    needsVisibleUnreadCheckRef.current = true;
     queueVisibleUnreadCheck();
   }, [queueVisibleUnreadCheck, unreadScrollTo]);
+  React.useEffect(function () {
+    if (!needsVisibleUnreadCheckRef.current || unreadScrollTo || !tabIsActive || connectionStatus !== CONNECTION_STATUS.CONNECTED) {
+      return;
+    }
+    queueVisibleUnreadCheck();
+  }, [connectionStatus, queueVisibleUnreadCheck, tabIsActive, unreadScrollTo]);
   React.useEffect(function () {
     return function () {
       var _pendingWindowLoadRef3, _pendingEdgeLoadRefs$5, _pendingEdgeLoadRefs$6;
@@ -48851,6 +48878,33 @@ var createMessageMarkerBatcher = function createMessageMarkerBatcher(_ref) {
   };
 };
 
+var hasSendableTextOrPoll = function hasSendableTextOrPoll(messageText, isPoll) {
+  return Boolean(messageText.trim() || isPoll);
+};
+var DEFAULT_MEDIA_EXTENSIONS = ['jpg', 'jpeg', 'png', 'gif', 'mp4', 'mov', 'avi', 'wmv', 'flv', 'webm', 'jfif'];
+var DEFAULT_MEDIA_MIME_TYPES = new Set(['image/jpeg', 'image/png', 'image/gif', 'image/jfif', 'image/pjpeg', 'video/mp4', 'video/quicktime', 'video/x-msvideo', 'video/avi', 'video/x-ms-wmv', 'video/x-flv', 'video/webm']);
+var isDefaultSupportedMediaMimeType = function isDefaultSupportedMediaMimeType(mimeType) {
+  return DEFAULT_MEDIA_MIME_TYPES.has(mimeType.toLowerCase());
+};
+var getMediaAttachmentValidationError = function getMediaAttachmentValidationError(file, _ref) {
+  var _file$name$split$pop;
+  var allowedExtensions = _ref.allowedExtensions,
+    sizeLimitKb = _ref.sizeLimitKb,
+    invalidTypeMessage = _ref.invalidTypeMessage,
+    sizeLimitMessage = _ref.sizeLimitMessage;
+  if (sizeLimitKb && file.size / 1024 > sizeLimitKb) {
+    return sizeLimitMessage != null ? sizeLimitMessage : "File size exceeds the limit of " + sizeLimitKb + " KB.";
+  }
+  var supportedExtensions = (allowedExtensions !== null && allowedExtensions !== void 0 && allowedExtensions.length ? allowedExtensions : DEFAULT_MEDIA_EXTENSIONS).map(function (extension) {
+    return extension.replace(/^\./, '').toLowerCase();
+  });
+  var extension = (_file$name$split$pop = file.name.split('.').pop()) === null || _file$name$split$pop === void 0 ? void 0 : _file$name$split$pop.toLowerCase();
+  if (!extension || !supportedExtensions.includes(extension)) {
+    return invalidTypeMessage != null ? invalidTypeMessage : "Invalid file type. Allowed extensions are: " + supportedExtensions.join(', ') + ".";
+  }
+  return null;
+};
+
 var _templateObject$P, _templateObject2$K, _templateObject3$C, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$m, _templateObject8$k, _templateObject9$i, _templateObject0$h, _templateObject1$e, _templateObject10$b, _templateObject11$8;
 var MessageList = function MessageList(_ref) {
   var _scrollRef$current, _scrollRef$current$of, _scrollRef$current2;
@@ -49237,8 +49291,7 @@ var MessageList = function MessageList(_ref) {
     } else {
       var fileList = Array.from(e.dataTransfer.items);
       var hasMedia = fileList.some(function (item) {
-        var fileType = item.type.split('/')[0];
-        return fileType === 'image' || fileType === 'video';
+        return isDefaultSupportedMediaMimeType(item.type);
       });
       filesType = hasMedia ? 'media' : 'file';
     }
@@ -53198,10 +53251,6 @@ var SettingItem = styled__default.div(_templateObject9$j || (_templateObject9$j
   return props.color;
 });
 
-var hasSendableTextOrPoll = function hasSendableTextOrPoll(messageText, isPoll) {
-  return Boolean(messageText.trim() || isPoll);
-};
-
 var _templateObject$W, _templateObject2$R, _templateObject3$I, _templateObject4$C, _templateObject5$x, _templateObject6$t, _templateObject7$q, _templateObject8$n, _templateObject9$k, _templateObject0$i, _templateObject1$f, _templateObject10$c, _templateObject11$9, _templateObject12$7, _templateObject13$6, _templateObject14$5, _templateObject15$3, _templateObject16$2, _templateObject17$2, _templateObject18$2, _templateObject19$2, _templateObject20$2, _templateObject21$2, _templateObject22$1, _templateObject23$1, _templateObject24$1, _templateObject25$1, _templateObject26$1, _templateObject27$1, _templateObject28$1, _templateObject29$1, _templateObject30$1, _templateObject31$1, _templateObject32$1, _templateObject33$1, _templateObject34$1, _templateObject35$1, _templateObject36$1, _templateObject37$1, _templateObject38$1, _templateObject39$1, _templateObject40$1, _templateObject41$1, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46;
 function AutoFocusPlugin(_ref) {
   var messageForReply = _ref.messageForReply;
@@ -54073,6 +54122,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setUploadErrorMessage('');
     }, 3000);
   };
+  var validateMediaAttachment = function validateMediaAttachment(file) {
+    return getMediaAttachmentValidationError(file, {
+      allowedExtensions: allowedMediaExtensions,
+      sizeLimitKb: mediaAttachmentSizeLimit,
+      invalidTypeMessage: allowedMediaExtensionsErrorMessage,
+      sizeLimitMessage: attachmentSizeLimitErrorMessage
+    });
+  };
   var handleFileUpload = function handleFileUpload(e) {
     var isMediaAttachment = e.target.accept === mediaExtensions;
     var fileList = Object.values(e.target.files);
@@ -54089,27 +54146,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
     filesToProcess.forEach(function (file) {
       try {
-        var allowUpload = true;
-        var errorMessage = '';
-        if (isMediaAttachment) {
-          if (mediaAttachmentSizeLimit && file.size / 1024 > mediaAttachmentSizeLimit) {
-            allowUpload = false;
-            errorMessage = attachmentSizeLimitErrorMessage != null ? attachmentSizeLimitErrorMessage : "File size exceeds the limit of " + mediaAttachmentSizeLimit + " KB.";
-          }
-          if (allowedMediaExtensions !== null && allowedMediaExtensions !== void 0 && allowedMediaExtensions.length) {
-            var fileName = file.name;
-            var fileExtension = fileName.split('.').pop().toLowerCase();
-            if (!allowedMediaExtensions.includes(fileExtension)) {
-              allowUpload = false;
-              errorMessage = allowedMediaExtensionsErrorMessage != null ? allowedMediaExtensionsErrorMessage : "Invalid file type. Allowed extensions are: " + allowedMediaExtensions.join(', ') + ".";
-            }
-          }
-        }
+        var validationError = isMediaAttachment ? validateMediaAttachment(file) : null;
         var _temp8 = function () {
-          if (allowUpload) {
+          if (!validationError) {
             return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
           } else {
-            showFileUploadError(errorMessage);
+            showFileUploadError(validationError);
           }
         }();
         return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
@@ -54149,25 +54191,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         }
         filesToProcess.forEach(function (file) {
           try {
-            var allowUpload = true;
-            var errorMessage = '';
-            if (mediaAttachmentSizeLimit && file.size / 1024 > mediaAttachmentSizeLimit) {
-              allowUpload = false;
-              errorMessage = attachmentSizeLimitErrorMessage != null ? attachmentSizeLimitErrorMessage : "File size exceeds the limit of " + mediaAttachmentSizeLimit + " KB.";
-            }
-            if (allowedMediaExtensions !== null && allowedMediaExtensions !== void 0 && allowedMediaExtensions.length) {
-              var fileName = file.name;
-              var fileExtension = fileName.split('.').pop().toLowerCase();
-              if (!allowedMediaExtensions.includes(fileExtension)) {
-                allowUpload = false;
-                errorMessage = allowedMediaExtensionsErrorMessage != null ? allowedMediaExtensionsErrorMessage : "Invalid file type. Allowed extensions are: " + allowedMediaExtensions.join(', ') + ".";
-              }
-            }
+            var validationError = validateMediaAttachment(file);
             var _temp9 = function () {
-              if (allowUpload) {
+              if (!validationError) {
                 return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, true)).then(function () {});
               } else {
-                showFileUploadError(errorMessage);
+                showFileUploadError(validationError);
               }
             }();
             return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
@@ -54503,27 +54532,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var isMediaAttachment = draggedAttachments[0].attachmentType === 'media';
       filesToProcess.forEach(function (file) {
         try {
-          var allowUpload = true;
-          var errorMessage = '';
-          if (isMediaAttachment) {
-            if (mediaAttachmentSizeLimit && file.size / 1024 > mediaAttachmentSizeLimit) {
-              allowUpload = false;
-              errorMessage = attachmentSizeLimitErrorMessage != null ? attachmentSizeLimitErrorMessage : "File size exceeds the limit of " + mediaAttachmentSizeLimit + " KB.";
-            }
-            if (allowedMediaExtensions !== null && allowedMediaExtensions !== void 0 && allowedMediaExtensions.length) {
-              var fileName = file.name;
-              var fileExtension = fileName.split('.').pop().toLowerCase();
-              if (!allowedMediaExtensions.includes(fileExtension)) {
-                allowUpload = false;
-                errorMessage = allowedMediaExtensionsErrorMessage != null ? allowedMediaExtensionsErrorMessage : "Invalid file type. Allowed extensions are: " + allowedMediaExtensions.join(', ') + ".";
-              }
-            }
-          }
+          var validationError = isMediaAttachment ? validateMediaAttachment(file) : null;
           var _temp19 = function () {
-            if (allowUpload) {
+            if (!validationError) {
               return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
             } else {
-              showFileUploadError(errorMessage);
+              showFileUploadError(validationError);
             }
           }();
           return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);

package/index.modern.js

@@ -46834,6 +46834,10 @@ function useChatController(_ref5) {
   var highlightTimeoutRef = useRef(null);
   var unreadRestoreCompletedRef = useRef(false);
   var previousUnreadScrollToRef = useRef(unreadScrollTo);
+  var unreadScrollToRef = useRef(unreadScrollTo);
+  var tabIsActiveRef = useRef(tabIsActive);
+  var hasNextMessagesRef = useRef(hasNextMessages);
+  var needsVisibleUnreadCheckRef = useRef(false);
   var historyLoadArmedRef = useRef(true);
   var latestLoadArmedRef = useRef(true);
   var pendingNewestCountRef = useRef(0);
@@ -46945,6 +46949,9 @@ function useChatController(_ref5) {
     visibleMessagesMapRef.current = visibleMessagesMap;
     channelRef.current = channel;
     connectionStatusRef.current = connectionStatus;
+    unreadScrollToRef.current = unreadScrollTo;
+    tabIsActiveRef.current = tabIsActive;
+    hasNextMessagesRef.current = hasNext;
   });
   var oldestConfirmedMessage = getFirstConfirmedMessage(messages);
   var newestConfirmedMessage = getLastConfirmedMessage(messages);
@@ -46978,6 +46985,7 @@ function useChatController(_ref5) {
     });
   }, [channel.id, messages]);
   var hasNext = hasNextMessages || (newestConfirmedMessage ? hasNextContiguousInMap(channel.id, newestConfirmedMessage) : false) || (newestConfirmedMessageId && (_channel$lastMessage = channel.lastMessage) !== null && _channel$lastMessage !== void 0 && _channel$lastMessage.id ? compareMessageIds(channel.lastMessage.id, newestConfirmedMessageId) > 0 : false) || hiddenPendingTailExists;
+  hasNextMessagesRef.current = hasNext;
   var isScrollInteractionActive = useCallback(function () {
     return Date.now() - lastScrollActivityAtRef.current < SCROLL_IDLE_MS;
   }, []);
@@ -47082,21 +47090,32 @@ function useChatController(_ref5) {
     }, lockDuration);
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = useCallback(function () {
-    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
+    if (pendingVisibleUnreadFrameRef.current !== null) {
+      return;
+    }
+    if (unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+      needsVisibleUnreadCheckRef.current = true;
       return;
     }
+    var scheduledChannelId = channel.id;
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
       pendingVisibleUnreadFrameRef.current = null;
+      var currentChannel = channelRef.current;
+      if (currentChannel.id !== scheduledChannelId || unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+        needsVisibleUnreadCheckRef.current = true;
+        return;
+      }
       var container = scrollRef.current;
       if (!container) {
         return;
       }
-      var unreadStartIndex = getUnreadTrackingStartIndex(messages);
+      var currentMessages = messagesRef.current;
+      var unreadStartIndex = getUnreadTrackingStartIndex(currentMessages);
       if (unreadStartIndex < 0) {
         return;
       }
-      var candidateUnreadMessages = messages.slice(unreadStartIndex);
-      var pinnedToLatestWithoutMorePages = !hasNext && isPinnedToLatest(container);
+      var candidateUnreadMessages = currentMessages.slice(unreadStartIndex);
+      var pinnedToLatestWithoutMorePages = !hasNextMessagesRef.current && isPinnedToLatest(container);
       var containerRect = pinnedToLatestWithoutMorePages ? null : container.getBoundingClientRect();
       var visibleUnreadMessages = candidateUnreadMessages.map(function (message) {
         if (visibleUnreadReportedRef.current.has(message.id)) {
@@ -47117,16 +47136,17 @@ function useChatController(_ref5) {
       var ids = visibleUnreadMessages.filter(isUnreadIncomingMessage).map(function (message) {
         return message.id;
       });
-      if (!ids.length || !channel.id || !channel.newMessageCount) {
+      if (!ids.length || !currentChannel.id || !currentChannel.newMessageCount) {
         return;
       }
       ids.forEach(function (id) {
         visibleUnreadReportedRef.current.add(id);
       });
+      needsVisibleUnreadCheckRef.current = false;
       registerLocallyReadUnreadMessages(ids.length);
-      dispatch(markMessagesAsReadAC(channel.id, ids));
+      dispatch(markMessagesAsReadAC(currentChannel.id, ids));
     });
-  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo, tabIsActive]);
+  }, [channel.id, dispatch, registerLocallyReadUnreadMessages]);
   var timelineItems = useMemo(function () {
     var unreadStartIndex = getUnreadDividerIndex(messages, unreadMessageId);
     return messages.flatMap(function (message, index) {
@@ -48554,8 +48574,15 @@ function useChatController(_ref5) {
     if (!previousUnreadScrollTo || unreadScrollTo) {
       return;
     }
+    needsVisibleUnreadCheckRef.current = true;
     queueVisibleUnreadCheck();
   }, [queueVisibleUnreadCheck, unreadScrollTo]);
+  useEffect(function () {
+    if (!needsVisibleUnreadCheckRef.current || unreadScrollTo || !tabIsActive || connectionStatus !== CONNECTION_STATUS.CONNECTED) {
+      return;
+    }
+    queueVisibleUnreadCheck();
+  }, [connectionStatus, queueVisibleUnreadCheck, tabIsActive, unreadScrollTo]);
   useEffect(function () {
     return function () {
       var _pendingWindowLoadRef3, _pendingEdgeLoadRefs$5, _pendingEdgeLoadRefs$6;
@@ -48831,6 +48858,33 @@ var createMessageMarkerBatcher = function createMessageMarkerBatcher(_ref) {
   };
 };
 
+var hasSendableTextOrPoll = function hasSendableTextOrPoll(messageText, isPoll) {
+  return Boolean(messageText.trim() || isPoll);
+};
+var DEFAULT_MEDIA_EXTENSIONS = ['jpg', 'jpeg', 'png', 'gif', 'mp4', 'mov', 'avi', 'wmv', 'flv', 'webm', 'jfif'];
+var DEFAULT_MEDIA_MIME_TYPES = new Set(['image/jpeg', 'image/png', 'image/gif', 'image/jfif', 'image/pjpeg', 'video/mp4', 'video/quicktime', 'video/x-msvideo', 'video/avi', 'video/x-ms-wmv', 'video/x-flv', 'video/webm']);
+var isDefaultSupportedMediaMimeType = function isDefaultSupportedMediaMimeType(mimeType) {
+  return DEFAULT_MEDIA_MIME_TYPES.has(mimeType.toLowerCase());
+};
+var getMediaAttachmentValidationError = function getMediaAttachmentValidationError(file, _ref) {
+  var _file$name$split$pop;
+  var allowedExtensions = _ref.allowedExtensions,
+    sizeLimitKb = _ref.sizeLimitKb,
+    invalidTypeMessage = _ref.invalidTypeMessage,
+    sizeLimitMessage = _ref.sizeLimitMessage;
+  if (sizeLimitKb && file.size / 1024 > sizeLimitKb) {
+    return sizeLimitMessage != null ? sizeLimitMessage : "File size exceeds the limit of " + sizeLimitKb + " KB.";
+  }
+  var supportedExtensions = (allowedExtensions !== null && allowedExtensions !== void 0 && allowedExtensions.length ? allowedExtensions : DEFAULT_MEDIA_EXTENSIONS).map(function (extension) {
+    return extension.replace(/^\./, '').toLowerCase();
+  });
+  var extension = (_file$name$split$pop = file.name.split('.').pop()) === null || _file$name$split$pop === void 0 ? void 0 : _file$name$split$pop.toLowerCase();
+  if (!extension || !supportedExtensions.includes(extension)) {
+    return invalidTypeMessage != null ? invalidTypeMessage : "Invalid file type. Allowed extensions are: " + supportedExtensions.join(', ') + ".";
+  }
+  return null;
+};
+
 var _templateObject$P, _templateObject2$K, _templateObject3$C, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$m, _templateObject8$k, _templateObject9$i, _templateObject0$h, _templateObject1$e, _templateObject10$b, _templateObject11$8;
 var MessageList = function MessageList(_ref) {
   var _scrollRef$current, _scrollRef$current$of, _scrollRef$current2;
@@ -49217,8 +49271,7 @@ var MessageList = function MessageList(_ref) {
     } else {
       var fileList = Array.from(e.dataTransfer.items);
       var hasMedia = fileList.some(function (item) {
-        var fileType = item.type.split('/')[0];
-        return fileType === 'image' || fileType === 'video';
+        return isDefaultSupportedMediaMimeType(item.type);
       });
       filesType = hasMedia ? 'media' : 'file';
     }
@@ -53178,10 +53231,6 @@ var SettingItem = styled.div(_templateObject9$j || (_templateObject9$j = _tagged
   return props.color;
 });
 
-var hasSendableTextOrPoll = function hasSendableTextOrPoll(messageText, isPoll) {
-  return Boolean(messageText.trim() || isPoll);
-};
-
 var _templateObject$W, _templateObject2$R, _templateObject3$I, _templateObject4$C, _templateObject5$x, _templateObject6$t, _templateObject7$q, _templateObject8$n, _templateObject9$k, _templateObject0$i, _templateObject1$f, _templateObject10$c, _templateObject11$9, _templateObject12$7, _templateObject13$6, _templateObject14$5, _templateObject15$3, _templateObject16$2, _templateObject17$2, _templateObject18$2, _templateObject19$2, _templateObject20$2, _templateObject21$2, _templateObject22$1, _templateObject23$1, _templateObject24$1, _templateObject25$1, _templateObject26$1, _templateObject27$1, _templateObject28$1, _templateObject29$1, _templateObject30$1, _templateObject31$1, _templateObject32$1, _templateObject33$1, _templateObject34$1, _templateObject35$1, _templateObject36$1, _templateObject37$1, _templateObject38$1, _templateObject39$1, _templateObject40$1, _templateObject41$1, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46;
 function AutoFocusPlugin(_ref) {
   var messageForReply = _ref.messageForReply;
@@ -54053,6 +54102,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setUploadErrorMessage('');
     }, 3000);
   };
+  var validateMediaAttachment = function validateMediaAttachment(file) {
+    return getMediaAttachmentValidationError(file, {
+      allowedExtensions: allowedMediaExtensions,
+      sizeLimitKb: mediaAttachmentSizeLimit,
+      invalidTypeMessage: allowedMediaExtensionsErrorMessage,
+      sizeLimitMessage: attachmentSizeLimitErrorMessage
+    });
+  };
   var handleFileUpload = function handleFileUpload(e) {
     var isMediaAttachment = e.target.accept === mediaExtensions;
     var fileList = Object.values(e.target.files);
@@ -54069,27 +54126,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
     filesToProcess.forEach(function (file) {
       try {
-        var allowUpload = true;
-        var errorMessage = '';
-        if (isMediaAttachment) {
-          if (mediaAttachmentSizeLimit && file.size / 1024 > mediaAttachmentSizeLimit) {
-            allowUpload = false;
-            errorMessage = attachmentSizeLimitErrorMessage != null ? attachmentSizeLimitErrorMessage : "File size exceeds the limit of " + mediaAttachmentSizeLimit + " KB.";
-          }
-          if (allowedMediaExtensions !== null && allowedMediaExtensions !== void 0 && allowedMediaExtensions.length) {
-            var fileName = file.name;
-            var fileExtension = fileName.split('.').pop().toLowerCase();
-            if (!allowedMediaExtensions.includes(fileExtension)) {
-              allowUpload = false;
-              errorMessage = allowedMediaExtensionsErrorMessage != null ? allowedMediaExtensionsErrorMessage : "Invalid file type. Allowed extensions are: " + allowedMediaExtensions.join(', ') + ".";
-            }
-          }
-        }
+        var validationError = isMediaAttachment ? validateMediaAttachment(file) : null;
         var _temp8 = function () {
-          if (allowUpload) {
+          if (!validationError) {
             return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
           } else {
-            showFileUploadError(errorMessage);
+            showFileUploadError(validationError);
           }
         }();
         return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
@@ -54129,25 +54171,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         }
         filesToProcess.forEach(function (file) {
           try {
-            var allowUpload = true;
-            var errorMessage = '';
-            if (mediaAttachmentSizeLimit && file.size / 1024 > mediaAttachmentSizeLimit) {
-              allowUpload = false;
-              errorMessage = attachmentSizeLimitErrorMessage != null ? attachmentSizeLimitErrorMessage : "File size exceeds the limit of " + mediaAttachmentSizeLimit + " KB.";
-            }
-            if (allowedMediaExtensions !== null && allowedMediaExtensions !== void 0 && allowedMediaExtensions.length) {
-              var fileName = file.name;
-              var fileExtension = fileName.split('.').pop().toLowerCase();
-              if (!allowedMediaExtensions.includes(fileExtension)) {
-                allowUpload = false;
-                errorMessage = allowedMediaExtensionsErrorMessage != null ? allowedMediaExtensionsErrorMessage : "Invalid file type. Allowed extensions are: " + allowedMediaExtensions.join(', ') + ".";
-              }
-            }
+            var validationError = validateMediaAttachment(file);
             var _temp9 = function () {
-              if (allowUpload) {
+              if (!validationError) {
                 return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, true)).then(function () {});
               } else {
-                showFileUploadError(errorMessage);
+                showFileUploadError(validationError);
               }
             }();
             return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
@@ -54483,27 +54512,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var isMediaAttachment = draggedAttachments[0].attachmentType === 'media';
       filesToProcess.forEach(function (file) {
         try {
-          var allowUpload = true;
-          var errorMessage = '';
-          if (isMediaAttachment) {
-            if (mediaAttachmentSizeLimit && file.size / 1024 > mediaAttachmentSizeLimit) {
-              allowUpload = false;
-              errorMessage = attachmentSizeLimitErrorMessage != null ? attachmentSizeLimitErrorMessage : "File size exceeds the limit of " + mediaAttachmentSizeLimit + " KB.";
-            }
-            if (allowedMediaExtensions !== null && allowedMediaExtensions !== void 0 && allowedMediaExtensions.length) {
-              var fileName = file.name;
-              var fileExtension = fileName.split('.').pop().toLowerCase();
-              if (!allowedMediaExtensions.includes(fileExtension)) {
-                allowUpload = false;
-                errorMessage = allowedMediaExtensionsErrorMessage != null ? allowedMediaExtensionsErrorMessage : "Invalid file type. Allowed extensions are: " + allowedMediaExtensions.join(', ') + ".";
-              }
-            }
-          }
+          var validationError = isMediaAttachment ? validateMediaAttachment(file) : null;
           var _temp19 = function () {
-            if (allowUpload) {
+            if (!validationError) {
               return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
             } else {
-              showFileUploadError(errorMessage);
+              showFileUploadError(validationError);
             }
           }();
           return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);

package/package.json

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