@uzum-tech/ui 1.12.4 → 1.12.6

package/es/_internal/typography/index.d.ts

@@ -1,3 +1,7 @@
 export { default as InternalUText, internalTextProps } from './src/text';
 export type { InternalTextProps } from './src/text';
-export type { TypographyVariant, TypographyVariantOptions, TypographyVariantWeightsOptions } from './src/variants';
+export type { TypographyVariant, TypographyVariantOptions, 
+/**
+ * @deprecated Weight options are fixed; override via `variantOptions` instead.
+ */
+TypographyVariantWeightsOptions } from './src/variants';

package/es/_internal/typography/src/text.d.ts

@@ -25,6 +25,9 @@ export declare const internalTextProps: {
         readonly type: PropType<TypographyVariantOptions>;
         readonly default: () => {};
     };
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
     readonly variantWeightsOptions: {
         readonly type: PropType<TypographyVariantWeightsOptions>;
         readonly default: () => {};
@@ -114,6 +117,9 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: PropType<TypographyVariantOptions>;
         readonly default: () => {};
     };
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
     readonly variantWeightsOptions: {
         readonly type: PropType<TypographyVariantWeightsOptions>;
         readonly default: () => {};
@@ -207,6 +213,9 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: PropType<TypographyVariantOptions>;
         readonly default: () => {};
     };
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
     readonly variantWeightsOptions: {
         readonly type: PropType<TypographyVariantWeightsOptions>;
         readonly default: () => {};

package/es/_internal/typography/src/text.js

@@ -22,7 +22,11 @@ export const internalTextProps = Object.assign(Object.assign({}, useTheme.props)
     }, variantOptions: {
         type: Object,
         default: () => ({})
-    }, variantWeightsOptions: {
+    }, 
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
+    variantWeightsOptions: {
         type: Object,
         default: () => ({})
     }, strong: Boolean, italic: Boolean, underline: Boolean, strikethrough: Boolean });
@@ -54,14 +58,13 @@ export default defineComponent({
                 '--u-margin': margin,
                 '--u-prefix-color': blockquotePrefixColor
             };
-            return getVariantCssVars(variant, baseVars, fontFamilyWixMadeforDisplay, props.variantOptions, props.variantWeightsOptions);
+            return getVariantCssVars(variant, baseVars, fontFamilyWixMadeforDisplay, props.variantOptions);
         });
         const themeClassHandle = inlineThemeDisabled
             ? useThemeClass('text', computed(() => `${(props === null || props === void 0 ? void 0 : props.variant) || ''}${(props === null || props === void 0 ? void 0 : props.tag) || ''}`), cssVarsRef, props)
             : undefined;
         const tagToRender = props.tag ||
-            (props.variant &&
-                getVariantTag(props.variant, props.variantOptions, props.variantWeightsOptions)) ||
+            (props.variant && getVariantTag(props.variant, props.variantOptions)) ||
             'span';
         return {
             mergedClsPrefix: mergedClsPrefixRef,

package/es/_internal/typography/src/variants.d.ts

@@ -2,9 +2,13 @@ export interface TypographyVariantBase {
     fontSize: string;
     lineHeight: string;
     letterSpacing: string;
+    fontStyle?: string;
+    fontFamily?: string;
+    defaultFontWeight?: TypographyFontWeight;
     tag: keyof HTMLElementTagNameMap;
 }
 export type TypographyVariantOptions = Record<PropertyKey, Record<PropertyKey, TypographyVariantBase>>;
+/** @deprecated Weight options are now fixed; this is kept for type compatibility. */
 export type TypographyVariantWeightsOptions = Record<PropertyKey, readonly string[]>;
 export interface TypographyVariantConfig {
     fontFamily: string;
@@ -91,24 +95,20 @@ export declare const defaultVariantOptions: {
         };
     };
 };
-declare const variantWeights: {
-    readonly display: readonly ["", "medium", "semi-bold", "bold"];
-    readonly heading: readonly ["medium", "semi-bold", "bold"];
-    readonly title: readonly ["medium", "semi-bold", "bold"];
-    readonly body: readonly ["medium", "semi-bold", "bold"];
-};
-type VariantWeights = typeof variantWeights;
+declare const weightOrder: readonly ["", "thin", "extra-light", "light", "normal", "medium", "semi-bold", "bold", "extra-bold", "black"];
+export type TypographyFontWeight = (typeof weightOrder)[number];
+type VariantWeights = typeof weightOrder;
 type WeightSuffix<W> = W extends string ? (W extends '' ? '' : `-${W}`) : '';
+type VariantCategories<Options> = Options;
 export type TypographyVariantFromOptions<Options extends TypographyVariantOptions> = {
-    [Category in keyof Options & keyof VariantWeights]: {
-        [Size in keyof Options[Category]]: `${string & Category}-${string & Size}${WeightSuffix<VariantWeights[Category][number]>}`;
-    }[keyof Options[Category]];
-}[keyof Options & keyof VariantWeights];
+    [Category in keyof VariantCategories<Options>]: {
+        [Size in keyof VariantCategories<Options>[Category]]: `${string & Category}-${string & Size}${WeightSuffix<VariantWeights[number]>}`;
+    }[keyof VariantCategories<Options>[Category]];
+}[keyof VariantCategories<Options>];
 export type TypographyDefaultVariant = TypographyVariantFromOptions<typeof defaultVariantOptions>;
 export type TypographyVariant = TypographyDefaultVariant | (string & {});
 export declare function mergeVariantOptions(variantOptions?: TypographyVariantOptions): TypographyVariantOptions;
-export declare function mergeVariantWeights(variantWeightsOptions?: Partial<Record<PropertyKey, readonly string[]>>): Record<PropertyKey, readonly string[]>;
-export declare function getVariantCssVars(variant: TypographyVariant | undefined, baseVars: Record<string, string>, fontFamilyVariant: string, variantOptions?: TypographyVariantOptions, variantWeightsOptions?: Partial<Record<PropertyKey, readonly string[]>>): Record<string, string>;
-export declare function getVariantTag(variant: TypographyVariant, variantOptions?: TypographyVariantOptions, variantWeightsOptions?: Partial<Record<PropertyKey, readonly string[]>>): keyof HTMLElementTagNameMap;
+export declare function getVariantCssVars(variant: TypographyVariant | undefined, baseVars: Record<string, string>, fontFamilyVariant: string, variantOptions?: TypographyVariantOptions): Record<string, string>;
+export declare function getVariantTag(variant: TypographyVariant, variantOptions?: TypographyVariantOptions): keyof HTMLElementTagNameMap;
 export declare const variantToCssVars: Record<string, TypographyVariantConfig>;
 export {};

package/es/_internal/typography/src/variants.js

@@ -75,27 +75,42 @@ export const defaultVariantOptions = {
         }
     }
 };
-const variantWeights = {
-    display: ['', 'medium', 'semi-bold', 'bold'],
-    heading: ['medium', 'semi-bold', 'bold'],
-    title: ['medium', 'semi-bold', 'bold'],
-    body: ['medium', 'semi-bold', 'bold']
-};
+const weightOrder = [
+    '',
+    'thin',
+    'extra-light',
+    'light',
+    'normal',
+    'medium',
+    'semi-bold',
+    'bold',
+    'extra-bold',
+    'black'
+];
 const fontWeights = {
-    medium: { weight: '500', style: 'medium' },
-    'semi-bold': { weight: '600', style: 'semibold' },
-    bold: { weight: '700', style: 'bold' },
-    '': { weight: '700', style: 'bold' }
+    thin: { weight: '100', style: 'normal' },
+    'extra-light': { weight: '200', style: 'normal' },
+    light: { weight: '300', style: 'normal' },
+    normal: { weight: '400', style: 'normal' },
+    medium: { weight: '500', style: 'normal' },
+    'semi-bold': { weight: '600', style: 'normal' },
+    bold: { weight: '700', style: 'normal' },
+    'extra-bold': { weight: '800', style: 'normal' },
+    black: { weight: '900', style: 'normal' },
+    '': { weight: '700', style: 'normal' }
 };
 function createVariant(options, category, size, weight) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const base = (_b = (_a = options === null || options === void 0 ? void 0 : options[category]) === null || _a === void 0 ? void 0 : _a[size]) !== null && _b !== void 0 ? _b : (_c = defaultVariantOptions[category]) === null || _c === void 0 ? void 0 : _c[size];
-    const { weight: fontWeight, style: fontStyle } = fontWeights[weight];
+    const effectiveWeight = weight === '' ? (_d = base === null || base === void 0 ? void 0 : base.defaultFontWeight) !== null && _d !== void 0 ? _d : '' : weight;
+    const { weight: fontWeight, style: fontStyle } = fontWeights[effectiveWeight] || fontWeights[''];
+    const resolvedFontFamily = (_e = base.fontFamily) !== null && _e !== void 0 ? _e : fontFamily;
+    const resolvedFontStyle = (_f = base.fontStyle) !== null && _f !== void 0 ? _f : fontStyle;
     return {
-        fontFamily,
+        fontFamily: resolvedFontFamily,
         fontSize: base.fontSize,
         fontWeight,
-        fontStyle,
+        fontStyle: resolvedFontStyle,
         lineHeight: base.lineHeight,
         letterSpacing: base.letterSpacing,
         tag: base.tag
@@ -115,34 +130,11 @@ export function mergeVariantOptions(variantOptions) {
     });
     return mergedOptions;
 }
-export function mergeVariantWeights(variantWeightsOptions) {
-    if (!variantWeightsOptions)
-        return variantWeights;
-    const mergedWeights = {};
-    const categories = new Set([
-        ...Object.keys(variantWeights),
-        ...Object.keys(variantWeightsOptions)
-    ]);
-    categories.forEach((category) => {
-        const defaultWeights = variantWeights[category] || [];
-        const customWeights = variantWeightsOptions[category] || [];
-        const combined = [...defaultWeights];
-        customWeights.forEach((weight) => {
-            if (!combined.includes(weight)) {
-                combined.push(weight);
-            }
-        });
-        mergedWeights[category] = combined;
-    });
-    return mergedWeights;
-}
-function createVariantToCssVars(variantOptions, variantWeightsOptions) {
+function createVariantToCssVars(variantOptions) {
     const configs = {};
-    const mergedWeights = mergeVariantWeights(variantWeightsOptions);
     Object.entries(variantOptions).forEach(([category, sizes]) => {
-        const weights = mergedWeights[category] || [];
         Object.keys(sizes).forEach((size) => {
-            weights.forEach((weight) => {
+            weightOrder.forEach((weight) => {
                 const variantKey = `${category}-${size}${weight ? `-${weight}` : ''}`;
                 configs[variantKey] = createVariant(variantOptions, category, size, weight);
             });
@@ -150,25 +142,25 @@ function createVariantToCssVars(variantOptions, variantWeightsOptions) {
     });
     return configs;
 }
-function resolveVariantConfigs(variantOptions, variantWeightsOptions) {
+function resolveVariantConfigs(variantOptions) {
     const hasCustomOptions = variantOptions && Object.keys(variantOptions).length > 0;
-    const hasCustomWeights = variantWeightsOptions && Object.keys(variantWeightsOptions).length > 0;
-    if (!hasCustomOptions && !hasCustomWeights) {
+    if (!hasCustomOptions) {
         return variantToCssVars;
     }
-    return createVariantToCssVars(mergeVariantOptions(variantOptions), variantWeightsOptions);
+    const mergedOptions = mergeVariantOptions(variantOptions);
+    return createVariantToCssVars(mergedOptions);
 }
-export function getVariantCssVars(variant, baseVars, fontFamilyVariant, variantOptions, variantWeightsOptions) {
+export function getVariantCssVars(variant, baseVars, fontFamilyVariant, variantOptions) {
     const variantStyles = variant
-        ? resolveVariantConfigs(variantOptions, variantWeightsOptions)[variant]
+        ? resolveVariantConfigs(variantOptions)[variant]
         : undefined;
     if (!variantStyles) {
         return baseVars;
     }
     return Object.assign(Object.assign({}, baseVars), { '--u-font-famliy-variant': fontFamilyVariant, '--u-variant-font-size': variantStyles.fontSize, '--u-variant-font-weight': variantStyles.fontWeight, '--u-variant-line-height': variantStyles.lineHeight, '--u-variant-font-family': variantStyles.fontFamily, '--u-variant-font-style': variantStyles.fontStyle, '--u-variant-letter-spacing': variantStyles.letterSpacing });
 }
-export function getVariantTag(variant, variantOptions, variantWeightsOptions) {
+export function getVariantTag(variant, variantOptions) {
     var _a;
-    return (_a = resolveVariantConfigs(variantOptions, variantWeightsOptions)[variant]) === null || _a === void 0 ? void 0 : _a.tag;
+    return (_a = resolveVariantConfigs(variantOptions)[variant]) === null || _a === void 0 ? void 0 : _a.tag;
 }
-export const variantToCssVars = createVariantToCssVars(defaultVariantOptions, variantWeights);
+export const variantToCssVars = createVariantToCssVars(defaultVariantOptions);

package/es/chat/src/ChatParts/MainArea.js

@@ -384,7 +384,7 @@ export default defineComponent({
         };
         const renderFooter = () => {
             return (h("div", { class: `${mergedClsPrefixRef.value}-chat-main__footer` },
-                h(UUpload, Object.assign({ abstract: true, multiple: true, defaultUpload: false, fileList: attachmentFileList.value, onUpdateFileList: handleFileListUpdate }, footerUploadPropsRef.value, { onChange: handleOnChange() }), {
+                h(UUpload, Object.assign({ abstract: true, multiple: true, defaultUpload: false, fileList: attachmentFileList.value, onUpdateFileList: !handleOnChange() ? handleFileListUpdate : undefined }, footerUploadPropsRef.value, { onChange: handleOnChange() }), {
                     default: () => (h(UFlex, { align: "end", size: "small", wrap: false, class: `${mergedClsPrefixRef.value}-chat-main__input-container` }, {
                         default: () => (h(Fragment, null,
                             h(UUploadTrigger, { abstract: true }, {

package/es/locales/common/ruRU.d.ts

@@ -0,0 +1,3 @@
+import type { ULocale } from './enUS';
+declare const ruRu: ULocale;
+export default ruRu;

package/es/locales/common/ruRU.js

@@ -0,0 +1,152 @@
+const ruRu = {
+    name: 'ru-RU',
+    global: {
+        undo: 'Отменить',
+        redo: 'Вернуть',
+        confirm: 'Подтвердить',
+        clear: 'Очистить'
+    },
+    Popconfirm: {
+        positiveText: 'Подтвердить',
+        negativeText: 'Отмена'
+    },
+    Cascader: {
+        placeholder: 'Выбрать',
+        loading: 'Загрузка',
+        loadingRequiredMessage: (label) => `Загрузите все дочерние узлы ${label} прежде чем они станут необязательными`
+    },
+    Time: {
+        dateFormat: 'yyyy-MM-dd',
+        dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    },
+    DatePicker: {
+        yearFormat: 'yyyy',
+        monthFormat: 'MMM',
+        dayFormat: 'eeeeee',
+        yearTypeFormat: 'yyyy',
+        monthTypeFormat: 'yyyy-MM',
+        dateFormat: 'yyyy-MM-dd',
+        dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
+        quarterFormat: 'yyyy-qqq',
+        clear: 'Очистить',
+        now: 'Сейчас',
+        confirm: 'Подтвердить',
+        selectTime: 'Выбрать время',
+        selectDate: 'Выбрать дату',
+        datePlaceholder: 'Выбрать дату',
+        datetimePlaceholder: 'Выбрать дату и время',
+        monthPlaceholder: 'Выберите месяц',
+        // FIXME: translation needed
+        yearPlaceholder: 'Select Year',
+        quarterPlaceholder: 'Select Quarter',
+        startDatePlaceholder: 'Дата начала',
+        endDatePlaceholder: 'Дата окончания',
+        startDatetimePlaceholder: 'Дата и время начала',
+        endDatetimePlaceholder: 'Дата и время окончания',
+        // FIXME: translation needed
+        startMonthPlaceholder: 'Start Month',
+        endMonthPlaceholder: 'End Month',
+        monthBeforeYear: true,
+        firstDayOfWeek: 0,
+        today: 'Сегодня'
+    },
+    DataTable: {
+        checkTableAll: 'Выбрать все в таблице',
+        uncheckTableAll: 'Отменить все в таблице',
+        confirm: 'Подтвердить',
+        clear: 'Очистить'
+    },
+    LegacyTransfer: {
+        sourceTitle: 'Источник',
+        targetTitle: 'Назначение'
+    },
+    // TODO: translation
+    Transfer: {
+        selectAll: 'Select all',
+        unselectAll: 'Unselect all',
+        clearAll: 'Clear',
+        total: (num) => `Total ${num} items`,
+        selected: (num) => `${num} items selected`
+    },
+    Empty: {
+        title: 'Нет совпадений',
+        description: 'Попробуйте изменить поисковый запрос'
+    },
+    Select: {
+        placeholder: 'Выбрать'
+    },
+    TimePicker: {
+        placeholder: 'Выбрать время',
+        positiveText: 'OK',
+        negativeText: 'Отменить',
+        now: 'Сейчас'
+    },
+    Pagination: {
+        goto: 'Перейти',
+        selectionSuffix: 'страница'
+    },
+    DynamicTags: {
+        add: 'Добавить'
+    },
+    Log: {
+        loading: 'Загрузка'
+    },
+    Input: {
+        placeholder: 'Ввести',
+        copied: 'Скопировано'
+    },
+    InputNumber: {
+        placeholder: 'Ввести'
+    },
+    DynamicInput: {
+        create: 'Создать'
+    },
+    ThemeEditor: {
+        title: 'Редактор темы',
+        clearAllVars: 'Очистить все',
+        clearSearch: 'Очистить поиск',
+        filterCompName: 'Фильтровать по имени компонента',
+        filterVarName: 'Фильтровать имена переменных',
+        import: 'Импорт',
+        export: 'Экспорт',
+        restore: 'Сбросить'
+    },
+    // TODO: translation
+    Image: {
+        tipPrevious: 'Previous picture (←)',
+        tipNext: 'Next picture (→)',
+        tipCounterclockwise: 'Counterclockwise',
+        tipClockwise: 'Clockwise',
+        tipZoomOut: 'Zoom out',
+        tipZoomIn: 'Zoom in',
+        tipDownload: 'Download',
+        tipClose: 'Close (Esc)',
+        // TODO: translation
+        tipOriginalSize: 'Zoom to original size'
+    },
+    Upload: {
+        title: 'Выберите файл или перетащите сюда',
+        subtitle: 'PDF, PNG, JPEG не более 100 MB',
+        uploading: 'Загружается'
+    },
+    Chat: {
+        inputPlaceholder: 'Написать сообщение...',
+        typingText: 'Печатает...',
+        retryText: 'Повторно отправить',
+        closeButtonText: 'Завершить чат',
+        shareButtonTooltip: 'Поделиться чатом',
+        profileButtonTooltip: 'Просмотреть профиль',
+        unreadNotificationText: 'новых сообщений',
+        editText: 'Редактировать',
+        copyText: 'Скопировать',
+        deleteText: 'Удалить',
+        editingTitle: 'Редактирование'
+    },
+    Header: {
+        desktopSearchTitle: 'Поиск',
+        searchPlaceholder: 'Поиск по сайту',
+        primaryActionText: 'Стать клиентом',
+        secondaryActionText: 'Перейти в приложение'
+    }
+};
+export default ruRu;

package/es/locales/date/ruRU.d.ts

@@ -0,0 +1,3 @@
+import { type UDateLocale } from './enUS';
+declare const dateRuRU: UDateLocale;
+export default dateRuRU;

package/es/locales/date/ruRU.js

@@ -0,0 +1,6 @@
+import ru from 'date-fns/locale/ru'; //
+const dateRuRU = {
+    name: 'ru-RU',
+    locale: ru
+};
+export default dateRuRU;

package/es/locales/index.d.ts

@@ -1,5 +1,7 @@
 export { default as enUS } from './common/enUS';
+export { default as ruRU } from './common/ruRU';
 export { default as dateEnUS } from './date/enUS';
+export { default as dateRuRU } from './date/ruRU';
 export type { ULocale } from './common/enUS';
 export type { UDateLocale } from './date/enUS';
 export type { UPartialLocale } from './utils/index';

package/es/locales/index.js

@@ -1,3 +1,5 @@
 export { default as enUS } from './common/enUS';
+export { default as ruRU } from './common/ruRU';
 export { default as dateEnUS } from './date/enUS';
+export { default as dateRuRU } from './date/ruRU';
 export { createLocale } from './utils/index';

package/es/typography/index.d.ts

@@ -20,4 +20,8 @@ export type { OlProps } from './src/ol';
 export { default as ULi } from './src/li';
 export { default as UText, textProps } from './src/text';
 export type { TextProps } from './src/text';
-export type { TypographyVariant, TypographyVariantOptions, TypographyVariantWeightsOptions } from '../_internal/typography';
+export type { TypographyVariant, TypographyVariantOptions, 
+/**
+ * @deprecated Weight options are fixed; kept for backwards compatibility.
+ */
+TypographyVariantWeightsOptions } from '../_internal/typography';

package/es/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "1.12.4";
+declare const _default: "1.12.6";
 export default _default;

package/es/version.js

@@ -1 +1 @@
-export default '1.12.4';
+export default '1.12.6';

package/lib/_internal/typography/index.d.ts

@@ -1,3 +1,7 @@
 export { default as InternalUText, internalTextProps } from './src/text';
 export type { InternalTextProps } from './src/text';
-export type { TypographyVariant, TypographyVariantOptions, TypographyVariantWeightsOptions } from './src/variants';
+export type { TypographyVariant, TypographyVariantOptions, 
+/**
+ * @deprecated Weight options are fixed; override via `variantOptions` instead.
+ */
+TypographyVariantWeightsOptions } from './src/variants';

package/lib/_internal/typography/src/text.d.ts

@@ -25,6 +25,9 @@ export declare const internalTextProps: {
         readonly type: PropType<TypographyVariantOptions>;
         readonly default: () => {};
     };
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
     readonly variantWeightsOptions: {
         readonly type: PropType<TypographyVariantWeightsOptions>;
         readonly default: () => {};
@@ -114,6 +117,9 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: PropType<TypographyVariantOptions>;
         readonly default: () => {};
     };
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
     readonly variantWeightsOptions: {
         readonly type: PropType<TypographyVariantWeightsOptions>;
         readonly default: () => {};
@@ -207,6 +213,9 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: PropType<TypographyVariantOptions>;
         readonly default: () => {};
     };
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
     readonly variantWeightsOptions: {
         readonly type: PropType<TypographyVariantWeightsOptions>;
         readonly default: () => {};

package/lib/_internal/typography/src/text.js

@@ -28,7 +28,11 @@ exports.internalTextProps = Object.assign(Object.assign({}, _mixins_1.useTheme.p
     }, variantOptions: {
         type: Object,
         default: () => ({})
-    }, variantWeightsOptions: {
+    }, 
+    /**
+     * @deprecated Weight options are fixed internally; kept for backwards compatibility.
+     */
+    variantWeightsOptions: {
         type: Object,
         default: () => ({})
     }, strong: Boolean, italic: Boolean, underline: Boolean, strikethrough: Boolean });
@@ -60,14 +64,13 @@ exports.default = (0, vue_1.defineComponent)({
                 '--u-margin': margin,
                 '--u-prefix-color': blockquotePrefixColor
             };
-            return (0, variants_1.getVariantCssVars)(variant, baseVars, fontFamilyWixMadeforDisplay, props.variantOptions, props.variantWeightsOptions);
+            return (0, variants_1.getVariantCssVars)(variant, baseVars, fontFamilyWixMadeforDisplay, props.variantOptions);
         });
         const themeClassHandle = inlineThemeDisabled
             ? (0, _mixins_1.useThemeClass)('text', (0, vue_1.computed)(() => `${(props === null || props === void 0 ? void 0 : props.variant) || ''}${(props === null || props === void 0 ? void 0 : props.tag) || ''}`), cssVarsRef, props)
             : undefined;
         const tagToRender = props.tag ||
-            (props.variant &&
-                (0, variants_1.getVariantTag)(props.variant, props.variantOptions, props.variantWeightsOptions)) ||
+            (props.variant && (0, variants_1.getVariantTag)(props.variant, props.variantOptions)) ||
             'span';
         return {
             mergedClsPrefix: mergedClsPrefixRef,

package/lib/_internal/typography/src/variants.d.ts

@@ -2,9 +2,13 @@ export interface TypographyVariantBase {
     fontSize: string;
     lineHeight: string;
     letterSpacing: string;
+    fontStyle?: string;
+    fontFamily?: string;
+    defaultFontWeight?: TypographyFontWeight;
     tag: keyof HTMLElementTagNameMap;
 }
 export type TypographyVariantOptions = Record<PropertyKey, Record<PropertyKey, TypographyVariantBase>>;
+/** @deprecated Weight options are now fixed; this is kept for type compatibility. */
 export type TypographyVariantWeightsOptions = Record<PropertyKey, readonly string[]>;
 export interface TypographyVariantConfig {
     fontFamily: string;
@@ -91,24 +95,20 @@ export declare const defaultVariantOptions: {
         };
     };
 };
-declare const variantWeights: {
-    readonly display: readonly ["", "medium", "semi-bold", "bold"];
-    readonly heading: readonly ["medium", "semi-bold", "bold"];
-    readonly title: readonly ["medium", "semi-bold", "bold"];
-    readonly body: readonly ["medium", "semi-bold", "bold"];
-};
-type VariantWeights = typeof variantWeights;
+declare const weightOrder: readonly ["", "thin", "extra-light", "light", "normal", "medium", "semi-bold", "bold", "extra-bold", "black"];
+export type TypographyFontWeight = (typeof weightOrder)[number];
+type VariantWeights = typeof weightOrder;
 type WeightSuffix<W> = W extends string ? (W extends '' ? '' : `-${W}`) : '';
+type VariantCategories<Options> = Options;
 export type TypographyVariantFromOptions<Options extends TypographyVariantOptions> = {
-    [Category in keyof Options & keyof VariantWeights]: {
-        [Size in keyof Options[Category]]: `${string & Category}-${string & Size}${WeightSuffix<VariantWeights[Category][number]>}`;
-    }[keyof Options[Category]];
-}[keyof Options & keyof VariantWeights];
+    [Category in keyof VariantCategories<Options>]: {
+        [Size in keyof VariantCategories<Options>[Category]]: `${string & Category}-${string & Size}${WeightSuffix<VariantWeights[number]>}`;
+    }[keyof VariantCategories<Options>[Category]];
+}[keyof VariantCategories<Options>];
 export type TypographyDefaultVariant = TypographyVariantFromOptions<typeof defaultVariantOptions>;
 export type TypographyVariant = TypographyDefaultVariant | (string & {});
 export declare function mergeVariantOptions(variantOptions?: TypographyVariantOptions): TypographyVariantOptions;
-export declare function mergeVariantWeights(variantWeightsOptions?: Partial<Record<PropertyKey, readonly string[]>>): Record<PropertyKey, readonly string[]>;
-export declare function getVariantCssVars(variant: TypographyVariant | undefined, baseVars: Record<string, string>, fontFamilyVariant: string, variantOptions?: TypographyVariantOptions, variantWeightsOptions?: Partial<Record<PropertyKey, readonly string[]>>): Record<string, string>;
-export declare function getVariantTag(variant: TypographyVariant, variantOptions?: TypographyVariantOptions, variantWeightsOptions?: Partial<Record<PropertyKey, readonly string[]>>): keyof HTMLElementTagNameMap;
+export declare function getVariantCssVars(variant: TypographyVariant | undefined, baseVars: Record<string, string>, fontFamilyVariant: string, variantOptions?: TypographyVariantOptions): Record<string, string>;
+export declare function getVariantTag(variant: TypographyVariant, variantOptions?: TypographyVariantOptions): keyof HTMLElementTagNameMap;
 export declare const variantToCssVars: Record<string, TypographyVariantConfig>;
 export {};