naive-ui 2.25.2 → 2.25.3

package/lib/color-picker/src/ColorPicker.js

@@ -55,7 +55,7 @@ exports.default = (0, vue_1.defineComponent)({
         const formItem = (0, _mixins_1.useFormItem)(props);
         const { mergedSizeRef, mergedDisabledRef } = formItem;
         const { localeRef } = (0, _mixins_1.useLocale)('global');
-        const { mergedClsPrefixRef, namespaceRef } = (0, _mixins_1.useConfig)(props);
+        const { mergedClsPrefixRef, namespaceRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)(props);
         const themeRef = (0, _mixins_1.useTheme)('ColorPicker', '-color-picker', index_cssr_1.default, styles_1.colorPickerLight, props, mergedClsPrefixRef);
         (0, vue_1.provide)(context_1.colorPickerInjectionKey, {
             themeRef,
@@ -358,6 +358,11 @@ exports.default = (0, vue_1.defineComponent)({
                 '--n-divider-color': dividerColor
             };
         });
+        const themeClassHandle = inlineThemeDisabled
+            ? (0, _mixins_1.useThemeClass)('color-picker', (0, vue_1.computed)(() => {
+                return mergedSizeRef.value[0];
+            }), cssVarsRef, props)
+            : undefined;
         function renderPanel() {
             var _a;
             const { value: rgba } = rgbaRef;
@@ -365,9 +370,14 @@ exports.default = (0, vue_1.defineComponent)({
             const { internalActions, modes, actions } = props;
             const { value: mergedTheme } = themeRef;
             const { value: mergedClsPrefix } = mergedClsPrefixRef;
-            return ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker-panel`, onDragstart: (e) => {
+            return ((0, vue_1.h)("div", { class: [
+                    `${mergedClsPrefix}-color-picker-panel`,
+                    themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value
+                ], onDragstart: (e) => {
                     e.preventDefault();
-                }, style: cssVarsRef.value },
+                }, style: inlineThemeDisabled
+                    ? undefined
+                    : cssVarsRef.value },
                 (0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker-control` },
                     (0, vue_1.h)(Pallete_1.default, { clsPrefix: mergedClsPrefix, rgba: rgba, displayedHue: displayedHue, displayedSv: displayedSvRef.value, onUpdateSV: handleUpdateSv, onComplete: handleComplete }),
                     (0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker-preview` },
@@ -403,12 +413,15 @@ exports.default = (0, vue_1.defineComponent)({
                 doUpdateShow(false);
             },
             renderPanel,
-            cssVars: cssVarsRef
+            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 { $slots, mergedClsPrefix } = this;
-        return ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker`, ref: "selfRef", style: this.cssVars },
+        const { $slots, mergedClsPrefix, onRender } = this;
+        onRender === null || onRender === void 0 ? void 0 : onRender();
+        return ((0, vue_1.h)("div", { class: [this.themeClass, `${mergedClsPrefix}-color-picker`], ref: "selfRef", style: this.cssVars },
             (0, vue_1.h)(vueuc_1.VBinder, null, {
                 default: () => [
                     (0, vue_1.h)(vueuc_1.VTarget, null, {

package/lib/components.d.ts

@@ -81,3 +81,4 @@ export * from './tree';
 export * from './tree-select';
 export * from './typography';
 export * from './upload';
+export * from './watermark';

package/lib/components.js

@@ -93,3 +93,4 @@ __exportStar(require("./tree"), exports);
 __exportStar(require("./tree-select"), exports);
 __exportStar(require("./typography"), exports);
 __exportStar(require("./upload"), exports);
+__exportStar(require("./watermark"), exports);

package/lib/config-provider/src/ConfigProvider.d.ts

@@ -132,7 +132,7 @@ export declare const configProviderProps: {
     readonly componentOptions: PropType<GlobalComponentConfig>;
     readonly icons: PropType<GlobalIconConfig>;
     readonly breakpoints: PropType<Breakpoints>;
-    readonly disableInlineTheme: {
+    readonly inlineThemeDisabled: {
         readonly type: BooleanConstructor;
         readonly default: undefined;
     };
@@ -271,7 +271,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly componentOptions: PropType<GlobalComponentConfig>;
     readonly icons: PropType<GlobalIconConfig>;
     readonly breakpoints: PropType<Breakpoints>;
-    readonly disableInlineTheme: {
+    readonly inlineThemeDisabled: {
         readonly type: BooleanConstructor;
         readonly default: undefined;
     };
@@ -414,7 +414,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly componentOptions: PropType<GlobalComponentConfig>;
     readonly icons: PropType<GlobalIconConfig>;
     readonly breakpoints: PropType<Breakpoints>;
-    readonly disableInlineTheme: {
+    readonly inlineThemeDisabled: {
         readonly type: BooleanConstructor;
         readonly default: undefined;
     };
@@ -428,6 +428,6 @@ declare const _default: import("vue").DefineComponent<{
     tag: string;
     as: string | undefined;
     bordered: boolean | undefined;
-    disableInlineTheme: boolean;
+    inlineThemeDisabled: boolean;
 }>;
 export default _default;

package/lib/config-provider/src/ConfigProvider.js

@@ -29,7 +29,7 @@ exports.configProviderProps = {
     componentOptions: Object,
     icons: Object,
     breakpoints: Object,
-    disableInlineTheme: {
+    inlineThemeDisabled: {
         type: Boolean,
         default: undefined
     },
@@ -123,7 +123,7 @@ exports.default = (0, vue_1.defineComponent)({
         const mergedBreakpointsRef = (0, vue_1.computed)(() => {
             return props.breakpoints || (NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.mergedBreakpointsRef.value);
         });
-        const disableInlineTheme = props.disableInlineTheme || (NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.disableInlineTheme);
+        const inlineThemeDisabled = props.inlineThemeDisabled || (NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.inlineThemeDisabled);
         const mergedThemeHashRef = (0, vue_1.computed)(() => {
             const { value: theme } = mergedThemeRef;
             const { value: mergedThemeOverrides } = mergedThemeOverridesRef;
@@ -173,7 +173,7 @@ exports.default = (0, vue_1.defineComponent)({
             }),
             mergedThemeRef,
             mergedThemeOverridesRef,
-            disableInlineTheme: disableInlineTheme || false
+            inlineThemeDisabled: inlineThemeDisabled || false
         });
         return {
             mergedClsPrefix: mergedClsPrefixRef,

package/lib/config-provider/src/internal-interface.d.ts

@@ -74,6 +74,7 @@ import type { TreeTheme } from '../../tree/styles';
 import type { TreeSelectTheme } from '../../tree-select/styles';
 import type { TypographyTheme } from '../../typography/styles';
 import type { UploadTheme } from '../../upload/styles';
+import type { WatermarkTheme } from '../../watermark/styles';
 import type { InternalSelectMenuTheme } from '../../_internal/select-menu/styles';
 import type { InternalSelectionTheme } from '../../_internal/selection/styles';
 import type { NDateLocale, NLocale } from '../../locales';
@@ -163,6 +164,7 @@ export interface GlobalThemeWithoutCommon {
     TreeSelect?: TreeSelectTheme;
     Typography?: TypographyTheme;
     Upload?: UploadTheme;
+    Watermark?: WatermarkTheme;
     InternalSelectMenu?: InternalSelectMenuTheme;
     InternalSelection?: InternalSelectionTheme;
 }
@@ -229,5 +231,5 @@ export interface ConfigProviderInjection {
     mergedThemeOverridesRef: Ref<GlobalThemeOverrides | undefined>;
     mergedRtlRef: Ref<RtlEnabledState | undefined>;
     mergedThemeHashRef: Ref<string>;
-    disableInlineTheme: boolean;
+    inlineThemeDisabled: boolean;
 }

package/lib/countdown/src/Countdown.d.ts

@@ -1,7 +1,6 @@
 import { PropType, VNodeChild } from 'vue';
 import type { ExtractPublicPropTypes } from '../../_utils';
 declare const countdownProps: {
-    label: StringConstructor;
     duration: {
         type: NumberConstructor;
         default: number;
@@ -24,7 +23,6 @@ declare const countdownProps: {
 };
 export declare type CountdownProps = ExtractPublicPropTypes<typeof countdownProps>;
 declare const _default: import("vue").DefineComponent<{
-    label: StringConstructor;
     duration: {
         type: NumberConstructor;
         default: number;
@@ -45,7 +43,6 @@ declare const _default: import("vue").DefineComponent<{
     }) => VNodeChild>;
     onFinish: PropType<() => void>;
 }, () => VNodeChild, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    label: StringConstructor;
     duration: {
         type: NumberConstructor;
         default: number;

package/lib/countdown/src/Countdown.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const vue_1 = require("vue");
 const countdownProps = {
-    label: String,
     duration: {
         type: Number,
         default: 0

package/lib/data-table/src/DataTable.d.ts

@@ -3782,47 +3782,6 @@ declare const _default: import("vue").DefineComponent<{
         }>;
     }>>>;
 }, {
-    cssVars: import("vue").ComputedRef<{
-        '--n-font-size': string;
-        '--n-th-padding': string;
-        '--n-td-padding': string;
-        '--n-bezier': string;
-        '--n-border-radius': string;
-        '--n-line-height': string;
-        '--n-border-color': string;
-        '--n-border-color-modal': string;
-        '--n-border-color-popover': string;
-        '--n-th-color': string;
-        '--n-th-color-hover': string;
-        '--n-th-color-modal': string;
-        '--n-th-color-hover-modal': string;
-        '--n-th-color-popover': string;
-        '--n-th-color-hover-popover': string;
-        '--n-td-color': string;
-        '--n-td-color-hover': string;
-        '--n-td-color-modal': string;
-        '--n-td-color-hover-modal': string;
-        '--n-n-td-color-popover': string;
-        '--n-td-color-hover-popover': string;
-        '--n-th-text-color': string;
-        '--n-td-text-color': string;
-        '--n-th-font-weight': string;
-        '--n-th-button-color-hover': string;
-        '--n-th-icon-color': string;
-        '--n-th-icon-color-active': string;
-        '--n-filter-size': string;
-        '--n-pagination-margin': string;
-        '--n-empty-padding': string;
-        '--n-box-shadow-before': string;
-        '--n-box-shadow-after': string;
-        '--n-sorter-size': string;
-        '--n-loading-size': string;
-        '--n-loading-color': string;
-        '--n-opacity-loading': string;
-        '--n-td-color-striped': string;
-        '--n-td-color-striped-modal': string;
-        '--n-td-color-striped-popover': string;
-    }>;
     filter: (filters: import("./interface").FilterState | null) => void;
     filters: (filters: import("./interface").FilterState | null) => void;
     clearFilters: () => void;
@@ -4793,6 +4752,49 @@ declare const _default: import("vue").DefineComponent<{
     mergedBordered: import("vue").ComputedRef<boolean>;
     mergedBottomBordered: import("vue").ComputedRef<boolean>;
     mergedPagination: import("vue").ComputedRef<PaginationProps>;
+    cssVars: import("vue").ComputedRef<{
+        '--n-font-size': string;
+        '--n-th-padding': string;
+        '--n-td-padding': string;
+        '--n-bezier': string;
+        '--n-border-radius': string;
+        '--n-line-height': string;
+        '--n-border-color': string;
+        '--n-border-color-modal': string;
+        '--n-border-color-popover': string;
+        '--n-th-color': string;
+        '--n-th-color-hover': string;
+        '--n-th-color-modal': string;
+        '--n-th-color-hover-modal': string;
+        '--n-th-color-popover': string;
+        '--n-th-color-hover-popover': string;
+        '--n-td-color': string;
+        '--n-td-color-hover': string;
+        '--n-td-color-modal': string;
+        '--n-td-color-hover-modal': string;
+        '--n-td-color-popover': string;
+        '--n-td-color-hover-popover': string;
+        '--n-th-text-color': string;
+        '--n-td-text-color': string;
+        '--n-th-font-weight': string;
+        '--n-th-button-color-hover': string;
+        '--n-th-icon-color': string;
+        '--n-th-icon-color-active': string;
+        '--n-filter-size': string;
+        '--n-pagination-margin': string;
+        '--n-empty-padding': string;
+        '--n-box-shadow-before': string;
+        '--n-box-shadow-after': string;
+        '--n-sorter-size': string;
+        '--n-loading-size': string;
+        '--n-loading-color': string;
+        '--n-opacity-loading': string;
+        '--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<ExtractPropTypes<{
     readonly pagination: {
         readonly type: PropType<false | PaginationProps>;

package/lib/data-table/src/DataTable.js

@@ -87,7 +87,7 @@ exports.default = (0, vue_1.defineComponent)({
                 }
             });
         }
-        const { mergedBorderedRef, mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
+        const { mergedBorderedRef, mergedClsPrefixRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)(props);
         const mergedBottomBorderedRef = (0, vue_1.computed)(() => {
             const { bottomBordered } = props;
             // do not add bottom bordered class if bordered is true
@@ -211,56 +211,62 @@ exports.default = (0, vue_1.defineComponent)({
             sort,
             clearFilter
         };
-        return Object.assign(Object.assign({ mainTableInstRef, mergedClsPrefix: mergedClsPrefixRef, mergedTheme: themeRef, paginatedData: paginatedDataRef, mergedBordered: mergedBorderedRef, mergedBottomBordered: mergedBottomBorderedRef, mergedPagination: mergedPaginationRef }, exposedMethods), { cssVars: (0, vue_1.computed)(() => {
-                const { size } = props;
-                const { common: { cubicBezierEaseInOut }, self: { borderColor, tdColorHover, thColor, thColorHover, tdColor, tdTextColor, thTextColor, thFontWeight, thButtonColorHover, thIconColor, thIconColorActive, filterSize, borderRadius, lineHeight, tdColorModal, thColorModal, borderColorModal, thColorHoverModal, tdColorHoverModal, borderColorPopover, thColorPopover, tdColorPopover, tdColorHoverPopover, thColorHoverPopover, paginationMargin, emptyPadding, boxShadowAfter, boxShadowBefore, sorterSize, loadingColor, loadingSize, opacityLoading, tdColorStriped, tdColorStripedModal, tdColorStripedPopover, [(0, _utils_1.createKey)('fontSize', size)]: fontSize, [(0, _utils_1.createKey)('thPadding', size)]: thPadding, [(0, _utils_1.createKey)('tdPadding', size)]: tdPadding } } = themeRef.value;
-                return {
-                    '--n-font-size': fontSize,
-                    '--n-th-padding': thPadding,
-                    '--n-td-padding': tdPadding,
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-border-radius': borderRadius,
-                    '--n-line-height': lineHeight,
-                    '--n-border-color': borderColor,
-                    '--n-border-color-modal': borderColorModal,
-                    '--n-border-color-popover': borderColorPopover,
-                    '--n-th-color': thColor,
-                    '--n-th-color-hover': thColorHover,
-                    '--n-th-color-modal': thColorModal,
-                    '--n-th-color-hover-modal': thColorHoverModal,
-                    '--n-th-color-popover': thColorPopover,
-                    '--n-th-color-hover-popover': thColorHoverPopover,
-                    '--n-td-color': tdColor,
-                    '--n-td-color-hover': tdColorHover,
-                    '--n-td-color-modal': tdColorModal,
-                    '--n-td-color-hover-modal': tdColorHoverModal,
-                    '--n-n-td-color-popover': tdColorPopover,
-                    '--n-td-color-hover-popover': tdColorHoverPopover,
-                    '--n-th-text-color': thTextColor,
-                    '--n-td-text-color': tdTextColor,
-                    '--n-th-font-weight': thFontWeight,
-                    '--n-th-button-color-hover': thButtonColorHover,
-                    '--n-th-icon-color': thIconColor,
-                    '--n-th-icon-color-active': thIconColorActive,
-                    '--n-filter-size': filterSize,
-                    '--n-pagination-margin': paginationMargin,
-                    '--n-empty-padding': emptyPadding,
-                    '--n-box-shadow-before': boxShadowBefore,
-                    '--n-box-shadow-after': boxShadowAfter,
-                    '--n-sorter-size': sorterSize,
-                    '--n-loading-size': loadingSize,
-                    '--n-loading-color': loadingColor,
-                    '--n-opacity-loading': opacityLoading,
-                    '--n-td-color-striped': tdColorStriped,
-                    '--n-td-color-striped-modal': tdColorStripedModal,
-                    '--n-td-color-striped-popover': tdColorStripedPopover
-                };
-            }) });
+        const cssVarsRef = (0, vue_1.computed)(() => {
+            const { size } = props;
+            const { common: { cubicBezierEaseInOut }, self: { borderColor, tdColorHover, thColor, thColorHover, tdColor, tdTextColor, thTextColor, thFontWeight, thButtonColorHover, thIconColor, thIconColorActive, filterSize, borderRadius, lineHeight, tdColorModal, thColorModal, borderColorModal, thColorHoverModal, tdColorHoverModal, borderColorPopover, thColorPopover, tdColorPopover, tdColorHoverPopover, thColorHoverPopover, paginationMargin, emptyPadding, boxShadowAfter, boxShadowBefore, sorterSize, loadingColor, loadingSize, opacityLoading, tdColorStriped, tdColorStripedModal, tdColorStripedPopover, [(0, _utils_1.createKey)('fontSize', size)]: fontSize, [(0, _utils_1.createKey)('thPadding', size)]: thPadding, [(0, _utils_1.createKey)('tdPadding', size)]: tdPadding } } = themeRef.value;
+            return {
+                '--n-font-size': fontSize,
+                '--n-th-padding': thPadding,
+                '--n-td-padding': tdPadding,
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-border-radius': borderRadius,
+                '--n-line-height': lineHeight,
+                '--n-border-color': borderColor,
+                '--n-border-color-modal': borderColorModal,
+                '--n-border-color-popover': borderColorPopover,
+                '--n-th-color': thColor,
+                '--n-th-color-hover': thColorHover,
+                '--n-th-color-modal': thColorModal,
+                '--n-th-color-hover-modal': thColorHoverModal,
+                '--n-th-color-popover': thColorPopover,
+                '--n-th-color-hover-popover': thColorHoverPopover,
+                '--n-td-color': tdColor,
+                '--n-td-color-hover': tdColorHover,
+                '--n-td-color-modal': tdColorModal,
+                '--n-td-color-hover-modal': tdColorHoverModal,
+                '--n-td-color-popover': tdColorPopover,
+                '--n-td-color-hover-popover': tdColorHoverPopover,
+                '--n-th-text-color': thTextColor,
+                '--n-td-text-color': tdTextColor,
+                '--n-th-font-weight': thFontWeight,
+                '--n-th-button-color-hover': thButtonColorHover,
+                '--n-th-icon-color': thIconColor,
+                '--n-th-icon-color-active': thIconColorActive,
+                '--n-filter-size': filterSize,
+                '--n-pagination-margin': paginationMargin,
+                '--n-empty-padding': emptyPadding,
+                '--n-box-shadow-before': boxShadowBefore,
+                '--n-box-shadow-after': boxShadowAfter,
+                '--n-sorter-size': sorterSize,
+                '--n-loading-size': loadingSize,
+                '--n-loading-color': loadingColor,
+                '--n-opacity-loading': opacityLoading,
+                '--n-td-color-striped': tdColorStriped,
+                '--n-td-color-striped-modal': tdColorStripedModal,
+                '--n-td-color-striped-popover': tdColorStripedPopover
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? (0, _mixins_1.useThemeClass)('data-table', (0, vue_1.computed)(() => props.size[0]), cssVarsRef, props)
+            : undefined;
+        return Object.assign({ mainTableInstRef, mergedClsPrefix: mergedClsPrefixRef, mergedTheme: themeRef, paginatedData: paginatedDataRef, mergedBordered: mergedBorderedRef, mergedBottomBordered: mergedBottomBorderedRef, mergedPagination: mergedPaginationRef, 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 } = this;
+        const { mergedClsPrefix, themeClass, onRender } = this;
+        onRender === null || onRender === void 0 ? void 0 : onRender();
         return ((0, vue_1.h)("div", { class: [
                 `${mergedClsPrefix}-data-table`,
+                themeClass,
                 {
                     [`${mergedClsPrefix}-data-table--bordered`]: this.mergedBordered,
                     [`${mergedClsPrefix}-data-table--bottom-bordered`]: this.mergedBottomBordered,

package/lib/data-table/src/HeaderButton/FilterButton.js

@@ -29,7 +29,7 @@ exports.default = (0, vue_1.defineComponent)({
         }
     },
     setup(props) {
-        const { NConfigProvider } = (0, _mixins_1.useConfig)();
+        const { mergedComponentPropsRef } = (0, _mixins_1.useConfig)();
         const { mergedThemeRef, mergedClsPrefixRef, mergedFilterStateRef, filterMenuCssVarsRef, doUpdateFilters
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
          } = (0, vue_1.inject)(interface_1.dataTableInjectionKey);
@@ -58,7 +58,8 @@ exports.default = (0, vue_1.defineComponent)({
         });
         const mergedRenderFilterRef = (0, vue_1.computed)(() => {
             var _a, _b;
-            return (((_b = (_a = NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.DataTable) === null || _b === void 0 ? void 0 : _b.renderFilter) || props.column.renderFilter);
+            return (((_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.DataTable) === null || _b === void 0 ? void 0 : _b.renderFilter) ||
+                props.column.renderFilter);
         });
         function handleFilterChange(mergedFilterValue) {
             const nextFilterState = createFilterState(filterStateRef.value, props.column.key, mergedFilterValue);

package/lib/data-table/src/HeaderButton/SortButton.js

@@ -18,7 +18,7 @@ exports.default = (0, vue_1.defineComponent)({
         }
     },
     setup(props) {
-        const { NConfigProvider } = (0, _mixins_1.useConfig)();
+        const { mergedComponentPropsRef } = (0, _mixins_1.useConfig)();
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const { mergedSortStateRef, mergedClsPrefixRef } = (0, vue_1.inject)(interface_1.dataTableInjectionKey);
         const sortStateRef = (0, vue_1.computed)(() => mergedSortStateRef.value.find((state) => state.columnKey === props.column.key));
@@ -34,7 +34,8 @@ exports.default = (0, vue_1.defineComponent)({
         });
         const mergedRenderSorterRef = (0, vue_1.computed)(() => {
             var _a, _b;
-            return (((_b = (_a = NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.DataTable) === null || _b === void 0 ? void 0 : _b.renderSorter) || props.column.renderSorter);
+            return (((_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.DataTable) === null || _b === void 0 ? void 0 : _b.renderSorter) ||
+                props.column.renderSorter);
         });
         return {
             mergedClsPrefix: mergedClsPrefixRef,

package/lib/data-table/src/TableParts/Body.d.ts

@@ -18,6 +18,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;

package/lib/data-table/src/TableParts/Body.js

@@ -500,7 +500,9 @@ exports.default = (0, vue_1.defineComponent)({
             const createEmptyNode = () => ((0, vue_1.h)("div", { class: [
                     `${mergedClsPrefix}-data-table-empty`,
                     this.loading && `${mergedClsPrefix}-data-table-empty--hide`
-                ], style: this.bodyStyle, ref: "emptyElRef" }, this.dataTableSlots.empty ? (this.dataTableSlots.empty()) : ((0, vue_1.h)(empty_1.NEmpty, { theme: this.mergedTheme.peers.Empty, themeOverrides: this.mergedTheme.peerOverrides.Empty }))));
+                ], style: this.bodyStyle, ref: "emptyElRef" }, (0, _utils_1.resolveSlot)(this.dataTableSlots.empty, () => [
+                (0, vue_1.h)(empty_1.NEmpty, { theme: this.mergedTheme.peers.Empty, themeOverrides: this.mergedTheme.peerOverrides.Empty })
+            ])));
             if (this.shouldDisplaySomeTablePart) {
                 return ((0, vue_1.h)(vue_1.Fragment, null,
                     tableNode,

package/lib/data-table/src/interface.d.ts

@@ -220,7 +220,7 @@ export interface DataTableInst {
 }
 export declare type CreateSummary<T = InternalRowData> = (pageData: T[]) => SummaryRowData | SummaryRowData[];
 export interface SummaryCell {
-    value?: string | number;
+    value?: VNodeChild;
     colSpan?: number;
     rowSpan?: number;
 }

package/lib/data-table/src/use-table-data.js

@@ -11,12 +11,19 @@ const use_sorter_1 = require("./use-sorter");
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function useTableData(props, { dataRelatedColsRef }) {
     const selectionColumnRef = (0, vue_1.computed)(() => {
-        return (props.columns.find((col) => {
-            if (col.type === 'selection') {
-                return true;
+        const getSelectionColumn = (cols) => {
+            for (let i = 0; i < cols.length; ++i) {
+                const col = cols[i];
+                if ('children' in col) {
+                    return getSelectionColumn(col.children);
+                }
+                else if (col.type === 'selection') {
+                    return col;
+                }
             }
-            return false;
-        }) || null);
+            return null;
+        };
+        return getSelectionColumn(props.columns);
     });
     const treeMateRef = (0, vue_1.computed)(() => {
         const { childrenKey } = props;
@@ -53,10 +60,15 @@ function useTableData(props, { dataRelatedColsRef }) {
         });
         const controlledFilterState = {};
         columnsWithControlledFilter.forEach((column) => {
+            var _a;
             if (column.type === 'selection' || column.type === 'expand')
                 return;
-            controlledFilterState[column.key] =
-                column.filterOptionValues || column.filterOptionValue || null;
+            if (column.filterOptionValues === undefined) {
+                controlledFilterState[column.key] = (_a = column.filterOptionValue) !== null && _a !== void 0 ? _a : null;
+            }
+            else {
+                controlledFilterState[column.key] = column.filterOptionValues;
+            }
         });
         const activeFilters = Object.assign((0, utils_1.createShallowClonedObject)(uncontrolledFilterStateRef.value), controlledFilterState);
         return activeFilters;

package/lib/date-picker/src/DatePicker.d.ts

@@ -3809,6 +3809,7 @@ declare const _default: import("vue").DefineComponent<{
             containerScrollTop: number;
             syncUnifiedContainer: () => void;
             scrollTo: import("../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+            scrollBy: import("../../_internal/scrollbar/src/ScrollBar").ScrollBy;
             sync: () => void;
             handleMouseEnterWrapper: () => void;
             handleMouseLeaveWrapper: () => void;

package/lib/date-picker/src/DatePicker.js

@@ -57,7 +57,7 @@ exports.default = (0, vue_1.defineComponent)({
         const { localeRef, dateLocaleRef } = (0, _mixins_1.useLocale)('DatePicker');
         const formItem = (0, _mixins_1.useFormItem)(props);
         const { mergedSizeRef, mergedDisabledRef, mergedStatusRef } = formItem;
-        const { NConfigProvider, mergedClsPrefixRef, mergedBorderedRef, namespaceRef } = (0, _mixins_1.useConfig)(props);
+        const { mergedComponentPropsRef, mergedClsPrefixRef, mergedBorderedRef, namespaceRef } = (0, _mixins_1.useConfig)(props);
         const panelInstRef = (0, vue_1.ref)(null);
         const triggerElRef = (0, vue_1.ref)(null);
         const inputInstRef = (0, vue_1.ref)(null);
@@ -128,7 +128,7 @@ exports.default = (0, vue_1.defineComponent)({
         const themeRef = (0, _mixins_1.useTheme)('DatePicker', '-date-picker', index_cssr_1.default, styles_1.datePickerLight, props, mergedClsPrefixRef);
         const timePickerSizeRef = (0, vue_1.computed)(() => {
             var _a, _b;
-            return (((_b = (_a = NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.DatePicker) === null || _b === void 0 ? void 0 : _b.timePickerSize) || 'small');
+            return (((_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.DatePicker) === null || _b === void 0 ? void 0 : _b.timePickerSize) || 'small');
         });
         const isRangeRef = (0, vue_1.computed)(() => {
             return ['daterange', 'datetimerange'].includes(props.type);

package/lib/date-picker/src/panel/date.d.ts

@@ -48,6 +48,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;
@@ -63,6 +64,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;

package/lib/date-picker/src/panel/datetime.d.ts

@@ -42,6 +42,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;
@@ -57,6 +58,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;

package/lib/date-picker/src/panel/month.d.ts

@@ -50,6 +50,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;
@@ -65,6 +66,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;

package/lib/date-picker/src/panel/panelHeader.d.ts

@@ -127,6 +127,7 @@ declare const _default: import("vue").DefineComponent<{
                 containerScrollTop: number;
                 syncUnifiedContainer: () => void;
                 scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+                scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
                 sync: () => void;
                 handleMouseEnterWrapper: () => void;
                 handleMouseLeaveWrapper: () => void;
@@ -142,6 +143,7 @@ declare const _default: import("vue").DefineComponent<{
                 containerScrollTop: number;
                 syncUnifiedContainer: () => void;
                 scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+                scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
                 sync: () => void;
                 handleMouseEnterWrapper: () => void;
                 handleMouseLeaveWrapper: () => void;
@@ -1306,6 +1308,7 @@ declare const _default: import("vue").DefineComponent<{
             containerScrollTop: number;
             syncUnifiedContainer: () => void;
             scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+            scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
             sync: () => void;
             handleMouseEnterWrapper: () => void;
             handleMouseLeaveWrapper: () => void;
@@ -1321,6 +1324,7 @@ declare const _default: import("vue").DefineComponent<{
             containerScrollTop: number;
             syncUnifiedContainer: () => void;
             scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+            scrollBy: import("../../../_internal/scrollbar/src/ScrollBar").ScrollBy;
             sync: () => void;
             handleMouseEnterWrapper: () => void;
             handleMouseLeaveWrapper: () => void;