[RTE]: fixed bug when files added from attachment button inserted in …

…preview mode instead of attachment block
epam · Dec 2, 2024 · ccc9033 · ccc9033
1 parent 0be8b6c
commit ccc9033
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -13,6 +13,7 @@
 * [Modals]: prevent scrolling to the modal toggler because of focus return after modal close
 * [RTE]: fixed scroll to the top of the editor after editor modal windows(Add image/link/video etc.) were close
 * [RTE]: fixed error while merging cells without content
+* [RTE]: fixed bug when files added from attachment button inserted in preview mode instead of attachment block
 
 # 5.11.0 - 15.11.2024
 

diff --git a/uui-editor/src/plugins/uploadFilePlugin/file_uploader.ts b/uui-editor/src/plugins/uploadFilePlugin/file_uploader.ts
@@ -82,21 +82,25 @@ const isValidFileType = (fileType?: string) => {
 
 const buildFragments = (
     files: FileUploadResponse[],
+    blockType?: UploadType,
 ) => {
     return files.map((file: FileUploadResponse) => {
         const fileType = file.type;
-        const uploadType = (
-            isValidFileType(fileType) ? fileType : ATTACHMENT_TYPE
-        ) as UploadType;
+        if (blockType) {
+            return UPLOAD_BLOCKS[blockType](file);
+        } else {
+            const blockTypeByFile = (isValidFileType(fileType) ? fileType : ATTACHMENT_TYPE) as UploadType;
 
-        return UPLOAD_BLOCKS[uploadType](file);
+            return UPLOAD_BLOCKS[blockTypeByFile](file);
+        }
     });
 };
 
 export const createFileUploader = (options?: UploadFileOptions) =>
     async (
         editor: PlateEditor,
         files: File[],
+        blockType: UploadType,
     ) => {
         const uploadFile = options?.uploadFile;
         if (!uploadFile) return;
@@ -127,7 +131,7 @@ export const createFileUploader = (options?: UploadFileOptions) =>
         }
 
         // build fragments
-        const fileFragments = buildFragments(res);
+        const fileFragments = buildFragments(res, blockType);
 
         // remove loader
         removeLoader();
@@ -138,14 +142,14 @@ export const createFileUploader = (options?: UploadFileOptions) =>
 
 export const useFilesUploader = (editor: PlateEditor) => {
     return useCallback(
-        (files: File[], overriddenAction?: UploadType): Promise<void> => {
+        (files: File[], blockType?: UploadType): Promise<void> => {
             const callback = getPlugin<FileUploaderOptions>(editor, UPLOAD_PLUGIN_KEY)?.options.uploadFiles;
 
             if (callback) {
                 return callback(
                     editor,
                     files,
-                    overriddenAction,
+                    blockType,
                 );
             }