naive-ui 2.25.2 → 2.25.3

package/es/switch/src/Switch.js

@@ -1,9 +1,9 @@
-import { h, ref, toRef, defineComponent, computed, Transition, watchEffect } from 'vue';
+import { h, ref, toRef, defineComponent, computed, watchEffect } from 'vue';
 import { depx, pxfy } from 'seemly';
 import { useMergedState } from 'vooks';
-import { useConfig, useFormItem, useTheme } from '../../_mixins';
-import { NBaseLoading } from '../../_internal';
-import { call, createKey, warnOnce } from '../../_utils';
+import { useConfig, useFormItem, useTheme, useThemeClass } from '../../_mixins';
+import { NBaseLoading, NIconSwitchTransition } from '../../_internal';
+import { call, createKey, warnOnce, isSlotEmpty, resolveWrappedSlot } from '../../_utils';
 import { switchLight } from '../styles';
 import style from './styles/index.cssr';
 const switchProps = Object.assign(Object.assign({}, useTheme.props), { size: {
@@ -41,7 +41,7 @@ export default defineComponent({
                 }
             });
         }
-        const { mergedClsPrefixRef } = useConfig(props);
+        const { mergedClsPrefixRef, inlineThemeDisabled } = useConfig(props);
         const themeRef = useTheme('Switch', '-switch', style, switchLight, props, mergedClsPrefixRef);
         const formItem = useFormItem(props);
         const { mergedSizeRef, mergedDisabledRef } = formItem;
@@ -81,15 +81,13 @@ export default defineComponent({
             nTriggerFormBlur();
         }
         function handleClick() {
-            if (props.loading)
+            if (props.loading || mergedDisabledRef.value)
                 return;
-            if (!mergedDisabledRef.value) {
-                if (mergedValueRef.value !== props.checkedValue) {
-                    doUpdateValue(props.checkedValue);
-                }
-                else {
-                    doUpdateValue(props.uncheckedValue);
-                }
+            if (mergedValueRef.value !== props.checkedValue) {
+                doUpdateValue(props.checkedValue);
+            }
+            else {
+                doUpdateValue(props.uncheckedValue);
             }
         }
         function handleFocus() {
@@ -102,21 +100,62 @@ export default defineComponent({
             pressedRef.value = false;
         }
         function handleKeyup(e) {
-            if (props.loading)
+            if (props.loading || mergedDisabledRef.value)
                 return;
             if (e.code === 'Space') {
-                doUpdateValue(!mergedValueRef.value);
+                if (mergedValueRef.value !== props.checkedValue) {
+                    doUpdateValue(props.checkedValue);
+                }
+                else {
+                    doUpdateValue(props.uncheckedValue);
+                }
                 pressedRef.value = false;
             }
         }
         function handleKeydown(e) {
-            if (props.loading)
+            if (props.loading || mergedDisabledRef.value)
                 return;
             if (e.code === 'Space') {
                 e.preventDefault();
                 pressedRef.value = true;
             }
         }
+        const cssVarsRef = computed(() => {
+            const { value: size } = mergedSizeRef;
+            const { self: { opacityDisabled, railColor, railColorActive, buttonBoxShadow, buttonColor, boxShadowFocus, loadingColor, textColor, iconColor, [createKey('buttonHeight', size)]: buttonHeight, [createKey('buttonWidth', size)]: buttonWidth, [createKey('buttonWidthPressed', size)]: buttonWidthPressed, [createKey('railHeight', size)]: railHeight, [createKey('railWidth', size)]: railWidth, [createKey('railBorderRadius', size)]: railBorderRadius, [createKey('buttonBorderRadius', size)]: buttonBorderRadius }, common: { cubicBezierEaseInOut } } = themeRef.value;
+            const offset = pxfy((depx(railHeight) - depx(buttonHeight)) / 2);
+            const height = pxfy(Math.max(depx(railHeight), depx(buttonHeight)));
+            const width = depx(railHeight) > depx(buttonHeight)
+                ? railWidth
+                : pxfy(depx(railWidth) + depx(buttonHeight) - depx(railHeight));
+            return {
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-button-border-radius': buttonBorderRadius,
+                '--n-button-box-shadow': buttonBoxShadow,
+                '--n-button-color': buttonColor,
+                '--n-button-width': buttonWidth,
+                '--n-button-width-pressed': buttonWidthPressed,
+                '--n-button-height': buttonHeight,
+                '--n-height': height,
+                '--n-offset': offset,
+                '--n-opacity-disabled': opacityDisabled,
+                '--n-rail-border-radius': railBorderRadius,
+                '--n-rail-color': railColor,
+                '--n-rail-color-active': railColorActive,
+                '--n-rail-height': railHeight,
+                '--n-rail-width': railWidth,
+                '--n-width': width,
+                '--n-box-shadow-focus': boxShadowFocus,
+                '--n-loading-color': loadingColor,
+                '--n-text-color': textColor,
+                '--n-icon-color': iconColor
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? useThemeClass('switch', computed(() => {
+                return mergedSizeRef.value[0];
+            }), cssVarsRef, props)
+            : undefined;
         return {
             handleClick,
             handleBlur,
@@ -129,43 +168,22 @@ export default defineComponent({
             mergedValue: mergedValueRef,
             checked: checkedRef,
             mergedDisabled: mergedDisabledRef,
-            cssVars: computed(() => {
-                const { value: size } = mergedSizeRef;
-                const { self: { opacityDisabled, railColor, railColorActive, buttonBoxShadow, buttonColor, boxShadowFocus, loadingColor, textColor, [createKey('buttonHeight', size)]: buttonHeight, [createKey('buttonWidth', size)]: buttonWidth, [createKey('buttonWidthPressed', size)]: buttonWidthPressed, [createKey('railHeight', size)]: railHeight, [createKey('railWidth', size)]: railWidth, [createKey('railBorderRadius', size)]: railBorderRadius, [createKey('buttonBorderRadius', size)]: buttonBorderRadius }, common: { cubicBezierEaseInOut } } = themeRef.value;
-                const offset = pxfy((depx(railHeight) - depx(buttonHeight)) / 2);
-                const height = pxfy(Math.max(depx(railHeight), depx(buttonHeight)));
-                const width = depx(railHeight) > depx(buttonHeight)
-                    ? railWidth
-                    : pxfy(depx(railWidth) + depx(buttonHeight) - depx(railHeight));
-                return {
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-button-border-radius': buttonBorderRadius,
-                    '--n-button-box-shadow': buttonBoxShadow,
-                    '--n-button-color': buttonColor,
-                    '--n-button-width': buttonWidth,
-                    '--n-button-width-pressed': buttonWidthPressed,
-                    '--n-button-height': buttonHeight,
-                    '--n-height': height,
-                    '--n-offset': offset,
-                    '--n-opacity-disabled': opacityDisabled,
-                    '--n-rail-border-radius': railBorderRadius,
-                    '--n-rail-color': railColor,
-                    '--n-rail-color-active': railColorActive,
-                    '--n-rail-height': railHeight,
-                    '--n-rail-width': railWidth,
-                    '--n-width': width,
-                    '--n-box-shadow-focus': boxShadowFocus,
-                    '--n-loading-color': loadingColor,
-                    '--n-text-color': textColor
-                };
-            })
+            cssVars: inlineThemeDisabled ? undefined : cssVarsRef,
+            themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass,
+            onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender
         };
     },
     render() {
-        const { mergedClsPrefix, mergedDisabled, checked, mergedRailStyle, $slots } = this;
-        const { checked: checkedSlot, unchecked: uncheckedSlot } = $slots;
+        const { mergedClsPrefix, mergedDisabled, checked, mergedRailStyle, onRender, $slots } = this;
+        onRender === null || onRender === void 0 ? void 0 : onRender();
+        const { checked: checkedSlot, unchecked: uncheckedSlot, icon: iconSlot, 'checked-icon': checkedIconSlot, 'unchecked-icon': uncheckedIconSlot } = $slots;
+        const hasIcon = !(isSlotEmpty(iconSlot) &&
+            isSlotEmpty(checkedIconSlot) &&
+            isSlotEmpty(uncheckedIconSlot));
         return (h("div", { role: "switch", "aria-checked": checked, class: [
                 `${mergedClsPrefix}-switch`,
+                this.themeClass,
+                hasIcon && `${mergedClsPrefix}-switch--icon`,
                 checked && `${mergedClsPrefix}-switch--active`,
                 mergedDisabled && `${mergedClsPrefix}-switch--disabled`,
                 this.round && `${mergedClsPrefix}-switch--round`,
@@ -173,18 +191,25 @@ export default defineComponent({
                 this.pressed && `${mergedClsPrefix}-switch--pressed`
             ], tabindex: !this.mergedDisabled ? 0 : undefined, style: this.cssVars, onClick: this.handleClick, onFocus: this.handleFocus, onBlur: this.handleBlur, onKeyup: this.handleKeyup, onKeydown: this.handleKeydown },
             h("div", { class: `${mergedClsPrefix}-switch__rail`, "aria-hidden": "true", style: mergedRailStyle },
-                (checkedSlot || uncheckedSlot) && (h("div", { "aria-hidden": true, class: `${mergedClsPrefix}-switch__children-placeholder` },
-                    h("div", { class: `${mergedClsPrefix}-switch__rail-placeholder` },
-                        h("div", { class: `${mergedClsPrefix}-switch__button-placeholder` }), checkedSlot === null || checkedSlot === void 0 ? void 0 :
-                        checkedSlot()),
-                    h("div", { class: `${mergedClsPrefix}-switch__rail-placeholder` },
-                        h("div", { class: `${mergedClsPrefix}-switch__button-placeholder` }), uncheckedSlot === null || uncheckedSlot === void 0 ? void 0 :
-                        uncheckedSlot()))),
+                resolveWrappedSlot(checkedSlot, (checkedSlotChildren) => resolveWrappedSlot(uncheckedSlot, (uncheckedSlotChildren) => {
+                    if (checkedSlotChildren || uncheckedSlotChildren) {
+                        return (h("div", { "aria-hidden": true, class: `${mergedClsPrefix}-switch__children-placeholder` },
+                            h("div", { class: `${mergedClsPrefix}-switch__rail-placeholder` },
+                                h("div", { class: `${mergedClsPrefix}-switch__button-placeholder` }),
+                                checkedSlotChildren),
+                            h("div", { class: `${mergedClsPrefix}-switch__rail-placeholder` },
+                                h("div", { class: `${mergedClsPrefix}-switch__button-placeholder` }),
+                                uncheckedSlotChildren)));
+                    }
+                    return null;
+                })),
                 h("div", { class: `${mergedClsPrefix}-switch__button` },
-                    h(Transition, { name: "fade-in-scale-up-transition" }, {
-                        default: () => this.loading ? (h(NBaseLoading, { key: "loading", clsPrefix: mergedClsPrefix, strokeWidth: 20 })) : null
-                    }),
-                    checkedSlot && (h("div", { key: "checked", class: `${mergedClsPrefix}-switch__checked` }, checkedSlot())),
-                    uncheckedSlot && (h("div", { key: "unchecked", class: `${mergedClsPrefix}-switch__unchecked` }, uncheckedSlot()))))));
+                    resolveWrappedSlot(iconSlot, (icon) => resolveWrappedSlot(checkedIconSlot, (checkedIcon) => resolveWrappedSlot(uncheckedIconSlot, (uncheckedIcon) => {
+                        return (h(NIconSwitchTransition, null, {
+                            default: () => this.loading ? (h(NBaseLoading, { key: "loading", clsPrefix: mergedClsPrefix, strokeWidth: 20 })) : this.checked && (checkedIcon || icon) ? (h("div", { class: `${mergedClsPrefix}-switch__button-icon`, key: checkedIcon ? 'checked-icon' : 'icon' }, checkedIcon || icon)) : !this.checked && (uncheckedIcon || icon) ? (h("div", { class: `${mergedClsPrefix}-switch__button-icon`, key: uncheckedIcon ? 'unchecked-icon' : 'icon' }, uncheckedIcon || icon)) : null
+                        }));
+                    }))),
+                    resolveWrappedSlot(checkedSlot, (children) => children && (h("div", { key: "checked", class: `${mergedClsPrefix}-switch__checked` }, children))),
+                    resolveWrappedSlot(uncheckedSlot, (children) => children && (h("div", { key: "unchecked", class: `${mergedClsPrefix}-switch__unchecked` }, children)))))));
     }
 });

package/es/switch/src/styles/index.cssr.js

@@ -1,4 +1,4 @@
-import fadeInScaleUpTransition from '../../../_styles/transitions/fade-in-scale-up.cssr';
+import iconSwitchTransition from '../../../_styles/transitions/icon-switch.cssr';
 import { c, cB, cE, cM, cNotM } from '../../../_utils/cssr'; // vars:
 // --n-bezier
 // --n-button-border-radius
@@ -17,6 +17,7 @@ import { c, cB, cE, cM, cNotM } from '../../../_utils/cssr'; // vars:
 // --n-box-shadow-focus
 // --n-loading-color
 // --n-text-color
+// --n-icon-color
 
 export default cB('switch', `
  height: var(--n-height);
@@ -48,7 +49,7 @@ export default cB('switch', `
  font-size: calc(var(--n-button-width) - 4px);
  color: var(--n-loading-color);
  transition: color .3s var(--n-bezier);
- `, [fadeInScaleUpTransition({
+ `, [iconSwitchTransition({
   originalTransform: 'translateX(-50%) translateY(-50%)'
 })]), cE('checked, unchecked', `
  transition: color .3s var(--n-bezier);
@@ -74,7 +75,7 @@ export default cB('switch', `
   borderRadius: 'calc(var(--n-rail-height) / 2)'
 }, [cE('button', {
   borderRadius: 'calc(var(--n-button-height) / 2)'
-})])]), cNotM('disabled', [cM('pressed', [cE('rail', [cE('button', {
+})])]), cNotM('disabled', [cNotM('icon', [cM('pressed', [cE('rail', [cE('button', {
   maxWidth: 'var(--n-button-width-pressed)'
 })])]), cE('rail', [c('&:active', [cE('button', {
   maxWidth: 'var(--n-button-width-pressed)'
@@ -82,7 +83,7 @@ export default cB('switch', `
   left: 'calc(100% - var(--n-offset) - var(--n-button-width-pressed))'
 })])]), cE('rail', [c('&:active', [cE('button', {
   left: 'calc(100% - var(--n-offset) - var(--n-button-width-pressed))'
-})])])])]), cM('active', [cE('rail', [cE('button', {
+})])])])])]), cM('active', [cE('rail', [cE('button', {
   left: 'calc(100% - (var(--n-rail-height) + var(--n-button-width)) / 2)'
 })])]), cE('rail', `
  overflow: hidden;
@@ -95,7 +96,21 @@ export default cB('switch', `
  background .3s var(--n-bezier),
  box-shadow .3s var(--n-bezier);
  background-color: var(--n-rail-color);
- `, [cE('button', `
+ `, [cE('button-icon', `
+ color: var(--n-icon-color);
+ transition: color .3s var(--n-bezier);
+ font-size: calc(var(--n-button-height) - 4px);
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ line-height: 1;
+ `, [iconSwitchTransition()]), cE('button', `
+ align-items: center; 
  top: var(--n-offset);
  left: var(--n-offset);
  height: var(--n-button-width);
@@ -114,9 +129,7 @@ export default cB('switch', `
  opacity .3s var(--n-bezier),
  max-width .3s var(--n-bezier),
  box-shadow .3s var(--n-bezier);
- `)]), cM('active', [cE('rail', {
-  backgroundColor: 'var(--n-rail-color-active)'
-})]), cM('disabled', [cE('rail', `
+ `)]), cM('active', [cE('rail', 'background-color: var(--n-rail-color-active);')]), cM('disabled', [cE('rail', `
  cursor: not-allowed;
  opacity: .5;
  `)]), cM('loading', [cE('rail', `

package/es/switch/styles/dark.js

@@ -5,9 +5,9 @@ const switchDark = {
     name: 'Switch',
     common: commonDark,
     self(vars) {
-        const { primaryColorSuppl, opacityDisabled, borderRadius, primaryColor, textColor2 } = vars;
+        const { primaryColorSuppl, opacityDisabled, borderRadius, primaryColor, textColor2, baseColor } = vars;
         const railOverlayColor = 'rgba(255, 255, 255, .20)';
-        return Object.assign(Object.assign({}, commonVars), { textColor: textColor2, loadingColor: primaryColorSuppl, opacityDisabled, railColor: railOverlayColor, railColorActive: primaryColorSuppl, buttonBoxShadow: '0px 2px 4px 0 rgba(0, 0, 0, 0.4)', buttonColor: '#FFF', railBorderRadiusSmall: borderRadius, railBorderRadiusMedium: borderRadius, railBorderRadiusLarge: borderRadius, buttonBorderRadiusSmall: borderRadius, buttonBorderRadiusMedium: borderRadius, buttonBorderRadiusLarge: borderRadius, boxShadowFocus: `0 0 8px 0 ${changeColor(primaryColor, { alpha: 0.3 })}` });
+        return Object.assign(Object.assign({}, commonVars), { iconColor: baseColor, textColor: textColor2, loadingColor: primaryColorSuppl, opacityDisabled, railColor: railOverlayColor, railColorActive: primaryColorSuppl, buttonBoxShadow: '0px 2px 4px 0 rgba(0, 0, 0, 0.4)', buttonColor: '#FFF', railBorderRadiusSmall: borderRadius, railBorderRadiusMedium: borderRadius, railBorderRadiusLarge: borderRadius, buttonBorderRadiusSmall: borderRadius, buttonBorderRadiusMedium: borderRadius, buttonBorderRadiusLarge: borderRadius, boxShadowFocus: `0 0 8px 0 ${changeColor(primaryColor, { alpha: 0.3 })}` });
     }
 };
 export default switchDark;

package/es/switch/styles/light.d.ts

@@ -1,6 +1,7 @@
 import type { ThemeCommonVars } from '../../_styles/common';
 import type { Theme } from '../../_mixins';
 declare const self: (vars: ThemeCommonVars) => {
+    iconColor: string;
     textColor: string;
     loadingColor: string;
     opacityDisabled: string;

package/es/switch/styles/light.js

@@ -2,9 +2,9 @@ import { changeColor } from 'seemly';
 import commonVars from './_common';
 import { commonLight } from '../../_styles/common';
 const self = (vars) => {
-    const { primaryColor, opacityDisabled, borderRadius } = vars;
+    const { primaryColor, opacityDisabled, borderRadius, textColor3 } = vars;
     const railOverlayColor = 'rgba(0, 0, 0, .14)';
-    return Object.assign(Object.assign({}, commonVars), { textColor: 'white', loadingColor: primaryColor, opacityDisabled, railColor: railOverlayColor, railColorActive: primaryColor, buttonBoxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)', buttonColor: '#FFF', railBorderRadiusSmall: borderRadius, railBorderRadiusMedium: borderRadius, railBorderRadiusLarge: borderRadius, buttonBorderRadiusSmall: borderRadius, buttonBorderRadiusMedium: borderRadius, buttonBorderRadiusLarge: borderRadius, boxShadowFocus: `0 0 0 2px ${changeColor(primaryColor, { alpha: 0.2 })}` });
+    return Object.assign(Object.assign({}, commonVars), { iconColor: textColor3, textColor: 'white', loadingColor: primaryColor, opacityDisabled, railColor: railOverlayColor, railColorActive: primaryColor, buttonBoxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)', buttonColor: '#FFF', railBorderRadiusSmall: borderRadius, railBorderRadiusMedium: borderRadius, railBorderRadiusLarge: borderRadius, buttonBorderRadiusSmall: borderRadius, buttonBorderRadiusMedium: borderRadius, buttonBorderRadiusLarge: borderRadius, boxShadowFocus: `0 0 0 2px ${changeColor(primaryColor, { alpha: 0.2 })}` });
 };
 const switchLight = {
     name: 'Switch',

package/es/table/src/Table.d.ts

@@ -232,7 +232,9 @@ declare const _default: import("vue").DefineComponent<{
         '--n-td-color-striped': string;
         '--n-td-color-striped-modal': string;
         '--n-td-color-striped-popover': string;
-    }>;
+    }> | undefined;
+    themeClass: import("vue").Ref<string> | undefined;
+    onRender: (() => void) | undefined;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     bordered: {
         type: BooleanConstructor;

package/es/table/src/Table.js

@@ -1,5 +1,5 @@
 import { defineComponent, computed, h } from 'vue';
-import { useConfig, useTheme } from '../../_mixins';
+import { useConfig, useTheme, useThemeClass } from '../../_mixins';
 import { createKey } from '../../_utils';
 import { tableLight } from '../styles';
 import style from './styles/index.cssr';
@@ -20,43 +20,54 @@ export default defineComponent({
     name: 'Table',
     props: tableProps,
     setup(props) {
-        const { mergedClsPrefixRef } = useConfig(props);
+        const { mergedClsPrefixRef, inlineThemeDisabled } = useConfig(props);
         const themeRef = useTheme('Table', '-table', style, tableLight, props, mergedClsPrefixRef);
+        const cssVarsRef = computed(() => {
+            const { size } = props;
+            const { self: { borderColor, tdColor, tdColorModal, tdColorPopover, thColor, thColorModal, thColorPopover, thTextColor, tdTextColor, borderRadius, thFontWeight, lineHeight, borderColorModal, borderColorPopover, tdColorStriped, tdColorStripedModal, tdColorStripedPopover, [createKey('fontSize', size)]: fontSize, [createKey('tdPadding', size)]: tdPadding, [createKey('thPadding', size)]: thPadding }, common: { cubicBezierEaseInOut } } = themeRef.value;
+            return {
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-td-color': tdColor,
+                '--n-td-color-modal': tdColorModal,
+                '--n-td-color-popover': tdColorPopover,
+                '--n-td-text-color': tdTextColor,
+                '--n-border-color': borderColor,
+                '--n-border-color-modal': borderColorModal,
+                '--n-border-color-popover': borderColorPopover,
+                '--n-border-radius': borderRadius,
+                '--n-font-size': fontSize,
+                '--n-th-color': thColor,
+                '--n-th-color-modal': thColorModal,
+                '--n-th-color-popover': thColorPopover,
+                '--n-th-font-weight': thFontWeight,
+                '--n-th-text-color': thTextColor,
+                '--n-line-height': lineHeight,
+                '--n-td-padding': tdPadding,
+                '--n-th-padding': thPadding,
+                '--n-td-color-striped': tdColorStriped,
+                '--n-td-color-striped-modal': tdColorStripedModal,
+                '--n-td-color-striped-popover': tdColorStripedPopover
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? useThemeClass('table', computed(() => {
+                return props.size[0];
+            }), cssVarsRef, props)
+            : undefined;
         return {
             mergedClsPrefix: mergedClsPrefixRef,
-            cssVars: computed(() => {
-                const { size } = props;
-                const { self: { borderColor, tdColor, tdColorModal, tdColorPopover, thColor, thColorModal, thColorPopover, thTextColor, tdTextColor, borderRadius, thFontWeight, lineHeight, borderColorModal, borderColorPopover, tdColorStriped, tdColorStripedModal, tdColorStripedPopover, [createKey('fontSize', size)]: fontSize, [createKey('tdPadding', size)]: tdPadding, [createKey('thPadding', size)]: thPadding }, common: { cubicBezierEaseInOut } } = themeRef.value;
-                return {
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-td-color': tdColor,
-                    '--n-td-color-modal': tdColorModal,
-                    '--n-td-color-popover': tdColorPopover,
-                    '--n-td-text-color': tdTextColor,
-                    '--n-border-color': borderColor,
-                    '--n-border-color-modal': borderColorModal,
-                    '--n-border-color-popover': borderColorPopover,
-                    '--n-border-radius': borderRadius,
-                    '--n-font-size': fontSize,
-                    '--n-th-color': thColor,
-                    '--n-th-color-modal': thColorModal,
-                    '--n-th-color-popover': thColorPopover,
-                    '--n-th-font-weight': thFontWeight,
-                    '--n-th-text-color': thTextColor,
-                    '--n-line-height': lineHeight,
-                    '--n-td-padding': tdPadding,
-                    '--n-th-padding': thPadding,
-                    '--n-td-color-striped': tdColorStriped,
-                    '--n-td-color-striped-modal': tdColorStripedModal,
-                    '--n-td-color-striped-popover': tdColorStripedPopover
-                };
-            })
+            cssVars: inlineThemeDisabled ? undefined : cssVarsRef,
+            themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass,
+            onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender
         };
     },
     render() {
+        var _a;
         const { mergedClsPrefix } = this;
+        (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
         return (h("table", { class: [
                 `${mergedClsPrefix}-table`,
+                this.themeClass,
                 {
                     [`${mergedClsPrefix}-table--bottom-bordered`]: this.bottomBordered,
                     [`${mergedClsPrefix}-table--bordered`]: this.bordered,

package/es/table/src/styles/index.cssr.js

@@ -69,7 +69,7 @@ export default c([cB('table', `
  border: 1px solid var(--n-merged-border-color);
  border-radius: var(--n-border-radius);
  `, [c('tr', [c('&:last-child', [c('td', `
- border-bottom: none;
+ border-bottom: 0 solid var(--n-merged-border-color);
  `)])])]), cM('single-line', [c('th', `
  border-right: none;
  `), c('td', `

package/es/tabs/src/Tabs.d.ts

@@ -494,29 +494,31 @@ declare const _default: import("vue").DefineComponent<{
     handleScroll: import("lodash").DebouncedFunc<(e: Event) => void>;
     handleTabsResize: import("lodash").DebouncedFunc<(entry: ResizeObserverEntry) => void>;
     cssVars: import("vue").ComputedRef<{
-        '--bezier': string;
-        '--color-segment': string;
-        '--bar-color': string;
-        '--tab-font-size': string;
-        '--tab-text-color': string;
-        '--tab-text-color-active': string;
-        '--tab-text-color-disabled': string;
-        '--tab-text-color-hover': string;
-        '--pane-text-color': string;
-        '--tab-border-color': string;
-        '--tab-border-radius': string;
-        '--close-color': string;
-        '--close-color-hover': string;
-        '--close-color-pressed': string;
-        '--tab-color': string;
-        '--tab-font-weight': string;
-        '--tab-font-weight-active': string;
-        '--tab-padding': string;
-        '--tab-gap': string;
-        '--pane-padding': string;
-        '--font-weight-strong': string;
-        '--tab-color-segment': string;
-    }>;
+        '--n-bezier': string;
+        '--n-color-segment': string;
+        '--n-bar-color': string;
+        '--n-tab-font-size': string;
+        '--n-tab-text-color': string;
+        '--n-tab-text-color-active': string;
+        '--n-tab-text-color-disabled': string;
+        '--n-tab-text-color-hover': string;
+        '--n-pane-text-color': string;
+        '--n-tab-border-color': string;
+        '--n-tab-border-radius': string;
+        '--n-close-color': string;
+        '--n-close-color-hover': string;
+        '--n-close-color-pressed': string;
+        '--n-tab-color': string;
+        '--n-tab-font-weight': string;
+        '--n-tab-font-weight-active': string;
+        '--n-tab-padding': string;
+        '--n-tab-gap': string;
+        '--n-pane-padding': string;
+        '--n-font-weight-strong': string;
+        '--n-tab-color-segment': string;
+    }> | undefined;
+    themeClass: import("vue").Ref<string> | undefined;
+    onRender: (() => void) | undefined;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     readonly value: PropType<string | number>;
     readonly defaultValue: PropType<string | number>;

package/es/tabs/src/Tabs.js

@@ -2,8 +2,8 @@ import { h, ref, defineComponent, computed, provide, watch, toRef, nextTick, wit
 import { VResizeObserver, VXScroll } from 'vueuc';
 import { throttle } from 'lodash-es';
 import { useCompitable, onFontsReady, useMergedState } from 'vooks';
-import { useConfig, useTheme } from '../../_mixins';
-import { createKey, call, flatten, warnOnce } from '../../_utils';
+import { useConfig, useTheme, useThemeClass } from '../../_mixins';
+import { createKey, call, flatten, warnOnce, resolveWrappedSlot } from '../../_utils';
 import { tabsLight } from '../styles';
 import { tabsInjectionKey } from './interface';
 import Tab from './Tab';
@@ -38,7 +38,7 @@ export default defineComponent({
                 }
             });
         }
-        const { mergedClsPrefixRef } = useConfig(props);
+        const { mergedClsPrefixRef, inlineThemeDisabled } = useConfig(props);
         const themeRef = useTheme('Tabs', '-tabs', style, tabsLight, props, mergedClsPrefixRef);
         const tabsElRef = ref(null);
         const barElRef = ref(null);
@@ -241,50 +241,57 @@ export default defineComponent({
                 updateCurrentBarStyle();
             }
         };
+        const cssVarsRef = computed(() => {
+            const { value: size } = compitableSizeRef;
+            const { type } = props;
+            const typeSuffix = {
+                card: 'Card',
+                bar: 'Bar',
+                line: 'Line',
+                segment: 'Segment'
+            }[type];
+            const sizeType = `${size}${typeSuffix}`;
+            const { self: { barColor, closeColor, closeColorHover, closeColorPressed, tabColor, tabBorderColor, paneTextColor, tabFontWeight, tabBorderRadius, tabFontWeightActive, colorSegment, fontWeightStrong, tabColorSegment, [createKey('panePadding', size)]: panePadding, [createKey('tabPadding', sizeType)]: tabPadding, [createKey('tabGap', sizeType)]: tabGap, [createKey('tabTextColor', type)]: tabTextColor, [createKey('tabTextColorActive', type)]: tabTextColorActive, [createKey('tabTextColorHover', type)]: tabTextColorHover, [createKey('tabTextColorDisabled', type)]: tabTextColorDisabled, [createKey('tabFontSize', size)]: tabFontSize }, common: { cubicBezierEaseInOut } } = themeRef.value;
+            return {
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-color-segment': colorSegment,
+                '--n-bar-color': barColor,
+                '--n-tab-font-size': tabFontSize,
+                '--n-tab-text-color': tabTextColor,
+                '--n-tab-text-color-active': tabTextColorActive,
+                '--n-tab-text-color-disabled': tabTextColorDisabled,
+                '--n-tab-text-color-hover': tabTextColorHover,
+                '--n-pane-text-color': paneTextColor,
+                '--n-tab-border-color': tabBorderColor,
+                '--n-tab-border-radius': tabBorderRadius,
+                '--n-close-color': closeColor,
+                '--n-close-color-hover': closeColorHover,
+                '--n-close-color-pressed': closeColorPressed,
+                '--n-tab-color': tabColor,
+                '--n-tab-font-weight': tabFontWeight,
+                '--n-tab-font-weight-active': tabFontWeightActive,
+                '--n-tab-padding': tabPadding,
+                '--n-tab-gap': tabGap,
+                '--n-pane-padding': panePadding,
+                '--n-font-weight-strong': fontWeightStrong,
+                '--n-tab-color-segment': tabColorSegment
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? useThemeClass('tabs', computed(() => {
+                return `${compitableSizeRef.value[0]}${props.type[0]}`;
+            }), cssVarsRef, props)
+            : undefined;
         return Object.assign({ mergedClsPrefix: mergedClsPrefixRef, mergedValue: mergedValueRef, renderedNames: new Set(), tabsElRef,
             barElRef,
             addTabInstRef,
             xScrollInstRef,
             scrollWrapperElRef, addTabFixed: addTabFixedRef, tabWrapperStyle: tabWrapperStyleRef, handleNavResize, mergedSize: compitableSizeRef, handleScroll,
-            handleTabsResize, cssVars: computed(() => {
-                const { value: size } = compitableSizeRef;
-                const { type } = props;
-                const typeSuffix = {
-                    card: 'Card',
-                    bar: 'Bar',
-                    line: 'Line',
-                    segment: 'Segment'
-                }[type];
-                const sizeType = `${size}${typeSuffix}`;
-                const { self: { barColor, closeColor, closeColorHover, closeColorPressed, tabColor, tabBorderColor, paneTextColor, tabFontWeight, tabBorderRadius, tabFontWeightActive, colorSegment, fontWeightStrong, tabColorSegment, [createKey('panePadding', size)]: panePadding, [createKey('tabPadding', sizeType)]: tabPadding, [createKey('tabGap', sizeType)]: tabGap, [createKey('tabTextColor', type)]: tabTextColor, [createKey('tabTextColorActive', type)]: tabTextColorActive, [createKey('tabTextColorHover', type)]: tabTextColorHover, [createKey('tabTextColorDisabled', type)]: tabTextColorDisabled, [createKey('tabFontSize', size)]: tabFontSize }, common: { cubicBezierEaseInOut } } = themeRef.value;
-                return {
-                    '--bezier': cubicBezierEaseInOut,
-                    '--color-segment': colorSegment,
-                    '--bar-color': barColor,
-                    '--tab-font-size': tabFontSize,
-                    '--tab-text-color': tabTextColor,
-                    '--tab-text-color-active': tabTextColorActive,
-                    '--tab-text-color-disabled': tabTextColorDisabled,
-                    '--tab-text-color-hover': tabTextColorHover,
-                    '--pane-text-color': paneTextColor,
-                    '--tab-border-color': tabBorderColor,
-                    '--tab-border-radius': tabBorderRadius,
-                    '--close-color': closeColor,
-                    '--close-color-hover': closeColorHover,
-                    '--close-color-pressed': closeColorPressed,
-                    '--tab-color': tabColor,
-                    '--tab-font-weight': tabFontWeight,
-                    '--tab-font-weight-active': tabFontWeightActive,
-                    '--tab-padding': tabPadding,
-                    '--tab-gap': tabGap,
-                    '--pane-padding': panePadding,
-                    '--font-weight-strong': fontWeightStrong,
-                    '--tab-color-segment': tabColorSegment
-                };
-            }) }, exposedMethods);
+            handleTabsResize, cssVars: inlineThemeDisabled ? undefined : cssVarsRef, themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass, onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender }, exposedMethods);
     },
     render() {
-        const { mergedClsPrefix, type, addTabFixed, addable, mergedSize, $slots: { default: defaultSlot, prefix: prefixSlot, suffix: suffixSlot } } = this;
+        const { mergedClsPrefix, type, addTabFixed, addable, mergedSize, onRender, $slots: { default: defaultSlot, prefix: prefixSlot, suffix: suffixSlot } } = this;
+        onRender === null || onRender === void 0 ? void 0 : onRender();
         const tabPaneChildren = defaultSlot
             ? flatten(defaultSlot()).filter((v) => {
                 return v.type.__TAB_PANE__ === true;
@@ -296,13 +303,12 @@ export default defineComponent({
             })
             : [];
         const showPane = !tabChildren.length;
-        const prefix = prefixSlot ? prefixSlot() : null;
-        const suffix = suffixSlot ? suffixSlot() : null;
         const isCard = type === 'card';
         const isSegment = type === 'segment';
         const mergedJustifyContent = !isCard && !isSegment && this.justifyContent;
         return (h("div", { class: [
                 `${mergedClsPrefix}-tabs`,
+                this.themeClass,
                 `${mergedClsPrefix}-tabs--${type}-type`,
                 `${mergedClsPrefix}-tabs--${mergedSize}-size`,
                 mergedJustifyContent && `${mergedClsPrefix}-tabs--flex`
@@ -315,7 +321,7 @@ export default defineComponent({
                     `${mergedClsPrefix}-tabs-nav--${type}-type`,
                     `${mergedClsPrefix}-tabs-nav`
                 ] },
-                prefix ? (h("div", { class: `${mergedClsPrefix}-tabs-nav__prefix` }, prefix)) : null,
+                resolveWrappedSlot(prefixSlot, (children) => children && (h("div", { class: `${mergedClsPrefix}-tabs-nav__prefix` }, children))),
                 isSegment ? (h("div", { class: `${mergedClsPrefix}-tabs-rail` }, showPane
                     ? tabPaneChildren.map((tabPaneVNode, index) => {
                         return (h(Tab, Object.assign({}, tabPaneVNode.props, { internalCreatedByPane: true, internalLeftPadded: index !== 0 }), tabPaneVNode.children
@@ -376,7 +382,7 @@ export default defineComponent({
                 addTabFixed && addable && isCard
                     ? createAddTag(addable, true)
                     : null,
-                suffix ? (h("div", { class: `${mergedClsPrefix}-tabs-nav__suffix` }, suffix)) : null),
+                resolveWrappedSlot(suffixSlot, (children) => children && (h("div", { class: `${mergedClsPrefix}-tabs-nav__suffix` }, children)))),
             showPane &&
                 filterMapTabPanes(tabPaneChildren, this.mergedValue, this.renderedNames)));
     }