naive-ui 2.24.6 → 2.25.2

package/es/_internal/selection/src/Selection.js

@@ -3,7 +3,7 @@ import { h, defineComponent, Fragment, ref, computed, watch, toRef, nextTick, wa
 import { VOverflow } from 'vueuc';
 import { NPopover } from '../../../popover';
 import { NTag } from '../../../tag';
-import { useTheme } from '../../../_mixins';
+import { useThemeClass, useTheme, emptyThemeClassHandle } from '../../../_mixins';
 import { createKey, getTitleAttribute, render } from '../../../_utils';
 import Suffix from '../../suffix';
 import { internalSelectionLight } from '../styles';
@@ -18,7 +18,7 @@ export default defineComponent({
             default: undefined
         }, active: Boolean, pattern: {
             type: String,
-            default: null
+            default: ''
         }, placeholder: String, selectedOption: {
             type: Object,
             default: null
@@ -31,7 +31,7 @@ export default defineComponent({
         }, loading: Boolean, autofocus: Boolean, showArrow: {
             type: Boolean,
             default: true
-        }, inputProps: Object, focused: Boolean, renderTag: Function, onKeyup: Function, onKeydown: Function, onClick: Function, onBlur: Function, onFocus: Function, onDeleteOption: Function, maxTagCount: [String, Number], onClear: Function, onPatternInput: Function, renderLabel: Function }),
+        }, inputProps: Object, focused: Boolean, renderTag: Function, onKeyup: Function, onKeydown: Function, onClick: Function, onBlur: Function, onFocus: Function, onDeleteOption: Function, maxTagCount: [String, Number], onClear: Function, onPatternInput: Function, onPatternFocus: Function, onPatternBlur: Function, renderLabel: Function, status: String, disableInlineTheme: Boolean }),
     setup(props) {
         const patternInputMirrorRef = ref(null);
         const patternInputRef = ref(null);
@@ -46,7 +46,7 @@ export default defineComponent({
         const showTagsPopoverRef = ref(false);
         const patternInputFocusedRef = ref(false);
         const hoverRef = ref(false);
-        const themeRef = useTheme('InternalSelection', 'InternalSelection', style, internalSelectionLight, props, toRef(props, 'clsPrefix'));
+        const themeRef = useTheme('InternalSelection', '-internal-selection', style, internalSelectionLight, props, toRef(props, 'clsPrefix'));
         const mergedClearableRef = computed(() => {
             return (props.clearable && !props.disabled && (hoverRef.value || props.active));
         });
@@ -166,7 +166,7 @@ export default defineComponent({
             doDeleteOption(option);
         }
         function handlePatternKeyDown(e) {
-            if (e.code === 'Backspace') {
+            if (e.code === 'Backspace' && !isCompositingRef.value) {
                 if (!props.pattern.length) {
                     const { selectedOptions } = props;
                     if (selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions.length) {
@@ -202,11 +202,15 @@ export default defineComponent({
             doPatternInput(cachedInputEvent);
             cachedInputEvent = null;
         }
-        function handlePatternInputFocus() {
+        function handlePatternInputFocus(e) {
+            var _a;
             patternInputFocusedRef.value = true;
+            (_a = props.onPatternFocus) === null || _a === void 0 ? void 0 : _a.call(props, e);
         }
         function handlePatternInputBlur(e) {
+            var _a;
             patternInputFocusedRef.value = false;
+            (_a = props.onPatternBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
         }
         function blur() {
             var _a, _b;
@@ -294,15 +298,76 @@ export default defineComponent({
                     props.disabled || patternInputFocusedRef.value ? -1 : 0;
             });
         });
-        return {
-            mergedTheme: themeRef,
-            mergedClearable: mergedClearableRef,
-            patternInputFocused: patternInputFocusedRef,
-            filterablePlaceholder: filterablePlaceholderRef,
-            label: labelRef,
-            selected: selectedRef,
-            showTagsPanel: showTagsPopoverRef,
-            isCompositing: isCompositingRef,
+        const { disableInlineTheme } = props;
+        const cssVarsRef = computed(() => {
+            const { size } = props;
+            const { common: { cubicBezierEaseInOut }, self: { borderRadius, color, placeholderColor, textColor, paddingSingle, paddingMultiple, caretColor, colorDisabled, textColorDisabled, placeholderColorDisabled, colorActive, boxShadowFocus, boxShadowActive, boxShadowHover, border, borderFocus, borderHover, borderActive, arrowColor, arrowColorDisabled, loadingColor, 
+            // form warning
+            colorActiveWarning, boxShadowFocusWarning, boxShadowActiveWarning, boxShadowHoverWarning, borderWarning, borderFocusWarning, borderHoverWarning, borderActiveWarning, 
+            // form error
+            colorActiveError, boxShadowFocusError, boxShadowActiveError, boxShadowHoverError, borderError, borderFocusError, borderHoverError, borderActiveError, 
+            // clear
+            clearColor, clearColorHover, clearColorPressed, clearSize, 
+            // arrow
+            arrowSize, [createKey('height', size)]: height, [createKey('fontSize', size)]: fontSize } } = themeRef.value;
+            return {
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-border': border,
+                '--n-border-active': borderActive,
+                '--n-border-focus': borderFocus,
+                '--n-border-hover': borderHover,
+                '--n-border-radius': borderRadius,
+                '--n-box-shadow-active': boxShadowActive,
+                '--n-box-shadow-focus': boxShadowFocus,
+                '--n-box-shadow-hover': boxShadowHover,
+                '--n-caret-color': caretColor,
+                '--n-color': color,
+                '--n-color-active': colorActive,
+                '--n-color-disabled': colorDisabled,
+                '--n-font-size': fontSize,
+                '--n-height': height,
+                '--n-padding-single': paddingSingle,
+                '--n-padding-multiple': paddingMultiple,
+                '--n-placeholder-color': placeholderColor,
+                '--n-placeholder-color-disabled': placeholderColorDisabled,
+                '--n-text-color': textColor,
+                '--n-text-color-disabled': textColorDisabled,
+                '--n-arrow-color': arrowColor,
+                '--n-arrow-color-disabled': arrowColorDisabled,
+                '--n-loading-color': loadingColor,
+                // form warning
+                '--n-color-active-warning': colorActiveWarning,
+                '--n-box-shadow-focus-warning': boxShadowFocusWarning,
+                '--n-box-shadow-active-warning': boxShadowActiveWarning,
+                '--n-box-shadow-hover-warning': boxShadowHoverWarning,
+                '--n-border-warning': borderWarning,
+                '--n-border-focus-warning': borderFocusWarning,
+                '--n-border-hover-warning': borderHoverWarning,
+                '--n-border-active-warning': borderActiveWarning,
+                // form error
+                '--n-color-active-error': colorActiveError,
+                '--n-box-shadow-focus-error': boxShadowFocusError,
+                '--n-box-shadow-active-error': boxShadowActiveError,
+                '--n-box-shadow-hover-error': boxShadowHoverError,
+                '--n-border-error': borderError,
+                '--n-border-focus-error': borderFocusError,
+                '--n-border-hover-error': borderHoverError,
+                '--n-border-active-error': borderActiveError,
+                // clear
+                '--n-clear-size': clearSize,
+                '--n-clear-color': clearColor,
+                '--n-clear-color-hover': clearColorHover,
+                '--n-clear-color-pressed': clearColorPressed,
+                // arrow-size
+                '--n-arrow-size': arrowSize
+            };
+        });
+        const themeClassHandle = disableInlineTheme
+            ? useThemeClass('internal-selection', computed(() => {
+                return props.size[0];
+            }), cssVarsRef, props)
+            : emptyThemeClassHandle;
+        return Object.assign({ mergedTheme: themeRef, mergedClearable: mergedClearableRef, patternInputFocused: patternInputFocusedRef, filterablePlaceholder: filterablePlaceholderRef, label: labelRef, selected: selectedRef, showTagsPanel: showTagsPopoverRef, isCompositing: isCompositingRef, 
             // dom ref
             counterRef,
             counterWrapperRef,
@@ -336,75 +401,11 @@ export default defineComponent({
             blurInput,
             updateCounter,
             getCounter,
-            getTail,
-            renderLabel: props.renderLabel,
-            cssVars: computed(() => {
-                const { size } = props;
-                const { common: { cubicBezierEaseInOut }, self: { borderRadius, color, placeholderColor, textColor, paddingSingle, paddingMultiple, caretColor, colorDisabled, textColorDisabled, placeholderColorDisabled, colorActive, boxShadowFocus, boxShadowActive, boxShadowHover, border, borderFocus, borderHover, borderActive, arrowColor, arrowColorDisabled, loadingColor, 
-                // form warning
-                colorActiveWarning, boxShadowFocusWarning, boxShadowActiveWarning, boxShadowHoverWarning, borderWarning, borderFocusWarning, borderHoverWarning, borderActiveWarning, 
-                // form error
-                colorActiveError, boxShadowFocusError, boxShadowActiveError, boxShadowHoverError, borderError, borderFocusError, borderHoverError, borderActiveError, 
-                // clear
-                clearColor, clearColorHover, clearColorPressed, clearSize, 
-                // arrow
-                arrowSize, [createKey('height', size)]: height, [createKey('fontSize', size)]: fontSize } } = themeRef.value;
-                return {
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-border': border,
-                    '--n-border-active': borderActive,
-                    '--n-border-focus': borderFocus,
-                    '--n-border-hover': borderHover,
-                    '--n-border-radius': borderRadius,
-                    '--n-box-shadow-active': boxShadowActive,
-                    '--n-box-shadow-focus': boxShadowFocus,
-                    '--n-box-shadow-hover': boxShadowHover,
-                    '--n-caret-color': caretColor,
-                    '--n-color': color,
-                    '--n-color-active': colorActive,
-                    '--n-color-disabled': colorDisabled,
-                    '--n-font-size': fontSize,
-                    '--n-height': height,
-                    '--n-padding-single': paddingSingle,
-                    '--n-padding-multiple': paddingMultiple,
-                    '--n-placeholder-color': placeholderColor,
-                    '--n-placeholder-color-disabled': placeholderColorDisabled,
-                    '--n-text-color': textColor,
-                    '--n-text-color-disabled': textColorDisabled,
-                    '--n-arrow-color': arrowColor,
-                    '--n-arrow-color-disabled': arrowColorDisabled,
-                    '--n-loading-color': loadingColor,
-                    // form warning
-                    '--n-color-active-warning': colorActiveWarning,
-                    '--n-box-shadow-focus-warning': boxShadowFocusWarning,
-                    '--n-box-shadow-active-warning': boxShadowActiveWarning,
-                    '--n-box-shadow-hover-warning': boxShadowHoverWarning,
-                    '--n-border-warning': borderWarning,
-                    '--n-border-focus-warning': borderFocusWarning,
-                    '--n-border-hover-warning': borderHoverWarning,
-                    '--n-border-active-warning': borderActiveWarning,
-                    // form error
-                    '--n-color-active-error': colorActiveError,
-                    '--n-box-shadow-focus-error': boxShadowFocusError,
-                    '--n-box-shadow-active-error': boxShadowActiveError,
-                    '--n-box-shadow-hover-error': boxShadowHoverError,
-                    '--n-border-error': borderError,
-                    '--n-border-focus-error': borderFocusError,
-                    '--n-border-hover-error': borderHoverError,
-                    '--n-border-active-error': borderActiveError,
-                    // clear
-                    '--n-clear-size': clearSize,
-                    '--n-clear-color': clearColor,
-                    '--n-clear-color-hover': clearColorHover,
-                    '--n-clear-color-pressed': clearColorPressed,
-                    // arrow-size
-                    '--n-arrow-size': arrowSize
-                };
-            })
-        };
+            getTail, renderLabel: props.renderLabel, cssVars: disableInlineTheme ? undefined : cssVarsRef }, themeClassHandle);
     },
     render() {
-        const { multiple, size, disabled, filterable, maxTagCount, bordered, clsPrefix, renderTag, renderLabel } = this;
+        const { status, multiple, size, disabled, filterable, maxTagCount, bordered, clsPrefix, onRender, renderTag, renderLabel } = this;
+        onRender === null || onRender === void 0 ? void 0 : onRender();
         const maxTagCountResponsive = maxTagCount === 'responsive';
         const maxTagCountNumeric = typeof maxTagCount === 'number';
         const useMaxTagCount = maxTagCountResponsive || maxTagCountNumeric;
@@ -426,18 +427,18 @@ export default defineComponent({
                 : this.selectedOptions).map(createTag);
             const input = filterable ? (h("div", { class: `${clsPrefix}-base-selection-input-tag`, ref: "inputTagElRef", key: "__input-tag__" },
                 h("input", Object.assign({}, this.inputProps, { ref: "patternInputRef", tabindex: -1, disabled: disabled, value: this.pattern, autofocus: this.autofocus, class: `${clsPrefix}-base-selection-input-tag__input`, onBlur: this.handlePatternInputBlur, onFocus: this.handlePatternInputFocus, onKeydown: this.handlePatternKeyDown, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd })),
-                h("span", { ref: "patternInputMirrorRef", class: `${clsPrefix}-base-selection-input-tag__mirror` }, this.pattern ? this.pattern : ''))) : null;
+                h("span", { ref: "patternInputMirrorRef", class: `${clsPrefix}-base-selection-input-tag__mirror` }, this.pattern))) : null;
             // May Overflow
             const renderCounter = maxTagCountResponsive
                 ? () => (h("div", { class: `${clsPrefix}-base-selection-tag-wrapper`, ref: "counterWrapperRef" },
-                    h(NTag, { ref: "counterRef", onMouseenter: this.handleMouseEnterCounter, onMouseleave: this.handleMouseLeaveCounter, disabled: disabled })))
+                    h(NTag, { size: size, ref: "counterRef", onMouseenter: this.handleMouseEnterCounter, onMouseleave: this.handleMouseLeaveCounter, disabled: disabled })))
                 : undefined;
             let counter;
             if (maxTagCountNumeric) {
                 const rest = this.selectedOptions.length - maxTagCount;
                 if (rest > 0) {
                     counter = (h("div", { class: `${clsPrefix}-base-selection-tag-wrapper`, key: "__counter__" },
-                        h(NTag, { ref: "counterRef", onMouseenter: this.handleMouseEnterCounter, disabled: disabled }, {
+                        h(NTag, { size: size, ref: "counterRef", onMouseenter: this.handleMouseEnterCounter, disabled: disabled }, {
                             default: () => `+${rest}`
                         })));
                 }
@@ -475,7 +476,12 @@ export default defineComponent({
                     themeOverrides: this.mergedTheme.peerOverrides.Popover
                 }
                 : null;
-            const placeholder = !this.selected && !this.pattern && !this.isCompositing ? (h("div", { class: `${clsPrefix}-base-selection-placeholder ${clsPrefix}-base-selection-overlay` }, this.placeholder)) : null;
+            const showPlaceholder = this.selected
+                ? false
+                : this.active
+                    ? !this.pattern && !this.isCompositing
+                    : true;
+            const placeholder = showPlaceholder ? (h("div", { class: `${clsPrefix}-base-selection-placeholder ${clsPrefix}-base-selection-overlay` }, this.placeholder)) : null;
             if (filterable) {
                 const popoverTrigger = (h("div", { ref: "patternInputWrapperRef", class: `${clsPrefix}-base-selection-tags` },
                     tags,
@@ -502,13 +508,12 @@ export default defineComponent({
         }
         else {
             if (filterable) {
-                const showPlaceholder = !this.pattern &&
-                    (this.active || !this.selected) &&
-                    !this.isCompositing;
+                const hasInput = this.pattern || this.isCompositing;
+                const showPlaceholder = this.active ? !hasInput : !this.selected;
+                const showSelectedLabel = this.active ? false : this.selected;
                 body = (h("div", { ref: "patternInputWrapperRef", class: `${clsPrefix}-base-selection-label` },
-                    h("input", Object.assign({}, this.inputProps, { ref: "patternInputRef", class: `${clsPrefix}-base-selection-input`, value: this.patternInputFocused && this.active ? this.pattern : '', placeholder: "", readonly: disabled, disabled: disabled, tabindex: -1, autofocus: this.autofocus, onFocus: this.handlePatternInputFocus, onBlur: this.handlePatternInputBlur, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd })),
-                    showPlaceholder ? null : this.patternInputFocused &&
-                        this.active ? null : (h("div", { class: `${clsPrefix}-base-selection-label__render-label ${clsPrefix}-base-selection-overlay`, key: "input" },
+                    h("input", Object.assign({}, this.inputProps, { ref: "patternInputRef", class: `${clsPrefix}-base-selection-input`, value: this.active ? this.pattern : '', placeholder: "", readonly: disabled, disabled: disabled, tabindex: -1, autofocus: this.autofocus, onFocus: this.handlePatternInputFocus, onBlur: this.handlePatternInputBlur, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd })),
+                    showSelectedLabel ? (h("div", { class: `${clsPrefix}-base-selection-label__render-label ${clsPrefix}-base-selection-overlay`, key: "input" },
                         h("div", { class: `${clsPrefix}-base-selection-overlay__wrapper` }, renderTag
                             ? renderTag({
                                 option: this.selectedOption,
@@ -516,7 +521,7 @@ export default defineComponent({
                             })
                             : renderLabel
                                 ? renderLabel(this.selectedOption, true)
-                                : render(this.label, this.selectedOption, true)))),
+                                : render(this.label, this.selectedOption, true)))) : null,
                     showPlaceholder ? (h("div", { class: `${clsPrefix}-base-selection-placeholder ${clsPrefix}-base-selection-overlay`, key: "placeholder" },
                         h("div", { class: `${clsPrefix}-base-selection-overlay__wrapper` }, this.filterablePlaceholder))) : null,
                     suffix));
@@ -537,6 +542,8 @@ export default defineComponent({
         }
         return (h("div", { ref: "selfRef", class: [
                 `${clsPrefix}-base-selection`,
+                this.themeClass,
+                status && `${clsPrefix}-base-selection--${status}-status`,
                 {
                     [`${clsPrefix}-base-selection--active`]: this.active,
                     [`${clsPrefix}-base-selection--selected`]: this.selected || (this.active && this.pattern),

package/es/_internal/selection/src/interface.d.ts

@@ -1,6 +1,6 @@
 import { VNodeChild } from 'vue';
-import type { SelectBaseOption } from '../../../select/src/interface';
+import type { SelectOption } from '../../../select/src/interface';
 export declare type RenderTag = (props: {
-    option: SelectBaseOption;
+    option: SelectOption;
     handleClose: () => void;
 }) => VNodeChild;

package/es/_internal/selection/src/styles/index.cssr.js

@@ -1,4 +1,4 @@
-import { c, cB, cE, cM, cNotM, insideFormItem } from '../../../../_utils/cssr'; // vars:
+import { c, cB, cE, cM, cNotM } from '../../../../_utils/cssr'; // vars:
 // --n-bezier
 // --n-border
 // --n-border-active
@@ -40,9 +40,7 @@ export default c([cB('base-selection', `
  font-size: var(--n-font-size);
  `, [cB('base-loading', `
  color: var(--n-loading-color);
- `), cB('base-selection-tags', {
-  minHeight: 'var(--n-height)'
-}), cE('border, state-border', `
+ `), cB('base-selection-tags', 'min-height: var(--n-height);'), cE('border, state-border', `
  position: absolute;
  left: 0;
  right: 0;
@@ -148,13 +146,7 @@ export default c([cB('base-selection', `
  `)]), cM('active', [cE('state-border', `
  box-shadow: var(--n-box-shadow-active);
  border: var(--n-border-active);
- `), cB('base-selection-label', {
-  backgroundColor: 'var(--n-color-active)'
-}), cB('base-selection-tags', {
-  backgroundColor: 'var(--n-color-active)'
-})])]), cM('disabled', {
-  cursor: 'not-allowed'
-}, [cE('arrow', `
+ `), cB('base-selection-label', 'background-color: var(--n-color-active);'), cB('base-selection-tags', 'background-color: var(--n-color-active);')])]), cM('disabled', 'cursor: not-allowed;', [cE('arrow', `
  color: var(--n-arrow-color-disabled);
  `), cB('base-selection-label', `
  cursor: not-allowed;
@@ -200,7 +192,16 @@ export default c([cB('base-selection', `
  visibility: hidden;
  user-select: none;
  opacity: 0;
- `)])]), cB('base-selection-popover', `
+ `)]), ['warning', 'error'].map(status => cM(`${status}-status`, [cE('state-border', `border: var(--n-border-${status});`), cNotM('disabled', [c('&:hover', [cE('state-border', `
+ box-shadow: var(--n-box-shadow-hover-${status});
+ border: var(--n-border-hover-${status});
+ `)]), cM('active', [cE('state-border', `
+ box-shadow: var(--n-box-shadow-active-${status});
+ border: var(--n-border-active-${status});
+ `), cB('base-selection-label', `background-color: var(--n-color-active-${status});`), cB('base-selection-tags', `background-color: var(--n-color-active-${status});`)]), cM('focus', [cE('state-border', `
+ box-shadow: var(--n-box-shadow-focus-${status});
+ border: var(--n-border-focus-${status});
+ `)])])]))]), cB('base-selection-popover', `
  margin-bottom: -3px;
  display: flex;
  flex-wrap: wrap;
@@ -208,27 +209,11 @@ export default c([cB('base-selection', `
  max-width: 100%;
  display: inline-flex;
  padding: 0 7px 3px 0;
- `, [c('&:last-child', {
-  paddingRight: 0
-}), cB('tag', `
+ `, [c('&:last-child', 'padding-right: 0;'), cB('tag', `
  font-size: 14px;
  max-width: 100%;
  `, [cE('content', `
+ line-height: 1.25;
  text-overflow: ellipsis;
  overflow: hidden;
- `)])]), ['warning', 'error'].map(status => insideFormItem(status, cB('base-selection', [cE('state-border', {
-  border: `var(--n-border-${status})`
-}), cNotM('disabled', [c('&:hover', [cE('state-border', `
- box-shadow: var(--n-box-shadow-hover-${status});
- border: var(--n-border-hover-${status});
- `)]), cM('active', [cE('state-border', `
- box-shadow: var(--n-box-shadow-active-${status});
- border: var(--n-border-active-${status});
- `), cB('base-selection-label', {
-  backgroundColor: `var(--n-color-active-${status})`
-}), cB('base-selection-tags', {
-  backgroundColor: `var(--n-box-shadow-active-${status})`
-})]), cM('focus', [cE('state-border', `
- box-shadow: var(--n-box-shadow-focus-${status});
- border: var(--n-border-focus-${status});
- `)])])])))]);
+ `)])])]);

package/es/_internal/selection/styles/dark.js

@@ -22,19 +22,19 @@ const internalSelectionDark = {
             // default
             textColor: textColor2, textColorDisabled,
             placeholderColor,
-            placeholderColorDisabled, color: inputColor, colorDisabled: inputColorDisabled, colorActive: changeColor(primaryColor, { alpha: 0.1 }), border: '1px solid #0000', borderHover: `1px solid ${primaryColorHover}`, borderActive: `1px solid ${primaryColor}`, borderFocus: `1px solid ${primaryColorHover}`, boxShadowHover: null, boxShadowActive: `0 0 8px 0 ${changeColor(primaryColor, {
+            placeholderColorDisabled, color: inputColor, colorDisabled: inputColorDisabled, colorActive: changeColor(primaryColor, { alpha: 0.1 }), border: '1px solid #0000', borderHover: `1px solid ${primaryColorHover}`, borderActive: `1px solid ${primaryColor}`, borderFocus: `1px solid ${primaryColorHover}`, boxShadowHover: 'none', boxShadowActive: `0 0 8px 0 ${changeColor(primaryColor, {
                 alpha: 0.4
             })}`, boxShadowFocus: `0 0 8px 0 ${changeColor(primaryColor, {
                 alpha: 0.4
             })}`, caretColor: primaryColor, arrowColor: iconColor, arrowColorDisabled: iconColorDisabled, loadingColor: primaryColor, 
             // warning
-            borderWarning: `1px solid ${warningColor}`, borderHoverWarning: `1px solid ${warningColorHover}`, borderActiveWarning: `1px solid ${warningColor}`, borderFocusWarning: `1px solid ${warningColorHover}`, boxShadowHoverWarning: null, boxShadowActiveWarning: `0 0 8px 0 ${changeColor(warningColor, {
+            borderWarning: `1px solid ${warningColor}`, borderHoverWarning: `1px solid ${warningColorHover}`, borderActiveWarning: `1px solid ${warningColor}`, borderFocusWarning: `1px solid ${warningColorHover}`, boxShadowHoverWarning: 'none', boxShadowActiveWarning: `0 0 8px 0 ${changeColor(warningColor, {
                 alpha: 0.4
             })}`, boxShadowFocusWarning: `0 0 8px 0 ${changeColor(warningColor, {
                 alpha: 0.4
             })}`, colorActiveWarning: changeColor(warningColor, { alpha: 0.1 }), caretColorWarning: warningColor, 
             // error
-            borderError: `1px solid ${errorColor}`, borderHoverError: `1px solid ${errorColorHover}`, borderActiveError: `1px solid ${errorColor}`, borderFocusError: `1px solid ${errorColorHover}`, boxShadowHoverError: null, boxShadowActiveError: `0 0 8px 0 ${changeColor(errorColor, {
+            borderError: `1px solid ${errorColor}`, borderHoverError: `1px solid ${errorColorHover}`, borderActiveError: `1px solid ${errorColor}`, borderFocusError: `1px solid ${errorColorHover}`, boxShadowHoverError: 'none', boxShadowActiveError: `0 0 8px 0 ${changeColor(errorColor, {
                 alpha: 0.4
             })}`, boxShadowFocusError: `0 0 8px 0 ${changeColor(errorColor, {
                 alpha: 0.4

package/es/_internal/selection/styles/light.d.ts

@@ -20,7 +20,7 @@ declare const self: (vars: ThemeCommonVars) => {
     borderHover: string;
     borderActive: string;
     borderFocus: string;
-    boxShadowHover: null;
+    boxShadowHover: string;
     boxShadowActive: string;
     boxShadowFocus: string;
     caretColor: string;
@@ -31,7 +31,7 @@ declare const self: (vars: ThemeCommonVars) => {
     borderHoverWarning: string;
     borderActiveWarning: string;
     borderFocusWarning: string;
-    boxShadowHoverWarning: null;
+    boxShadowHoverWarning: string;
     boxShadowActiveWarning: string;
     boxShadowFocusWarning: string;
     colorActiveWarning: string;
@@ -40,7 +40,7 @@ declare const self: (vars: ThemeCommonVars) => {
     borderHoverError: string;
     borderActiveError: string;
     borderFocusError: string;
-    boxShadowHoverError: null;
+    boxShadowHoverError: string;
     boxShadowActiveError: string;
     boxShadowFocusError: string;
     colorActiveError: string;
@@ -75,7 +75,7 @@ declare const internalSelectionLight: import("../../../_mixins").Theme<"Internal
     borderHover: string;
     borderActive: string;
     borderFocus: string;
-    boxShadowHover: null;
+    boxShadowHover: string;
     boxShadowActive: string;
     boxShadowFocus: string;
     caretColor: string;
@@ -86,7 +86,7 @@ declare const internalSelectionLight: import("../../../_mixins").Theme<"Internal
     borderHoverWarning: string;
     borderActiveWarning: string;
     borderFocusWarning: string;
-    boxShadowHoverWarning: null;
+    boxShadowHoverWarning: string;
     boxShadowActiveWarning: string;
     boxShadowFocusWarning: string;
     colorActiveWarning: string;
@@ -95,7 +95,7 @@ declare const internalSelectionLight: import("../../../_mixins").Theme<"Internal
     borderHoverError: string;
     borderActiveError: string;
     borderFocusError: string;
-    boxShadowHoverError: null;
+    boxShadowHoverError: string;
     boxShadowActiveError: string;
     boxShadowFocusError: string;
     colorActiveError: string;

package/es/_internal/selection/styles/light.js

@@ -17,19 +17,19 @@ const self = (vars) => {
         // default
         textColor: textColor2, textColorDisabled,
         placeholderColor,
-        placeholderColorDisabled, color: inputColor, colorDisabled: inputColorDisabled, colorActive: inputColor, border: `1px solid ${borderColor}`, borderHover: `1px solid ${primaryColorHover}`, borderActive: `1px solid ${primaryColor}`, borderFocus: `1px solid ${primaryColorHover}`, boxShadowHover: null, boxShadowActive: `0 0 0 2px ${changeColor(primaryColor, {
+        placeholderColorDisabled, color: inputColor, colorDisabled: inputColorDisabled, colorActive: inputColor, border: `1px solid ${borderColor}`, borderHover: `1px solid ${primaryColorHover}`, borderActive: `1px solid ${primaryColor}`, borderFocus: `1px solid ${primaryColorHover}`, boxShadowHover: 'none', boxShadowActive: `0 0 0 2px ${changeColor(primaryColor, {
             alpha: 0.2
         })}`, boxShadowFocus: `0 0 0 2px ${changeColor(primaryColor, {
             alpha: 0.2
         })}`, caretColor: primaryColor, arrowColor: iconColor, arrowColorDisabled: iconColorDisabled, loadingColor: primaryColor, 
         // warning
-        borderWarning: `1px solid ${warningColor}`, borderHoverWarning: `1px solid ${warningColorHover}`, borderActiveWarning: `1px solid ${warningColor}`, borderFocusWarning: `1px solid ${warningColorHover}`, boxShadowHoverWarning: null, boxShadowActiveWarning: `0 0 0 2px ${changeColor(warningColor, {
+        borderWarning: `1px solid ${warningColor}`, borderHoverWarning: `1px solid ${warningColorHover}`, borderActiveWarning: `1px solid ${warningColor}`, borderFocusWarning: `1px solid ${warningColorHover}`, boxShadowHoverWarning: 'none', boxShadowActiveWarning: `0 0 0 2px ${changeColor(warningColor, {
             alpha: 0.2
         })}`, boxShadowFocusWarning: `0 0 0 2px ${changeColor(warningColor, {
             alpha: 0.2
         })}`, colorActiveWarning: inputColor, caretColorWarning: warningColor, 
         // error
-        borderError: `1px solid ${errorColor}`, borderHoverError: `1px solid ${errorColorHover}`, borderActiveError: `1px solid ${errorColor}`, borderFocusError: `1px solid ${errorColorHover}`, boxShadowHoverError: null, boxShadowActiveError: `0 0 0 2px ${changeColor(errorColor, {
+        borderError: `1px solid ${errorColor}`, borderHoverError: `1px solid ${errorColorHover}`, borderActiveError: `1px solid ${errorColor}`, borderFocusError: `1px solid ${errorColorHover}`, boxShadowHoverError: 'none', boxShadowActiveError: `0 0 0 2px ${changeColor(errorColor, {
             alpha: 0.2
         })}`, boxShadowFocusError: `0 0 0 2px ${changeColor(errorColor, {
             alpha: 0.2

package/es/_internal/slot-machine/src/SlotMachine.js

@@ -24,7 +24,7 @@ export default defineComponent({
         }
     },
     setup(props) {
-        useStyle('BaseSlotMachine', style, toRef(props, 'clsPrefix'));
+        useStyle('-base-slot-machine', style, toRef(props, 'clsPrefix'));
         const oldValueRef = ref();
         const newValueRef = ref();
         const numbersRef = computed(() => {

package/es/_internal/wave/src/Wave.js

@@ -10,7 +10,7 @@ export default defineComponent({
         }
     },
     setup(props) {
-        useStyle('BaseWave', style, toRef(props, 'clsPrefix'));
+        useStyle('-base-wave', style, toRef(props, 'clsPrefix'));
         const selfRef = ref(null);
         const activeRef = ref(false);
         let animationTimerId = null;

package/es/_mixins/index.d.ts

@@ -6,4 +6,4 @@ export { default as useLocale } from './use-locale';
 export { default as useStyle } from './use-style';
 export { default as useHljs } from './use-hljs';
 export type { Hljs } from './use-hljs';
-export { useCssVarsClass } from './use-css-vars-class';
+export { useThemeClass, emptyThemeClassHandle } from './use-css-vars-class';

package/es/_mixins/index.js

@@ -4,4 +4,4 @@ export { default as useConfig, defaultClsPrefix } from './use-config';
 export { default as useLocale } from './use-locale';
 export { default as useStyle } from './use-style';
 export { default as useHljs } from './use-hljs';
-export { useCssVarsClass } from './use-css-vars-class';
+export { useThemeClass, emptyThemeClassHandle } from './use-css-vars-class';

package/es/_mixins/use-config.js

@@ -1,5 +1,5 @@
 import { inject, computed } from 'vue';
-import { configProviderInjectionKey } from '../config-provider/src/ConfigProvider';
+import { configProviderInjectionKey } from '../config-provider/src/context';
 export const defaultClsPrefix = 'n';
 export default function useConfig(props = {}, options = {
     defaultBordered: true

package/es/_mixins/use-css-vars-class.d.ts

@@ -1,2 +1,11 @@
-import { Ref } from 'vue';
-export declare function useCssVarsClass(cssVarsRef: Ref<Record<string, string>>): Ref<string>;
+import { ComputedRef, Ref } from 'vue';
+export declare function useThemeClass(componentName: string, hashRef: Ref<string> | undefined, cssVarsRef: ComputedRef<Record<string, string>> | undefined, props: {
+    themeOverrides?: unknown;
+}): {
+    themeClass: Ref<string>;
+    onRender: () => void;
+};
+export declare const emptyThemeClassHandle: {
+    themeClass?: Ref<string>;
+    onRender?: () => void;
+};

package/es/_mixins/use-css-vars-class.js

@@ -1,22 +1,53 @@
-import { ref, watchEffect } from 'vue';
-import hash from '@emotion/hash';
+import { ref, inject, watchEffect } from 'vue';
+import { hash } from 'css-render';
+import { useSsrAdapter } from '@css-render/vue3-ssr';
+import { configProviderInjectionKey } from '../config-provider/src/context';
+import { throwError } from '../_utils';
 import { c } from '../_utils/cssr';
-// window.xxx = 0
-export function useCssVarsClass(cssVarsRef) {
-    const cssVarsClassRef = ref('');
-    watchEffect(() => {
-        // window.xxx -= performance.now()
-        const cssVars = cssVarsRef.value;
-        let style = '';
-        for (const key in cssVars) {
-            style += `${key}: ${cssVars[key]};`;
+export function useThemeClass(componentName, hashRef, cssVarsRef, props) {
+    var _a;
+    if (!cssVarsRef)
+        throwError('useThemeClass', 'cssVarsRef is not passed');
+    const mergedThemeHashRef = (_a = inject(configProviderInjectionKey, null)) === null || _a === void 0 ? void 0 : _a.mergedThemeHashRef;
+    const themeClassRef = ref('');
+    const ssrAdapter = useSsrAdapter();
+    let renderCallback;
+    const mountStyle = () => {
+        let finalThemeHash = componentName;
+        const hashValue = hashRef ? hashRef.value : undefined;
+        const themeHash = mergedThemeHashRef === null || mergedThemeHashRef === void 0 ? void 0 : mergedThemeHashRef.value;
+        if (themeHash)
+            finalThemeHash += '-' + themeHash;
+        if (hashValue)
+            finalThemeHash += '-' + hashValue;
+        if (props.themeOverrides) {
+            finalThemeHash += '-' + hash(JSON.stringify(props.themeOverrides));
         }
-        const styleHash = hash(style);
-        cssVarsClassRef.value = `c${styleHash}`;
-        c(`.c${styleHash}`, style).mount({
-            id: styleHash
-        });
-        // window.xxx += performance.now()
+        themeClassRef.value = finalThemeHash;
+        renderCallback = () => {
+            const cssVars = cssVarsRef.value;
+            let style = '';
+            for (const key in cssVars) {
+                style += `${key}: ${cssVars[key]};`;
+            }
+            c(`.${finalThemeHash}`, style).mount({
+                id: finalThemeHash,
+                ssr: ssrAdapter
+            });
+            renderCallback = undefined;
+        };
+    };
+    watchEffect(() => {
+        mountStyle();
     });
-    return cssVarsClassRef;
+    return {
+        themeClass: themeClassRef,
+        onRender: () => {
+            renderCallback === null || renderCallback === void 0 ? void 0 : renderCallback();
+        }
+    };
 }
+export const emptyThemeClassHandle = {
+    themeClass: undefined,
+    onRender: undefined
+};