naive-ui 2.24.6 → 2.25.2

package/es/pagination/src/Pagination.d.ts

@@ -111,7 +111,7 @@ declare const paginationProps: {
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -122,7 +122,7 @@ declare const paginationProps: {
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -131,7 +131,7 @@ declare const paginationProps: {
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -339,7 +339,7 @@ declare const paginationProps: {
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -350,7 +350,7 @@ declare const paginationProps: {
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -359,7 +359,7 @@ declare const paginationProps: {
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -567,7 +567,7 @@ declare const paginationProps: {
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -578,7 +578,7 @@ declare const paginationProps: {
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -587,7 +587,7 @@ declare const paginationProps: {
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -838,7 +838,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -849,7 +849,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -858,7 +858,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -1066,7 +1066,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -1077,7 +1077,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -1086,7 +1086,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -1294,7 +1294,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -1305,7 +1305,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -1314,7 +1314,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -1655,7 +1655,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHover: string;
                     borderActive: string;
                     borderFocus: string;
-                    boxShadowHover: null;
+                    boxShadowHover: string;
                     boxShadowActive: string;
                     boxShadowFocus: string;
                     caretColor: string;
@@ -1666,7 +1666,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverWarning: string;
                     borderActiveWarning: string;
                     borderFocusWarning: string;
-                    boxShadowHoverWarning: null;
+                    boxShadowHoverWarning: string;
                     boxShadowActiveWarning: string;
                     boxShadowFocusWarning: string;
                     colorActiveWarning: string;
@@ -1675,7 +1675,7 @@ declare const _default: import("vue").DefineComponent<{
                     borderHoverError: string;
                     borderActiveError: string;
                     borderFocusError: string;
-                    boxShadowHoverError: null;
+                    boxShadowHoverError: string;
                     boxShadowActiveError: string;
                     boxShadowFocusError: string;
                     colorActiveError: string;
@@ -1841,7 +1841,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHover: string;
                         borderActive: string;
                         borderFocus: string;
-                        boxShadowHover: null;
+                        boxShadowHover: string;
                         boxShadowActive: string;
                         boxShadowFocus: string;
                         caretColor: string;
@@ -1852,7 +1852,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverWarning: string;
                         borderActiveWarning: string;
                         borderFocusWarning: string;
-                        boxShadowHoverWarning: null;
+                        boxShadowHoverWarning: string;
                         boxShadowActiveWarning: string;
                         boxShadowFocusWarning: string;
                         colorActiveWarning: string;
@@ -1861,7 +1861,7 @@ declare const _default: import("vue").DefineComponent<{
                         borderHoverError: string;
                         borderActiveError: string;
                         borderFocusError: string;
-                        boxShadowHoverError: null;
+                        boxShadowHoverError: string;
                         boxShadowActiveError: string;
                         boxShadowFocusError: string;
                         colorActiveError: string;
@@ -2111,7 +2111,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -2122,7 +2122,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -2131,7 +2131,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -2339,7 +2339,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -2350,7 +2350,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -2359,7 +2359,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -2567,7 +2567,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -2578,7 +2578,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -2587,7 +2587,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;

package/es/pagination/src/Pagination.js

@@ -50,7 +50,7 @@ export default defineComponent({
             });
         }
         const { NConfigProvider, mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Pagination', 'Pagination', style, paginationLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Pagination', '-pagination', style, paginationLight, props, mergedClsPrefixRef);
         const { localeRef } = useLocale('Pagination');
         const selfRef = ref(null);
         const jumperRef = ref(null);

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

@@ -108,7 +108,7 @@ declare const paginationLight: import("../../_mixins").Theme<"Pagination", {
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -119,7 +119,7 @@ declare const paginationLight: import("../../_mixins").Theme<"Pagination", {
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -128,7 +128,7 @@ declare const paginationLight: import("../../_mixins").Theme<"Pagination", {
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;

package/es/popconfirm/src/Popconfirm.d.ts

@@ -33,7 +33,7 @@ declare const popconfirmProps: {
     };
     raw: BooleanConstructor;
     placement: {
-        type: PropType<import("vueuc").FollowerPlacement>;
+        type: PropType<import("vueuc/lib/binder/src/interface").Placement>;
         default: string;
     };
     x: NumberConstructor;
@@ -58,11 +58,15 @@ declare const popconfirmProps: {
         default: undefined;
     };
     overlap: BooleanConstructor;
+    keepAliveOnHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    onClickoutside: PropType<(e: MouseEvent) => void>;
     internalExtraClass: {
         type: PropType<string[]>;
         default: () => never[];
     };
-    onClickoutside: PropType<(e: MouseEvent) => void>;
     'onUpdate:show': PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     onUpdateShow: PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     zIndex: NumberConstructor;
@@ -790,7 +794,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     raw: BooleanConstructor;
     placement: {
-        type: PropType<import("vueuc").FollowerPlacement>;
+        type: PropType<import("vueuc/lib/binder/src/interface").Placement>;
         default: string;
     };
     x: NumberConstructor;
@@ -815,11 +819,15 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     overlap: BooleanConstructor;
+    keepAliveOnHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    onClickoutside: PropType<(e: MouseEvent) => void>;
     internalExtraClass: {
         type: PropType<string[]>;
         default: () => never[];
     };
-    onClickoutside: PropType<(e: MouseEvent) => void>;
     'onUpdate:show': PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     onUpdateShow: PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     zIndex: NumberConstructor;
@@ -1894,7 +1902,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     raw: BooleanConstructor;
     placement: {
-        type: PropType<import("vueuc").FollowerPlacement>;
+        type: PropType<import("vueuc/lib/binder/src/interface").Placement>;
         default: string;
     };
     x: NumberConstructor;
@@ -1919,11 +1927,15 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     overlap: BooleanConstructor;
+    keepAliveOnHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    onClickoutside: PropType<(e: MouseEvent) => void>;
     internalExtraClass: {
         type: PropType<string[]>;
         default: () => never[];
     };
-    onClickoutside: PropType<(e: MouseEvent) => void>;
     'onUpdate:show': PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     onUpdateShow: PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     zIndex: NumberConstructor;
@@ -2625,13 +2637,14 @@ declare const _default: import("vue").DefineComponent<{
     duration: number;
     to: string | boolean | HTMLElement;
     raw: boolean;
-    placement: import("vueuc").FollowerPlacement;
-    overlap: boolean;
     showIcon: boolean;
+    placement: import("vueuc/lib/binder/src/interface").Placement;
+    overlap: boolean;
     trigger: PopoverTrigger;
     showArrow: boolean;
     delay: number;
     displayDirective: "show" | "if";
+    keepAliveOnHover: boolean;
     internalTrapFocus: boolean;
     animated: boolean;
     defaultShow: boolean;

package/es/popconfirm/src/Popconfirm.js

@@ -20,7 +20,7 @@ export default defineComponent({
     __popover__: true,
     setup(props) {
         const { mergedClsPrefixRef } = useConfig();
-        const themeRef = useTheme('Popconfirm', 'Popconfirm', style, popconfirmLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Popconfirm', '-popconfirm', style, popconfirmLight, props, mergedClsPrefixRef);
         const popoverInstRef = ref(null);
         function handlePositiveClick(e) {
             const { onPositiveClick, 'onUpdate:show': onUpdateShow } = props;

package/es/popover/index.d.ts

@@ -1,3 +1,4 @@
 export { default as NPopover } from './src/Popover';
 export type { PopoverProps } from './src/Popover';
 export type { PopoverTrigger, PopoverInst } from './src/interface';
+export type { FollowerPlacement as PopoverPlacement } from 'vueuc';

package/es/popover/src/Popover.d.ts

@@ -76,11 +76,15 @@ export declare const popoverBaseProps: {
         default: undefined;
     };
     overlap: BooleanConstructor;
+    keepAliveOnHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    onClickoutside: PropType<(e: MouseEvent) => void>;
     internalExtraClass: {
         type: PropType<string[]>;
         default: () => never[];
     };
-    onClickoutside: PropType<(e: MouseEvent) => void>;
     'onUpdate:show': PropType<MaybeArray<(value: boolean) => void>>;
     onUpdateShow: PropType<MaybeArray<(value: boolean) => void>>;
     zIndex: NumberConstructor;
@@ -158,11 +162,15 @@ declare const popoverProps: {
         default: undefined;
     };
     overlap: BooleanConstructor;
+    keepAliveOnHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    onClickoutside: PropType<(e: MouseEvent) => void>;
     internalExtraClass: {
         type: PropType<string[]>;
         default: () => never[];
     };
-    onClickoutside: PropType<(e: MouseEvent) => void>;
     'onUpdate:show': PropType<MaybeArray<(value: boolean) => void>>;
     onUpdateShow: PropType<MaybeArray<(value: boolean) => void>>;
     zIndex: NumberConstructor;
@@ -284,11 +292,15 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     overlap: BooleanConstructor;
+    keepAliveOnHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    onClickoutside: PropType<(e: MouseEvent) => void>;
     internalExtraClass: {
         type: PropType<string[]>;
         default: () => never[];
     };
-    onClickoutside: PropType<(e: MouseEvent) => void>;
     'onUpdate:show': PropType<MaybeArray<(value: boolean) => void>>;
     onUpdateShow: PropType<MaybeArray<(value: boolean) => void>>;
     zIndex: NumberConstructor;
@@ -423,11 +435,15 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     overlap: BooleanConstructor;
+    keepAliveOnHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    onClickoutside: PropType<(e: MouseEvent) => void>;
     internalExtraClass: {
         type: PropType<string[]>;
         default: () => never[];
     };
-    onClickoutside: PropType<(e: MouseEvent) => void>;
     'onUpdate:show': PropType<MaybeArray<(value: boolean) => void>>;
     onUpdateShow: PropType<MaybeArray<(value: boolean) => void>>;
     zIndex: NumberConstructor;
@@ -510,6 +526,7 @@ declare const _default: import("vue").DefineComponent<{
     showArrow: boolean;
     delay: number;
     displayDirective: "show" | "if";
+    keepAliveOnHover: boolean;
     internalTrapFocus: boolean;
     animated: boolean;
     defaultShow: boolean;

package/es/popover/src/Popover.js

@@ -82,11 +82,15 @@ export const popoverBaseProps = {
         default: undefined
     },
     overlap: Boolean,
+    keepAliveOnHover: {
+        type: Boolean,
+        default: true
+    },
+    onClickoutside: Function,
     internalExtraClass: {
         type: Array,
         default: () => []
     },
-    onClickoutside: Function,
     // events
     'onUpdate:show': [Function, Array],
     onUpdateShow: [Function, Array],
@@ -454,7 +458,10 @@ export default defineComponent({
                         : h(VTarget, null, {
                             default: () => triggerVNode
                         }),
-                    h(NPopoverBody, keep(this.$props, bodyPropKeys, Object.assign(Object.assign({}, this.$attrs), { showArrow: this.mergedShowArrow, show: mergedShow })), slots)
+                    h(NPopoverBody, keep(this.$props, bodyPropKeys, Object.assign(Object.assign({}, this.$attrs), { showArrow: this.mergedShowArrow, show: mergedShow })), {
+                        default: () => { var _a, _b; return (_b = (_a = this.$slots).default) === null || _b === void 0 ? void 0 : _b.call(_a); },
+                        header: () => { var _a, _b; return (_b = (_a = this.$slots).header) === null || _b === void 0 ? void 0 : _b.call(_a); }
+                    })
                 ];
             }
         }));

package/es/popover/src/PopoverBody.d.ts

@@ -20,6 +20,7 @@ export declare const popoverBodyProps: {
     overlap: BooleanConstructor;
     placement: PropType<FollowerPlacement>;
     width: PropType<number | "trigger">;
+    keepAliveOnHover: BooleanConstructor;
     internalTrapFocus: BooleanConstructor;
     animated: BooleanConstructor;
     onClickoutside: PropType<(e: MouseEvent) => void>;
@@ -93,6 +94,7 @@ declare const _default: import("vue").DefineComponent<{
     overlap: BooleanConstructor;
     placement: PropType<FollowerPlacement>;
     width: PropType<number | "trigger">;
+    keepAliveOnHover: BooleanConstructor;
     internalTrapFocus: BooleanConstructor;
     animated: BooleanConstructor;
     onClickoutside: PropType<(e: MouseEvent) => void>;
@@ -170,6 +172,7 @@ declare const _default: import("vue").DefineComponent<{
     overlap: BooleanConstructor;
     placement: PropType<FollowerPlacement>;
     width: PropType<number | "trigger">;
+    keepAliveOnHover: BooleanConstructor;
     internalTrapFocus: BooleanConstructor;
     animated: BooleanConstructor;
     onClickoutside: PropType<(e: MouseEvent) => void>;
@@ -225,6 +228,7 @@ declare const _default: import("vue").DefineComponent<{
     raw: boolean;
     overlap: boolean;
     showArrow: boolean;
+    keepAliveOnHover: boolean;
     internalTrapFocus: boolean;
     animated: boolean;
 }>;

package/es/popover/src/PopoverBody.js

@@ -1,14 +1,14 @@
-import { h, vShow, withDirectives, Transition, ref, defineComponent, computed, mergeProps, inject, onBeforeUnmount, watch, toRef, provide, Fragment } from 'vue';
+import { h, vShow, withDirectives, Transition, ref, defineComponent, computed, mergeProps, inject, onBeforeUnmount, watch, toRef, provide } from 'vue';
 import { VFollower, VFocusTrap } from 'vueuc';
 import { clickoutside, mousemoveoutside } from 'vdirs';
 import { useTheme, useConfig } from '../../_mixins';
-import { formatLength, useAdjustedTo } from '../../_utils';
+import { formatLength, isSlotEmpty, resolveWrappedSlot, useAdjustedTo } from '../../_utils';
 import { popoverLight } from '../styles';
 import style from './styles/index.cssr';
 import { popoverBodyInjectionKey } from './interface';
 import { drawerBodyInjectionKey } from '../../drawer/src/interface';
 import { modalBodyInjectionKey } from '../../modal/src/interface';
-export const popoverBodyProps = Object.assign(Object.assign({}, useTheme.props), { to: useAdjustedTo.propTo, show: Boolean, trigger: String, showArrow: Boolean, delay: Number, duration: Number, raw: Boolean, arrowStyle: [String, Object], displayDirective: String, x: Number, y: Number, flip: Boolean, overlap: Boolean, placement: String, width: [Number, String], internalTrapFocus: Boolean, 
+export const popoverBodyProps = Object.assign(Object.assign({}, useTheme.props), { to: useAdjustedTo.propTo, show: Boolean, trigger: String, showArrow: Boolean, delay: Number, duration: Number, raw: Boolean, arrowStyle: [String, Object], displayDirective: String, x: Number, y: Number, flip: Boolean, overlap: Boolean, placement: String, width: [Number, String], keepAliveOnHover: Boolean, internalTrapFocus: Boolean, 
     // private
     animated: Boolean, onClickoutside: Function, 
     /** @deprecated */
@@ -23,7 +23,7 @@ export default defineComponent({
     props: popoverBodyProps,
     setup(props, { slots, attrs }) {
         const { namespaceRef, mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Popover', 'Popover', style, popoverLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Popover', '-popover', style, popoverLight, props, mergedClsPrefixRef);
         const followerRef = ref(null);
         const NPopover = inject('NPopover');
         const bodyRef = ref(null);
@@ -101,12 +101,12 @@ export default defineComponent({
             (_a = followerRef.value) === null || _a === void 0 ? void 0 : _a.syncPosition();
         }
         function handleMouseEnter(e) {
-            if (props.trigger === 'hover') {
+            if (props.trigger === 'hover' && props.keepAliveOnHover) {
                 NPopover.handleMouseEnter(e);
             }
         }
         function handleMouseLeave(e) {
-            if (props.trigger === 'hover') {
+            if (props.trigger === 'hover' && props.keepAliveOnHover) {
                 NPopover.handleMouseLeave(e);
             }
         }
@@ -139,9 +139,10 @@ export default defineComponent({
                 const renderContentInnerNode = () => {
                     var _a;
                     return [
-                        slots.header ? (h(Fragment, null,
-                            h("div", { class: `${mergedClsPrefix}-popover__header` }, slots.header()),
-                            h("div", { class: `${mergedClsPrefix}-popover__content` }, slots))) : ((_a = slots.default) === null || _a === void 0 ? void 0 : _a.call(slots)),
+                        resolveWrappedSlot(slots.header, (children) => [
+                            h("div", { class: `${mergedClsPrefix}-popover__header` }, children),
+                            h("div", { class: `${mergedClsPrefix}-popover__content` }, slots)
+                        ]) || ((_a = slots.default) === null || _a === void 0 ? void 0 : _a.call(slots)),
                         props.showArrow
                             ? renderArrow({
                                 arrowStyle: props.arrowStyle,
@@ -157,8 +158,9 @@ export default defineComponent({
                         {
                             [`${mergedClsPrefix}-popover--overlap`]: props.overlap,
                             [`${mergedClsPrefix}-popover--show-arrow`]: props.showArrow,
-                            [`${mergedClsPrefix}-popover--show-header`]: !!slots.header,
-                            [`${mergedClsPrefix}-popover--raw`]: props.raw
+                            [`${mergedClsPrefix}-popover--show-header`]: !isSlotEmpty(slots.header),
+                            [`${mergedClsPrefix}-popover--raw`]: props.raw,
+                            [`${mergedClsPrefix}-popover--manual-trigger`]: props.trigger === 'manual'
                         }
                     ],
                     ref: bodyRef,

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

@@ -114,9 +114,9 @@ c('&.popover-transition-enter-from, &.popover-transition-leave-to', `
 function placementStyle(placement, arrowStyleLiteral) {
   const position = placement.split('-')[0];
   const sizeStyle = ['top', 'bottom'].includes(position) ? 'height: var(--n-space-arrow);' : 'width: var(--n-space-arrow);';
-  return c(`[v-placement="${placement}"] >`, [cB('popover', `
+  return c(`[v-placement="${placement}"] >`, [cB('popover', [cNotM('manual-trigger', `
  margin-${oppositePlacement[position]}: var(--n-space);
- `, [cM('show-arrow', `
+ `), cM('show-arrow', `
  margin-${oppositePlacement[position]}: var(--n-space-arrow);
  `), cM('overlap', `
  margin: 0;