@astral/ui 4.70.0 → 4.71.1

package/node/components/Typography/Typography.d.ts

@@ -13,4 +13,5 @@ export declare const Typography: import("react").ForwardRefExoticComponent<impor
     component?: ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement>>;

package/node/components/Typography/Typography.js

@@ -4,12 +4,21 @@ exports.Typography = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const classNames_1 = require("../utils/classNames");
+const cva_1 = require("../utils/cva");
 const constants_1 = require("./constants");
 const hooks_1 = require("./hooks");
 const styles_1 = require("./styles");
-exports.Typography = (0, react_1.forwardRef)(({ children, color, colorIntensity = '800', component, withoutCalt, className, ...props }, ref) => {
+const typographyCva = (0, cva_1.cva)(constants_1.typographyClassnames.root, {
+    variants: {
+        isTabularNums: {
+            true: constants_1.typographyClassnames.tabularNums,
+        },
+        withoutCalt: {
+            true: constants_1.typographyClassnames.withoutCalt,
+        },
+    },
+});
+exports.Typography = (0, react_1.forwardRef)(({ children, color, colorIntensity = '800', component, withoutCalt, className, isTabularNums, ...props }, ref) => {
     const typographyColor = (0, hooks_1.useTypographyColor)({ color, colorIntensity });
-    return ((0, jsx_runtime_1.jsx)(styles_1.TypographyWrapper, { ref: ref, ...props, component: component, color: typographyColor, className: (0, classNames_1.classNames)(constants_1.typographyClassnames.root, className, {
-            [constants_1.typographyClassnames.withoutCalt]: withoutCalt,
-        }), children: children }));
+    return ((0, jsx_runtime_1.jsx)(styles_1.TypographyWrapper, { ref: ref, ...props, component: component, color: typographyColor, className: (0, classNames_1.classNames)(typographyCva({ isTabularNums, withoutCalt }), className), children: children }));
 });

package/node/components/Typography/constants.d.ts

@@ -1,4 +1,5 @@
 export declare const typographyClassnames: {
     root: string;
     withoutCalt: string;
+    tabularNums: string;
 };

package/node/components/Typography/constants.js

@@ -4,5 +4,6 @@ exports.typographyClassnames = void 0;
 const createUIKitClassname_1 = require("../utils/createUIKitClassname");
 exports.typographyClassnames = {
     root: (0, createUIKitClassname_1.createUIKitClassname)('typography'),
-    withoutCalt: 'typography_without-calt',
+    withoutCalt: (0, createUIKitClassname_1.createUIKitClassname)('typography_without-calt'),
+    tabularNums: (0, createUIKitClassname_1.createUIKitClassname)('typography_tabular-nums'),
 };

package/node/components/Typography/styles.js

@@ -15,4 +15,8 @@ exports.TypographyWrapper = (0, styled_1.styled)(Typography_1.default, {
   .${constants_1.typographyClassnames.withoutCalt} {
     font-feature-settings: "calt" 0;
   }
+
+  &.${constants_1.typographyClassnames.tabularNums} {
+    font-feature-settings: "tnum" 1;
+  }
 `;

package/node/components/Typography/types.d.ts

@@ -35,4 +35,8 @@ export type TypographyProps = TypographyPropsBase & {
      * Отключает контекстные альтернативы шрифта. Подробнее в [документации](https://ui-kit.astral.ru/?path=/docs/getting-started-fonts--docs)
      */
     withoutCalt?: boolean;
+    /**
+     * Включает моноширинные цифры.
+     */
+    isTabularNums?: boolean;
 } & HTMLAttributes<HTMLParagraphElement>;

package/node/components/WelcomeScreen/styles.d.ts

@@ -22,6 +22,7 @@ export declare const Greeting: import("@emotion/styled/dist/declarations/src/typ
     component?: import("../Typography/types").ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement> & {
     theme?: import("@emotion/react").Theme | undefined;
 }, {}, {}>;
@@ -32,6 +33,7 @@ export declare const UserName: import("@emotion/styled/dist/declarations/src/typ
     component?: import("../Typography/types").ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement> & {
     theme?: import("@emotion/react").Theme | undefined;
 }, {}, {}>;

package/node/components/fileUploading/FileInfo/styles.d.ts

@@ -350,6 +350,7 @@ export declare const FileSize: import("@emotion/styled/dist/declarations/src/typ
     component?: import("../../Typography/types").ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement> & {
     theme?: import("@emotion/react").Theme | undefined;
 }, {}, {}>;

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/node/components/placeholders/Placeholder/styles.d.ts

@@ -18,6 +18,7 @@ export declare const Title: import("@emotion/styled/dist/declarations/src/types"
     component?: import("../../Typography/types").ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement> & {
     theme?: import("@emotion/react").Theme | undefined;
 } & WithSize, {}, {}>;
@@ -28,6 +29,7 @@ export declare const Description: import("@emotion/styled/dist/declarations/src/
     component?: import("../../Typography/types").ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement> & {
     theme?: import("@emotion/react").Theme | undefined;
 } & WithSize, {}, {}>;

package/node/hook-form/EditableText/EditingForm/styles.d.ts

@@ -10,6 +10,7 @@ export declare const Description: import("@emotion/styled/dist/declarations/src/
     component?: import("../../../components/Typography/types").ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement> & {
     theme?: import("@emotion/react").Theme | undefined;
 }, {}, {}>;

package/node/hook-form/EditableText/styles.d.ts

@@ -6,6 +6,7 @@ export declare const DisplayValue: import("@emotion/styled/dist/declarations/src
     component?: import("../../components/Typography/types").ComponentProp | undefined;
     isUpperCase?: boolean | undefined;
     withoutCalt?: boolean | undefined;
+    isTabularNums?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLParagraphElement> & import("react").RefAttributes<HTMLSpanElement> & {
     theme?: import("@emotion/react").Theme | undefined;
 } & {

package/package.json

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