sceyt-chat-react-uikit 1.8.9-beta.15 → 1.8.9-beta.17

package/components/SendMessageInput/sendMessageUtils.d.ts

@@ -0,0 +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

@@ -48851,6 +48851,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 +49264,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';
     }
@@ -53724,7 +53750,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         type = event.type,
         code = event.code;
       var isEnter = (code === 'Enter' || code === 'NumpadEnter') && shiftKey === false;
-      var isPoll = pollDetails && pollDetails.options.length > 0 && pollDetails.name.trim();
+      var isPoll = Boolean(pollDetails && pollDetails.options.length > 0 && pollDetails.name.trim());
       var messageTextForSend = isPoll ? pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.name.trim() : messageText.trim();
       var shouldSend = (isEnter || type === 'click') && (messageToEdit || messageTextForSend || attachments.length && attachments.length > 0);
       if (isEnter) {
@@ -53839,7 +53865,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                       });
                     }
                   }
-                  if (messageTexToSend !== null && messageTexToSend !== void 0 && messageTexToSend.trim() && !attachments.length) {
+                  if (hasSendableTextOrPoll(messageTexToSend, isPoll) && !attachments.length) {
                     if (linkAttachment) {
                       messageToSend.attachments = [linkAttachment];
                     }
@@ -54069,6 +54095,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);
@@ -54085,27 +54119,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);
@@ -54145,25 +54164,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);
@@ -54499,27 +54505,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

@@ -48831,6 +48831,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 +49244,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';
     }
@@ -53704,7 +53730,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         type = event.type,
         code = event.code;
       var isEnter = (code === 'Enter' || code === 'NumpadEnter') && shiftKey === false;
-      var isPoll = pollDetails && pollDetails.options.length > 0 && pollDetails.name.trim();
+      var isPoll = Boolean(pollDetails && pollDetails.options.length > 0 && pollDetails.name.trim());
       var messageTextForSend = isPoll ? pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.name.trim() : messageText.trim();
       var shouldSend = (isEnter || type === 'click') && (messageToEdit || messageTextForSend || attachments.length && attachments.length > 0);
       if (isEnter) {
@@ -53819,7 +53845,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                       });
                     }
                   }
-                  if (messageTexToSend !== null && messageTexToSend !== void 0 && messageTexToSend.trim() && !attachments.length) {
+                  if (hasSendableTextOrPoll(messageTexToSend, isPoll) && !attachments.length) {
                     if (linkAttachment) {
                       messageToSend.attachments = [linkAttachment];
                     }
@@ -54049,6 +54075,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);
@@ -54065,27 +54099,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);
@@ -54125,25 +54144,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);
@@ -54479,27 +54485,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.15",
+  "version": "1.8.9-beta.17",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",