naive-ui 2.21.5 → 2.23.2

package/es/pagination/src/Pagination.js

@@ -100,6 +100,12 @@ export default defineComponent({
             }
             return endIndex;
         });
+        const mergedItemCountRef = computed(() => {
+            const { itemCount } = props;
+            if (itemCount !== undefined)
+                return itemCount;
+            return (props.pageCount || 1) * mergedPageSizeRef.value;
+        });
         const disableTransitionOneTick = () => {
             void nextTick(() => {
                 var _a;
@@ -244,6 +250,7 @@ export default defineComponent({
             showFastBackward: showFastBackwardRef,
             showFastForward: showFastForwardRef,
             pageItems: computed(() => pageItems(mergedPageRef.value, mergedPageCountRef.value, props.pageSlot)),
+            mergedItemCount: mergedItemCountRef,
             jumperValue: jumperValueRef,
             pageSizeOptions: pageSizeOptionsRef,
             mergedPageSize: mergedPageSizeRef,
@@ -264,47 +271,47 @@ export default defineComponent({
             cssVars: computed(() => {
                 const { self: { itemSize, itemPadding, itemMargin, inputWidth, selectWidth, inputMargin, selectMargin, buttonBorder, buttonBorderHover, buttonBorderPressed, buttonIconColor, buttonIconColorHover, buttonIconColorPressed, buttonIconSize, itemTextColor, itemTextColorHover, itemTextColorPressed, itemTextColorActive, itemTextColorDisabled, itemColor, itemColorHover, itemColorPressed, itemColorActive, itemColorActiveHover, itemColorDisabled, itemBorder, itemBorderHover, itemBorderPressed, itemBorderActive, itemBorderDisabled, itemBorderRadius, itemFontSize, jumperFontSize, jumperTextColor, jumperTextColorDisabled, prefixMargin, suffixMargin, buttonColor, buttonColorHover, buttonColorPressed }, common: { cubicBezierEaseInOut } } = themeRef.value;
                 return {
-                    '--prefix-margin': prefixMargin,
-                    '--suffix-margin': suffixMargin,
-                    '--item-font-size': itemFontSize,
-                    '--select-width': selectWidth,
-                    '--select-margin': selectMargin,
-                    '--input-width': inputWidth,
-                    '--input-margin': inputMargin,
-                    '--item-size': itemSize,
-                    '--item-text-color': itemTextColor,
-                    '--item-text-color-disabled': itemTextColorDisabled,
-                    '--item-text-color-hover': itemTextColorHover,
-                    '--item-text-color-active': itemTextColorActive,
-                    '--item-text-color-pressed': itemTextColorPressed,
-                    '--item-color': itemColor,
-                    '--item-color-hover': itemColorHover,
-                    '--item-color-disabled': itemColorDisabled,
-                    '--item-color-active': itemColorActive,
-                    '--item-color-active-hover': itemColorActiveHover,
-                    '--item-color-pressed': itemColorPressed,
-                    '--item-border': itemBorder,
-                    '--item-border-hover': itemBorderHover,
-                    '--item-border-disabled': itemBorderDisabled,
-                    '--item-border-active': itemBorderActive,
-                    '--item-border-pressed': itemBorderPressed,
-                    '--item-padding': itemPadding,
-                    '--item-border-radius': itemBorderRadius,
-                    '--bezier': cubicBezierEaseInOut,
-                    '--jumper-font-size': jumperFontSize,
-                    '--jumper-text-color': jumperTextColor,
-                    '--jumper-text-color-disabled': jumperTextColorDisabled,
-                    '--item-margin': itemMargin,
-                    '--button-icon-size': buttonIconSize,
-                    '--button-icon-color': buttonIconColor,
-                    '--button-icon-color-hover': buttonIconColorHover,
-                    '--button-icon-color-pressed': buttonIconColorPressed,
-                    '--button-color-hover': buttonColorHover,
-                    '--button-color': buttonColor,
-                    '--button-color-pressed': buttonColorPressed,
-                    '--button-border': buttonBorder,
-                    '--button-border-hover': buttonBorderHover,
-                    '--button-border-pressed': buttonBorderPressed
+                    '--n-prefix-margin': prefixMargin,
+                    '--n-suffix-margin': suffixMargin,
+                    '--n-item-font-size': itemFontSize,
+                    '--n-select-width': selectWidth,
+                    '--n-select-margin': selectMargin,
+                    '--n-input-width': inputWidth,
+                    '--n-input-margin': inputMargin,
+                    '--n-item-size': itemSize,
+                    '--n-item-text-color': itemTextColor,
+                    '--n-item-text-color-disabled': itemTextColorDisabled,
+                    '--n-item-text-color-hover': itemTextColorHover,
+                    '--n-item-text-color-active': itemTextColorActive,
+                    '--n-item-text-color-pressed': itemTextColorPressed,
+                    '--n-item-color': itemColor,
+                    '--n-item-color-hover': itemColorHover,
+                    '--n-item-color-disabled': itemColorDisabled,
+                    '--n-item-color-active': itemColorActive,
+                    '--n-item-color-active-hover': itemColorActiveHover,
+                    '--n-item-color-pressed': itemColorPressed,
+                    '--n-item-border': itemBorder,
+                    '--n-item-border-hover': itemBorderHover,
+                    '--n-item-border-disabled': itemBorderDisabled,
+                    '--n-item-border-active': itemBorderActive,
+                    '--n-item-border-pressed': itemBorderPressed,
+                    '--n-item-padding': itemPadding,
+                    '--n-item-border-radius': itemBorderRadius,
+                    '--n-bezier': cubicBezierEaseInOut,
+                    '--n-jumper-font-size': jumperFontSize,
+                    '--n-jumper-text-color': jumperTextColor,
+                    '--n-jumper-text-color-disabled': jumperTextColorDisabled,
+                    '--n-item-margin': itemMargin,
+                    '--n-button-icon-size': buttonIconSize,
+                    '--n-button-icon-color': buttonIconColor,
+                    '--n-button-icon-color-hover': buttonIconColorHover,
+                    '--n-button-icon-color-pressed': buttonIconColorPressed,
+                    '--n-button-color-hover': buttonColorHover,
+                    '--n-button-color': buttonColor,
+                    '--n-button-color-pressed': buttonColorPressed,
+                    '--n-button-border': buttonBorder,
+                    '--n-button-border-hover': buttonBorderHover,
+                    '--n-button-border-pressed': buttonBorderPressed
                 };
             })
         };
@@ -326,7 +333,7 @@ export default defineComponent({
                 pageCount: mergedPageCount,
                 startIndex: this.startIndex,
                 endIndex: this.endIndex,
-                itemCount: this.itemCount
+                itemCount: this.mergedItemCount
             }))) : null,
             h("div", { class: [
                     `${mergedClsPrefix}-pagination-item`,
@@ -339,7 +346,7 @@ export default defineComponent({
                 pageCount: mergedPageCount,
                 startIndex: this.startIndex,
                 endIndex: this.endIndex,
-                itemCount: this.itemCount
+                itemCount: this.mergedItemCount
             })) : (h(NBaseIcon, { clsPrefix: mergedClsPrefix }, { default: () => h(BackwardIcon, null) }))),
             pageItems.map((pageItem, index) => {
                 return (h("div", { key: index, class: [
@@ -363,7 +370,7 @@ export default defineComponent({
                 page: mergedPage,
                 pageSize: mergedPageSize,
                 pageCount: mergedPageCount,
-                itemCount: this.itemCount,
+                itemCount: this.mergedItemCount,
                 startIndex: this.startIndex,
                 endIndex: this.endIndex
             })) : (h(NBaseIcon, { clsPrefix: mergedClsPrefix }, { default: () => h(ForwardIcon, null) }))),
@@ -379,7 +386,7 @@ export default defineComponent({
                 pageCount: mergedPageCount,
                 startIndex: this.startIndex,
                 endIndex: this.endIndex,
-                itemCount: this.itemCount
+                itemCount: this.mergedItemCount
             }))) : null));
     }
 });

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

@@ -1,69 +1,69 @@
 import { cB, c, cM, cNotM } from '../../../_utils/cssr'; // vars:
-// --item-font-size
-// --select-width
-// --input-width
-// --input-margin
-// --item-size
-// --item-text-color
-// --item-text-color-disabled
-// --item-text-color-hover
-// --item-text-color-active
-// --item-color
-// --item-color-hover
-// --item-color-disabled
-// --item-color-active
-// --item-color-active-hover
-// --item-border
-// --item-border-hover
-// --item-border-disabled
-// --item-border-active
-// --item-padding
-// --item-font-size
-// --item-border-radius
-// --bezier
-// --jumper-font-size
-// --jumper-text-color
-// --jumper-text-color-disabled
-// --item-margin
-// --button-icon-size
-// --button-icon-color
-// --button-icon-color-hover
-// --button-icon-color-pressed
-// --prefix-margin
-// --suffix-margin
-// --button-color
-// --button-color-hover
-// --button-color-pressed
+// --n-item-font-size
+// --n-select-width
+// --n-input-width
+// --n-input-margin
+// --n-item-size
+// --n-item-text-color
+// --n-item-text-color-disabled
+// --n-item-text-color-hover
+// --n-item-text-color-active
+// --n-item-color
+// --n-item-color-hover
+// --n-item-color-disabled
+// --n-item-color-active
+// --n-item-color-active-hover
+// --n-item-border
+// --n-item-border-hover
+// --n-item-border-disabled
+// --n-item-border-active
+// --n-item-padding
+// --n-item-font-size
+// --n-item-border-radius
+// --n-bezier
+// --n-jumper-font-size
+// --n-jumper-text-color
+// --n-jumper-text-color-disabled
+// --n-item-margin
+// --n-button-icon-size
+// --n-button-icon-color
+// --n-button-icon-color-hover
+// --n-button-icon-color-pressed
+// --n-prefix-margin
+// --n-suffix-margin
+// --n-button-color
+// --n-button-color-hover
+// --n-button-color-pressed
 
 export default cB('pagination', `
  display: flex;
  vertical-align: middle;
- font-size: var(--item-font-size);
+ font-size: var(--n-item-font-size);
  flex-wrap: nowrap;
 `, [cB('pagination-prefix', `
  display: flex;
  align-items: center;
- margin: var(--prefix-margin);
+ margin: var(--n-prefix-margin);
  `), cB('pagination-suffix', `
  display: flex;
  align-items: center;
- margin: var(--suffix-margin);
+ margin: var(--n-suffix-margin);
  `), c('> *:not(:first-child)', {
-  margin: 'var(--item-margin)'
+  margin: 'var(--n-item-margin)'
 }), cB('select', {
-  width: 'var(--select-width)'
+  width: 'var(--n-select-width)'
 }), c('&.transition-disabled', [cB('pagination-item', {
   transition: 'none!important'
 })]), cB('pagination-quick-jumper', `
  white-space: nowrap;
  display: flex;
- color: var(--jumper-text-color);
- transition: color .3s var(--bezier);
+ color: var(--n-jumper-text-color);
+ transition: color .3s var(--n-bezier);
  align-items: center;
- font-size: var(--jumter-font-size);
+ font-size: var(--n-jumter-font-size);
  `, [cB('input', `
- margin: var(--input-margin);
- width: var(--input-width);
+ margin: var(--n-input-margin);
+ width: var(--n-input-width);
  `)]), cB('pagination-item', `
  position: relative;
  cursor: pointer;
@@ -72,55 +72,55 @@ export default cB('pagination', `
  align-items: center;
  justify-content: center;
  box-sizing: border-box;
- min-width: var(--item-size);
- height: var(--item-size);
- padding: var(--item-padding);
- background-color: var(--item-color);
- color: var(--item-text-color);
- border-radius: var(--item-border-radius);
- border: var(--item-border);
- fill: var(--button-icon-color);
+ min-width: var(--n-item-size);
+ height: var(--n-item-size);
+ padding: var(--n-item-padding);
+ background-color: var(--n-item-color);
+ color: var(--n-item-text-color);
+ border-radius: var(--n-item-border-radius);
+ border: var(--n-item-border);
+ fill: var(--n-button-icon-color);
  transition:
- color .3s var(--bezier),
- border-color .3s var(--bezier),
- background-color .3s var(--bezier),
- fill .3s var(--bezier);
+ color .3s var(--n-bezier),
+ border-color .3s var(--n-bezier),
+ background-color .3s var(--n-bezier),
+ fill .3s var(--n-bezier);
  `, [cM('button', `
- background: var(--button-color);
- color: var(--button-icon-color);
- border: var(--button-border);
+ background: var(--n-button-color);
+ color: var(--n-button-icon-color);
+ border: var(--n-button-border);
  `, [cB('base-icon', `
- font-size: var(--button-icon-size);
+ font-size: var(--n-button-icon-size);
  `)]), cNotM('disabled', [c('&:hover', {
-  background: 'var(--item-color-hover)',
-  color: 'var(--item-text-color-hover)',
-  border: 'var(--item-border-hover)'
+  background: 'var(--n-item-color-hover)',
+  color: 'var(--n-item-text-color-hover)',
+  border: 'var(--n-item-border-hover)'
 }, [cM('button', {
-  background: 'var(--button-color-hover)',
-  border: 'var(--button-border-hover)',
-  color: 'var(--button-icon-color-hover)'
+  background: 'var(--n-button-color-hover)',
+  border: 'var(--n-button-border-hover)',
+  color: 'var(--n-button-icon-color-hover)'
 })]), c('&:active', {
-  background: 'var(--item-color-pressed)',
-  color: 'var(--item-text-color-pressed)',
-  border: 'var(--item-border-pressed)'
+  background: 'var(--n-item-color-pressed)',
+  color: 'var(--n-item-text-color-pressed)',
+  border: 'var(--n-item-border-pressed)'
 }, [cM('button', {
-  background: 'var(--button-color-pressed)',
-  border: 'var(--button-border-pressed)',
-  color: 'var(--button-icon-color-pressed)'
+  background: 'var(--n-button-color-pressed)',
+  border: 'var(--n-button-border-pressed)',
+  color: 'var(--n-button-icon-color-pressed)'
 })]), cM('active', {
-  background: 'var(--item-color-active)',
-  color: 'var(--item-text-color-active)',
-  border: 'var(--item-border-active)'
+  background: 'var(--n-item-color-active)',
+  color: 'var(--n-item-text-color-active)',
+  border: 'var(--n-item-border-active)'
 }, [c('&:hover', {
-  background: 'var(--item-color-active-hover)'
+  background: 'var(--n-item-color-active-hover)'
 })])]), cM('disabled', `
  cursor: not-allowed;
- color: var(--item-text-color-disabled);
+ color: var(--n-item-text-color-disabled);
  `, [cM('active, button', {
-  backgroundColor: 'var(--item-color-disabled)',
-  border: 'var(--item-border-disabled)'
+  backgroundColor: 'var(--n-item-color-disabled)',
+  border: 'var(--n-item-border-disabled)'
 })])]), cM('disabled', {
   cursor: 'not-allowed'
 }, [cB('pagination-quick-jumper', {
-  color: 'var(--jumper-text-color-disabled)'
+  color: 'var(--n-jumper-text-color-disabled)'
 })])]);

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

@@ -1907,6 +1907,7 @@ declare const _default: import("vue").DefineComponent<{
     raw: boolean;
     placement: import("vueuc").FollowerPlacement;
     overlap: boolean;
+    showIcon: boolean;
     trigger: PopoverTrigger;
     showArrow: boolean;
     delay: number;
@@ -1916,7 +1917,6 @@ declare const _default: import("vue").DefineComponent<{
     internalExtraClass: string[];
     internalSyncTargetWithParent: boolean;
     internalInheritedEventHandlers: import("../../popover/src/Popover").TriggerEventHandlers[];
-    showIcon: boolean;
 } & {
     show?: boolean | undefined;
     x?: number | undefined;
@@ -2620,6 +2620,7 @@ declare const _default: import("vue").DefineComponent<{
     raw: boolean;
     placement: import("vueuc").FollowerPlacement;
     overlap: boolean;
+    showIcon: boolean;
     trigger: PopoverTrigger;
     showArrow: boolean;
     delay: number;
@@ -2630,6 +2631,5 @@ declare const _default: import("vue").DefineComponent<{
     internalSyncTargetWithParent: boolean;
     internalInheritedEventHandlers: import("../../popover/src/Popover").TriggerEventHandlers[];
     arrow: boolean | undefined;
-    showIcon: boolean;
 }>;
 export default _default;

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

@@ -34,10 +34,10 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     mergedClsPrefix: import("vue").Ref<string>;
     cssVars: import("vue").ComputedRef<{
-        '--bezier': string;
-        '--font-size': string;
-        '--icon-size': string;
-        '--icon-color': string;
+        '--n-bezier': string;
+        '--n-font-size': string;
+        '--n-icon-size': string;
+        '--n-icon-color': string;
     }>;
     localizedPositiveText: import("vue").ComputedRef<string>;
     localizedNegativeText: import("vue").ComputedRef<string>;

package/es/popconfirm/src/PopconfirmPanel.js

@@ -32,10 +32,10 @@ export default defineComponent({
         return Object.assign(Object.assign({}, useLocale('Popconfirm')), { mergedClsPrefix: mergedClsPrefixRef, cssVars: computed(() => {
                 const { common: { cubicBezierEaseInOut }, self: { fontSize, iconSize, iconColor } } = mergedThemeRef.value;
                 return {
-                    '--bezier': cubicBezierEaseInOut,
-                    '--font-size': fontSize,
-                    '--icon-size': iconSize,
-                    '--icon-color': iconColor
+                    '--n-bezier': cubicBezierEaseInOut,
+                    '--n-font-size': fontSize,
+                    '--n-icon-size': iconSize,
+                    '--n-icon-color': iconColor
                 };
             }), localizedPositiveText: computed(() => {
                 return props.positiveText || localeRef.value.positiveText;

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

@@ -1,20 +1,20 @@
 import { c, cB, cE } from '../../../_utils/cssr'; // vars:
-// --font-size
-// --icon-size
-// --bezier
-// --icon-color
+// --n-font-size
+// --n-icon-size
+// --n-bezier
+// --n-icon-color
 
 export default cB('popconfirm', [cE('body', `
- font-size: var(--font-size);
+ font-size: var(--n-font-size);
  display: flex;
  align-items: center;
  flex-wrap: nowrap;
  position: relative;
  `, [cE('icon', `
  display: flex;
- font-size: var(--icon-size);
- color: var(--icon-color);
- transition: color .3s var(--bezier);
+ font-size: var(--n-icon-size);
+ color: var(--n-icon-color);
+ transition: color .3s var(--n-bezier);
  margin: 0 8px 0 0;
  `)]), cE('action', `
  margin-top: 8px;

package/es/popover/src/Popover.js

@@ -119,9 +119,12 @@ export default defineComponent({
     setup(props) {
         if (process.env.NODE_ENV !== 'production') {
             watchEffect(() => {
-                if (props.minWidth !== undefined) {
+                if (props.maxWidth !== undefined) {
                     warnOnce('popover', '`max-width` is deprecated, please use `style` instead.');
                 }
+                if (props.minWidth !== undefined) {
+                    warnOnce('popover', '`min-width` is deprecated, please use `style` instead.');
+                }
                 if (props.arrow !== undefined) {
                     warnOnce('popover', '`arrow` is deprecated, please use `showArrow` instead.');
                 }

package/es/popover/src/PopoverBody.js

@@ -51,31 +51,31 @@ export default defineComponent({
         const styleRef = computed(() => {
             return [
                 {
-                    width: props.width === 'trigger' ? '' : formatLength(props.width),
-                    maxWidth: formatLength(props.maxWidth),
-                    minWidth: formatLength(props.minWidth)
+                    width: props.width === 'trigger' ? '' : formatLength(props.width)
                 },
+                props.maxWidth ? { maxWidth: formatLength(props.maxWidth) } : {},
+                props.minWidth ? { minWidth: formatLength(props.minWidth) } : {},
                 cssVarsRef.value
             ];
         });
         const cssVarsRef = computed(() => {
             const { common: { cubicBezierEaseInOut, cubicBezierEaseIn, cubicBezierEaseOut }, self: { space, spaceArrow, padding, fontSize, textColor, dividerColor, color, boxShadow, borderRadius, arrowHeight, arrowOffset, arrowOffsetVertical } } = themeRef.value;
             return {
-                '--box-shadow': boxShadow,
-                '--bezier': cubicBezierEaseInOut,
-                '--bezier-ease-in': cubicBezierEaseIn,
-                '--bezier-ease-out': cubicBezierEaseOut,
-                '--font-size': fontSize,
-                '--text-color': textColor,
-                '--color': color,
-                '--divider-color': dividerColor,
-                '--border-radius': borderRadius,
-                '--arrow-height': arrowHeight,
-                '--arrow-offset': arrowOffset,
-                '--arrow-offset-vertical': arrowOffsetVertical,
-                '--padding': padding,
-                '--space': space,
-                '--space-arrow': spaceArrow
+                '--n-box-shadow': boxShadow,
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-bezier-ease-in': cubicBezierEaseIn,
+                '--n-bezier-ease-out': cubicBezierEaseOut,
+                '--n-font-size': fontSize,
+                '--n-text-color': textColor,
+                '--n-color': color,
+                '--n-divider-color': dividerColor,
+                '--n-border-radius': borderRadius,
+                '--n-arrow-height': arrowHeight,
+                '--n-arrow-offset': arrowOffset,
+                '--n-arrow-offset-vertical': arrowOffsetVertical,
+                '--n-padding': padding,
+                '--n-space': space,
+                '--n-space-arrow': spaceArrow
             };
         });
         NPopover.setBodyInstance({