naive-ui 2.24.4 → 2.25.0

package/es/tree/src/Tree.d.ts

@@ -1,10 +1,11 @@
 import { PropType } from 'vue';
 import { TreeMate, TreeMateOptions, CheckStrategy } from 'treemate';
 import type { ExtractPublicPropTypes, MaybeArray } from '../../_utils';
-import { TreeDragInfo, TreeDropInfo, TreeOptions, Key, TreeOption, AllowDrop, RenderSwitcherIcon } from './interface';
+import type { TreeDragInfo, TreeDropInfo, TreeOptions, Key, TreeOption, AllowDrop, RenderSwitcherIcon, TreeNodeProps } from './interface';
 import { defaultAllowDrop } from './dnd';
 export declare function createTreeMateOptions<T>(keyField: string, childrenField: string): TreeMateOptions<T, T, T>;
-declare type OnUpdateKeys = (value: Key[], option: Array<TreeOption | null>) => void;
+export declare type OnUpdateKeys = (value: Array<string & number>, option: Array<TreeOption | null>) => void;
+export declare type OnUpdateKeysImpl = (value: Key[], option: Array<TreeOption | null>) => void;
 declare type OnLoad = (node: TreeOption) => Promise<void>;
 export declare const treeSharedProps: {
     readonly filter: PropType<(pattern: string, node: TreeOption) => boolean>;
@@ -134,6 +135,7 @@ declare const treeProps: {
     readonly renderPrefix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSuffix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSwitcherIcon: PropType<RenderSwitcherIcon>;
+    readonly nodeProps: PropType<TreeNodeProps>;
     readonly onDragenter: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragleave: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragend: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
@@ -383,6 +385,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly renderPrefix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSuffix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSwitcherIcon: PropType<RenderSwitcherIcon>;
+    readonly nodeProps: PropType<TreeNodeProps>;
     readonly onDragenter: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragleave: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragend: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
@@ -1080,6 +1083,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly renderPrefix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSuffix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSwitcherIcon: PropType<RenderSwitcherIcon>;
+    readonly nodeProps: PropType<TreeNodeProps>;
     readonly onDragenter: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragleave: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragend: PropType<MaybeArray<(e: TreeDragInfo) => void>>;

package/es/tree/src/Tree.js

@@ -97,7 +97,7 @@ const treeProps = Object.assign(Object.assign(Object.assign(Object.assign({}, us
     }, animated: {
         type: Boolean,
         default: true
-    }, virtualScroll: Boolean, watchProps: Array, renderLabel: Function, renderPrefix: Function, renderSuffix: Function, renderSwitcherIcon: Function, onDragenter: [Function, Array], onDragleave: [Function, Array], onDragend: [Function, Array], onDragstart: [Function, Array], onDragover: [Function, Array], onDrop: [Function, Array], onUpdateCheckedKeys: [Function, Array], 'onUpdate:checkedKeys': [Function, Array], onUpdateSelectedKeys: [Function, Array], 'onUpdate:selectedKeys': [Function, Array] }), treeSharedProps), { 
+    }, virtualScroll: Boolean, watchProps: Array, renderLabel: Function, renderPrefix: Function, renderSuffix: Function, renderSwitcherIcon: Function, nodeProps: Function, onDragenter: [Function, Array], onDragleave: [Function, Array], onDragend: [Function, Array], onDragstart: [Function, Array], onDragover: [Function, Array], onDrop: [Function, Array], onUpdateCheckedKeys: [Function, Array], 'onUpdate:checkedKeys': [Function, Array], onUpdateSelectedKeys: [Function, Array], 'onUpdate:selectedKeys': [Function, Array] }), treeSharedProps), { 
     // internal props for tree-select
     internalScrollable: Boolean, internalScrollablePadding: String, 
     // use it to do check
@@ -119,7 +119,7 @@ export default defineComponent({
     props: treeProps,
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Tree', 'Tree', style, treeLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Tree', '-tree', style, treeLight, props, mergedClsPrefixRef);
         const selfElRef = ref(null);
         const scrollbarInstRef = ref(null);
         const virtualListInstRef = ref(null);
@@ -408,18 +408,22 @@ export default defineComponent({
         function doUpdateExpandedKeys(value, option) {
             const { 'onUpdate:expandedKeys': _onUpdateExpandedKeys, onUpdateExpandedKeys } = props;
             uncontrolledExpandedKeysRef.value = value;
-            if (_onUpdateExpandedKeys)
+            if (_onUpdateExpandedKeys) {
                 call(_onUpdateExpandedKeys, value, option);
-            if (onUpdateExpandedKeys)
+            }
+            if (onUpdateExpandedKeys) {
                 call(onUpdateExpandedKeys, value, option);
+            }
         }
         function doUpdateCheckedKeys(value, option) {
             const { 'onUpdate:checkedKeys': _onUpdateCheckedKeys, onUpdateCheckedKeys } = props;
             uncontrolledCheckedKeysRef.value = value;
-            if (onUpdateCheckedKeys)
+            if (onUpdateCheckedKeys) {
                 call(onUpdateCheckedKeys, value, option);
-            if (_onUpdateCheckedKeys)
+            }
+            if (_onUpdateCheckedKeys) {
                 call(_onUpdateCheckedKeys, value, option);
+            }
         }
         function doUpdateIndeterminateKeys(value, option) {
             const { 'onUpdate:indeterminateKeys': _onUpdateIndeterminateKeys, onUpdateIndeterminateKeys } = props;
@@ -433,10 +437,12 @@ export default defineComponent({
         function doUpdateSelectedKeys(value, option) {
             const { 'onUpdate:selectedKeys': _onUpdateSelectedKeys, onUpdateSelectedKeys } = props;
             uncontrolledSelectedKeysRef.value = value;
-            if (onUpdateSelectedKeys)
+            if (onUpdateSelectedKeys) {
                 call(onUpdateSelectedKeys, value, option);
-            if (_onUpdateSelectedKeys)
+            }
+            if (_onUpdateSelectedKeys) {
                 call(_onUpdateSelectedKeys, value, option);
+            }
         }
         // Drag & Drop
         function doDragEnter(info) {
@@ -933,6 +939,7 @@ export default defineComponent({
             mergedExpandedKeysRef,
             mergedThemeRef: themeRef,
             mergedCheckStrategyRef,
+            nodePropsRef: toRef(props, 'nodeProps'),
             disabledRef: toRef(props, 'disabled'),
             checkableRef: toRef(props, 'checkable'),
             selectableRef: toRef(props, 'selectable'),

package/es/tree/src/TreeNode.d.ts

@@ -26,6 +26,7 @@ declare const TreeNode: import("vue").DefineComponent<{
     internalScrollable: import("vue").Ref<boolean>;
     draggable: import("vue").Ref<boolean>;
     blockLine: import("vue").Ref<boolean>;
+    nodeProps: import("vue").ComputedRef<import("vue").HTMLAttributes | undefined>;
     checkboxFocusable: import("vue").Ref<boolean>;
     droppingPosition: import("vue").Ref<import("./interface").DropPosition | null>;
     droppingOffsetLevel: import("vue").Ref<number>;
@@ -41,6 +42,7 @@ declare const TreeNode: import("vue").DefineComponent<{
     handleDragOver: (e: DragEvent) => void;
     handleDragEnd: (e: DragEvent) => void;
     handleDragLeave: (e: DragEvent) => void;
+    handleLineClick: (e: MouseEvent) => void;
     handleContentClick: (e: MouseEvent) => void;
     handleSwitcherClick: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/tree/src/TreeNode.js

@@ -23,7 +23,14 @@ const TreeNode = defineComponent({
     setup(props) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const NTree = inject(treeInjectionKey);
-        const { droppingNodeParentRef, droppingMouseNodeRef, draggingNodeRef, droppingPositionRef, droppingOffsetLevelRef, indentRef } = NTree;
+        const { droppingNodeParentRef, droppingMouseNodeRef, draggingNodeRef, droppingPositionRef, droppingOffsetLevelRef, nodePropsRef, indentRef, blockLineRef } = NTree;
+        const disabledRef = computed(() => NTree.disabledRef.value || props.tmNode.disabled);
+        const resolvedNodePropsRef = computed(() => {
+            const { value: nodeProps } = nodePropsRef;
+            if (!nodeProps)
+                return undefined;
+            return nodeProps({ option: props.tmNode.rawNode });
+        });
         // used for drag and drop
         const contentInstRef = ref(null);
         // must be non-reactive
@@ -52,11 +59,28 @@ const TreeNode = defineComponent({
                 NTree.handleSwitcherClick(tmNode);
             }
         }
-        function handleContentClick(e) {
+        function _handleClick(e) {
             if (happensIn(e, 'checkbox') || 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);
         }
@@ -143,7 +167,7 @@ const TreeNode = defineComponent({
             indeterminate: useMemo(() => NTree.displayedIndeterminateKeysRef.value.includes(props.tmNode.key)),
             selected: useMemo(() => NTree.mergedSelectedKeysRef.value.includes(props.tmNode.key)),
             expanded: useMemo(() => NTree.mergedExpandedKeysRef.value.includes(props.tmNode.key)),
-            disabled: computed(() => NTree.disabledRef.value || props.tmNode.disabled),
+            disabled: disabledRef,
             checkable: computed(() => NTree.checkableRef.value &&
                 (NTree.cascadeRef.value ||
                     NTree.mergedCheckStrategyRef.value !== 'child' ||
@@ -155,7 +179,8 @@ const TreeNode = defineComponent({
                     : true)),
             internalScrollable: NTree.internalScrollableRef,
             draggable: NTree.draggableRef,
-            blockLine: NTree.blockLineRef,
+            blockLine: blockLineRef,
+            nodeProps: resolvedNodePropsRef,
             checkboxFocusable: NTree.internalCheckboxFocusableRef,
             droppingPosition: droppingPositionRef,
             droppingOffsetLevel: droppingOffsetLevelRef,
@@ -169,12 +194,13 @@ const TreeNode = 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
@@ -190,7 +216,7 @@ const TreeNode = defineComponent({
         // scrolled to, so we need data-key to query the target element.
         const dataKey = internalScrollable ? createDataKey(tmNode.key) : undefined;
         return (h("div", Object.assign({ class: `${clsPrefix}-tree-node-wrapper` }, dragEventHandlers),
-            h("div", { class: [
+            h("div", Object.assign({}, (blockLine ? nodeProps : undefined), { class: [
                     `${clsPrefix}-tree-node`,
                     {
                         [`${clsPrefix}-tree-node--selected`]: selected,
@@ -199,14 +225,15 @@ const TreeNode = 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 }),
                 repeat(tmNode.level, h("div", { class: `${clsPrefix}-tree-node-indent`, style: { flex: `0 0 ${indent}px` } })),
                 h(NTreeNodeSwitcher, { clsPrefix: clsPrefix, expanded: this.expanded, loading: this.loading, hide: tmNode.isLeaf, onClick: this.handleSwitcherClick }),
                 checkable ? (h(NTreeNodeCheckbox, { focusable: this.checkboxFocusable, disabled: disabled || this.checkboxDisabled, clsPrefix: clsPrefix, checked: this.checked, indeterminate: this.indeterminate, onCheck: this.handleCheck })) : null,
-                h(NTreeNodeContent, { ref: "contentInstRef", clsPrefix: clsPrefix, checked: checked, selected: selected, onClick: blockLine || disabled ? undefined : this.handleContentClick, onDragstart: draggable && !blockLine && !disabled
+                h(NTreeNodeContent, { 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/es/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/es/tree/src/TreeNodeContent.js

@@ -16,7 +16,8 @@ export default defineComponent({
         tmNode: {
             type: Object,
             required: true
-        }
+        },
+        nodeProps: Object
     },
     setup(props) {
         const { renderLabelRef, renderPrefixRef, renderSuffixRef, labelFieldRef } = 
@@ -41,8 +42,8 @@ export default defineComponent({
         };
     },
     render() {
-        const { clsPrefix, labelField, checked = false, selected = false, renderLabel, renderPrefix, renderSuffix, handleClick, onDragstart, tmNode: { rawNode, rawNode: { prefix, suffix, [labelField]: label } } } = this;
-        return (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 (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 ? (h("div", { class: `${clsPrefix}-tree-node-content__prefix` }, renderPrefix
                 ? renderPrefix({
                     option: rawNode,

package/es/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/es/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/es/tree-select/src/TreeSelect.js

@@ -69,7 +69,7 @@ export default defineComponent({
         const menuElRef = ref(null);
         const { mergedClsPrefixRef, namespaceRef } = useConfig(props);
         const { localeRef } = useLocale('Select');
-        const { mergedSizeRef, mergedDisabledRef, nTriggerFormBlur, nTriggerFormChange, nTriggerFormFocus, nTriggerFormInput } = useFormItem(props);
+        const { mergedSizeRef, mergedDisabledRef, mergedStatusRef, nTriggerFormBlur, nTriggerFormChange, nTriggerFormFocus, nTriggerFormInput } = useFormItem(props);
         const uncontrolledValueRef = ref(props.defaultValue);
         const controlledValueRef = toRef(props, 'value');
         const mergedValueRef = useMergedState(controlledValueRef, uncontrolledValueRef);
@@ -237,10 +237,12 @@ export default defineComponent({
         }
         function doUpdateExpandedKeys(keys, option) {
             const { onUpdateExpandedKeys, 'onUpdate:expandedKeys': _onUpdateExpandedKeys } = props;
-            if (onUpdateExpandedKeys)
+            if (onUpdateExpandedKeys) {
                 call(onUpdateExpandedKeys, keys, option);
-            if (_onUpdateExpandedKeys)
+            }
+            if (_onUpdateExpandedKeys) {
                 call(_onUpdateExpandedKeys, keys, option);
+            }
             uncontrolledExpandedKeysRef.value = keys;
         }
         function doFocus(e) {
@@ -470,9 +472,10 @@ export default defineComponent({
                 }
             }
         });
-        const themeRef = useTheme('TreeSelect', 'TreeSelect', style, treeSelectLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('TreeSelect', '-tree-select', style, treeSelectLight, props, mergedClsPrefixRef);
         return {
             menuElRef,
+            mergedStatus: mergedStatusRef,
             triggerInstRef,
             followerInstRef,
             treeInstRef,
@@ -537,7 +540,7 @@ export default defineComponent({
             h(VBinder, null, {
                 default: () => [
                     h(VTarget, null, {
-                        default: () => (h(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: () => (h(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 }))
                     }),
                     h(VFollower, { ref: "followerInstRef", show: this.mergedShow, placement: this.placement, to: this.adjustedTo, teleportDisabled: this.adjustedTo === useAdjustedTo.tdkey, containerClass: this.namespace, width: this.consistentMenuWidth ? 'target' : undefined, minWidth: "target" }, {
                         default: () => (h(Transition, { name: "fade-in-scale-up-transition", appear: this.isMounted, onLeave: this.handleMenuLeave }, {

package/es/typography/src/a.js

@@ -8,7 +8,7 @@ export default defineComponent({
     props: aProps,
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Typography', 'A', style, typographyLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Typography', '-a', style, typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: computed(() => {

package/es/typography/src/blockquote.js

@@ -8,7 +8,7 @@ export default defineComponent({
     props: blockquoteProps,
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Typography', 'Blockquote', style, typographyLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Typography', '-blockquote', style, typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: computed(() => {

package/es/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/es/typography/src/create-header.js

@@ -13,7 +13,7 @@ export default (level) => defineComponent({
     props: headerProps,
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Typography', 'H', style, typographyLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Typography', '-h', style, typographyLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             cssVars: computed(() => {