naive-ui 2.24.4 → 2.25.0

package/lib/tree/src/TreeNode.js

@@ -28,7 +28,14 @@ const TreeNode = (0, vue_1.defineComponent)({
     setup(props) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const NTree = (0, vue_1.inject)(interface_1.treeInjectionKey);
-        const { droppingNodeParentRef, droppingMouseNodeRef, draggingNodeRef, droppingPositionRef, droppingOffsetLevelRef, indentRef } = NTree;
+        const { droppingNodeParentRef, droppingMouseNodeRef, draggingNodeRef, droppingPositionRef, droppingOffsetLevelRef, nodePropsRef, indentRef, blockLineRef } = NTree;
+        const disabledRef = (0, vue_1.computed)(() => NTree.disabledRef.value || props.tmNode.disabled);
+        const resolvedNodePropsRef = (0, vue_1.computed)(() => {
+            const { value: nodeProps } = nodePropsRef;
+            if (!nodeProps)
+                return undefined;
+            return nodeProps({ option: props.tmNode.rawNode });
+        });
         // used for drag and drop
         const contentInstRef = (0, vue_1.ref)(null);
         // must be non-reactive
@@ -57,11 +64,28 @@ const TreeNode = (0, vue_1.defineComponent)({
                 NTree.handleSwitcherClick(tmNode);
             }
         }
-        function handleContentClick(e) {
+        function _handleClick(e) {
             if ((0, seemly_1.happensIn)(e, 'checkbox') || (0, seemly_1.happensIn)(e, 'switcher'))
                 return;
             NTree.handleSelect(props.tmNode);
         }
+        function handleContentClick(e) {
+            var _a, _b;
+            if (blockLineRef.value)
+                return;
+            if (!disabledRef.value)
+                _handleClick(e);
+            (_b = (_a = resolvedNodePropsRef.value) === null || _a === void 0 ? void 0 : _a.onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
+        }
+        function handleLineClick(e) {
+            var _a, _b;
+            if (!blockLineRef.value)
+                return;
+            if (!disabledRef.value) {
+                _handleClick(e);
+            }
+            (_b = (_a = resolvedNodePropsRef.value) === null || _a === void 0 ? void 0 : _a.onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
+        }
         function handleCheck(checked) {
             NTree.handleCheck(props.tmNode, checked);
         }
@@ -148,7 +172,7 @@ const TreeNode = (0, vue_1.defineComponent)({
             indeterminate: (0, vooks_1.useMemo)(() => NTree.displayedIndeterminateKeysRef.value.includes(props.tmNode.key)),
             selected: (0, vooks_1.useMemo)(() => NTree.mergedSelectedKeysRef.value.includes(props.tmNode.key)),
             expanded: (0, vooks_1.useMemo)(() => NTree.mergedExpandedKeysRef.value.includes(props.tmNode.key)),
-            disabled: (0, vue_1.computed)(() => NTree.disabledRef.value || props.tmNode.disabled),
+            disabled: disabledRef,
             checkable: (0, vue_1.computed)(() => NTree.checkableRef.value &&
                 (NTree.cascadeRef.value ||
                     NTree.mergedCheckStrategyRef.value !== 'child' ||
@@ -160,7 +184,8 @@ const TreeNode = (0, vue_1.defineComponent)({
                     : true)),
             internalScrollable: NTree.internalScrollableRef,
             draggable: NTree.draggableRef,
-            blockLine: NTree.blockLineRef,
+            blockLine: blockLineRef,
+            nodeProps: resolvedNodePropsRef,
             checkboxFocusable: NTree.internalCheckboxFocusableRef,
             droppingPosition: droppingPositionRef,
             droppingOffsetLevel: droppingOffsetLevelRef,
@@ -174,12 +199,13 @@ const TreeNode = (0, vue_1.defineComponent)({
             handleDragOver,
             handleDragEnd,
             handleDragLeave,
+            handleLineClick,
             handleContentClick,
             handleSwitcherClick
         };
     },
     render() {
-        const { tmNode, clsPrefix, checkable, selectable, selected, checked, highlight, draggable, blockLine, indent, disabled, pending, internalScrollable } = this;
+        const { tmNode, clsPrefix, checkable, selectable, selected, checked, highlight, draggable, blockLine, indent, disabled, pending, internalScrollable, nodeProps } = this;
         // drag start not inside
         // it need to be append to node itself, not wrapper
         const dragEventHandlers = draggable && !disabled
@@ -195,7 +221,7 @@ const TreeNode = (0, vue_1.defineComponent)({
         // scrolled to, so we need data-key to query the target element.
         const dataKey = internalScrollable ? (0, _utils_1.createDataKey)(tmNode.key) : undefined;
         return ((0, vue_1.h)("div", Object.assign({ class: `${clsPrefix}-tree-node-wrapper` }, dragEventHandlers),
-            (0, vue_1.h)("div", { class: [
+            (0, vue_1.h)("div", Object.assign({}, (blockLine ? nodeProps : undefined), { class: [
                     `${clsPrefix}-tree-node`,
                     {
                         [`${clsPrefix}-tree-node--selected`]: selected,
@@ -204,14 +230,15 @@ const TreeNode = (0, vue_1.defineComponent)({
                         [`${clsPrefix}-tree-node--pending`]: pending,
                         [`${clsPrefix}-tree-node--disabled`]: disabled,
                         [`${clsPrefix}-tree-node--selectable`]: selectable
-                    }
-                ], "data-key": dataKey, draggable: draggable && blockLine, onClick: blockLine && !disabled ? this.handleContentClick : undefined, onDragstart: draggable && blockLine && !disabled
+                    },
+                    nodeProps === null || nodeProps === void 0 ? void 0 : nodeProps.class
+                ], "data-key": dataKey, draggable: draggable && blockLine, onClick: this.handleLineClick, onDragstart: draggable && blockLine && !disabled
                     ? this.handleDragStart
-                    : undefined },
+                    : undefined }),
                 (0, seemly_1.repeat)(tmNode.level, (0, vue_1.h)("div", { class: `${clsPrefix}-tree-node-indent`, style: { flex: `0 0 ${indent}px` } })),
                 (0, vue_1.h)(TreeNodeSwitcher_1.default, { clsPrefix: clsPrefix, expanded: this.expanded, loading: this.loading, hide: tmNode.isLeaf, onClick: this.handleSwitcherClick }),
                 checkable ? ((0, vue_1.h)(TreeNodeCheckbox_1.default, { focusable: this.checkboxFocusable, disabled: disabled || this.checkboxDisabled, clsPrefix: clsPrefix, checked: this.checked, indeterminate: this.indeterminate, onCheck: this.handleCheck })) : null,
-                (0, vue_1.h)(TreeNodeContent_1.default, { ref: "contentInstRef", clsPrefix: clsPrefix, checked: checked, selected: selected, onClick: blockLine || disabled ? undefined : this.handleContentClick, onDragstart: draggable && !blockLine && !disabled
+                (0, vue_1.h)(TreeNodeContent_1.default, { ref: "contentInstRef", clsPrefix: clsPrefix, checked: checked, selected: selected, onClick: this.handleContentClick, nodeProps: blockLine ? undefined : nodeProps, onDragstart: draggable && !blockLine && !disabled
                         ? this.handleDragStart
                         : undefined, tmNode: tmNode }),
                 draggable

package/lib/tree/src/TreeNodeContent.d.ts

@@ -1,4 +1,4 @@
-import { PropType } from 'vue';
+import { PropType, HTMLAttributes } from 'vue';
 import { TmNode } from './interface';
 declare const _default: import("vue").DefineComponent<{
     clsPrefix: {
@@ -14,6 +14,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<TmNode>;
         required: true;
     };
+    nodeProps: PropType<HTMLAttributes>;
 }, {
     selfRef: import("vue").Ref<HTMLElement | null>;
     renderLabel: import("vue").Ref<(({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild) | undefined>;
@@ -35,6 +36,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<TmNode>;
         required: true;
     };
+    nodeProps: PropType<HTMLAttributes>;
 }>>, {
     disabled: boolean;
     checked: boolean;

package/lib/tree/src/TreeNodeContent.js

@@ -18,7 +18,8 @@ exports.default = (0, vue_1.defineComponent)({
         tmNode: {
             type: Object,
             required: true
-        }
+        },
+        nodeProps: Object
     },
     setup(props) {
         const { renderLabelRef, renderPrefixRef, renderSuffixRef, labelFieldRef } = 
@@ -43,8 +44,8 @@ exports.default = (0, vue_1.defineComponent)({
         };
     },
     render() {
-        const { clsPrefix, labelField, checked = false, selected = false, renderLabel, renderPrefix, renderSuffix, handleClick, onDragstart, tmNode: { rawNode, rawNode: { prefix, suffix, [labelField]: label } } } = this;
-        return ((0, vue_1.h)("span", { ref: "selfRef", class: [`${clsPrefix}-tree-node-content`], onClick: handleClick, draggable: onDragstart === undefined ? undefined : true, onDragstart: onDragstart },
+        const { clsPrefix, labelField, nodeProps, checked = false, selected = false, renderLabel, renderPrefix, renderSuffix, handleClick, onDragstart, tmNode: { rawNode, rawNode: { prefix, suffix, [labelField]: label } } } = this;
+        return ((0, vue_1.h)("span", Object.assign({}, nodeProps, { ref: "selfRef", class: [`${clsPrefix}-tree-node-content`, nodeProps === null || nodeProps === void 0 ? void 0 : nodeProps.class], onClick: handleClick, draggable: onDragstart === undefined ? undefined : true, onDragstart: onDragstart }),
             renderPrefix || prefix ? ((0, vue_1.h)("div", { class: `${clsPrefix}-tree-node-content__prefix` }, renderPrefix
                 ? renderPrefix({
                     option: rawNode,

package/lib/tree/src/interface.d.ts

@@ -1,5 +1,5 @@
 import { CheckStrategy, TreeNode } from 'treemate';
-import { Ref, VNodeChild } from 'vue';
+import { HTMLAttributes, Ref, VNodeChild } from 'vue';
 import type { MergedTheme } from '../../_mixins';
 import type { TreeTheme } from '../styles';
 export declare type Key = string | number;
@@ -26,6 +26,9 @@ declare type RenderTreePart = ({ option, checked, selected }: TreeRenderProps) =
 export declare type RenderLabel = RenderTreePart;
 export declare type RenderPrefix = RenderTreePart;
 export declare type RenderSuffix = RenderTreePart;
+export declare type TreeNodeProps = (info: {
+    option: TreeOption;
+}) => HTMLAttributes;
 export interface TreeDragInfo {
     event: DragEvent;
     node: TreeOption;
@@ -84,6 +87,7 @@ export interface TreeInjection {
     renderSuffixRef: Ref<RenderSuffix | undefined>;
     renderSwitcherIconRef: Ref<RenderSwitcherIcon | undefined>;
     labelFieldRef: Ref<string>;
+    nodePropsRef: Ref<TreeNodeProps | undefined>;
     handleSwitcherClick: (node: TreeNode<TreeOption>) => void;
     handleSelect: (node: TreeNode<TreeOption>) => void;
     handleCheck: (node: TreeNode<TreeOption>, checked: boolean) => void;

package/lib/tree-select/src/TreeSelect.d.ts

@@ -39,10 +39,10 @@ declare const props: {
         readonly default: () => never[];
     };
     readonly indeterminateKeys: PropType<Key[]>;
-    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly onUpdateExpandedKeys: PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly 'onUpdate:expandedKeys': PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
+    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly onUpdateExpandedKeys: PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly 'onUpdate:expandedKeys': PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
     readonly bordered: {
         readonly type: BooleanConstructor;
         readonly default: true;
@@ -549,10 +549,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: () => never[];
     };
     readonly indeterminateKeys: PropType<Key[]>;
-    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly onUpdateExpandedKeys: PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly 'onUpdate:expandedKeys': PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
+    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly onUpdateExpandedKeys: PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly 'onUpdate:expandedKeys': PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
     readonly bordered: {
         readonly type: BooleanConstructor;
         readonly default: true;
@@ -1025,7 +1025,9 @@ declare const _default: import("vue").DefineComponent<{
     }>>>;
 }, {
     menuElRef: import("vue").Ref<HTMLDivElement | null>;
+    mergedStatus: import("vue").ComputedRef<import("../../form/src/interface").FormValidationStatus | undefined>;
     triggerInstRef: import("vue").Ref<{
+        isCompositing: boolean;
         focus: () => void;
         focusInput: () => void;
         blur: () => void;
@@ -1430,10 +1432,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: () => never[];
     };
     readonly indeterminateKeys: PropType<Key[]>;
-    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly onUpdateExpandedKeys: PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
-    readonly 'onUpdate:expandedKeys': PropType<MaybeArray<(value: Key[], option: (import("../../tree").TreeOption | null)[]) => void>>;
+    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly onUpdateExpandedKeys: PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
+    readonly 'onUpdate:expandedKeys': PropType<MaybeArray<import("../../tree/src/Tree").OnUpdateKeys>>;
     readonly bordered: {
         readonly type: BooleanConstructor;
         readonly default: true;
@@ -1910,15 +1912,15 @@ declare const _default: import("vue").DefineComponent<{
     multiple: boolean;
     disabled: boolean | undefined;
     to: string | boolean | HTMLElement;
+    options: TreeSelectOption[];
+    bordered: boolean;
     placement: FollowerPlacement;
     keyField: string;
-    bordered: boolean;
     virtualScroll: boolean;
     checkable: boolean;
     defaultShow: boolean;
     filterable: boolean;
     clearable: boolean;
-    options: TreeSelectOption[];
     defaultValue: string | number | (string | number)[] | null;
     consistentMenuWidth: boolean;
     cascade: boolean;

package/lib/tree-select/src/TreeSelect.js

@@ -74,7 +74,7 @@ exports.default = (0, vue_1.defineComponent)({
         const menuElRef = (0, vue_1.ref)(null);
         const { mergedClsPrefixRef, namespaceRef } = (0, _mixins_1.useConfig)(props);
         const { localeRef } = (0, _mixins_1.useLocale)('Select');
-        const { mergedSizeRef, mergedDisabledRef, nTriggerFormBlur, nTriggerFormChange, nTriggerFormFocus, nTriggerFormInput } = (0, _mixins_1.useFormItem)(props);
+        const { mergedSizeRef, mergedDisabledRef, mergedStatusRef, nTriggerFormBlur, nTriggerFormChange, nTriggerFormFocus, nTriggerFormInput } = (0, _mixins_1.useFormItem)(props);
         const uncontrolledValueRef = (0, vue_1.ref)(props.defaultValue);
         const controlledValueRef = (0, vue_1.toRef)(props, 'value');
         const mergedValueRef = (0, vooks_1.useMergedState)(controlledValueRef, uncontrolledValueRef);
@@ -242,10 +242,12 @@ exports.default = (0, vue_1.defineComponent)({
         }
         function doUpdateExpandedKeys(keys, option) {
             const { onUpdateExpandedKeys, 'onUpdate:expandedKeys': _onUpdateExpandedKeys } = props;
-            if (onUpdateExpandedKeys)
+            if (onUpdateExpandedKeys) {
                 (0, _utils_1.call)(onUpdateExpandedKeys, keys, option);
-            if (_onUpdateExpandedKeys)
+            }
+            if (_onUpdateExpandedKeys) {
                 (0, _utils_1.call)(_onUpdateExpandedKeys, keys, option);
+            }
             uncontrolledExpandedKeysRef.value = keys;
         }
         function doFocus(e) {
@@ -475,9 +477,10 @@ exports.default = (0, vue_1.defineComponent)({
                 }
             }
         });
-        const themeRef = (0, _mixins_1.useTheme)('TreeSelect', 'TreeSelect', index_cssr_1.default, styles_1.treeSelectLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('TreeSelect', '-tree-select', index_cssr_1.default, styles_1.treeSelectLight, props, mergedClsPrefixRef);
         return {
             menuElRef,
+            mergedStatus: mergedStatusRef,
             triggerInstRef,
             followerInstRef,
             treeInstRef,
@@ -542,7 +545,7 @@ exports.default = (0, vue_1.defineComponent)({
             (0, vue_1.h)(vueuc_1.VBinder, null, {
                 default: () => [
                     (0, vue_1.h)(vueuc_1.VTarget, null, {
-                        default: () => ((0, vue_1.h)(_internal_1.NInternalSelection, { ref: "triggerInstRef", focused: this.focused, clsPrefix: mergedClsPrefix, theme: mergedTheme.peers.InternalSelection, themeOverrides: mergedTheme.peerOverrides.InternalSelection, selectedOption: this.selectedOption, selectedOptions: this.selectedOptions, size: this.mergedSize, bordered: this.bordered, placeholder: this.mergedPlaceholder, disabled: this.mergedDisabled, active: this.mergedShow, multiple: this.multiple, maxTagCount: this.maxTagCount, showArrow: true, filterable: this.filterable, clearable: this.clearable, pattern: this.pattern, onPatternInput: this.handlePatternInput, onClear: this.handleClear, onClick: this.handleTriggerClick, onFocus: this.handleTriggerFocus, onBlur: this.handleTriggerBlur, onDeleteOption: this.handleDeleteOption, onKeydown: this.handleKeydown, onKeyup: this.handleKeyup }))
+                        default: () => ((0, vue_1.h)(_internal_1.NInternalSelection, { ref: "triggerInstRef", status: this.mergedStatus, focused: this.focused, clsPrefix: mergedClsPrefix, theme: mergedTheme.peers.InternalSelection, themeOverrides: mergedTheme.peerOverrides.InternalSelection, selectedOption: this.selectedOption, selectedOptions: this.selectedOptions, size: this.mergedSize, bordered: this.bordered, placeholder: this.mergedPlaceholder, disabled: this.mergedDisabled, active: this.mergedShow, multiple: this.multiple, maxTagCount: this.maxTagCount, showArrow: true, filterable: this.filterable, clearable: this.clearable, pattern: this.pattern, onPatternInput: this.handlePatternInput, onClear: this.handleClear, onClick: this.handleTriggerClick, onFocus: this.handleTriggerFocus, onBlur: this.handleTriggerBlur, onDeleteOption: this.handleDeleteOption, onKeydown: this.handleKeydown, onKeyup: this.handleKeyup }))
                     }),
                     (0, vue_1.h)(vueuc_1.VFollower, { ref: "followerInstRef", show: this.mergedShow, placement: this.placement, to: this.adjustedTo, teleportDisabled: this.adjustedTo === _utils_1.useAdjustedTo.tdkey, containerClass: this.namespace, width: this.consistentMenuWidth ? 'target' : undefined, minWidth: "target" }, {
                         default: () => ((0, vue_1.h)(vue_1.Transition, { name: "fade-in-scale-up-transition", appear: this.isMounted, onLeave: this.handleMenuLeave }, {

package/lib/typography/src/a.js

@@ -13,7 +13,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: aProps,
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'A', a_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-a', a_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: (0, vue_1.computed)(() => {

package/lib/typography/src/blockquote.js

@@ -13,7 +13,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: blockquoteProps,
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'Blockquote', blockquote_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-blockquote', blockquote_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: (0, vue_1.computed)(() => {

package/lib/typography/src/create-header.d.ts

@@ -2,7 +2,7 @@ import { PropType } from 'vue';
 import { ExtractPublicPropTypes } from '../../_utils';
 declare const headerProps: {
     readonly type: {
-        readonly type: PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -209,7 +209,7 @@ declare const headerProps: {
 export declare type HeaderProps = ExtractPublicPropTypes<typeof headerProps>;
 declare const _default: (level: '1' | '2' | '3' | '4' | '5' | '6') => import("vue").DefineComponent<{
     readonly type: {
-        readonly type: PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -426,7 +426,7 @@ declare const _default: (level: '1' | '2' | '3' | '4' | '5' | '6') => import("vu
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly type: {
-        readonly type: PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -630,7 +630,7 @@ declare const _default: (level: '1' | '2' | '3' | '4' | '5' | '6') => import("vu
         ulPadding: string;
     }, any>>>;
 }>>, {
-    type: "default" | "error" | "info" | "success" | "warning";
+    type: "default" | "success" | "error" | "warning" | "info";
     alignText: boolean;
 }>;
 export default _default;

package/lib/typography/src/create-header.js

@@ -18,7 +18,7 @@ exports.default = (level) => (0, vue_1.defineComponent)({
     props: headerProps,
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'H', header_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-h', header_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: (0, vue_1.computed)(() => {

package/lib/typography/src/headers.d.ts

@@ -1,6 +1,6 @@
 export declare const NH1: import("vue").DefineComponent<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -217,7 +217,7 @@ export declare const NH1: import("vue").DefineComponent<{
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -421,12 +421,12 @@ export declare const NH1: import("vue").DefineComponent<{
         ulPadding: string;
     }, any>>>;
 }>>, {
-    type: "default" | "error" | "info" | "success" | "warning";
+    type: "default" | "success" | "error" | "warning" | "info";
     alignText: boolean;
 }>;
 export declare const NH2: import("vue").DefineComponent<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -643,7 +643,7 @@ export declare const NH2: import("vue").DefineComponent<{
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -847,12 +847,12 @@ export declare const NH2: import("vue").DefineComponent<{
         ulPadding: string;
     }, any>>>;
 }>>, {
-    type: "default" | "error" | "info" | "success" | "warning";
+    type: "default" | "success" | "error" | "warning" | "info";
     alignText: boolean;
 }>;
 export declare const NH3: import("vue").DefineComponent<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -1069,7 +1069,7 @@ export declare const NH3: import("vue").DefineComponent<{
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -1273,12 +1273,12 @@ export declare const NH3: import("vue").DefineComponent<{
         ulPadding: string;
     }, any>>>;
 }>>, {
-    type: "default" | "error" | "info" | "success" | "warning";
+    type: "default" | "success" | "error" | "warning" | "info";
     alignText: boolean;
 }>;
 export declare const NH4: import("vue").DefineComponent<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -1495,7 +1495,7 @@ export declare const NH4: import("vue").DefineComponent<{
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -1699,12 +1699,12 @@ export declare const NH4: import("vue").DefineComponent<{
         ulPadding: string;
     }, any>>>;
 }>>, {
-    type: "default" | "error" | "info" | "success" | "warning";
+    type: "default" | "success" | "error" | "warning" | "info";
     alignText: boolean;
 }>;
 export declare const NH5: import("vue").DefineComponent<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -1921,7 +1921,7 @@ export declare const NH5: import("vue").DefineComponent<{
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -2125,12 +2125,12 @@ export declare const NH5: import("vue").DefineComponent<{
         ulPadding: string;
     }, any>>>;
 }>>, {
-    type: "default" | "error" | "info" | "success" | "warning";
+    type: "default" | "success" | "error" | "warning" | "info";
     alignText: boolean;
 }>;
 export declare const NH6: import("vue").DefineComponent<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -2347,7 +2347,7 @@ export declare const NH6: import("vue").DefineComponent<{
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly type: {
-        readonly type: import("vue").PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly type: import("vue").PropType<"default" | "success" | "error" | "warning" | "info">;
         readonly default: "default";
     };
     readonly prefix: StringConstructor;
@@ -2551,6 +2551,6 @@ export declare const NH6: import("vue").DefineComponent<{
         ulPadding: string;
     }, any>>>;
 }>>, {
-    type: "default" | "error" | "info" | "success" | "warning";
+    type: "default" | "success" | "error" | "warning" | "info";
     alignText: boolean;
 }>;

package/lib/typography/src/hr.js

@@ -12,7 +12,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: Object.assign({}, _mixins_1.useTheme.props),
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'Hr', hr_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-hr', hr_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: (0, vue_1.computed)(() => {

package/lib/typography/src/ol.js

@@ -13,7 +13,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: olProps,
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'Ol&Ul', list_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-xl', list_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: (0, vue_1.computed)(() => {

package/lib/typography/src/p.js

@@ -13,7 +13,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: pProps,
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'P', p_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-p', p_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: (0, vue_1.computed)(() => {

package/lib/typography/src/text.js

@@ -29,7 +29,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: textProps,
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'Text', text_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-text', text_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             compitableTag: (0, vooks_1.useCompitable)(props, ['as', 'tag']),

package/lib/typography/src/ul.js

@@ -13,7 +13,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: ulProps,
     setup(props) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Typography', 'Ol&Ul', list_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Typography', '-xl', list_cssr_1.default, styles_1.typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: (0, vue_1.computed)(() => {

package/lib/upload/src/Upload.js

@@ -226,7 +226,7 @@ exports.default = (0, vue_1.defineComponent)({
             (0, _utils_1.throwError)('upload', 'when the list-type is image-card, abstract is not supported.');
         }
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Upload', 'Upload', index_cssr_1.default, styles_1.uploadLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Upload', '-upload', index_cssr_1.default, styles_1.uploadLight, props, mergedClsPrefixRef);
         const formItem = (0, _mixins_1.useFormItem)(props);
         const maxReachedRef = (0, vue_1.computed)(() => {
             const { max } = props;

package/lib/upload/src/UploadFile.d.ts

@@ -377,7 +377,7 @@ declare const _default: import("vue").DefineComponent<{
             } | undefined;
         };
     }>;
-    progressStatus: import("vue").ComputedRef<"error" | "info" | "success">;
+    progressStatus: import("vue").ComputedRef<"success" | "error" | "info">;
     buttonType: import("vue").ComputedRef<"error" | undefined>;
     showProgress: import("vue").ComputedRef<boolean>;
     disabled: import("vue").Ref<boolean>;

package/lib/upload/src/UploadProgress.d.ts

@@ -6,7 +6,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     status: {
-        type: PropType<"error" | "info" | "success">;
+        type: PropType<"success" | "error" | "info">;
         required: true;
     };
 }, {
@@ -380,7 +380,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     status: {
-        type: PropType<"error" | "info" | "success">;
+        type: PropType<"success" | "error" | "info">;
         required: true;
     };
 }>>, {

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.24.4";
+declare const _default: "2.25.0";
 export default _default;

package/lib/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '2.24.4';
+exports.default = '2.25.0';