@astral/ui 4.71.0 → 4.71.2

package/components/Notification/NotificationStackContainer/useLogic/hooks/useHover/useHover.js

@@ -4,13 +4,10 @@ export const useHover = (element, { enabled = true } = {}) => {
     const handleMouseEnter = () => setHover(true);
     const handleMouseLeave = () => setHover(false);
     useEffect(() => {
-        if (!enabled) {
+        if (!enabled || !element) {
             setHover(false);
             return undefined;
         }
-        if (!element) {
-            return undefined;
-        }
         element.addEventListener('mouseenter', handleMouseEnter);
         element.addEventListener('mouseleave', handleMouseLeave);
         return () => {

package/components/Notification/NotificationStackContainer/useLogic/useLogic.js

@@ -14,6 +14,9 @@ export const useLogic = ({ containerId: externalContainerId, }) => {
             const scrollContainer = document.querySelector(`#${externalContainerId} .Toastify__toast-container`);
             setContainer(scrollContainer);
         }
+        else {
+            setContainer(null);
+        }
     }, [externalContainerId, toasts]);
     // Ориентируемся на data-атрибут для отключении анимации стека при добавлении нового уведомления
     const handleAddNoTransitionAttr = () => {
@@ -40,7 +43,7 @@ export const useLogic = ({ containerId: externalContainerId, }) => {
         enabled: isMobile,
         hasOpenNotify,
     });
-    const isStackExpanded = isMobile ? isTouchExpanded : isHovered;
+    const isStackExpanded = (isMobile ? isTouchExpanded : isHovered) && hasOpenNotify;
     const handleAddToast = ({ id, containerId }) => {
         if (Object.is(containerId, externalContainerId)) {
             setToasts((currentToasts) => [...currentToasts, id]);

package/components/fileUploading/restrictions/restrictFileType/restrictFileType.js

@@ -1,9 +1,14 @@
 import { MimeTypeRegistry } from '../../services/MimeTypeRegistry';
 import { FILE_TYPE_ERROR_INFO, INCONSISTENCY_EXTENSION_AND_MIME_TYPE_ERROR_INFO, } from './constants';
 import { getFileMeta } from './utils';
-const getAcceptMimeTypes = (acceptMeta) => acceptMeta.mimeTypes.concat(...acceptMeta.extensions
-    .map((extension) => MimeTypeRegistry.getInstance().getMimeTypeByExtension(extension))
-    .filter((value) => typeof value === 'string'));
+const getAcceptMimeTypes = (acceptMeta) => {
+    return [
+        ...new Set([
+            ...acceptMeta.mimeTypes,
+            ...acceptMeta.extensions.flatMap((extension) => MimeTypeRegistry.getInstance().getMimeTypesByExtension(extension)),
+        ]),
+    ];
+};
 const checkEmptyAccept = (acceptMeta) => !acceptMeta.extensions.length &&
     !acceptMeta.mimeTypes.length &&
     !acceptMeta.generalMimeTypes.length;
@@ -20,9 +25,7 @@ export const restrictFileType = (acceptMeta) => (file) => {
         }
         return undefined;
     }
-    const isInconsistencyExtensionAndMimeType = !MimeTypeRegistry.getInstance()
-        .getExtensionsByMimeType(fileMeta.mimeType)
-        ?.includes(fileMeta.extension);
+    const isInconsistencyExtensionAndMimeType = !MimeTypeRegistry.getInstance().isExtensionValidForMimeType(fileMeta.mimeType, fileMeta.extension);
     if (isInconsistencyExtensionAndMimeType) {
         return INCONSISTENCY_EXTENSION_AND_MIME_TYPE_ERROR_INFO;
     }

package/components/fileUploading/services/MimeTypeRegistry/MimeTypeRegistry.d.ts

@@ -5,5 +5,13 @@ export declare class MimeTypeRegistry {
     private constructor();
     getMimeTypeByExtension(extension: string): string | null;
     getExtensionsByMimeType(mimeType: string): string[] | null;
+    /**
+     * Проверяет, что расширение файла допустимо для указанного MIME-типа.
+     * Учитывает wildcard-расширения из mime-db (например, `*xml` для `text/xml`).
+     */
+    isExtensionValidForMimeType(mimeType: string, extension: string): boolean;
+    getMimeTypesByExtension(extension: string): string[];
+    private normalizeExtension;
+    private matchExtension;
     static getInstance(): MimeTypeRegistry;
 }

package/components/fileUploading/services/MimeTypeRegistry/MimeTypeRegistry.js

@@ -10,11 +10,45 @@ export class MimeTypeRegistry {
         }
     }
     getMimeTypeByExtension(extension) {
-        return (this.extensionsMap.get(extension.toLowerCase().replace('.', '')) || null);
+        return this.extensionsMap.get(this.normalizeExtension(extension)) || null;
     }
     getExtensionsByMimeType(mimeType) {
         return this.mimeTypesMap[mimeType] || null;
     }
+    /**
+     * Проверяет, что расширение файла допустимо для указанного MIME-типа.
+     * Учитывает wildcard-расширения из mime-db (например, `*xml` для `text/xml`).
+     */
+    isExtensionValidForMimeType(mimeType, extension) {
+        const extensions = this.getExtensionsByMimeType(mimeType);
+        if (!extensions) {
+            return false;
+        }
+        return extensions.some((registeredExtension) => this.matchExtension(registeredExtension, extension));
+    }
+    getMimeTypesByExtension(extension) {
+        const normalizedExtension = this.normalizeExtension(extension);
+        const mimeTypes = [];
+        for (const [mimeType, extensions] of Object.entries(this.mimeTypesMap)) {
+            if (extensions.some((registeredExtension) => this.matchExtension(registeredExtension, normalizedExtension))) {
+                mimeTypes.push(mimeType);
+            }
+        }
+        return mimeTypes;
+    }
+    normalizeExtension(extension) {
+        return extension.toLowerCase().replace(/^\./, '');
+    }
+    matchExtension(registeredExtension, fileExtension) {
+        const normalizedFile = this.normalizeExtension(fileExtension);
+        const normalizedRegistered = registeredExtension.toLowerCase();
+        // Отдельная обработка для wildcard mime types, например xml === *xml
+        if (normalizedRegistered.startsWith('*')) {
+            const suffix = normalizedRegistered.slice(1);
+            return normalizedFile === suffix || normalizedFile.endsWith(suffix);
+        }
+        return normalizedRegistered === normalizedFile;
+    }
     static getInstance() {
         const instance = this.instanceRef?.deref();
         if (instance) {

package/node/components/Notification/NotificationStackContainer/useLogic/hooks/useHover/useHover.js

@@ -7,13 +7,10 @@ const useHover = (element, { enabled = true } = {}) => {
     const handleMouseEnter = () => setHover(true);
     const handleMouseLeave = () => setHover(false);
     (0, react_1.useEffect)(() => {
-        if (!enabled) {
+        if (!enabled || !element) {
             setHover(false);
             return undefined;
         }
-        if (!element) {
-            return undefined;
-        }
         element.addEventListener('mouseenter', handleMouseEnter);
         element.addEventListener('mouseleave', handleMouseLeave);
         return () => {

package/node/components/Notification/NotificationStackContainer/useLogic/useLogic.js

@@ -17,6 +17,9 @@ const useLogic = ({ containerId: externalContainerId, }) => {
             const scrollContainer = document.querySelector(`#${externalContainerId} .Toastify__toast-container`);
             setContainer(scrollContainer);
         }
+        else {
+            setContainer(null);
+        }
     }, [externalContainerId, toasts]);
     // Ориентируемся на data-атрибут для отключении анимации стека при добавлении нового уведомления
     const handleAddNoTransitionAttr = () => {
@@ -43,7 +46,7 @@ const useLogic = ({ containerId: externalContainerId, }) => {
         enabled: isMobile,
         hasOpenNotify,
     });
-    const isStackExpanded = isMobile ? isTouchExpanded : isHovered;
+    const isStackExpanded = (isMobile ? isTouchExpanded : isHovered) && hasOpenNotify;
     const handleAddToast = ({ id, containerId }) => {
         if (Object.is(containerId, externalContainerId)) {
             setToasts((currentToasts) => [...currentToasts, id]);

package/node/components/fileUploading/restrictions/restrictFileType/restrictFileType.js

@@ -4,9 +4,14 @@ exports.restrictFileType = void 0;
 const MimeTypeRegistry_1 = require("../../services/MimeTypeRegistry");
 const constants_1 = require("./constants");
 const utils_1 = require("./utils");
-const getAcceptMimeTypes = (acceptMeta) => acceptMeta.mimeTypes.concat(...acceptMeta.extensions
-    .map((extension) => MimeTypeRegistry_1.MimeTypeRegistry.getInstance().getMimeTypeByExtension(extension))
-    .filter((value) => typeof value === 'string'));
+const getAcceptMimeTypes = (acceptMeta) => {
+    return [
+        ...new Set([
+            ...acceptMeta.mimeTypes,
+            ...acceptMeta.extensions.flatMap((extension) => MimeTypeRegistry_1.MimeTypeRegistry.getInstance().getMimeTypesByExtension(extension)),
+        ]),
+    ];
+};
 const checkEmptyAccept = (acceptMeta) => !acceptMeta.extensions.length &&
     !acceptMeta.mimeTypes.length &&
     !acceptMeta.generalMimeTypes.length;
@@ -23,9 +28,7 @@ const restrictFileType = (acceptMeta) => (file) => {
         }
         return undefined;
     }
-    const isInconsistencyExtensionAndMimeType = !MimeTypeRegistry_1.MimeTypeRegistry.getInstance()
-        .getExtensionsByMimeType(fileMeta.mimeType)
-        ?.includes(fileMeta.extension);
+    const isInconsistencyExtensionAndMimeType = !MimeTypeRegistry_1.MimeTypeRegistry.getInstance().isExtensionValidForMimeType(fileMeta.mimeType, fileMeta.extension);
     if (isInconsistencyExtensionAndMimeType) {
         return constants_1.INCONSISTENCY_EXTENSION_AND_MIME_TYPE_ERROR_INFO;
     }

package/node/components/fileUploading/services/MimeTypeRegistry/MimeTypeRegistry.d.ts

@@ -5,5 +5,13 @@ export declare class MimeTypeRegistry {
     private constructor();
     getMimeTypeByExtension(extension: string): string | null;
     getExtensionsByMimeType(mimeType: string): string[] | null;
+    /**
+     * Проверяет, что расширение файла допустимо для указанного MIME-типа.
+     * Учитывает wildcard-расширения из mime-db (например, `*xml` для `text/xml`).
+     */
+    isExtensionValidForMimeType(mimeType: string, extension: string): boolean;
+    getMimeTypesByExtension(extension: string): string[];
+    private normalizeExtension;
+    private matchExtension;
     static getInstance(): MimeTypeRegistry;
 }

package/node/components/fileUploading/services/MimeTypeRegistry/MimeTypeRegistry.js

@@ -13,11 +13,45 @@ class MimeTypeRegistry {
         }
     }
     getMimeTypeByExtension(extension) {
-        return (this.extensionsMap.get(extension.toLowerCase().replace('.', '')) || null);
+        return this.extensionsMap.get(this.normalizeExtension(extension)) || null;
     }
     getExtensionsByMimeType(mimeType) {
         return this.mimeTypesMap[mimeType] || null;
     }
+    /**
+     * Проверяет, что расширение файла допустимо для указанного MIME-типа.
+     * Учитывает wildcard-расширения из mime-db (например, `*xml` для `text/xml`).
+     */
+    isExtensionValidForMimeType(mimeType, extension) {
+        const extensions = this.getExtensionsByMimeType(mimeType);
+        if (!extensions) {
+            return false;
+        }
+        return extensions.some((registeredExtension) => this.matchExtension(registeredExtension, extension));
+    }
+    getMimeTypesByExtension(extension) {
+        const normalizedExtension = this.normalizeExtension(extension);
+        const mimeTypes = [];
+        for (const [mimeType, extensions] of Object.entries(this.mimeTypesMap)) {
+            if (extensions.some((registeredExtension) => this.matchExtension(registeredExtension, normalizedExtension))) {
+                mimeTypes.push(mimeType);
+            }
+        }
+        return mimeTypes;
+    }
+    normalizeExtension(extension) {
+        return extension.toLowerCase().replace(/^\./, '');
+    }
+    matchExtension(registeredExtension, fileExtension) {
+        const normalizedFile = this.normalizeExtension(fileExtension);
+        const normalizedRegistered = registeredExtension.toLowerCase();
+        // Отдельная обработка для wildcard mime types, например xml === *xml
+        if (normalizedRegistered.startsWith('*')) {
+            const suffix = normalizedRegistered.slice(1);
+            return normalizedFile === suffix || normalizedFile.endsWith(suffix);
+        }
+        return normalizedRegistered === normalizedFile;
+    }
     static getInstance() {
         const instance = this.instanceRef?.deref();
         if (instance) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/ui",
-  "version": "4.71.0",
+  "version": "4.71.2",
   "browser": "./index.js",
   "main": "./node/index.js",
   "dependencies": {