naive-ui 2.30.6 → 2.31.0

package/lib/upload/src/UploadFile.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const vue_1 = require("vue");
+const vooks_1 = require("vooks");
 const icons_1 = require("../../_internal/icons");
 const image_1 = require("../../image");
 const button_1 = require("../../button");
@@ -90,12 +91,15 @@ exports.default = (0, vue_1.defineComponent)({
             const { file } = props;
             return ['error'].includes(file.status);
         });
+        const mergedThumbnailUrlRef = (0, vooks_1.useMemo)(() => {
+            return thumbnailUrlRef.value || props.file.thumbnailUrl || props.file.url;
+        });
         const showPreviewButtonRef = (0, vue_1.computed)(() => {
             if (!NUpload.showPreviewButtonRef.value)
                 return false;
-            const { file: { status, url }, listType } = props;
+            const { file: { status }, listType } = props;
             return (['finished'].includes(status) &&
-                (url || thumbnailUrlRef.value) &&
+                mergedThumbnailUrlRef.value &&
                 listType === 'image-card');
         });
         function handleRetryClick() {
@@ -185,7 +189,7 @@ exports.default = (0, vue_1.defineComponent)({
             showDownloadButton: showDownloadButtonRef,
             showRetryButton: showRetryButtonRef,
             showPreviewButton: showPreviewButtonRef,
-            thumbnailUrl: thumbnailUrlRef,
+            mergedThumbnailUrl: mergedThumbnailUrlRef,
             imageRef,
             handleRemoveOrCancelClick,
             handleDownloadClick,
@@ -201,7 +205,7 @@ exports.default = (0, vue_1.defineComponent)({
         const isImageCardType = listType === 'image-card';
         if (isImageType || isImageCardType) {
             icon = !(0, utils_1.isImageFile)(file) ? ((0, vue_1.h)("span", { class: `${clsPrefix}-upload-file-info__thumbnail` },
-                (0, vue_1.h)(_internal_1.NBaseIcon, { clsPrefix: clsPrefix }, { default: () => icons_2.documentIcon }))) : (file.url || this.thumbnailUrl) && file.status !== 'error' ? ((0, vue_1.h)("a", { rel: "noopener noreferer", target: "_blank", href: file.url || undefined, class: `${clsPrefix}-upload-file-info__thumbnail`, onClick: this.handlePreviewClick }, listType === 'image-card' ? ((0, vue_1.h)(image_1.NImage, { src: this.thumbnailUrl || file.thumbnailUrl || file.url || undefined, previewSrc: file.url || undefined, alt: file.name, ref: "imageRef" })) : ((0, vue_1.h)("img", { src: this.thumbnailUrl || file.thumbnailUrl || file.url || undefined, alt: file.name })))) : ((0, vue_1.h)("span", { class: `${clsPrefix}-upload-file-info__thumbnail` },
+                (0, vue_1.h)(_internal_1.NBaseIcon, { clsPrefix: clsPrefix }, { default: () => icons_2.documentIcon }))) : this.mergedThumbnailUrl && file.status !== 'error' ? ((0, vue_1.h)("a", { rel: "noopener noreferer", target: "_blank", href: file.url || undefined, class: `${clsPrefix}-upload-file-info__thumbnail`, onClick: this.handlePreviewClick }, listType === 'image-card' ? ((0, vue_1.h)(image_1.NImage, { src: this.mergedThumbnailUrl || undefined, previewSrc: file.url || undefined, alt: file.name, ref: "imageRef" })) : ((0, vue_1.h)("img", { src: this.mergedThumbnailUrl || undefined, alt: file.name })))) : ((0, vue_1.h)("span", { class: `${clsPrefix}-upload-file-info__thumbnail` },
                 (0, vue_1.h)(_internal_1.NBaseIcon, { clsPrefix: clsPrefix }, { default: () => icons_2.imageIcon })));
         }
         else {

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.30.6";
+declare const _default: "2.31.0";
 export default _default;

package/lib/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '2.30.6';
+exports.default = '2.31.0';

package/lib/watermark/index.d.ts

@@ -1,2 +1,2 @@
-export { default as NWatermark } from './src/Watermark';
+export { default as NWatermark, watermarkProps } from './src/Watermark';
 export type { WatermarkProps } from './src/Watermark';

package/lib/watermark/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NWatermark = void 0;
+exports.watermarkProps = exports.NWatermark = void 0;
 var Watermark_1 = require("./src/Watermark");
 Object.defineProperty(exports, "NWatermark", { enumerable: true, get: function () { return __importDefault(Watermark_1).default; } });
+Object.defineProperty(exports, "watermarkProps", { enumerable: true, get: function () { return Watermark_1.watermarkProps; } });

package/lib/watermark/src/Watermark.d.ts

@@ -1,6 +1,6 @@
 import { PropType } from 'vue';
 import { ExtractPublicPropTypes } from '../../_utils';
-declare const watermarkProps: {
+export declare const watermarkProps: {
     readonly debug: BooleanConstructor;
     readonly cross: BooleanConstructor;
     readonly fullscreen: BooleanConstructor;

package/lib/watermark/src/Watermark.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.watermarkProps = void 0;
 const vue_1 = require("vue");
 const vooks_1 = require("vooks");
 const _mixins_1 = require("../../_mixins");
@@ -22,7 +23,7 @@ function getRatio(context) {
         1;
     return (window.devicePixelRatio || 1) / backingStore;
 }
-const watermarkProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), { debug: Boolean, cross: Boolean, fullscreen: Boolean, width: {
+exports.watermarkProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), { debug: Boolean, cross: Boolean, fullscreen: Boolean, width: {
         type: Number,
         default: 32
     }, height: {
@@ -73,7 +74,7 @@ const watermarkProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props)
     } });
 exports.default = (0, vue_1.defineComponent)({
     name: 'Watermark',
-    props: watermarkProps,
+    props: exports.watermarkProps,
     setup(props, { slots }) {
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
         const themeRef = (0, _mixins_1.useTheme)('Watermark', '-watermark', index_cssr_1.default, styles_1.watermarkLight, props, mergedClsPrefixRef);

package/lib/watermark/src/styles/index.cssr.js

@@ -8,7 +8,10 @@ const cssr_1 = require("../../../_utils/cssr");
 
 exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('watermark-container', `
  position: relative;
- `, [(0, cssr_1.cNotM)('selectable', 'user-select: none;')]), (0, cssr_1.cB)('watermark', `
+ `, [(0, cssr_1.cNotM)('selectable', `
+ user-select: none;
+ -webkit-user-select: none;
+ `)]), (0, cssr_1.cB)('watermark', `
  position: absolute;
  top: 0;
  left: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "2.30.6",
+  "version": "2.31.0",
   "description": "A Vue 3 Component Library. Fairly Complete, Theme Customizable, Uses TypeScript, Fast",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -128,7 +128,7 @@
     "treemate": "^0.3.11",
     "vdirs": "^0.1.8",
     "vooks": "^0.2.12",
-    "vueuc": "^0.4.45"
+    "vueuc": "^0.4.47"
   },
   "sideEffects": false,
   "homepage": "https://www.naiveui.com",

package/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "naive-ui",
-  "version": "2.30.6",
+  "version": "2.31.0",
   "contributions": {
     "html": {
       "elements": [
@@ -596,6 +596,24 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "intersection-observer-options",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "object",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "lazy",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
             {
               "name": "color",
               "default": "-",
@@ -2666,7 +2684,12 @@
               }
             }
           ],
-          "js/events": []
+          "js/events": [
+            {
+              "name": "finish",
+              "description": "-"
+            }
+          ]
         },
         {
           "name": "n-data-table",
@@ -3918,6 +3941,33 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "resizable",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "default-width",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "number",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "default-height",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "number",
+                "kind": "expression"
+              }
+            },
             {
               "name": "drawer-style",
               "default": "-",
@@ -3952,6 +4002,22 @@
               "name": "esc",
               "description": "-"
             },
+            {
+              "name": "update-width",
+              "description": "-"
+            },
+            {
+              "name": "update-height",
+              "description": "-"
+            },
+            {
+              "name": "update-width",
+              "description": "-"
+            },
+            {
+              "name": "update-height",
+              "description": "-"
+            },
             {
               "name": "update-show",
               "description": "-"
@@ -4286,6 +4352,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "footer-style",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "object | string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "arrow",
               "default": "-",
@@ -4349,6 +4424,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "menu-props",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
             {
               "name": "render-label",
               "default": "-",
@@ -9311,6 +9395,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "footer-style",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "object | string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "arrow",
               "default": "-",
@@ -9644,6 +9737,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "footer-style",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "object | string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "arrow",
               "default": "-",
@@ -9915,6 +10017,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "footer-style",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "object | string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "min-width",
               "default": "-",
@@ -12907,6 +13018,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "footer-style",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "object | string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "arrow",
               "default": "-",
@@ -13090,6 +13210,15 @@
           "name": "n-tree",
           "slots": [],
           "attributes": [
+            {
+              "name": "accordion",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
             {
               "name": "show-irrelevant-nodes",
               "default": "-",
@@ -13126,6 +13255,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "check-on-click",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "boolean | Function",
+                "kind": "expression"
+              }
+            },
             {
               "name": "cancelable",
               "default": "-",
@@ -13333,15 +13471,6 @@
                 "kind": "expression"
               }
             },
-            {
-              "name": "render-switcher-icon",
-              "default": "-",
-              "description": "-",
-              "value": {
-                "type": "Function",
-                "kind": "expression"
-              }
-            },
             {
               "name": "node-props",
               "default": "-",
@@ -13432,6 +13561,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "render-switcher-icon",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
             {
               "name": "check-strategy",
               "default": "-",
@@ -13752,6 +13890,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "render-tag",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
             {
               "name": "allow-checking-not-loaded",
               "default": "-",
@@ -13833,6 +13980,51 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "render-switcher-icon",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "render-label",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "render-prefix",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "render-suffix",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "node-props",
+              "default": "-",
+              "description": "-",
+              "value": {
+                "type": "Function",
+                "kind": "expression"
+              }
+            },
             {
               "name": "leaf-only",
               "default": "-",