@emailmaker/filemanager 0.10.15 → 0.10.16

package/hooks/core/files/useFilesAPI.d.ts

@@ -21,6 +21,6 @@ export interface UseFilesAPIActions {
     handleAddFileByUrl: (url?: string | null, noFolder?: boolean) => Promise<AppFile | void>;
     handleDroppedFiles: (droppedFiles: globalThis.File[]) => Promise<void>;
     getFileData: (file: AppFile) => Promise<Blob | undefined>;
-    uploadFileWithProvider: (file: globalThis.File, targetFolderId?: string) => Promise<void>;
+    uploadFileWithProvider: (file: globalThis.File, targetFolderId?: string) => Promise<AppFile | undefined>;
 }
 export declare const useFilesAPI: () => UseFilesAPIActions;

package/hooks/useNotifications.d.ts

@@ -1,8 +1,22 @@
+import { Notify, NotifyEvent } from 'types';
+/**
+ * Хук уведомлений
+ */
 export declare const useNotifications: () => {
-    open: (args: import("antd").NotificationArgsProps) => void;
-    success: (args: import("antd").NotificationArgsProps) => void;
-    error: (args: import("antd").NotificationArgsProps) => void;
-    info: (args: import("antd").NotificationArgsProps) => void;
-    warning: (args: import("antd").NotificationArgsProps) => void;
-    destroy(key?: React.Key): void;
+    error<Key extends keyof Notify.ErrorMap>(args: Omit<Notify.ErrorEvent, "type" | "id" | "data"> & {
+        id: Key;
+    } & (Notify.ErrorMap[Key] extends never ? {} : {
+        data: Notify.ErrorMap[Key];
+    })): void;
+    success<Key extends keyof Notify.SuccessMap>(args: Omit<Notify.SuccessEvent, "type" | "id" | "data"> & {
+        id: Key;
+    } & (Notify.SuccessMap[Key] extends never ? {} : {
+        data: Notify.SuccessMap[Key];
+    })): void;
+    warning<Key extends keyof Notify.WarningMap>(args: Omit<Notify.WarningEvent, "type" | "id" | "data"> & {
+        id: Key;
+    } & (Notify.WarningMap[Key] extends never ? {} : {
+        data: Notify.WarningMap[Key];
+    })): void;
+    notify: (payload: NotifyEvent, silent?: boolean) => Promise<void>;
 };

package/notification.d.ts

@@ -0,0 +1,247 @@
+interface FilesQueryParams {
+  folderId?: string;
+  search?: string;
+  page?: number;
+  limit?: number;
+  sortBy?: 'name' | 'size' | 'date' | 'type';
+  sortOrder?: 'asc' | 'desc';
+  itemType?: 'file' | 'folder' | 'all';
+}
+
+interface ItemContextPayload {
+  itemIds?: string[];
+  itemNames?: string[];
+  folderId?: string | null;
+  folderName?: string | null;
+}
+
+type NotifyPlacement = 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
+
+type Notify = {
+  type: 'success' | 'info' | 'error' | 'warning';
+  message: HTMLElement | string;
+  description?: HTMLElement | string;
+  btn?: HTMLElement | string;
+  onClose?: () => void;
+  duration?: number | null;
+  icon?: HTMLElement | string;
+  placement?: NotifyPlacement;
+  style?: any;
+  className?: string;
+  onClick?: () => void;
+  closeIcon?: HTMLElement | string;
+  props?: any;
+  role?: 'alert' | 'status';
+};
+
+declare namespace Notify {
+  export interface OperationSuccessPayload extends ItemContextPayload {
+    successCount: number;
+    totalCount: number;
+  }
+
+  export interface OperationErrorDetail {
+    itemId?: string;
+  itemName?: string;
+    reason?: string;
+  }
+
+  export interface OperationErrorPayload extends ItemContextPayload {
+    failCount: number;
+    totalCount: number;
+    errors?: OperationErrorDetail[];
+  }
+
+  export interface SingleItemPayload {
+    itemId?: string;
+    itemName?: string;
+    folderId?: string | null;
+    folderName?: string | null;
+  }
+
+  export interface RenameErrorPayload extends SingleItemPayload {
+    reason?: string;
+  }
+
+  export interface FileUploadPayload extends SingleItemPayload {
+    uploadId?: string;
+  }
+
+  export interface FileUploadErrorPayload extends FileUploadPayload {
+    error?: string;
+  }
+
+  export interface UnsupportedFileTypePayload extends FileUploadErrorPayload {
+    fileType: string;
+  }
+
+  export interface FolderOperationPayload extends ItemContextPayload {
+    folderId?: string | null;
+    folderName?: string;
+    reason?: string;
+  }
+
+  export interface JsonDataProviderErrorPayload {
+    url?: string | null;
+    reason?: string;
+  }
+
+  export interface FileUrlValidationErrorPayload {
+    url?: string | null;
+    reason?: string;
+  }
+
+  export interface ImageFilePayload extends SingleItemPayload {
+    thumbnail?: string | null;
+  }
+
+  export interface UrlUploadPayload {
+    url?: string | null;
+    folderId?: string | null;
+    folderName?: string | null;
+  }
+
+  export interface UrlUploadErrorPayload extends UrlUploadPayload {
+    reason?: string;
+  }
+
+  export interface FetchFilesErrorPayload {
+    params?: FilesQueryParams;
+  }
+
+  interface AIImageGenerationBasePayload {
+    request: string;
+    taskId?: string | null;
+  }
+
+  export interface AIImageGenerationStartedPayload extends AIImageGenerationBasePayload {
+    response?: unknown;
+  }
+
+  export interface AIImageGenerationSuccessPayload extends AIImageGenerationBasePayload {
+    images: string[];
+  }
+
+  export interface AIImageGenerationFailedPayload extends AIImageGenerationBasePayload {
+    response?: unknown;
+    error?: unknown;
+  }
+
+  export type EventBase<TId extends string, TData> = {
+    id: TId;
+    data?: TData;
+    innerException?: unknown;
+    message: string;
+    placement?: NotifyPlacement; 
+    description?: string;
+
+  };
+
+  export interface ErrorMap {
+    FILE_DOWNLOAD_FAILED: ImageFilePayload;
+    IMAGE_DOWNLOAD_FAILED: ImageFilePayload;
+    IMAGE_SAVE_FAILED: ImageFilePayload;
+    EDITOR_INIT_FAILED: never;
+
+    AI_RESPONSE_INVALID: unknown;
+    AI_IMAGE_GENERATION_FAILED: AIImageGenerationFailedPayload;
+    AI_IMAGE_GENERATION_LIMIT_EXCEEDED: never;
+
+    FILES_FETCH_FAILED: FetchFilesErrorPayload;
+
+    FILES_DELETE_ERROR: OperationErrorPayload;
+
+    FOLDER_DELETE_ERROR: OperationErrorPayload;
+
+    FILE_RENAME_DISABLED_BY_CONFIG: SingleItemPayload;
+    FILE_RENAME_FAILED: RenameErrorPayload;
+
+    FOLDER_RENAME_DISABLED_BY_CONFIG: SingleItemPayload;
+    FOLDER_RENAME_FAILED: RenameErrorPayload;
+
+    ITEM_RENAME_FAILED: RenameErrorPayload;
+
+    FILE_UPLOAD_ITEM_FAILED: FileUploadErrorPayload;
+
+    FILES_UPLOAD_BATCH_FAILED: OperationErrorPayload;
+
+    FILES_UPLOAD_URL_VALIDATION_FAILED: UrlUploadPayload;
+
+    FILES_UPLOAD_URL_NOT_SUPPORTED: UrlUploadPayload;
+    FILES_UPLOAD_BY_URL_FAILED: UrlUploadErrorPayload;
+
+    FILES_UPLOAD_PROVIDER_NOT_CONFIGURED: never;
+
+    FILES_MOVE_DIRECTORY_NOT_SELECTED: never;
+    FILES_MOVE_ERROR: OperationErrorPayload;
+
+    FILES_COPY_DIRECTORY_NOT_SELECTED: never;
+    FILES_COPY_ERROR: OperationErrorPayload;
+
+    FILES_MOVE_TO_TRASH_ERROR: OperationErrorPayload;
+
+    FOLDERS_FETCH_FAILED: FolderOperationPayload;
+    FOLDER_CREATE_PROVIDER_NOT_CONFIGURED: FolderOperationPayload;
+    FOLDER_CREATE_FAILED: FolderOperationPayload;
+    FOLDER_CHILDREN_COUNT_FAILED: FolderOperationPayload;
+    FOLDER_CHILDREN_FETCH_FAILED: FolderOperationPayload;
+
+    JSON_DATA_PROVIDER_LOAD_FAILED: JsonDataProviderErrorPayload;
+    FILE_URL_VALIDATION_FAILED: FileUrlValidationErrorPayload;
+  }
+
+  export type Error = {
+    [K in keyof ErrorMap]: EventBase<K, ErrorMap[K]>;
+  }[keyof ErrorMap];
+
+  export type ErrorEvent = { type: 'error' } & Error;
+
+  export interface SuccessMap {
+    AI_IMAGE_GENERATION_STARTED: AIImageGenerationStartedPayload;
+    AI_IMAGE_GENERERATION_SUCCESS: AIImageGenerationSuccessPayload;
+
+    // EDITOR_IMAGE_DOWNLOAD_SUCCESS: ImageFilePayload;
+    IMAGE_UPDATE_SUCCESS: ImageFilePayload;
+
+    FILES_DELETE_SUCCESS: OperationSuccessPayload;
+    FILES_MOVE_SUCCESS: OperationSuccessPayload;
+    FILES_COPY_SUCCESS: OperationSuccessPayload;
+    FILE_RENAME_SUCCESS: SingleItemPayload;
+    FOLDER_RENAME_SUCCESS: SingleItemPayload;
+    FOLDER_DELETE_SUCCESS: OperationSuccessPayload;
+    FOLDER_CREATE_SUCCESS: FolderOperationPayload;
+    FILES_UPLOAD_BATCH_SUCCESS: OperationSuccessPayload;
+
+    FILE_UPLOAD_ITEM_SUCCESS: FileUploadPayload;
+  }
+
+  export type Success = {
+    [K in keyof SuccessMap]: EventBase<K, SuccessMap[K]>;
+  }[keyof SuccessMap];
+
+  export type SuccessEvent = { type: 'success' } & Success;
+
+  export interface WarningMap {
+    FILES_UPLOAD_UNSUPPORTED_TYPE: UnsupportedFileTypePayload;
+    FOLDER_OPERATION_VALIDATION_FAILED: FolderOperationPayload;
+  }
+
+  export type Warning = {
+    [K in keyof WarningMap]: EventBase<K, WarningMap[K]>;
+  }[keyof WarningMap];
+
+  export type WarningEvent = { type: 'warning' } & Warning;
+
+  export interface InfoMap {}
+
+  export type Info = {
+    [K in keyof InfoMap]: EventBase<K, InfoMap[K]>;
+  }[keyof InfoMap];
+
+  export type InfoEvent = { type: 'info' } & Info;
+}
+
+type NotifyEvent = Notify.SuccessEvent | Notify.ErrorEvent | Notify.WarningEvent | Notify.InfoEvent;
+
+export { Notify };
+export type { ItemContextPayload, NotifyEvent, NotifyPlacement };

package/package.json

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

package/shared/config.d.ts

@@ -1,5 +1,5 @@
 export interface Config {
-    theme?: 'light' | 'dark';
+    theme?: 'light' | 'dark' | 'system';
     activeTab?: string;
     showDefaultNotification?: boolean;
     disableMockServer?: boolean;

package/types.d.ts

@@ -2,7 +2,8 @@ import React, { ReactNode, RefObject } from 'react';
 import { FormInstance } from 'antd/es/form';
 import { MY_FILES, GIF, STOCK_IMAGES, AI, EDITOR } from './constants';
 import type { InputRef } from 'antd';
-import { NotificationInstance } from 'antd/es/notification/interface';
+import type { Notify, NotifyEvent } from 'notification';
+export * from 'notification';
 export interface Folder {
     id: string;
     name: string;
@@ -110,6 +111,8 @@ export interface CustomIcons {
     darkMode?: React.ComponentType<IconProps>;
     aiIcon_2?: React.ComponentType<IconProps>;
 }
+type MayBePromise<T> = T | Promise<T>;
+export type NotifyListener<T> = (value: T) => MayBePromise<void | false | (NotifyEvent & Notify)>;
 export interface FileManagerOptions {
     apiEndpoints?: {
         getFolders?: string;
@@ -131,13 +134,19 @@ export interface FileManagerOptions {
     config?: Config;
     customIcons?: CustomIcons;
     dragDropIcon?: string;
-    notification?: Partial<Omit<NotificationInstance, 'destroy'>>;
+    handleNotify?: NotifyListener<NotifyEvent>;
+    handleError?: NotifyListener<Notify.ErrorEvent>;
+    handleSuccess?: NotifyListener<Notify.SuccessEvent>;
 }
 /**
  * Результат операции
  */
 export interface OperationResult<T = void> {
-    id?: string;
+    /**
+     * Корреляционный идентификатор элемента запроса.
+     * Ранее использовалось поле `id`, которое остаётся для обратной совместимости.
+     */
+    requestId?: string;
     success?: boolean;
     data?: T;
     error?: string;
@@ -150,6 +159,37 @@ export type BatchResult<T> = {
     error?: string;
     detailed?: OperationResult<T>[];
 };
+export type UploadBinary = Blob | globalThis.File;
+export interface UploadFileItemInput {
+    /**
+     * Произвольный идентификатор для сопоставления результата.
+     * Если не указан, сопоставление выполняется по порядку элементов.
+     */
+    requestId?: string;
+    name: string;
+    size: number;
+    type: string;
+    folderId?: string | null;
+    /**
+     * Бинарные данные файла. При наличии реального File он передается как есть,
+     * иначе — Blob (например, после конвертации base64).
+     */
+    data: UploadBinary;
+    extension?: string;
+}
+export interface UploadFileResultData {
+    id?: string;
+    name?: string;
+    folderId?: string | null;
+}
+export interface UploadFilesRequest {
+    /**
+     * Список загружаемых файлов. Порядок элементов важен — при отсутствии requestId
+     * сопоставление результатов выполняется по индексу.
+     */
+    items: UploadFileItemInput[];
+    folderId?: string | null;
+}
 export interface FileManagerDataProviders {
     getFileData: (file: File) => Promise<Blob>;
     getFolders?: (options?: {
@@ -175,17 +215,19 @@ export interface FileManagerDataProviders {
     }) => Promise<Folder>;
     renameFolder?: (folderId: string, newName: string) => Promise<Folder>;
     deleteFolder?: (folderId: string) => Promise<boolean>;
-    uploadFile: (file: {
+    uploadFile?: (file: {
         name: string;
         size: number;
         type: string;
         folderId?: string | null;
-        data: Blob | string;
-        thumbnail?: string;
-        dimensions?: string;
-        aspectRatio?: string;
+        /**
+         * Бинарные данные файла. При наличии real File передается сам File,
+         * в остальных случаях — Blob.
+         */
+        data: UploadBinary;
         extension?: string;
     }) => Promise<File>;
+    uploadFiles?: (request: UploadFilesRequest) => Promise<BatchResult<UploadFileResultData>>;
     uploadFileByUrl?: (data: {
         url: string;
         folderId?: string | null;
@@ -211,7 +253,11 @@ export interface FileManagerDataProviders {
     updateFile?: (fileId: string, updates: {
         name?: string;
         type?: string;
-        data?: Blob | string;
+        /**
+         * Обновленные бинарные данные (File или Blob). Если не переданы —
+         * используются старые данные.
+         */
+        data?: UploadBinary;
         thumbnail?: string;
         dimensions?: string;
         aspectRatio?: string;
@@ -281,7 +327,7 @@ export type CustomTheme = Partial<import('antd/es/theme/interface').AliasToken>
     [key: string]: string | number | boolean | undefined;
 };
 export interface Config {
-    theme?: 'light' | 'dark';
+    theme?: 'light' | 'dark' | 'system';
     disableMockServer?: boolean;
     activeTab?: string;
     showDefaultNotification?: boolean;
@@ -484,7 +530,9 @@ export interface FileManagerProps {
     };
     customIcons?: CustomIcons;
     dragDropIcon?: string;
-    notification?: Partial<Omit<NotificationInstance, 'destroy'>>;
+    handleNotify?: NotifyListener<NotifyEvent>;
+    handleError?: NotifyListener<Notify.ErrorEvent>;
+    handleSuccess?: NotifyListener<Notify.SuccessEvent>;
 }
 export interface SafeImageProps {
     src?: string;
@@ -495,4 +543,3 @@ export interface SafeImageProps {
     preview?: boolean;
     file?: File;
 }
-export {};

package/utils/blobUtils.d.ts

@@ -0,0 +1 @@
+export declare const ensureBlobFromData: (data: Blob | string, fallbackMimeType?: string) => Blob;

package/utils/jsonDataProvider.d.ts

@@ -1,4 +1,4 @@
-import { FileManagerDataProviders, File, Folder, Config } from '../types';
+import { FileManagerDataProviders, File, Folder, Config, UploadFilesRequest, UploadFileResultData, BatchResult, UploadBinary } from '../types';
 export declare class JSONDataProvider implements FileManagerDataProviders {
     private files;
     private folders;
@@ -36,12 +36,10 @@ export declare class JSONDataProvider implements FileManagerDataProviders {
         size: number;
         type: string;
         folderId?: string | null;
-        data: Blob | string;
-        thumbnail?: string;
-        dimensions?: string;
-        aspectRatio?: string;
+        data: UploadBinary;
         extension?: string;
     }) => Promise<File>;
+    uploadFiles: (request: UploadFilesRequest) => Promise<BatchResult<UploadFileResultData>>;
     uploadFileByUrl: (data: {
         url: string;
         folderId?: string | null;
@@ -50,7 +48,7 @@ export declare class JSONDataProvider implements FileManagerDataProviders {
     updateFile: (fileId: string, updates: {
         name?: string;
         type?: string;
-        data?: Blob | string;
+        data?: UploadBinary;
         thumbnail?: string;
         dimensions?: string;
         aspectRatio?: string;

package/utils/themeUtils.d.ts

@@ -3,6 +3,6 @@ export declare const switchThemeVariables: (token?: {}) => void;
 /** Применяет кастомную тему к CSS переменным */
 export declare const applyCustomTheme: (config?: Config) => void;
 /** Устанавливает тему (светлая/темная) */
-export declare const setTheme: (theme: "light" | "dark") => void;
+export declare const setTheme: (theme: "light" | "dark" | "system") => void;
 /** Получает текущую тему */
 export declare const getCurrentTheme: () => "light" | "dark";