@emailmaker/filemanager 0.10.90 → 0.10.92

package/file-manager.css

@@ -1,145 +1,3 @@
-@charset "UTF-8";
-.em-filemanager .root {
-  padding: 16px 20px 24px;
-  max-width: 520px;
-}
-
-.em-filemanager .controls {
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-}
-
-.em-filemanager .segmentedControl {
-  background-color: var(--ant-color-fill-secondary, rgba(0, 0, 0, 0.06));
-  padding: 4px;
-}
-
-.em-filemanager .sizeRow {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 16px 24px;
-  align-items: center;
-  width: 100%;
-}
-
-.em-filemanager .sizeRowLabel {
-  margin: 0;
-}
-
-/** InputNumber с prefix / suffix — ширина блока значения */
-.em-filemanager .sizeInputNumber {
-  width: 100%;
-}
-
-.em-filemanager .sizeSuffix {
-  color: var(--ant-color-text-tertiary, rgba(0, 0, 0, 0.45));
-  font-size: 13px;
-  line-height: 1;
-  -webkit-user-select: none;
-          user-select: none;
-}
-
-.em-filemanager .colorGrid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 16px 24px;
-}
-
-.em-filemanager .colorCell {
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-  gap: 8px;
-  min-width: 0;
-}
-
-.em-filemanager .colorCellLabel {
-  margin: 0 !important;
-  white-space: nowrap;
-}
-
-.em-filemanager .colorPickerFull {
-  width: 100%;
-  justify-content: flex-start;
-}
-
-.em-filemanager .bgExtras {
-  grid-column: 1/-1;
-  margin-top: -8px;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.em-filemanager .bgWarning {
-  margin: 0;
-}
-
-.em-filemanager .previewSection {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.em-filemanager .previewTitle {
-  font-size: 14px;
-  font-weight: 600;
-}
-
-.em-filemanager .previewWrap {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  min-height: 220px;
-  padding: 16px;
-  border: 1px solid var(--ant-color-border-secondary, #f0f0f0);
-  border-radius: 8px;
-  background-color: var(--ant-color-fill-quaternary, #fafafa);
-  background-image: linear-gradient(45deg, #e8e8e8 25%, transparent 25%), linear-gradient(-45deg, #e8e8e8 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #e8e8e8 75%), linear-gradient(-45deg, transparent 75%, #e8e8e8 75%);
-  background-size: 16px 16px;
-  background-position: 0 0, 0 8px, 8px -8px, -8px 0;
-  position: relative;
-  overflow: hidden;
-}
-
-.em-filemanager .scanLine {
-  position: absolute;
-  top: 50%;
-  left: 20%;
-  right: 20%;
-  height: 2px;
-  background-color: #ff4d4f;
-  box-shadow: 0 0 6px #ff4d4f;
-  z-index: 10;
-  pointer-events: none;
-}
-
-.em-filemanager .scanLineBarcode {
-  left: 10%;
-  right: 10%;
-}
-
-.em-filemanager .previewWrapBarcode {
-  min-height: 104px;
-  padding: 12px 16px;
-}
-
-.em-filemanager .previewCanvas {
-  display: block;
-  max-width: 100%;
-  height: auto;
-  background: transparent;
-}
-
-.em-filemanager .previewCanvasBarcode {
-  max-height: 120px;
-  width: auto;
-}
-
-.em-filemanager .actions {
-  margin-top: 8px;
-}
 .em-filemanager .iconsTab {
   display: flex;
   flex-direction: column;
@@ -576,6 +434,148 @@
   background: rgba(255, 255, 255, 0.6);
   pointer-events: all;
 }
+@charset "UTF-8";
+.em-filemanager .root {
+  padding: 16px 20px 24px;
+  max-width: 520px;
+}
+
+.em-filemanager .controls {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.em-filemanager .segmentedControl {
+  background-color: var(--ant-color-fill-secondary, rgba(0, 0, 0, 0.06));
+  padding: 4px;
+}
+
+.em-filemanager .sizeRow {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 16px 24px;
+  align-items: center;
+  width: 100%;
+}
+
+.em-filemanager .sizeRowLabel {
+  margin: 0;
+}
+
+/** InputNumber с prefix / suffix — ширина блока значения */
+.em-filemanager .sizeInputNumber {
+  width: 100%;
+}
+
+.em-filemanager .sizeSuffix {
+  color: var(--ant-color-text-tertiary, rgba(0, 0, 0, 0.45));
+  font-size: 13px;
+  line-height: 1;
+  -webkit-user-select: none;
+          user-select: none;
+}
+
+.em-filemanager .colorGrid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 16px 24px;
+}
+
+.em-filemanager .colorCell {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  gap: 8px;
+  min-width: 0;
+}
+
+.em-filemanager .colorCellLabel {
+  margin: 0 !important;
+  white-space: nowrap;
+}
+
+.em-filemanager .colorPickerFull {
+  width: 100%;
+  justify-content: flex-start;
+}
+
+.em-filemanager .bgExtras {
+  grid-column: 1/-1;
+  margin-top: -8px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.em-filemanager .bgWarning {
+  margin: 0;
+}
+
+.em-filemanager .previewSection {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.em-filemanager .previewTitle {
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.em-filemanager .previewWrap {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 220px;
+  padding: 16px;
+  border: 1px solid var(--ant-color-border-secondary, #f0f0f0);
+  border-radius: 8px;
+  background-color: var(--ant-color-fill-quaternary, #fafafa);
+  background-image: linear-gradient(45deg, #e8e8e8 25%, transparent 25%), linear-gradient(-45deg, #e8e8e8 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #e8e8e8 75%), linear-gradient(-45deg, transparent 75%, #e8e8e8 75%);
+  background-size: 16px 16px;
+  background-position: 0 0, 0 8px, 8px -8px, -8px 0;
+  position: relative;
+  overflow: hidden;
+}
+
+.em-filemanager .scanLine {
+  position: absolute;
+  top: 50%;
+  left: 20%;
+  right: 20%;
+  height: 2px;
+  background-color: #ff4d4f;
+  box-shadow: 0 0 6px #ff4d4f;
+  z-index: 10;
+  pointer-events: none;
+}
+
+.em-filemanager .scanLineBarcode {
+  left: 10%;
+  right: 10%;
+}
+
+.em-filemanager .previewWrapBarcode {
+  min-height: 104px;
+  padding: 12px 16px;
+}
+
+.em-filemanager .previewCanvas {
+  display: block;
+  max-width: 100%;
+  height: auto;
+  background: transparent;
+}
+
+.em-filemanager .previewCanvasBarcode {
+  max-height: 120px;
+  width: auto;
+}
+
+.em-filemanager .actions {
+  margin-top: 8px;
+}
 .em-filemanager .noFilesContainer {
   text-align: center;
 }

package/file-manager.esm.js

@@ -1,2 +1,2 @@
-export{O as DEFAULT_FILE_MANAGER_CACHE_TTL_MS,R as DataSourceProxyBase,L as FailedRequestCache,A as FileContent,G as FileManagerApiError,z as FileManagerApp,t as FileManagerAppWithContext,B as FileModals,C as FolderSidebar,M as MutationRegistry,S as PathAwareStorageAdapter,P as PixieOnlyApp,T as TreeCache,V as ViewCacheManager,I as buildAssetsPath,y as default,Q as defaultIsFolderNotFoundError,U as fetchRemoteImageBlobByUrl,K as getAssetsBase,q as init,x as initFileManager,v as initPixieEditor,D as installResizeObserverErrorHandler,J as joinUrls,H as mapHttpStatusToErrorCode,E as uninstallResizeObserverErrorHandler,s as unmount,w as unmountPixieEditor}from"./file-manager-index-B3Ea-yTf.js";import"react/jsx-runtime";import"react";import"react-dom/client";import"antd";import"@ant-design/icons";import"@ant-design/cssinjs";import"react-dom";import"@untitledui/icons";import"browser-image-compression";import"pixie";
+export{O as DEFAULT_FILE_MANAGER_CACHE_TTL_MS,R as DataSourceProxyBase,L as FailedRequestCache,A as FileContent,G as FileManagerApiError,z as FileManagerApp,t as FileManagerAppWithContext,B as FileModals,C as FolderSidebar,M as MutationRegistry,S as PathAwareStorageAdapter,P as PixieOnlyApp,T as TreeCache,V as ViewCacheManager,I as buildAssetsPath,y as default,Q as defaultIsFolderNotFoundError,U as fetchRemoteImageBlobByUrl,K as getAssetsBase,q as init,x as initFileManager,v as initPixieEditor,D as installResizeObserverErrorHandler,J as joinUrls,H as mapHttpStatusToErrorCode,E as uninstallResizeObserverErrorHandler,s as unmount,w as unmountPixieEditor}from"./file-manager-index-Z8TrA-pu.js";import"react/jsx-runtime";import"react";import"react-dom/client";import"antd";import"@ant-design/icons";import"@ant-design/cssinjs";import"react-dom";import"@untitledui/icons";import"browser-image-compression";import"pixie";
 //# sourceMappingURL=file-manager.esm.js.map

package/file-manager.js

@@ -39572,6 +39572,19 @@ const PixieOnlyApp = props => {
             return null;
         }
     }, [dataProviders]);
+    const resolveUploadedFileById = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useCallback(async (fileId) => {
+        var _a;
+        if (!fileId || typeof (dataProviders === null || dataProviders === void 0 ? void 0 : dataProviders.getFileById) !== 'function') {
+            return null;
+        }
+        try {
+            return (_a = (await dataProviders.getFileById(fileId))) !== null && _a !== void 0 ? _a : null;
+        }
+        catch (error) {
+            console.warn('Standalone Pixie: failed to resolve uploaded file by id', error);
+            return null;
+        }
+    }, [dataProviders]);
     const file = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useMemo(() => {
         if (props.file)
             return props.file;
@@ -39614,7 +39627,7 @@ const PixieOnlyApp = props => {
         return null;
     }, [dataProviders]);
     const saveFileCopyToServer = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useCallback(async (updatedFile, payload) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         if (!updatedFile.thumbnail) {
             return null;
         }
@@ -39670,23 +39683,15 @@ const PixieOnlyApp = props => {
                     if (resolvedFile) {
                         return resolvedFile;
                     }
-                    return {
-                        id: firstResult.data.id || updatedFile.id || '',
-                        name: firstResult.data.name || updatedFile.name,
-                        folderId: (_f = firstResult.data.folderId) !== null && _f !== void 0 ? _f : targetFolderId,
-                        type: uploadFile.type,
-                        size: uploadFile.size,
-                        extension: (0,mimeUtils/* getExtensionFromMime */.wh)(mimeType),
-                        url: firstResult.data.url,
-                        thumbnailUrl: firstResult.data.thumbnailUrl,
-                        thumbnail: firstResult.data.thumbnail,
-                        isFolder: false,
-                        selected: false,
-                    };
+                    const resolvedById = await resolveUploadedFileById(firstResult.data.id);
+                    if (resolvedById) {
+                        return resolvedById;
+                    }
+                    return null;
                 }
             }
             if (dataProviders === null || dataProviders === void 0 ? void 0 : dataProviders.uploadFile) {
-                return await dataProviders.uploadFile({
+                const uploaded = await dataProviders.uploadFile({
                     name: uploadFile.name,
                     size: uploadFile.size,
                     type: uploadFile.type,
@@ -39695,6 +39700,17 @@ const PixieOnlyApp = props => {
                     data: uploadFile,
                     extension: (0,mimeUtils/* getExtensionFromMime */.wh)(mimeType),
                 });
+                if (!uploaded) {
+                    return null;
+                }
+                if (uploaded.url || uploaded.thumbnailUrl || uploaded.thumbnail) {
+                    return uploaded;
+                }
+                const resolvedById = await resolveUploadedFileById(uploaded.id);
+                if (resolvedById) {
+                    return resolvedById;
+                }
+                return null;
             }
             return null;
         }
@@ -39702,7 +39718,7 @@ const PixieOnlyApp = props => {
             console.error('Error saving file copy:', error);
             return null;
         }
-    }, [dataProviders, resolveUploadedFileFromProvider, mergedPixieConfig]);
+    }, [dataProviders, resolveUploadedFileFromProvider, resolveUploadedFileById, mergedPixieConfig]);
     // Обёртка над onSave если передан явный колбэк — используем его, иначе через дата провайдер
     const handleSave = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useCallback(async (updated, payload) => {
         if ((dataProviders === null || dataProviders === void 0 ? void 0 : dataProviders.updateFile) && updated.id && updated.thumbnail) {
@@ -39725,25 +39741,26 @@ const PixieOnlyApp = props => {
         return updated;
     }, [dataProviders, onSave, onClose, saveFileToServer]);
     const handleSaveCopy = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useCallback(async (updated, payload) => {
-        let result = updated;
-        if (updated.thumbnail) {
-            try {
-                const savedCopy = await saveFileCopyToServer(updated, payload);
-                if (savedCopy) {
-                    result = savedCopy;
-                }
+        if (!updated.thumbnail) {
+            return undefined;
+        }
+        try {
+            const savedCopy = await saveFileCopyToServer(updated, payload);
+            if (!savedCopy) {
+                return undefined;
             }
-            catch (e) {
-                console.error('Standalone Pixie: saveFileCopyToServer error', e);
+            if (onSave) {
+                await onSave(savedCopy, payload);
             }
+            if (onClose) {
+                onClose();
+            }
+            return savedCopy;
         }
-        if (onSave) {
-            await onSave(result, payload);
-        }
-        if (onClose) {
-            onClose();
+        catch (e) {
+            console.error('Standalone Pixie: saveFileCopyToServer error', e);
+            return undefined;
         }
-        return result;
     }, [onClose, onSave, saveFileCopyToServer]);
     const modalRootRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
     const getModalContainer = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(() => { var _a; return (_a = modalRootRef.current) !== null && _a !== void 0 ? _a : document.body; }, []);
@@ -41684,8 +41701,27 @@ class DataSourceProxyBase {
     getTrashFolder() {
         return this._findOrCreateFolderByPath(this._pathOptions.trashPath || DEFAULT_TRASH_PATH);
     }
-    getTempFolder() {
-        return this._findOrCreateFolderByPath(this._pathOptions.tempPath || DEFAULT_TEMP_PATH);
+    async getTempFolder() {
+        var _a;
+        // `??`, не `||`: пустой tempPath ('') — это осознанный выбор «грузить в корень»,
+        // а не повод откатиться на дефолтную папку 'Edited'.
+        const tempPath = (_a = this._pathOptions.tempPath) !== null && _a !== void 0 ? _a : DEFAULT_TEMP_PATH;
+        // Пустой путь = корень: temp-папка не нужна, createFolder не вызывается.
+        // Провайдеру с плоским каталогом (без папок) достаточно задать tempPath: ''.
+        if (!tempPath) {
+            return undefined;
+        }
+        try {
+            return await this._findOrCreateFolderByPath(tempPath);
+        }
+        catch (error) {
+            // Ошибки валидации пути — не маскируем; остальное (нет createFolder, throw провайдера) → корень.
+            if (error instanceof FileManagerApiError && error.code === 'ValidationError') {
+                throw error;
+            }
+            console.warn('getTempFolder: temp folder unavailable, falling back to root', error);
+            return undefined;
+        }
     }
     constructor(_dataProvider, _options = {}, _pathOptions, config = {}) {
         var _a, _b;
@@ -41739,7 +41775,7 @@ class DataSourceProxyBase {
             const descriptor = Object.getOwnPropertyDescriptor(proto, name);
             if (name !== 'constructor' && typeof (descriptor === null || descriptor === void 0 ? void 0 : descriptor.value) === 'function') {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                this[name] = this[name].bind(this);
+                this[name] = descriptor.value.bind(this);
             }
         }
     }
@@ -41855,31 +41891,37 @@ class DataSourceProxyBase {
     }
     async _getUrl(file) {
         var _a;
+        if (!file) {
+            return undefined;
+        }
         if (file.url) {
             return file.url;
         }
         try {
-            return typeof ((_a = this._dataProvider) === null || _a === void 0 ? void 0 : _a.getUrl) === 'function' ? (this._dataProvider.getUrl(file) || '') : '';
+            return typeof ((_a = this._dataProvider) === null || _a === void 0 ? void 0 : _a.getUrl) === 'function' ? this._dataProvider.getUrl(file) || undefined : undefined;
         }
         catch (e) {
             console.log(e);
         }
-        return '';
+        return undefined;
     }
     async _getThumbnailUrl(file) {
         var _a;
+        if (!file) {
+            return undefined;
+        }
         if (file.thumbnailUrl) {
             return file.thumbnailUrl;
         }
         try {
             return typeof ((_a = this._dataProvider) === null || _a === void 0 ? void 0 : _a.getThumbnailUrl) === 'function' ?
-                (this._dataProvider.getThumbnailUrl(file) || '')
-                : '';
+                this._dataProvider.getThumbnailUrl(file) || undefined
+                : undefined;
         }
         catch (e) {
             console.log(e);
         }
-        return '';
+        return undefined;
     }
     /**
      * Проверяет, является ли targetFolderId дочерней папкой sourceFolderId (циклическая ссылка)
@@ -41948,7 +41990,10 @@ class DataSourceProxyBase {
         return this.getFile(folderId, name);
     }
     async getFileUrl(folderId, name) {
-        const file = await this.getFile(folderId, name);
+        const file = await this.getFile(folderId !== null && folderId !== void 0 ? folderId : '', name);
+        if (!file) {
+            return undefined;
+        }
         return (await this._getUrl(file)) || (await this._getThumbnailUrl(file)) || file.thumbnail;
     }
     /**
@@ -42247,7 +42292,7 @@ class DataSourceProxyBase {
      * Загружает файл на сервер
      */
     async _uploadFile(file) {
-        var _a;
+        var _a, _b;
         const folderIdNormalized = this.normalizeId((_a = file.folderId) !== null && _a !== void 0 ? _a : this._rootId);
         if (typeof this._dataProvider.uploadFile !== 'function') {
             throw new FileManagerApiError('Upload file operation is not supported by data provider', 'UnsupportedOperation');
@@ -42263,7 +42308,9 @@ class DataSourceProxyBase {
             }
         }
         const uploaded = await this._dataProvider.uploadFile(Object.assign(Object.assign({}, file), { folderId: folderIdNormalized }));
-        const result = normalizeFileSystemItem(Object.assign(Object.assign({ name: file.name, size: file.size }, uploaded), { folderId: folderIdNormalized }));
+        const result = normalizeFileSystemItem(Object.assign(Object.assign({ name: file.name, size: file.size }, uploaded), { 
+            // Сохраняем folderId провайдера (flat-каталог enKod → '1'), иначе затираем корнем запроса.
+            folderId: (_b = uploaded.folderId) !== null && _b !== void 0 ? _b : folderIdNormalized }));
         this._cache.upsertEntity(result);
         return result;
     }
@@ -42308,7 +42355,14 @@ class DataSourceProxyBase {
             batchResult = mapBatchResult(providerResult, (data) => {
                 if (!data)
                     return undefined;
-                return { id: data.id, name: normalizeFileSystemItemName(data.name), folderId: data.folderId };
+                return {
+                    id: data.id,
+                    name: normalizeFileSystemItemName(data.name),
+                    folderId: data.folderId,
+                    url: data.url,
+                    thumbnailUrl: data.thumbnailUrl,
+                    thumbnail: data.thumbnail,
+                };
             });
             if (batchResult.detailed && batchResult.detailed.length) {
                 for (let i = 0; i < batchResult.detailed.length; i++) {
@@ -42887,7 +42941,9 @@ class DataSourceProxyBase {
         var _a;
         if (data.noFolder) {
             const tempFolder = await this.getTempFolder();
-            data = Object.assign(Object.assign({}, data), { folderId: tempFolder.id });
+            // tempFolder может быть undefined (tempPath: '' или недоступный createFolder) —
+            // тогда folderId остаётся неопределённым и ниже нормализуется в корень (_rootId).
+            data = Object.assign(Object.assign({}, data), { folderId: tempFolder === null || tempFolder === void 0 ? void 0 : tempFolder.id });
         }
         const folderIdNormalized = this.normalizeId((_a = data.folderId) !== null && _a !== void 0 ? _a : this._rootId);
         try {

package/package.json

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

package/types.d.ts

@@ -214,6 +214,9 @@ export interface UploadFileResultData {
     id?: string;
     name?: string;
     folderId?: string | null;
+    url?: string;
+    thumbnailUrl?: string;
+    thumbnail?: string;
 }
 export interface UploadFilesRequest {
     /**
@@ -235,6 +238,8 @@ export interface FileManagerDataProviders {
      * Опционально; для уведомлений и подписей в UI.
      */
     getItem?: (id: string) => Promise<FileManagerItemMeta | null> | FileManagerItemMeta | null;
+    /** Метаданные файла по id (кэш хоста, затем pathMode). */
+    getFileById?: (fileId: string) => Promise<File | null>;
     getFileData: (fileId: string) => Promise<Blob>;
     findFileByUrl?: (url: string) => Promise<File | null>;
     getFolders?: (options?: {