naive-ui 2.24.7 → 2.25.0

package/es/form/src/utils.js

@@ -1,6 +1,6 @@
 import { inject, computed, ref } from 'vue';
 import { get } from 'lodash-es';
-import { formInjectionKey } from './interface';
+import { formInjectionKey } from './context';
 import { formatLength } from '../../_utils';
 export function formItemSize(props) {
     const NForm = inject(formInjectionKey, null);

package/es/global-style/src/GlobalStyle.js

@@ -1,7 +1,7 @@
 import { defineComponent, watchEffect, onBeforeMount, onUnmounted, inject } from 'vue';
 import { warn } from '../../_utils';
 import { commonLight } from '../../_styles/common';
-import { configProviderInjectionKey } from '../../config-provider/src/ConfigProvider';
+import { configProviderInjectionKey } from '../../config-provider/src/context';
 import { merge } from 'lodash-es';
 export default defineComponent({
     name: 'GlobalStyle',

package/es/gradient-text/src/GradientText.d.ts

@@ -9,7 +9,7 @@ declare const gradientTextProps: {
     readonly size: PropType<string | number>;
     readonly fontSize: PropType<string | number>;
     readonly type: {
-        readonly type: PropType<"error" | "info" | "success" | "warning" | "primary" | "danger">;
+        readonly type: PropType<"success" | "error" | "warning" | "info" | "primary" | "danger">;
         readonly default: "primary";
     };
     readonly color: PropType<Gradient>;
@@ -62,7 +62,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly size: PropType<string | number>;
     readonly fontSize: PropType<string | number>;
     readonly type: {
-        readonly type: PropType<"error" | "info" | "success" | "warning" | "primary" | "danger">;
+        readonly type: PropType<"success" | "error" | "warning" | "info" | "primary" | "danger">;
         readonly default: "primary";
     };
     readonly color: PropType<Gradient>;
@@ -111,7 +111,7 @@ declare const _default: import("vue").DefineComponent<{
     }, any>>>;
 }, {
     mergedClsPrefix: import("vue").ComputedRef<string>;
-    compatibleType: import("vue").ComputedRef<"error" | "info" | "success" | "warning" | "primary">;
+    compatibleType: import("vue").ComputedRef<"success" | "error" | "warning" | "info" | "primary">;
     styleFontSize: import("vue").ComputedRef<string | number | undefined>;
     styleBgImage: import("vue").ComputedRef<string | undefined>;
     cssVars: import("vue").ComputedRef<{
@@ -125,7 +125,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly size: PropType<string | number>;
     readonly fontSize: PropType<string | number>;
     readonly type: {
-        readonly type: PropType<"error" | "info" | "success" | "warning" | "primary" | "danger">;
+        readonly type: PropType<"success" | "error" | "warning" | "info" | "primary" | "danger">;
         readonly default: "primary";
     };
     readonly color: PropType<Gradient>;
@@ -173,6 +173,6 @@ declare const _default: import("vue").DefineComponent<{
         colorEndSuccess: string;
     }, any>>>;
 }>>, {
-    type: "error" | "info" | "success" | "warning" | "primary" | "danger";
+    type: "success" | "error" | "warning" | "info" | "primary" | "danger";
 }>;
 export default _default;

package/es/gradient-text/src/GradientText.js

@@ -38,7 +38,7 @@ export default defineComponent({
             }
             return undefined;
         });
-        const themeRef = useTheme('GradientText', 'GradientText', style, gradientTextLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('GradientText', '-gradient-text', style, gradientTextLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             compatibleType: compatibleTypeRef,

package/es/grid/src/Grid.d.ts

@@ -31,7 +31,6 @@ export interface NGridInjection {
     xGapRef: Ref<string | undefined>;
     overflowRef: Ref<boolean>;
 }
-export declare const gridInjectionKey: import("vue").InjectionKey<NGridInjection>;
 export declare type GridProps = ExtractPublicPropTypes<typeof gridProps>;
 declare const _default: import("vue").DefineComponent<{
     readonly responsive: {

package/es/grid/src/Grid.js

@@ -4,8 +4,8 @@ import { VResizeObserver } from 'vueuc';
 import { pxfy, parseResponsivePropValue, beforeNextFrameOnce } from 'seemly';
 import { defaultBreakpoints } from '../../config-provider/src/config';
 import { useConfig } from '../../_mixins';
-import { getSlot, flatten, createInjectionKey } from '../../_utils';
-import { defaultSpan } from './GridItem';
+import { getSlot, flatten } from '../../_utils';
+import { defaultSpan, gridInjectionKey } from './config';
 const defaultCols = 24;
 const gridProps = {
     responsive: {
@@ -33,7 +33,6 @@ const gridProps = {
         default: 0
     }
 };
-export const gridInjectionKey = createInjectionKey('n-grid');
 export default defineComponent({
     name: 'Grid',
     inheritAttrs: false,

package/es/grid/src/GridItem.js

@@ -1,7 +1,7 @@
 import { h, defineComponent, inject, getCurrentInstance } from 'vue';
 import { pxfy } from 'seemly';
-import { gridInjectionKey } from './Grid';
 import { keysOf } from '../../_utils';
+import { gridInjectionKey } from './config';
 export const defaultSpan = 1;
 export const gridItemProps = {
     span: {

package/es/grid/src/config.d.ts

@@ -0,0 +1,3 @@
+import type { NGridInjection } from './Grid';
+export declare const defaultSpan = 1;
+export declare const gridInjectionKey: import("vue").InjectionKey<NGridInjection>;

package/es/grid/src/config.js

@@ -0,0 +1,3 @@
+import { createInjectionKey } from '../../_utils';
+export const defaultSpan = 1;
+export const gridInjectionKey = createInjectionKey('n-grid');

package/es/icon/index.d.ts

@@ -1 +1 @@
-export { default as NIcon } from './src/Icon';
+export { NIcon } from './src/Icon';

package/es/icon/index.js

@@ -1,2 +1,2 @@
 /* istanbul ignore file */
-export { default as NIcon } from './src/Icon';
+export { NIcon } from './src/Icon';

package/es/icon/src/Icon.d.ts

@@ -1,6 +1,6 @@
 import { Component, PropType } from 'vue';
 export declare type Depth = 1 | 2 | 3 | 4 | 5 | '1' | '2' | '3' | '4' | '5' | undefined;
-declare const _default: import("vue").DefineComponent<{
+export declare const NIcon: import("vue").DefineComponent<{
     depth: PropType<Depth>;
     size: (StringConstructor | NumberConstructor)[];
     color: StringConstructor;
@@ -74,4 +74,3 @@ declare const _default: import("vue").DefineComponent<{
         opacity5Depth: string;
     }, any>>>;
 }>>, {}>;
-export default _default;

package/es/icon/src/Icon.js

@@ -3,14 +3,14 @@ import { useConfig, useTheme } from '../../_mixins';
 import { formatLength, warn } from '../../_utils';
 import { iconLight } from '../styles';
 import style from './styles/index.cssr';
-export default defineComponent({
+export const NIcon = defineComponent({
     _n_icon__: true,
     name: 'Icon',
     inheritAttrs: false,
     props: Object.assign(Object.assign({}, useTheme.props), { depth: [String, Number], size: [Number, String], color: String, component: Object }),
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Icon', 'Icon', style, iconLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Icon', '-icon', style, iconLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             mergedStyle: computed(() => {

package/es/icon-wrapper/index.d.ts

@@ -0,0 +1 @@
+export { NIconWrapper } from './src/IconWrapper';

package/es/icon-wrapper/index.js

@@ -0,0 +1 @@
+export { NIconWrapper } from './src/IconWrapper';

package/es/icon-wrapper/src/IconWrapper.d.ts

@@ -0,0 +1,50 @@
+export declare const NIconWrapper: import("vue").DefineComponent<{
+    readonly size: {
+        readonly type: NumberConstructor;
+        readonly default: 24;
+    };
+    readonly borderRadius: {
+        readonly type: NumberConstructor;
+        readonly default: 6;
+    };
+    readonly color: StringConstructor;
+    readonly iconColor: StringConstructor;
+    readonly theme: import("vue").PropType<import("../../_mixins").Theme<"IconWrapper", {
+        color: string;
+        iconColor: string;
+    }, any>>;
+    readonly themeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"IconWrapper", {
+        color: string;
+        iconColor: string;
+    }, any>>>;
+    readonly builtinThemeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"IconWrapper", {
+        color: string;
+        iconColor: string;
+    }, any>>>;
+}, () => JSX.Element, 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 size: {
+        readonly type: NumberConstructor;
+        readonly default: 24;
+    };
+    readonly borderRadius: {
+        readonly type: NumberConstructor;
+        readonly default: 6;
+    };
+    readonly color: StringConstructor;
+    readonly iconColor: StringConstructor;
+    readonly theme: import("vue").PropType<import("../../_mixins").Theme<"IconWrapper", {
+        color: string;
+        iconColor: string;
+    }, any>>;
+    readonly themeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"IconWrapper", {
+        color: string;
+        iconColor: string;
+    }, any>>>;
+    readonly builtinThemeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"IconWrapper", {
+        color: string;
+        iconColor: string;
+    }, any>>>;
+}>>, {
+    size: number;
+    borderRadius: number;
+}>;

package/es/icon-wrapper/src/IconWrapper.js

@@ -0,0 +1,48 @@
+import { computed, defineComponent, h } from 'vue';
+import { useConfig, useTheme, useCssVarsClass } from '../../_mixins';
+import { formatLength } from '../../_utils';
+import { iconWrapperLight } from '../styles';
+import style from './styles/index.cssr';
+const iconWrapperProps = Object.assign(Object.assign({}, useTheme.props), { size: {
+        type: Number,
+        default: 24
+    }, borderRadius: {
+        type: Number,
+        default: 6
+    }, color: String, iconColor: String });
+export const NIconWrapper = defineComponent({
+    name: 'IconWrapper',
+    props: iconWrapperProps,
+    setup(props, { slots }) {
+        const themeRef = useTheme('IconWrapper', '-icon-wrapper', style, iconWrapperLight, props);
+        const { mergedClsPrefixRef, NConfigProvider } = useConfig(props);
+        const { disableInlineTheme } = NConfigProvider || {};
+        const cssVarsRef = computed(() => {
+            const { common: { cubicBezierEaseInOut }, self: { color, iconColor } } = themeRef.value;
+            return {
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-color': color,
+                '--n-icon-color': iconColor
+            };
+        });
+        const cssVarsClassRef = disableInlineTheme
+            ? useCssVarsClass('icon-wrapper', undefined, cssVarsRef, props)
+            : undefined;
+        return () => {
+            const size = formatLength(props.size);
+            return (h("div", { class: [
+                    `${mergedClsPrefixRef.value}-icon-wrapper`,
+                    cssVarsClassRef === null || cssVarsClassRef === void 0 ? void 0 : cssVarsClassRef.value
+                ], style: [
+                    cssVarsRef === null || cssVarsRef === void 0 ? void 0 : cssVarsRef.value,
+                    {
+                        height: size,
+                        width: size,
+                        borderRadius: formatLength(props.borderRadius),
+                        backgroundColor: props.color,
+                        color: props.iconColor
+                    }
+                ] }, slots));
+        };
+    }
+});

package/es/icon-wrapper/src/styles/index.cssr.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("css-render").CNode;
+export default _default;

package/es/icon-wrapper/src/styles/index.cssr.js

@@ -0,0 +1,16 @@
+import { cB } from '../../../_utils/cssr'; // vars:
+// --n-bezier
+// --n-border-radius
+// --n-color
+// --n-icon-color
+
+export default cB('icon-wrapper', `
+ transition:
+ color .3s var(--n-bezier),
+ background-color .3s var(--n-bezier);
+ background-color: var(--n-color);
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ color: var(--n-icon-color);
+`);

package/es/icon-wrapper/styles/dark.d.ts

@@ -0,0 +1,3 @@
+import type { IconWrapperTheme } from './light';
+declare const iconDark: IconWrapperTheme;
+export default iconDark;

package/es/icon-wrapper/styles/dark.js

@@ -0,0 +1,8 @@
+import { commonDark } from '../../_styles/common';
+import { self } from './light';
+const iconDark = {
+    name: 'IconWrapper',
+    common: commonDark,
+    self
+};
+export default iconDark;

package/es/icon-wrapper/styles/index.d.ts

@@ -0,0 +1,3 @@
+export { default as iconWrapperDark } from './dark';
+export { default as iconWrapperLight } from './light';
+export type { IconWrapperTheme, IconWrapperThemeVars } from './light';

package/es/icon-wrapper/styles/index.js

@@ -0,0 +1,2 @@
+export { default as iconWrapperDark } from './dark';
+export { default as iconWrapperLight } from './light';

package/es/icon-wrapper/styles/light.d.ts

@@ -0,0 +1,10 @@
+import type { ThemeCommonVars } from '../../_styles/common';
+import type { Theme } from '../../_mixins';
+export declare const self: (vars: ThemeCommonVars) => {
+    color: string;
+    iconColor: string;
+};
+export declare type IconWrapperThemeVars = ReturnType<typeof self>;
+declare const iconWrapperLight: Theme<'IconWrapper', IconWrapperThemeVars>;
+export default iconWrapperLight;
+export declare type IconWrapperTheme = typeof iconWrapperLight;

package/es/icon-wrapper/styles/light.js

@@ -0,0 +1,14 @@
+import { commonLight } from '../../_styles/common';
+export const self = (vars) => {
+    const { primaryColor, baseColor } = vars;
+    return {
+        color: primaryColor,
+        iconColor: baseColor
+    };
+};
+const iconWrapperLight = {
+    name: 'IconWrapper',
+    common: commonLight,
+    self
+};
+export default iconWrapperLight;

package/es/image/src/ImagePreview.js

@@ -19,7 +19,7 @@ export default defineComponent({
             required: true
         } }),
     setup(props) {
-        const themeRef = useTheme('Image', 'Image', style, imageLight, props, toRef(props, 'clsPrefix'));
+        const themeRef = useTheme('Image', '-image', style, imageLight, props, toRef(props, 'clsPrefix'));
         let thumbnailEl = null;
         const previewRef = ref(null);
         const previewWrapperRef = ref(null);

package/es/input/src/Input.d.ts

@@ -1,4 +1,5 @@
 import { PropType, InputHTMLAttributes, TextareaHTMLAttributes } from 'vue';
+import type { FormValidationStatus } from '../../form/src/interface';
 import { ExtractPublicPropTypes } from '../../_utils';
 import type { MaybeArray } from '../../_utils';
 import type { OnUpdateValue, Size } from './interface';
@@ -69,6 +70,7 @@ declare const inputProps: {
     onClick: PropType<MaybeArray<(e: MouseEvent) => void>>;
     onChange: PropType<OnUpdateValue>;
     onClear: PropType<MaybeArray<(e: MouseEvent) => void>>;
+    status: PropType<FormValidationStatus>;
     'onUpdate:value': PropType<MaybeArray<OnUpdateValue>>;
     onUpdateValue: PropType<MaybeArray<OnUpdateValue>>;
     /** private */
@@ -337,6 +339,7 @@ declare const _default: import("vue").DefineComponent<{
     onClick: PropType<MaybeArray<(e: MouseEvent) => void>>;
     onChange: PropType<OnUpdateValue>;
     onClear: PropType<MaybeArray<(e: MouseEvent) => void>>;
+    status: PropType<FormValidationStatus>;
     'onUpdate:value': PropType<MaybeArray<OnUpdateValue>>;
     onUpdateValue: PropType<MaybeArray<OnUpdateValue>>;
     /** private */
@@ -574,6 +577,7 @@ declare const _default: import("vue").DefineComponent<{
     placeholderStyle: import("vue").Ref<{
         top: string;
     }>;
+    mergedStatus: import("vue").ComputedRef<FormValidationStatus | undefined>;
     handleTextAreaScroll: (e: Event) => void;
     handleCompositionStart: () => void;
     handleCompositionEnd: (e: CompositionEvent) => void;
@@ -629,7 +633,7 @@ declare const _default: import("vue").DefineComponent<{
             iconColorDisabled: string;
             opacity1: string;
             opacity2: string;
-            opacity3: string;
+            opacity3: string; /** private */
             opacity4: string;
             opacity5: string;
             dividerColor: string;
@@ -884,6 +888,7 @@ declare const _default: import("vue").DefineComponent<{
     onClick: PropType<MaybeArray<(e: MouseEvent) => void>>;
     onChange: PropType<OnUpdateValue>;
     onClear: PropType<MaybeArray<(e: MouseEvent) => void>>;
+    status: PropType<FormValidationStatus>;
     'onUpdate:value': PropType<MaybeArray<OnUpdateValue>>;
     onUpdateValue: PropType<MaybeArray<OnUpdateValue>>;
     /** private */
@@ -1093,8 +1098,8 @@ declare const _default: import("vue").DefineComponent<{
         minRows?: number | undefined;
         maxRows?: number | undefined;
     };
-    loading: boolean;
     bordered: boolean | undefined;
+    loading: boolean;
     clearable: boolean;
     defaultValue: string | [string, string] | null;
     resizable: boolean;

package/es/input/src/Input.js

@@ -6,7 +6,7 @@ import { off, on } from 'evtd';
 import { EyeIcon, EyeOffIcon } from '../../_internal/icons';
 import { NBaseClear, NBaseIcon, NBaseSuffix, NScrollbar } from '../../_internal';
 import { useTheme, useLocale, useFormItem, useConfig } from '../../_mixins';
-import { call, createKey, warnOnce } from '../../_utils';
+import { call, createKey, resolveSlot, resolveWrappedSlot, warnOnce } from '../../_utils';
 import { inputLight } from '../styles';
 import { inputInjectionKey } from './interface';
 import { isEmptyValue } from './utils';
@@ -42,7 +42,7 @@ const inputProps = Object.assign(Object.assign({}, useTheme.props), { bordered:
     }, showCount: Boolean, loading: {
         type: Boolean,
         default: undefined
-    }, onMousedown: Function, onKeydown: Function, onKeyup: Function, onInput: [Function, Array], onFocus: [Function, Array], onBlur: [Function, Array], onClick: [Function, Array], onChange: [Function, Array], onClear: [Function, Array], 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], 
+    }, onMousedown: Function, onKeydown: Function, onKeyup: Function, onInput: [Function, Array], onFocus: [Function, Array], onBlur: [Function, Array], onClick: [Function, Array], onChange: [Function, Array], onClear: [Function, Array], status: String, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], 
     /** private */
     textDecoration: [String, Array], attrSize: {
         type: Number,
@@ -62,7 +62,7 @@ export default defineComponent({
             });
         }
         const { mergedClsPrefixRef, mergedBorderedRef } = useConfig(props);
-        const themeRef = useTheme('Input', 'Input', style, inputLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Input', '-input', style, inputLight, props, mergedClsPrefixRef);
         // dom refs
         const wrapperElRef = ref(null);
         const textareaElRef = ref(null);
@@ -79,7 +79,7 @@ export default defineComponent({
         const mergedValueRef = useMergedState(controlledValueRef, uncontrolledValueRef);
         // form-item
         const formItem = useFormItem(props);
-        const { mergedSizeRef, mergedDisabledRef } = formItem;
+        const { mergedSizeRef, mergedDisabledRef, mergedStatusRef } = formItem;
         // states
         const focusedRef = ref(false);
         const hoverRef = ref(false);
@@ -330,7 +330,6 @@ export default defineComponent({
             }
             // force update to sync input's view with value
             // if not set, after input, input value won't sync with dom input value
-            ;
             vm.$forceUpdate();
         }
         function handleInputBlur(e) {
@@ -639,7 +638,7 @@ export default defineComponent({
             textareaMirrorElRef,
             textareaScrollbarInstRef, 
             // value
-            uncontrolledValue: uncontrolledValueRef, mergedValue: mergedValueRef, passwordVisible: passwordVisibleRef, mergedPlaceholder: mergedPlaceholderRef, showPlaceholder1: showPlaceholder1Ref, showPlaceholder2: showPlaceholder2Ref, mergedFocus: mergedFocusRef, isComposing: isComposingRef, activated: activatedRef, showClearButton, mergedSize: mergedSizeRef, mergedDisabled: mergedDisabledRef, textDecorationStyle: textDecorationStyleRef, mergedClsPrefix: mergedClsPrefixRef, mergedBordered: mergedBorderedRef, mergedShowPasswordOn: mergedShowPasswordOnRef, placeholderStyle: placeholderStyleRef, 
+            uncontrolledValue: uncontrolledValueRef, mergedValue: mergedValueRef, passwordVisible: passwordVisibleRef, mergedPlaceholder: mergedPlaceholderRef, showPlaceholder1: showPlaceholder1Ref, showPlaceholder2: showPlaceholder2Ref, mergedFocus: mergedFocusRef, isComposing: isComposingRef, activated: activatedRef, showClearButton, mergedSize: mergedSizeRef, mergedDisabled: mergedDisabledRef, textDecorationStyle: textDecorationStyleRef, mergedClsPrefix: mergedClsPrefixRef, mergedBordered: mergedBorderedRef, mergedShowPasswordOn: mergedShowPasswordOnRef, placeholderStyle: placeholderStyleRef, mergedStatus: mergedStatusRef, 
             // methods
             handleTextAreaScroll,
             handleCompositionStart,
@@ -719,10 +718,11 @@ export default defineComponent({
             }) });
     },
     render() {
-        var _a, _b, _c, _d;
-        const { mergedClsPrefix, $slots } = this;
+        var _a, _b, _c;
+        const { mergedClsPrefix, mergedStatus, $slots } = this;
         return (h("div", { ref: "wrapperElRef", class: [
                 `${mergedClsPrefix}-input`,
+                mergedStatus && `${mergedClsPrefix}-input--${mergedStatus}-status`,
                 {
                     [`${mergedClsPrefix}-input--disabled`]: this.mergedDisabled,
                     [`${mergedClsPrefix}-input--textarea`]: this.type === 'textarea',
@@ -737,7 +737,9 @@ export default defineComponent({
                 ? 0
                 : undefined, onFocus: this.handleWrapperFocus, onBlur: this.handleWrapperBlur, onClick: this.handleClick, onMousedown: this.handleMouseDown, onMouseenter: this.handleMouseEnter, onMouseleave: this.handleMouseLeave, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd, onKeyup: this.onKeyup, onKeydown: this.handleWrapperKeyDown },
             h("div", { class: `${mergedClsPrefix}-input-wrapper` },
-                $slots.affix || $slots.prefix ? (h("div", { class: `${mergedClsPrefix}-input__prefix` }, (_a = ($slots.affix || $slots.prefix)) === null || _a === void 0 ? void 0 : _a())) : null,
+                resolveWrappedSlot($slots.prefix, (children) => [
+                    h("div", { class: `${mergedClsPrefix}-input__prefix` }, children)
+                ]),
                 this.type === 'textarea' ? (h(NScrollbar, { ref: "textareaScrollbarInstRef", class: `${mergedClsPrefix}-input__textarea`, container: this.getTextareaScrollContainer, triggerDisplayManually: true, useUnifiedContainer: true }, {
                     default: () => {
                         return (h(Fragment, null,
@@ -766,16 +768,18 @@ export default defineComponent({
                         this.showCount ||
                         this.mergedShowPasswordOn ||
                         this.loading !== undefined) ? (h("div", { class: `${mergedClsPrefix}-input__suffix` }, [
-                    this.clearable || $slots.clear ? (h(NBaseClear, { clsPrefix: mergedClsPrefix, show: this.showClearButton, onClear: this.handleClear }, { default: $slots.clear })) : null,
-                    !this.internalLoadingBeforeSuffix ? (_b = $slots.suffix) === null || _b === void 0 ? void 0 : _b.call($slots) : null,
+                    this.clearable || $slots.clear ? (h(NBaseClear, { clsPrefix: mergedClsPrefix, show: this.showClearButton, onClear: this.handleClear }, { default: () => { var _a; return (_a = $slots.clear) === null || _a === void 0 ? void 0 : _a.call($slots); } })) : null,
+                    !this.internalLoadingBeforeSuffix ? (_a = $slots.suffix) === null || _a === void 0 ? void 0 : _a.call($slots) : null,
                     this.loading !== undefined ? (h(NBaseSuffix, { clsPrefix: mergedClsPrefix, loading: this.loading, showArrow: false, showClear: false, style: this.cssVars })) : null,
-                    this.internalLoadingBeforeSuffix ? (_c = $slots.suffix) === null || _c === void 0 ? void 0 : _c.call($slots) : null,
-                    this.showCount && this.type !== 'textarea' ? (h(WordCount, null, { default: $slots.count })) : null,
+                    this.internalLoadingBeforeSuffix ? (_b = $slots.suffix) === null || _b === void 0 ? void 0 : _b.call($slots) : null,
+                    this.showCount && this.type !== 'textarea' ? (h(WordCount, null, {
+                        default: (props) => { var _a; return (_a = $slots.count) === null || _a === void 0 ? void 0 : _a.call($slots, props); }
+                    })) : null,
                     this.mergedShowPasswordOn && this.type === 'password' ? (h(NBaseIcon, { clsPrefix: mergedClsPrefix, class: `${mergedClsPrefix}-input__eye`, onMousedown: this.handlePasswordToggleMousedown, onClick: this.handlePasswordToggleClick }, {
                         default: () => this.passwordVisible ? h(EyeIcon, null) : h(EyeOffIcon, null)
                     })) : null
                 ])) : null),
-            this.pair ? (h("span", { class: `${mergedClsPrefix}-input__separator` }, $slots.separator ? $slots.separator() : this.separator)) : null,
+            this.pair ? (h("span", { class: `${mergedClsPrefix}-input__separator` }, resolveSlot($slots.separator, () => [this.separator]))) : null,
             this.pair ? (h("div", { class: `${mergedClsPrefix}-input-wrapper` },
                 h("div", { class: `${mergedClsPrefix}-input__input` },
                     h("input", { ref: "inputEl2Ref", type: this.type, class: `${mergedClsPrefix}-input__input-el`, tabindex: this.passivelyActivated && !this.activated ? -1 : undefined, placeholder: this.mergedPlaceholder[1], disabled: this.mergedDisabled, maxlength: this.maxlength, minlength: this.minlength, value: Array.isArray(this.mergedValue)
@@ -784,11 +788,11 @@ export default defineComponent({
                     this.showPlaceholder2 ? (h("div", { class: `${mergedClsPrefix}-input__placeholder` },
                         h("span", null, this.mergedPlaceholder[1]))) : null),
                 h("div", { class: `${mergedClsPrefix}-input__suffix` }, [
-                    this.clearable || $slots.clear ? (h(NBaseClear, { clsPrefix: mergedClsPrefix, show: this.showClearButton, onClear: this.handleClear }, { default: $slots.clear })) : null,
-                    (_d = $slots.suffix) === null || _d === void 0 ? void 0 : _d.call($slots)
+                    this.clearable && (h(NBaseClear, { clsPrefix: mergedClsPrefix, show: this.showClearButton, onClear: this.handleClear }, { default: () => { var _a; return (_a = $slots.clear) === null || _a === void 0 ? void 0 : _a.call($slots); } })),
+                    (_c = $slots.suffix) === null || _c === void 0 ? void 0 : _c.call($slots)
                 ]))) : null,
             this.mergedBordered ? (h("div", { class: `${mergedClsPrefix}-input__border` })) : null,
             this.mergedBordered ? (h("div", { class: `${mergedClsPrefix}-input__state-border` })) : null,
-            this.showCount && this.type === 'textarea' ? (h(WordCount, null, { default: $slots.count })) : null));
+            this.showCount && this.type === 'textarea' ? (h(WordCount, null, { default: (props) => { var _a; return (_a = $slots.count) === null || _a === void 0 ? void 0 : _a.call($slots, props); } })) : null));
     }
 });

package/es/input/src/InputGroup.js

@@ -7,7 +7,7 @@ export default defineComponent({
     props: inputGroupProps,
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
-        useStyle('InputGroup', style, mergedClsPrefixRef);
+        useStyle('-input-group', style, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef
         };

package/es/input/src/InputGroupLabel.js

@@ -15,7 +15,7 @@ export default defineComponent({
     props: inputGroupLabelProps,
     setup(props) {
         const { mergedBorderedRef, mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Input', 'InputGroupLabel', style, inputLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Input', '-input-group-label', style, inputLight, props, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             mergedBordered: mergedBorderedRef,

package/es/input/src/WordCount.js

@@ -1,4 +1,5 @@
 import { defineComponent, inject, h, computed } from 'vue';
+import { resolveSlotWithProps } from '../../_utils';
 import { inputInjectionKey } from './interface';
 import { len } from './utils';
 export default defineComponent({
@@ -16,15 +17,15 @@ export default defineComponent({
         return () => {
             const { value: maxlength } = maxlengthRef;
             const { value: mergedValue } = mergedValueRef;
-            return (h("span", { class: `${mergedClsPrefixRef.value}-input-word-count` }, slots.default
-                ? slots.default({
-                    value: mergedValue === null || Array.isArray(mergedValue)
-                        ? ''
-                        : mergedValue
-                })
-                : maxlength === undefined
+            return (h("span", { class: `${mergedClsPrefixRef.value}-input-word-count` }, resolveSlotWithProps(slots.default, {
+                value: mergedValue === null || Array.isArray(mergedValue)
+                    ? ''
+                    : mergedValue
+            }, () => [
+                maxlength === undefined
                     ? wordCountRef.value
-                    : `${wordCountRef.value} / ${maxlength}`));
+                    : `${wordCountRef.value} / ${maxlength}`
+            ])));
         };
     }
 });

package/es/input/src/styles/input.cssr.js

@@ -1,4 +1,4 @@
-import { cB, c, cE, cM, cNotM, insideFormItem } from '../../../_utils/cssr'; // vars:
+import { cB, c, cE, cM, cNotM } from '../../../_utils/cssr'; // vars:
 // --n-bezier
 // --n-color
 // --n-font-size
@@ -33,7 +33,7 @@ import { cB, c, cE, cM, cNotM, insideFormItem } from '../../../_utils/cssr'; //
 // --n-loading-color
 // ...form item vars
 
-export default c([cB('input', `
+export default cB('input', `
  max-width: 100%;
  cursor: text;
  line-height: 1.5;
@@ -47,7 +47,7 @@ export default c([cB('input', `
  transition: background-color .3s var(--n-bezier);
  font-size: var(--n-font-size);
  --n-padding-vertical: calc((var(--n-height) - 1.5 * var(--n-font-size)) / 2);
- `, [// common
+`, [// common
 cE('input, textarea', `
  overflow: hidden;
  flex-grow: 1;
@@ -241,7 +241,7 @@ cM('pair', [cE('input-el, placeholder', 'text-align: center;'), cE('separator',
  transition: color .3s var(--n-bezier);
  margin-left: 4px;
  font-variant: tabular-nums;
- `)]), ['warning', 'error'].map(status => insideFormItem(status, cB('input', [cNotM('disabled', [cB('base-loading', `
+ `), ['warning', 'error'].map(status => cM(`${status}-status`, [cNotM('disabled', [cB('base-loading', `
  color: var(--n-loading-color-${status})
  `), cE('input-el, textarea-el', `
  caret-color: var(--n-caret-color-${status});
@@ -259,4 +259,4 @@ cM('pair', [cE('input-el, placeholder', 'text-align: center;'), cE('separator',
  `, [cE('state-border', `
  box-shadow: var(--n-box-shadow-focus-${status});
  border: var(--n-border-focus-${status});
- `)])])])))]);
+ `)])])]))]);