naive-ui 2.25.0 → 2.25.3

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

@@ -470,7 +470,7 @@ export declare const dataTableProps: {
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -481,7 +481,7 @@ export declare const dataTableProps: {
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -490,7 +490,7 @@ export declare const dataTableProps: {
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -1071,7 +1071,7 @@ export declare const dataTableProps: {
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -1082,7 +1082,7 @@ export declare const dataTableProps: {
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -1091,7 +1091,7 @@ export declare const dataTableProps: {
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -1672,7 +1672,7 @@ export declare const dataTableProps: {
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -1683,7 +1683,7 @@ export declare const dataTableProps: {
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -1692,7 +1692,7 @@ export declare const dataTableProps: {
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -2361,7 +2361,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -2372,7 +2372,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -2381,7 +2381,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -2962,7 +2962,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -2973,7 +2973,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -2982,7 +2982,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -3563,7 +3563,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -3574,7 +3574,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -3583,7 +3583,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -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;
@@ -4323,7 +4282,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHover: string;
                         borderActive: string;
                         borderFocus: string;
-                        boxShadowHover: null;
+                        boxShadowHover: string;
                         boxShadowActive: string;
                         boxShadowFocus: string;
                         caretColor: string;
@@ -4334,7 +4293,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverWarning: string;
                         borderActiveWarning: string;
                         borderFocusWarning: string;
-                        boxShadowHoverWarning: null;
+                        boxShadowHoverWarning: string;
                         boxShadowActiveWarning: string;
                         boxShadowFocusWarning: string;
                         colorActiveWarning: string;
@@ -4343,7 +4302,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverError: string;
                         borderActiveError: string;
                         borderFocusError: string;
-                        boxShadowHoverError: null;
+                        boxShadowHoverError: string;
                         boxShadowActiveError: string;
                         boxShadowFocusError: string;
                         colorActiveError: string;
@@ -4583,7 +4542,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHover: string;
                             borderActive: string;
                             borderFocus: string;
-                            boxShadowHover: null;
+                            boxShadowHover: string;
                             boxShadowActive: string;
                             boxShadowFocus: string;
                             caretColor: string;
@@ -4594,7 +4553,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHoverWarning: string;
                             borderActiveWarning: string;
                             borderFocusWarning: string;
-                            boxShadowHoverWarning: null;
+                            boxShadowHoverWarning: string;
                             boxShadowActiveWarning: string;
                             boxShadowFocusWarning: string;
                             colorActiveWarning: string;
@@ -4603,7 +4562,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHoverError: string;
                             borderActiveError: string;
                             borderFocusError: string;
-                            boxShadowHoverError: null;
+                            boxShadowHoverError: string;
                             boxShadowActiveError: string;
                             boxShadowFocusError: string;
                             colorActiveError: string;
@@ -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>;
@@ -5261,7 +5263,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -5272,7 +5274,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -5281,7 +5283,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -5862,7 +5864,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -5873,7 +5875,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -5882,7 +5884,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -6463,7 +6465,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -6474,7 +6476,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -6483,7 +6485,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -6686,8 +6688,8 @@ declare const _default: import("vue").DefineComponent<{
     size: "small" | "medium" | "large";
     tableLayout: "fixed" | "auto";
     columns: TableColumns<any>;
-    bordered: boolean | undefined;
     loading: boolean;
+    bordered: boolean | undefined;
     virtualScroll: boolean;
     remote: boolean;
     pagination: 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.d.ts

@@ -498,7 +498,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHover: string;
                         borderActive: string;
                         borderFocus: string;
-                        boxShadowHover: null;
+                        boxShadowHover: string;
                         boxShadowActive: string;
                         boxShadowFocus: string;
                         caretColor: string;
@@ -509,7 +509,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverWarning: string;
                         borderActiveWarning: string;
                         borderFocusWarning: string;
-                        boxShadowHoverWarning: null;
+                        boxShadowHoverWarning: string;
                         boxShadowActiveWarning: string;
                         boxShadowFocusWarning: string;
                         colorActiveWarning: string;
@@ -518,7 +518,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverError: string;
                         borderActiveError: string;
                         borderFocusError: string;
-                        boxShadowHoverError: null;
+                        boxShadowHoverError: string;
                         boxShadowActiveError: string;
                         boxShadowFocusError: string;
                         colorActiveError: string;
@@ -758,7 +758,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHover: string;
                             borderActive: string;
                             borderFocus: string;
-                            boxShadowHover: null;
+                            boxShadowHover: string;
                             boxShadowActive: string;
                             boxShadowFocus: string;
                             caretColor: string;
@@ -769,7 +769,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHoverWarning: string;
                             borderActiveWarning: string;
                             borderFocusWarning: string;
-                            boxShadowHoverWarning: null;
+                            boxShadowHoverWarning: string;
                             boxShadowActiveWarning: string;
                             boxShadowFocusWarning: string;
                             colorActiveWarning: string;
@@ -778,7 +778,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHoverError: string;
                             borderActiveError: string;
                             borderFocusError: string;
-                            boxShadowHoverError: null;
+                            boxShadowHoverError: string;
                             boxShadowActiveError: string;
                             boxShadowFocusError: string;
                             colorActiveError: string;

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/FilterMenu.d.ts

@@ -523,7 +523,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHover: string;
                         borderActive: string;
                         borderFocus: string;
-                        boxShadowHover: null;
+                        boxShadowHover: string;
                         boxShadowActive: string;
                         boxShadowFocus: string;
                         caretColor: string;
@@ -534,7 +534,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverWarning: string;
                         borderActiveWarning: string;
                         borderFocusWarning: string;
-                        boxShadowHoverWarning: null;
+                        boxShadowHoverWarning: string;
                         boxShadowActiveWarning: string;
                         boxShadowFocusWarning: string;
                         colorActiveWarning: string;
@@ -543,7 +543,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverError: string;
                         borderActiveError: string;
                         borderFocusError: string;
-                        boxShadowHoverError: null;
+                        boxShadowHoverError: string;
                         boxShadowActiveError: string;
                         boxShadowFocusError: string;
                         colorActiveError: string;
@@ -783,7 +783,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHover: string;
                             borderActive: string;
                             borderFocus: string;
-                            boxShadowHover: null;
+                            boxShadowHover: string;
                             boxShadowActive: string;
                             boxShadowFocus: string;
                             caretColor: string;
@@ -794,7 +794,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHoverWarning: string;
                             borderActiveWarning: string;
                             borderFocusWarning: string;
-                            boxShadowHoverWarning: null;
+                            boxShadowHoverWarning: string;
                             boxShadowActiveWarning: string;
                             boxShadowFocusWarning: string;
                             colorActiveWarning: string;
@@ -803,7 +803,7 @@ declare const _default: import("vue").DefineComponent<{
                             borderHoverError: string;
                             borderActiveError: string;
                             borderFocusError: string;
-                            boxShadowHoverError: null;
+                            boxShadowHoverError: string;
                             boxShadowActiveError: string;
                             boxShadowFocusError: string;
                             colorActiveError: string;