@emailmaker/filemanager 0.10.85 → 0.10.86

package/file-manager.esm.js

@@ -1,2 +1,2 @@
-export{D as FileContent,J as FileManagerApiError,C as FileManagerApp,x as FileManagerAppWithContext,E as FileModals,G as FolderSidebar,P as PixieOnlyApp,B as default,v as init,A as initFileManager,y as initPixieEditor,H as installResizeObserverErrorHandler,K as mapHttpStatusToErrorCode,I as uninstallResizeObserverErrorHandler,w as unmount,z as unmountPixieEditor}from"./file-manager-index-DptuziBQ.js";import"react/jsx-runtime";import"react";import"react-dom/client";import"antd";import"antd/es/alert/ErrorBoundary";import"@ant-design/icons";import"react-dom";
+export{D as FileContent,J as FileManagerApiError,C as FileManagerApp,x as FileManagerAppWithContext,E as FileModals,G as FolderSidebar,P as PixieOnlyApp,B as default,v as init,A as initFileManager,y as initPixieEditor,H as installResizeObserverErrorHandler,K as mapHttpStatusToErrorCode,I as uninstallResizeObserverErrorHandler,w as unmount,z as unmountPixieEditor}from"./file-manager-index-B4pgaHpG.js";import"react/jsx-runtime";import"react";import"react-dom/client";import"antd";import"antd/es/alert/ErrorBoundary";import"@ant-design/icons";import"react-dom";
 //# sourceMappingURL=file-manager.esm.js.map

package/file-manager.js

@@ -31156,6 +31156,9 @@ function pathHistoryEqual(a, b) {
     }
     return a.every((p, i) => { var _a; return p.id === ((_a = b[i]) === null || _a === void 0 ? void 0 : _a.id); });
 }
+/** Без page/limit хост (EmailMaker) мог запрашивать весь каталог (per_page=10000). */
+const DEFAULT_FILES_LIST_PAGE = 1;
+const DEFAULT_FILES_LIST_PAGE_SIZE = 20;
 async function fetchBlobFromUrl(url) {
     const response = await fetch(url, { mode: 'cors' });
     if (!response.ok) {
@@ -31192,22 +31195,24 @@ const useFilesAPI = () => {
     const { setFiles, setLoading, setIsUrlModalVisible, setActiveLibraryItem, setPagination, setSelectedFolder, setPathHistory, } = actions;
     const { dataProviders } = options;
     const fetchFilesFromDataProvider = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(async (params) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         if (!(dataProviders === null || dataProviders === void 0 ? void 0 : dataProviders.getFiles))
             return [];
         const disablePagination = (_a = options === null || options === void 0 ? void 0 : options.config) === null || _a === void 0 ? void 0 : _a.disablePagination;
+        const resolvedPage = disablePagination ? undefined : ((_b = params === null || params === void 0 ? void 0 : params.page) !== null && _b !== void 0 ? _b : DEFAULT_FILES_LIST_PAGE);
+        const resolvedLimit = disablePagination ? undefined : ((_c = params === null || params === void 0 ? void 0 : params.limit) !== null && _c !== void 0 ? _c : DEFAULT_FILES_LIST_PAGE_SIZE);
         const { files, pagination: responsePagination } = await dataProviders.getFiles({
             folderId: (params === null || params === void 0 ? void 0 : params.folderId) !== 'folders' ? params === null || params === void 0 ? void 0 : params.folderId : undefined,
             noFolder: params === null || params === void 0 ? void 0 : params.noFolder,
-            search: ((_b = params === null || params === void 0 ? void 0 : params.search) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+            search: ((_d = params === null || params === void 0 ? void 0 : params.search) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
             sortBy: params === null || params === void 0 ? void 0 : params.sortBy,
             sortOrder: params === null || params === void 0 ? void 0 : params.sortOrder,
-            page: disablePagination ? undefined : params === null || params === void 0 ? void 0 : params.page,
-            limit: disablePagination ? undefined : params === null || params === void 0 ? void 0 : params.limit,
+            page: resolvedPage,
+            limit: resolvedLimit,
             itemType: (params === null || params === void 0 ? void 0 : params.itemType) || 'all',
         });
         if (setPagination) {
-            if ((_c = options === null || options === void 0 ? void 0 : options.config) === null || _c === void 0 ? void 0 : _c.disablePagination) {
+            if ((_e = options === null || options === void 0 ? void 0 : options.config) === null || _e === void 0 ? void 0 : _e.disablePagination) {
                 setPagination({ current: 1, pageSize: files.length || 1, total: files.length || 0 });
             }
             else if (responsePagination) {
@@ -31736,7 +31741,7 @@ const useFilesAPI = () => {
         }
     }, [dataProviders, notification, t]);
     const uploadFileWithProvider = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(async (file, targetFolderId, suppressNotifications, noFolder) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const effectiveFolderId = noFolder ? '' : (targetFolderId !== null && targetFolderId !== void 0 ? targetFolderId : (selectedFolder || ''));
         if (effectiveFolderId === 'Trash') {
             throw new Error(t('Upload to Trash is forbidden'));
@@ -31807,10 +31812,8 @@ const useFilesAPI = () => {
                             const resultData = firstResult.data;
                             if (resultData.id) {
                                 const targetFolder = ((_j = resultData.folderId) !== null && _j !== void 0 ? _j : folderId) || undefined;
-                                // Обновляем список файлов для UI
-                                await fetchFiles({ folderId: targetFolder, noFolder });
-                                // Пытаемся получить актуальный файл напрямую из провайдера,
-                                // чтобы не зависеть от асинхронного обновления state.files
+                                const refreshFolderId = (_k = targetFolder !== null && targetFolder !== void 0 ? targetFolder : selectedFolder) !== null && _k !== void 0 ? _k : '';
+                                await fetchFiles({ folderId: refreshFolderId, noFolder });
                                 let fileFromList = state.files.find(f => f.id === resultData.id);
                                 if (!fileFromList) {
                                     try {
@@ -31832,9 +31835,9 @@ const useFilesAPI = () => {
                                     return fileFromList;
                                 }
                                 // Если файл не найден в списке, возвращаем частичный объект
-                                return Object.assign(Object.assign({}, resultData), { id: resultData.id, name: resultData.name || normalizedFileName, folderId: (_l = (_k = resultData.folderId) !== null && _k !== void 0 ? _k : folderId) !== null && _l !== void 0 ? _l : null, type: fileToUpload.type || file.type, size: fileToUpload.size, extension: fileExtension || normalizedFileName.split('.').pop() || '', 
+                                return Object.assign(Object.assign({}, resultData), { id: resultData.id, name: resultData.name || normalizedFileName, folderId: (_m = (_l = resultData.folderId) !== null && _l !== void 0 ? _l : folderId) !== null && _m !== void 0 ? _m : null, type: fileToUpload.type || file.type, size: fileToUpload.size, extension: fileExtension || normalizedFileName.split('.').pop() || '', 
                                     // Пробрасываем базовые preview-поля, если они есть в ответе провайдера
-                                    thumbnail: (_m = resultData.thumbnail) !== null && _m !== void 0 ? _m : undefined, url: (_o = resultData.url) !== null && _o !== void 0 ? _o : undefined, thumbnailUrl: (_p = resultData.thumbnailUrl) !== null && _p !== void 0 ? _p : undefined, isFolder: false, selected: false });
+                                    thumbnail: (_o = resultData.thumbnail) !== null && _o !== void 0 ? _o : undefined, url: (_p = resultData.url) !== null && _p !== void 0 ? _p : undefined, thumbnailUrl: (_q = resultData.thumbnailUrl) !== null && _q !== void 0 ? _q : undefined, isFolder: false, selected: false });
                             }
                         }
                         else {
@@ -93508,6 +93511,15 @@ const FileManagerContent = () => {
             else {
                 fileUpload.markAsSuccess(uploadId);
             }
+            const rawTargetFolderId = (uploaded && uploaded.folderId) || selectedFolder || null;
+            if (handleFolderSelect) {
+                if (!rawTargetFolderId || rawTargetFolderId === 'folders') {
+                    handleFolderSelect('folders');
+                }
+                else {
+                    handleFolderSelect(rawTargetFolderId);
+                }
+            }
             await ((_a = folderSidebarRef.current) === null || _a === void 0 ? void 0 : _a.refreshFileCounts());
             return uploaded;
         }
@@ -93517,7 +93529,7 @@ const FileManagerContent = () => {
             fileUpload.markAsError(uploadId, errorMessage);
             throw error;
         }
-    }, [filesApi, fileUpload, selectedFolder, files]);
+    }, [filesApi, fileUpload, selectedFolder, files, handleFolderSelect]);
     const handleDroppedFilesWithRefresh = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useCallback(async (files) => {
         var _a;
         if (handleDroppedFiles) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emailmaker/filemanager",
-  "version": "0.10.85",
+  "version": "0.10.86",
   "main": "./file-manager.js",
   "module": "./file-manager.esm.js",
   "types": "./index.d.ts",