naive-ui 2.23.2 → 2.24.3

package/lib/date-picker/src/panel/panelHeader.js

@@ -0,0 +1,77 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const vue_1 = require("vue");
+const vueuc_1 = require("vueuc");
+const vdirs_1 = require("vdirs");
+const month_1 = __importDefault(require("./month"));
+exports.default = (0, vue_1.defineComponent)({
+    props: {
+        mergedClsPrefix: {
+            type: String,
+            required: true
+        },
+        value: Number,
+        monthBeforeYear: {
+            type: Boolean,
+            required: true
+        },
+        calendarMonth: {
+            type: String,
+            required: true
+        },
+        calendarYear: {
+            type: String,
+            required: true
+        },
+        onUpdateValue: {
+            type: Function,
+            required: true
+        }
+    },
+    setup() {
+        const triggerRef = (0, vue_1.ref)(null);
+        const monthPanelRef = (0, vue_1.ref)(null);
+        const showRef = (0, vue_1.ref)(false);
+        function handleClickOutside(e) {
+            var _a;
+            if (showRef.value && !((_a = triggerRef.value) === null || _a === void 0 ? void 0 : _a.contains(e.target))) {
+                showRef.value = false;
+            }
+        }
+        function handleHeaderClick() {
+            showRef.value = !showRef.value;
+        }
+        return {
+            show: showRef,
+            triggerRef,
+            monthPanelRef,
+            handleHeaderClick,
+            handleClickOutside
+        };
+    },
+    render() {
+        const { handleClickOutside, mergedClsPrefix } = this;
+        return ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-date-panel-month__month-year`, ref: "triggerRef" },
+            (0, vue_1.h)(vueuc_1.VBinder, null, {
+                default: () => [
+                    (0, vue_1.h)(vueuc_1.VTarget, null, {
+                        default: () => ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-date-panel-month__text`, onClick: this.handleHeaderClick }, this.monthBeforeYear
+                            ? [this.calendarMonth, this.calendarYear]
+                            : [this.calendarYear, this.calendarMonth]))
+                    }),
+                    (0, vue_1.h)(vueuc_1.VFollower, { show: this.show, teleportDisabled: true }, {
+                        default: () => ((0, vue_1.h)(vue_1.Transition, { name: "fade-in-scale-up-transition", appear: true }, {
+                            default: () => this.show
+                                ? (0, vue_1.withDirectives)((0, vue_1.h)(month_1.default, { ref: "monthPanelRef", onUpdateValue: this.onUpdateValue, actions: [], 
+                                    // month and year click show month type
+                                    type: "month", key: "month", useAsQuickJump: true, value: this.value }), [[vdirs_1.clickoutside, handleClickOutside]])
+                                : null
+                        }))
+                    })
+                ]
+            })));
+    }
+});

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

@@ -41,11 +41,14 @@ declare function useCalendar(props: ExtractPropTypes<typeof useCalendarProps>, t
         [name: string]: import("vue").Slot | undefined;
     }>;
     monthScrollRef: import("vue").Ref<{
-        scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
-        sync: () => void;
         containerRef: HTMLElement | null;
         contentRef: HTMLElement | null;
         containerScrollTop: number;
+        syncUnifiedContainer: () => void;
+        scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        sync: () => void;
+        handleMouseEnterWrapper: () => void;
+        handleMouseLeaveWrapper: () => void;
     } | null>;
     yearScrollRef: import("vue").Ref<{
         listElRef: HTMLElement;
@@ -53,12 +56,19 @@ declare function useCalendar(props: ExtractPropTypes<typeof useCalendarProps>, t
         scrollTo: import("vueuc/lib/virtual-list/src/VirtualList").ScrollTo;
     } | null>;
     scrollbarInstRef: import("vue").Ref<{
-        scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
-        sync: () => void;
         containerRef: HTMLElement | null;
         contentRef: HTMLElement | null;
         containerScrollTop: number;
+        syncUnifiedContainer: () => void;
+        scrollTo: import("../../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        sync: () => void;
+        handleMouseEnterWrapper: () => void;
+        handleMouseLeaveWrapper: () => void;
     } | null>;
+    handleQuickMonthClick: (dateItem: MonthItem | YearItem | QuarterItem, updatePanelValue: (value: number) => void) => void;
+    scrollPickerColumns: (value?: number | undefined) => void;
+    calendarValue: import("vue").Ref<number>;
+    onUpdateCalendarValue: (value: number) => void;
     mergedTheme: import("vue").Ref<{
         common: {
             baseColor: string;
@@ -1111,6 +1121,8 @@ declare function useCalendar(props: ExtractPropTypes<typeof useCalendarProps>, t
     restorePendingValue: () => void;
     getShortcutValue: (shortcut: number | [number, number] | (() => number) | (() => [number, number])) => number | [number, number];
     handleShortcutMouseleave: () => void;
+    showMonthYearPanel: import("vue").Ref<boolean>;
+    handleOpenQuickSelectMonthPanel: () => void;
     isValueInvalid: import("vue").ComputedRef<boolean>;
     isDateDisabled: import("vue").Ref<import("../interface").IsDateDisabled | undefined>;
     isDateInvalid: import("vue").ComputedRef<boolean>;

package/lib/date-picker/src/panel/use-calendar.js

@@ -6,6 +6,7 @@ const date_fns_1 = require("date-fns");
 const utils_1 = require("../utils");
 const interface_1 = require("../interface");
 const use_panel_common_1 = require("./use-panel-common");
+const config_1 = require("../config");
 const useCalendarProps = Object.assign(Object.assign({}, use_panel_common_1.usePanelCommonProps), { actions: {
         type: Array,
         default: () => ['now', 'clear', 'confirm']
@@ -14,7 +15,7 @@ exports.useCalendarProps = useCalendarProps;
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function useCalendar(props, type) {
     const panelCommon = (0, use_panel_common_1.usePanelCommon)(props);
-    const { isValueInvalidRef, isDateDisabledRef, isDateInvalidRef, isTimeInvalidRef, isDateTimeInvalidRef, isHourDisabledRef, isMinuteDisabledRef, isSecondDisabledRef, localeRef, firstDayOfWeekRef, datePickerSlots, scrollPickerColumns
+    const { isValueInvalidRef, isDateDisabledRef, isDateInvalidRef, isTimeInvalidRef, isDateTimeInvalidRef, isHourDisabledRef, isMinuteDisabledRef, isSecondDisabledRef, localeRef, firstDayOfWeekRef, datePickerSlots
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
      } = (0, vue_1.inject)(interface_1.datePickerInjectionKey);
     const validation = {
@@ -48,7 +49,7 @@ function useCalendar(props, type) {
     const yearArrayRef = (0, vue_1.computed)(() => {
         return (0, utils_1.yearArray)(calendarValueRef.value, props.value, nowRef.value);
     });
-    const querterArrayRef = (0, vue_1.computed)(() => {
+    const quarterArrayRef = (0, vue_1.computed)(() => {
         return (0, utils_1.quarterArray)(calendarValueRef.value, props.value, nowRef.value);
     });
     const weekdaysRef = (0, vue_1.computed)(() => {
@@ -179,6 +180,23 @@ function useCalendar(props, type) {
                 break;
         }
     }
+    function handleQuickMonthClick(dateItem, updatePanelValue) {
+        let newValue;
+        if (props.value !== null && !Array.isArray(props.value)) {
+            newValue = props.value;
+        }
+        else {
+            newValue = Date.now();
+        }
+        newValue = (0, date_fns_1.getTime)(dateItem.type === 'month'
+            ? (0, date_fns_1.setMonth)(newValue, dateItem.dateObject.month)
+            : (0, date_fns_1.setYear)(newValue, dateItem.dateObject.year));
+        updatePanelValue(newValue);
+        scrollPickerColumns(newValue);
+    }
+    function onUpdateCalendarValue(value) {
+        calendarValueRef.value = value;
+    }
     function deriveDateInputValue(time) {
         // If not selected, display nothing,
         // else update datetime related string
@@ -250,7 +268,26 @@ function useCalendar(props, type) {
         panelCommon.clearPendingValue();
         handleConfirmClick();
     }
-    return Object.assign(Object.assign(Object.assign({ dateArray: dateArrayRef, monthArray: monthArrayRef, yearArray: yearArrayRef, quarterArray: querterArrayRef, calendarYear: calendarYearRef, calendarMonth: calendarMonthRef, weekdays: weekdaysRef, mergedIsDateDisabled,
+    function scrollPickerColumns(value) {
+        const { value: mergedValue } = props;
+        if (monthScrollRef.value) {
+            const monthIndex = value === undefined
+                ? mergedValue === null
+                    ? (0, date_fns_1.getMonth)(Date.now())
+                    : (0, date_fns_1.getMonth)(mergedValue)
+                : (0, date_fns_1.getMonth)(value);
+            monthScrollRef.value.scrollTo({ top: monthIndex * config_1.MONTH_ITEM_HEIGHT });
+        }
+        if (yearScrollRef.value) {
+            const yearIndex = (value === undefined
+                ? mergedValue === null
+                    ? (0, date_fns_1.getYear)(Date.now())
+                    : (0, date_fns_1.getYear)(mergedValue)
+                : (0, date_fns_1.getYear)(value)) - config_1.START_YEAR;
+            yearScrollRef.value.scrollTo({ top: yearIndex * config_1.MONTH_ITEM_HEIGHT });
+        }
+    }
+    return Object.assign(Object.assign(Object.assign({ dateArray: dateArrayRef, monthArray: monthArrayRef, yearArray: yearArrayRef, quarterArray: quarterArrayRef, calendarYear: calendarYearRef, calendarMonth: calendarMonthRef, weekdays: weekdaysRef, mergedIsDateDisabled,
         nextYear,
         prevYear,
         nextMonth,
@@ -270,6 +307,8 @@ function useCalendar(props, type) {
         handleVirtualListScroll, timePickerSize: panelCommon.timePickerSize, dateInputValue: dateInputValueRef, datePickerSlots,
         monthScrollRef,
         yearScrollRef,
-        scrollbarInstRef });
+        scrollbarInstRef,
+        handleQuickMonthClick,
+        scrollPickerColumns, calendarValue: calendarValueRef, onUpdateCalendarValue });
 }
 exports.useCalendar = useCalendar;

package/lib/date-picker/src/panel/use-dual-calendar.d.ts

@@ -43,6 +43,10 @@ declare function useDualCalendar(props: ExtractPropTypes<typeof useDualCalendarP
         [name: string]: import("vue").Slot | undefined;
     }>;
     shortcuts: import("vue").ComputedRef<Shortcuts | undefined>;
+    startCalendarDateTime: import("vue").Ref<number>;
+    endCalendarDateTime: import("vue").Ref<number>;
+    onUpdateStartCalendarValue: (value: number) => void;
+    onUpdateEndCalendarValue: (value: number) => void;
     isDateDisabled: import("vue").Ref<import("../interface").IsDateDisabled | undefined>;
     isStartHourDisabled: import("vue").ComputedRef<import("../../../time-picker/src/interface").IsHourDisabled | undefined>;
     isEndHourDisabled: import("vue").ComputedRef<import("../../../time-picker/src/interface").IsHourDisabled | undefined>;
@@ -1108,6 +1112,8 @@ declare function useDualCalendar(props: ExtractPropTypes<typeof useDualCalendarP
     restorePendingValue: () => void;
     getShortcutValue: (shortcut: number | [number, number] | (() => number) | (() => [number, number])) => number | [number, number];
     handleShortcutMouseleave: () => void;
+    showMonthYearPanel: import("vue").Ref<boolean>;
+    handleOpenQuickSelectMonthPanel: () => void;
     startDatesElRef: import("vue").Ref<HTMLElement | null>;
     endDatesElRef: import("vue").Ref<HTMLElement | null>;
     resetSelectingStatus: (e: MouseEvent) => void;

package/lib/date-picker/src/panel/use-dual-calendar.js

@@ -167,6 +167,14 @@ function useDualCalendar(props, type = 'datetime') {
         endCalendarDateTimeRef.value = (0, date_fns_1.getTime)((0, date_fns_1.addMonths)(endCalendarDateTimeRef.value, -1));
         adjustCalendarTimes(false);
     }
+    function onUpdateStartCalendarValue(value) {
+        startCalendarDateTimeRef.value = value;
+        adjustCalendarTimes(true);
+    }
+    function onUpdateEndCalendarValue(value) {
+        endCalendarDateTimeRef.value = value;
+        adjustCalendarTimes(false);
+    }
     // The function is used on date panel, not the date-picker value validation
     function mergedIsDateDisabled(ts) {
         const isDateDisabled = isDateDisabledRef.value;
@@ -484,6 +492,7 @@ function useDualCalendar(props, type = 'datetime') {
         handleStartDateInputBlur,
         handleEndDateInput,
         handleEndDateInputBlur,
-        datePickerSlots, shortcuts: shortcutsRef });
+        datePickerSlots, shortcuts: shortcutsRef, startCalendarDateTime: startCalendarDateTimeRef, endCalendarDateTime: endCalendarDateTimeRef, onUpdateStartCalendarValue,
+        onUpdateEndCalendarValue });
 }
 exports.useDualCalendar = useDualCalendar;

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

@@ -1076,5 +1076,7 @@ declare function usePanelCommon(props: UsePanelCommonProps): {
     restorePendingValue: () => void;
     getShortcutValue: (shortcut: Shortcuts[string]) => number | [number, number];
     handleShortcutMouseleave: () => void;
+    showMonthYearPanel: import("vue").Ref<boolean>;
+    handleOpenQuickSelectMonthPanel: () => void;
 };
 export { usePanelCommon, usePanelCommonProps };

package/lib/date-picker/src/panel/use-panel-common.js

@@ -117,6 +117,10 @@ function usePanelCommon(props) {
         }
         return shortcut;
     }
+    const showMonthYearPanel = (0, vue_1.ref)(false);
+    function handleOpenQuickSelectMonthPanel() {
+        showMonthYearPanel.value = !showMonthYearPanel.value;
+    }
     return {
         mergedTheme: mergedThemeRef,
         mergedClsPrefix: mergedClsPrefixRef,
@@ -137,7 +141,9 @@ function usePanelCommon(props) {
         clearPendingValue,
         restorePendingValue,
         getShortcutValue,
-        handleShortcutMouseleave: restorePendingValue
+        handleShortcutMouseleave: restorePendingValue,
+        showMonthYearPanel,
+        handleOpenQuickSelectMonthPanel
     };
 }
 exports.usePanelCommon = usePanelCommon;

package/lib/date-picker/src/styles/index.cssr.js

@@ -199,13 +199,16 @@ exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('date-picker', `
  height: var(--n-arrow-size);
  color: var(--n-arrow-color);
  `), (0, cssr_1.cE)('month-year', `
+ flex-grow: 1;
+ position: relative;
+ `, [(0, cssr_1.cE)('text', `
  font-size: var(--n-calendar-title-font-size);
  font-weight: var(--n-calendar-title-font-weight);
  line-height: 17px;
- flex-grow: 1;
  text-align: center;
  color: var(--n-calendar-title-text-color);
- `)]), (0, cssr_1.cB)('date-panel-weekdays', `
+ cursor: pointer;
+ `)])]), (0, cssr_1.cB)('date-panel-weekdays', `
  display: grid;
  margin: auto;
  grid-template-columns: repeat(7, var(--n-item-cell-width));

package/lib/descriptions/src/Descriptions.d.ts

@@ -263,31 +263,33 @@ declare const _default: import("vue").DefineComponent<{
         '--n-border-color-popover': string;
     }>;
     compitableColumn: import("vue").ComputedRef<number>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    readonly title?: unknown;
-    readonly column?: unknown;
-    readonly columns?: unknown;
-    readonly labelPlacement?: unknown;
-    readonly labelAlign?: unknown;
-    readonly separator?: unknown;
-    readonly size?: unknown;
-    readonly bordered?: unknown;
-    readonly labelStyle?: unknown;
-    readonly contentStyle?: unknown;
-    readonly theme?: unknown;
-    readonly themeOverrides?: unknown;
-    readonly builtinThemeOverrides?: unknown;
-} & {
-    column: number;
-    size: "small" | "medium" | "large";
-    separator: string;
-    bordered: boolean;
-    labelPlacement: "left" | "top";
-    labelAlign: "left" | "right" | "center";
-} & {
-    columns?: number | undefined;
-    title?: string | undefined;
-    theme?: import("../../_mixins").Theme<"Descriptions", {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    readonly title: StringConstructor;
+    readonly column: {
+        readonly type: NumberConstructor;
+        readonly default: 3;
+    };
+    readonly columns: NumberConstructor;
+    readonly labelPlacement: {
+        readonly type: PropType<"left" | "top">;
+        readonly default: "top";
+    };
+    readonly labelAlign: {
+        readonly type: PropType<"left" | "right" | "center">;
+        readonly default: "left";
+    };
+    readonly separator: {
+        readonly type: StringConstructor;
+        readonly default: ":";
+    };
+    readonly size: {
+        readonly type: PropType<"small" | "medium" | "large">;
+        readonly default: "medium";
+    };
+    readonly bordered: BooleanConstructor;
+    readonly labelStyle: PropType<string | CSSProperties>;
+    readonly contentStyle: PropType<string | CSSProperties>;
+    readonly theme: PropType<import("../../_mixins").Theme<"Descriptions", {
         lineHeight: string;
         fontSizeSmall: string;
         fontSizeMedium: string;
@@ -317,8 +319,8 @@ declare const _default: import("vue").DefineComponent<{
         tdPaddingSmall: string;
         tdPaddingMedium: string;
         tdPaddingLarge: string;
-    }, any> | undefined;
-    themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Descriptions", {
+    }, any>>;
+    readonly themeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Descriptions", {
         lineHeight: string;
         fontSizeSmall: string;
         fontSizeMedium: string;
@@ -348,8 +350,8 @@ declare const _default: import("vue").DefineComponent<{
         tdPaddingSmall: string;
         tdPaddingMedium: string;
         tdPaddingLarge: string;
-    }, any>> | undefined;
-    builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Descriptions", {
+    }, any>>>;
+    readonly builtinThemeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Descriptions", {
         lineHeight: string;
         fontSizeSmall: string;
         fontSizeMedium: string;
@@ -379,10 +381,8 @@ declare const _default: import("vue").DefineComponent<{
         tdPaddingSmall: string;
         tdPaddingMedium: string;
         tdPaddingLarge: string;
-    }, any>> | undefined;
-    contentStyle?: string | CSSProperties | undefined;
-    labelStyle?: string | CSSProperties | undefined;
-}>, {
+    }, any>>>;
+}>>, {
     column: number;
     size: "small" | "medium" | "large";
     separator: string;

package/lib/descriptions/src/DescriptionsItem.d.ts

@@ -18,18 +18,15 @@ declare const _default: import("vue").DefineComponent<{
     };
     readonly labelStyle: PropType<string | CSSProperties>;
     readonly contentStyle: PropType<string | CSSProperties>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    readonly label?: unknown;
-    readonly span?: unknown;
-    readonly labelStyle?: unknown;
-    readonly contentStyle?: unknown;
-} & {
-    span: number;
-} & {
-    label?: string | undefined;
-    contentStyle?: string | CSSProperties | undefined;
-    labelStyle?: string | CSSProperties | undefined;
-}>, {
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    readonly label: StringConstructor;
+    readonly span: {
+        readonly type: NumberConstructor;
+        readonly default: 1;
+    };
+    readonly labelStyle: PropType<string | CSSProperties>;
+    readonly contentStyle: PropType<string | CSSProperties>;
+}>>, {
     span: number;
 }>;
 export default _default;

package/lib/dialog/src/Dialog.d.ts

@@ -1129,37 +1129,32 @@ declare const _default: import("vue").DefineComponent<{
         '--n-title-text-color': string;
         '--n-action-space': string;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    icon?: unknown;
-    type?: unknown;
-    title?: unknown;
-    closable?: unknown;
-    negativeText?: unknown;
-    positiveText?: unknown;
-    content?: unknown;
-    action?: unknown;
-    showIcon?: unknown;
-    loading?: unknown;
-    bordered?: unknown;
-    iconPlacement?: unknown;
-    onPositiveClick?: unknown;
-    onNegativeClick?: unknown;
-    onClose?: unknown;
-    theme?: unknown;
-    themeOverrides?: unknown;
-    builtinThemeOverrides?: unknown;
-} & {
-    type: "default" | "error" | "info" | "success" | "warning";
-    loading: boolean;
-    showIcon: boolean;
-    bordered: boolean;
-    closable: boolean;
-} & {
-    content?: string | (() => VNodeChild) | undefined;
-    icon?: (() => VNodeChild) | undefined;
-    title?: string | (() => VNodeChild) | undefined;
-    action?: (() => VNodeChild) | undefined;
-    theme?: import("../../_mixins").Theme<"Dialog", {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    icon: PropType<() => VNodeChild>;
+    type: {
+        readonly type: PropType<"default" | "error" | "info" | "success" | "warning">;
+        readonly default: "default";
+    };
+    title: PropType<string | (() => VNodeChild)>;
+    closable: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
+    negativeText: StringConstructor;
+    positiveText: StringConstructor;
+    content: PropType<string | (() => VNodeChild)>;
+    action: PropType<() => VNodeChild>;
+    showIcon: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
+    loading: BooleanConstructor;
+    bordered: BooleanConstructor;
+    iconPlacement: PropType<IconPlacement>;
+    onPositiveClick: PropType<(e: MouseEvent) => void>;
+    onNegativeClick: PropType<(e: MouseEvent) => void>;
+    onClose: PropType<() => void>;
+    theme: PropType<import("../../_mixins").Theme<"Dialog", {
         fontSize: string;
         lineHeight: string;
         border: string;
@@ -1391,8 +1386,8 @@ declare const _default: import("vue").DefineComponent<{
             iconSizeLarge: string;
             rippleDuration: string;
         }, any>;
-    }> | undefined;
-    themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Dialog", {
+    }>>;
+    themeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Dialog", {
         fontSize: string;
         lineHeight: string;
         border: string;
@@ -1624,8 +1619,8 @@ declare const _default: import("vue").DefineComponent<{
             iconSizeLarge: string;
             rippleDuration: string;
         }, any>;
-    }>> | undefined;
-    builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Dialog", {
+    }>>>;
+    builtinThemeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Dialog", {
         fontSize: string;
         lineHeight: string;
         border: string;
@@ -1857,14 +1852,8 @@ declare const _default: import("vue").DefineComponent<{
             iconSizeLarge: string;
             rippleDuration: string;
         }, any>;
-    }>> | undefined;
-    positiveText?: string | undefined;
-    negativeText?: string | undefined;
-    onClose?: (() => void) | undefined;
-    iconPlacement?: IconPlacement | undefined;
-    onPositiveClick?: ((e: MouseEvent) => void) | undefined;
-    onNegativeClick?: ((e: MouseEvent) => void) | undefined;
-}>, {
+    }>>>;
+}>>, {
     type: "default" | "error" | "info" | "success" | "warning";
     loading: boolean;
     showIcon: boolean;

package/lib/dialog/src/Dialog.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dialogPropKeys = exports.dialogProps = void 0;
 const vue_1 = require("vue");
+const icons_1 = require("../../_internal/icons");
 const _mixins_1 = require("../../_mixins");
 const _utils_1 = require("../../_utils");
 const _internal_1 = require("../../_internal");
 const button_1 = require("../../button");
-const icons_1 = require("../../_internal/icons");
 const styles_1 = require("../styles");
 const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
 const infoIcon = (0, vue_1.h)(icons_1.InfoIcon, null);
@@ -116,6 +116,7 @@ exports.default = (0, vue_1.defineComponent)({
     },
     render() {
         const { $slots, bordered, mergedIconPlacement, cssVars, closable, showIcon, title, content, action, negativeText, positiveText, handlePositiveClick, handleNegativeClick, mergedTheme, loading, type, mergedClsPrefix } = this;
+        console.log('action', $slots.action);
         return ((0, vue_1.h)("div", { class: [
                 `${mergedClsPrefix}-dialog`,
                 `${mergedClsPrefix}-dialog--icon-${mergedIconPlacement}`,
@@ -124,27 +125,33 @@ exports.default = (0, vue_1.defineComponent)({
             closable ? ((0, vue_1.h)(_internal_1.NBaseClose, { clsPrefix: mergedClsPrefix, class: `${mergedClsPrefix}-dialog__close`, onClick: this.handleCloseClick })) : null,
             showIcon && mergedIconPlacement === 'top' ? ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-dialog-icon-container` },
                 (0, vue_1.h)(_internal_1.NBaseIcon, { clsPrefix: mergedClsPrefix, class: `${mergedClsPrefix}-dialog__icon` }, {
-                    default: () => (0, vue_1.renderSlot)($slots, 'icon', undefined, () => [
-                        this.icon ? (0, _utils_1.render)(this.icon) : iconMap[this.type]
-                    ])
+                    default: () => $slots.icon
+                        ? $slots.icon()
+                        : this.icon
+                            ? (0, _utils_1.render)(this.icon)
+                            : iconMap[this.type]
                 }))) : null,
             (0, vue_1.h)("div", { class: `${mergedClsPrefix}-dialog__title` },
                 showIcon && mergedIconPlacement === 'left' ? ((0, vue_1.h)(_internal_1.NBaseIcon, { clsPrefix: mergedClsPrefix, class: `${mergedClsPrefix}-dialog__icon` }, {
-                    default: () => (0, vue_1.renderSlot)($slots, 'icon', undefined, () => [
-                        this.icon ? (0, _utils_1.render)(this.icon) : iconMap[this.type]
-                    ])
+                    default: () => $slots.icon
+                        ? $slots.icon()
+                        : this.icon
+                            ? (0, _utils_1.render)(this.icon)
+                            : iconMap[this.type]
                 })) : null,
-                (0, vue_1.renderSlot)($slots, 'header', undefined, () => [(0, _utils_1.render)(title)])),
-            (0, vue_1.h)("div", { class: `${mergedClsPrefix}-dialog__content` }, (0, vue_1.renderSlot)($slots, 'default', undefined, () => [(0, _utils_1.render)(content)])),
-            $slots.action || positiveText || negativeText || action ? ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-dialog__action` }, (0, vue_1.renderSlot)($slots, 'action', undefined, action
-                ? () => [(0, _utils_1.render)(action)]
-                : () => [
-                    this.negativeText && ((0, vue_1.h)(button_1.NButton, { theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, ghost: true, size: "small", onClick: handleNegativeClick }, {
-                        default: () => (0, _utils_1.render)(this.negativeText)
-                    })),
-                    this.positiveText && ((0, vue_1.h)(button_1.NButton, { theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, disabled: loading, loading: loading, size: "small", type: type === 'default' ? 'primary' : type, onClick: handlePositiveClick }, {
-                        default: () => (0, _utils_1.render)(this.positiveText)
-                    }))
-                ]))) : null));
+                $slots.header ? $slots.header() : (0, _utils_1.render)(title)),
+            (0, vue_1.h)("div", { class: `${mergedClsPrefix}-dialog__content` }, $slots.default ? $slots.default() : (0, _utils_1.render)(content)),
+            $slots.action || positiveText || negativeText || action ? ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-dialog__action` }, $slots.action
+                ? $slots.action()
+                : action
+                    ? (0, _utils_1.render)(action)
+                    : [
+                        this.negativeText && ((0, vue_1.h)(button_1.NButton, { theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, ghost: true, size: "small", onClick: handleNegativeClick }, {
+                            default: () => (0, _utils_1.render)(this.negativeText)
+                        })),
+                        this.positiveText && ((0, vue_1.h)(button_1.NButton, { theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, disabled: loading, loading: loading, size: "small", type: type === 'default' ? 'primary' : type, onClick: handlePositiveClick }, {
+                            default: () => (0, _utils_1.render)(this.positiveText)
+                        }))
+                    ])) : null));
     }
 });