naive-ui 2.22.0 → 2.24.0

package/lib/typography/src/styles/text.cssr.js

@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 
 const cssr_1 = require("../../../_utils/cssr"); // vars:
-// --text-color
-// --font-weight-strong
-// --font-famliy-mono
-// --code-border-radius
-// --code-text-color
-// --code-color
-// --code-border
+// --n-text-color
+// --n-font-weight-strong
+// --n-font-famliy-mono
+// --n-code-border-radius
+// --n-code-text-color
+// --n-code-color
+// --n-code-border
 
 
 exports.default = (0, cssr_1.cB)('text', `
- transition: color .3s var(--bezier);
- color: var(--text-color);
+ transition: color .3s var(--n-bezier);
+ color: var(--n-text-color);
 `, [(0, cssr_1.cM)('strong', `
- font-weight: var(--font-weight-strong);
+ font-weight: var(--n-font-weight-strong);
  `), (0, cssr_1.cM)('italic', {
   fontStyle: 'italic'
 }), (0, cssr_1.cM)('underline', {
@@ -26,16 +26,16 @@ exports.default = (0, cssr_1.cB)('text', `
 }), (0, cssr_1.cM)('code', `
  line-height: 1.4;
  display: inline-block;
- font-family: var(--font-famliy-mono);
+ font-family: var(--n-font-famliy-mono);
  transition: 
- color .3s var(--bezier),
- border-color .3s var(--bezier),
- background-color .3s var(--bezier);
+ color .3s var(--n-bezier),
+ border-color .3s var(--n-bezier),
+ background-color .3s var(--n-bezier);
  box-sizing: border-box;
  padding: .05em .35em 0 .35em;
- border-radius: var(--code-border-radius);
+ border-radius: var(--n-code-border-radius);
  font-size: .9em;
- color: var(--code-text-color);
- background-color: var(--code-color);
- border: var(--code-border);
+ color: var(--n-code-text-color);
+ background-color: var(--n-code-color);
+ border: var(--n-code-border);
  `)]);

package/lib/typography/src/text.d.ts

@@ -436,13 +436,14 @@ declare const _default: import("vue").DefineComponent<{
     mergedClsPrefix: import("vue").ComputedRef<string>;
     compitableTag: import("vue").ComputedRef<string | undefined>;
     cssVars: import("vue").ComputedRef<{
-        '--text-color': string;
-        '--font-weight-strong': string;
-        '--font-famliy-mono': string;
-        '--code-border-radius': string;
-        '--code-text-color': string;
-        '--code-color': string;
-        '--code-border': string;
+        '--n-bezier': string;
+        '--n-text-color': string;
+        '--n-font-weight-strong': string;
+        '--n-font-famliy-mono': string;
+        '--n-code-border-radius': string;
+        '--n-code-text-color': string;
+        '--n-code-color': string;
+        '--n-code-border': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     readonly code?: unknown;

package/lib/typography/src/text.js

@@ -40,15 +40,16 @@ exports.default = (0, vue_1.defineComponent)({
                         ? 'textColor'
                         : `textColor${depth}Depth`
                     : (0, _utils_1.createKey)('textColor', type);
-                const { common: { fontWeightStrong, fontFamilyMono }, self: { codeTextColor, codeBorderRadius, codeColor, codeBorder, [textColorKey]: textColor } } = themeRef.value;
+                const { common: { fontWeightStrong, fontFamilyMono, cubicBezierEaseInOut }, self: { codeTextColor, codeBorderRadius, codeColor, codeBorder, [textColorKey]: textColor } } = themeRef.value;
                 return {
-                    '--text-color': textColor,
-                    '--font-weight-strong': fontWeightStrong,
-                    '--font-famliy-mono': fontFamilyMono,
-                    '--code-border-radius': codeBorderRadius,
-                    '--code-text-color': codeTextColor,
-                    '--code-color': codeColor,
-                    '--code-border': codeBorder
+                    '--n-bezier': cubicBezierEaseInOut,
+                    '--n-text-color': textColor,
+                    '--n-font-weight-strong': fontWeightStrong,
+                    '--n-font-famliy-mono': fontFamilyMono,
+                    '--n-code-border-radius': codeBorderRadius,
+                    '--n-code-text-color': codeTextColor,
+                    '--n-code-color': codeColor,
+                    '--n-code-border': codeBorder
                 };
             })
         };

package/lib/typography/src/ul.d.ts

@@ -404,13 +404,13 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     mergedClsPrefix: import("vue").ComputedRef<string>;
     cssVars: import("vue").ComputedRef<{
-        '--bezier': string;
-        '--font-size': string;
-        '--line-height': string;
-        '--text-color': string;
-        '--li-margin': string;
-        '--ol-padding': string;
-        '--ul-padding': string;
+        '--n-bezier': string;
+        '--n-font-size': string;
+        '--n-line-height': string;
+        '--n-text-color': string;
+        '--n-li-margin': string;
+        '--n-ol-padding': string;
+        '--n-ul-padding': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     readonly alignText?: unknown;

package/lib/typography/src/ul.js

@@ -19,13 +19,13 @@ exports.default = (0, vue_1.defineComponent)({
             cssVars: (0, vue_1.computed)(() => {
                 const { common: { cubicBezierEaseInOut }, self: { olPadding, ulPadding, liMargin, liTextColor, liLineHeight, liFontSize } } = themeRef.value;
                 return {
-                    '--bezier': cubicBezierEaseInOut,
-                    '--font-size': liFontSize,
-                    '--line-height': liLineHeight,
-                    '--text-color': liTextColor,
-                    '--li-margin': liMargin,
-                    '--ol-padding': olPadding,
-                    '--ul-padding': ulPadding
+                    '--n-bezier': cubicBezierEaseInOut,
+                    '--n-font-size': liFontSize,
+                    '--n-line-height': liLineHeight,
+                    '--n-text-color': liTextColor,
+                    '--n-li-margin': liMargin,
+                    '--n-ol-padding': olPadding,
+                    '--n-ul-padding': ulPadding
                 };
             })
         };

package/lib/upload/src/Upload.d.ts

@@ -1,6 +1,7 @@
 import { PropType, CSSProperties } from 'vue';
-import { ExtractPublicPropTypes, MaybeArray } from '../../_utils';
-import { FileInfo, FuncOrRecordOrUndef, OnFinish, OnRemove, OnDownload, OnChange, OnUpdateFileList, OnBeforeUpload, listType, OnPreview, CreateThumbnailUrl, CustomRequest } from './interface';
+import type { ExtractPublicPropTypes, MaybeArray } from '../../_utils';
+import type { ImageGroupProps } from '../../image';
+import type { FileInfo, FuncOrRecordOrUndef, OnFinish, OnRemove, OnDownload, OnChange, OnUpdateFileList, OnBeforeUpload, ListType, OnPreview, CreateThumbnailUrl, CustomRequest, OnError } from './interface';
 declare const uploadProps: {
     readonly name: {
         readonly type: StringConstructor;
@@ -28,6 +29,7 @@ declare const uploadProps: {
     readonly onChange: PropType<OnChange>;
     readonly onRemove: PropType<OnRemove>;
     readonly onFinish: PropType<OnFinish>;
+    readonly onError: PropType<OnError>;
     readonly onBeforeUpload: PropType<OnBeforeUpload>;
     /** currently of no usage */
     readonly onDownload: PropType<OnDownload>;
@@ -61,7 +63,7 @@ declare const uploadProps: {
         readonly default: true;
     };
     readonly listType: {
-        readonly type: PropType<listType>;
+        readonly type: PropType<ListType>;
         readonly default: "text";
     };
     readonly onPreview: PropType<OnPreview>;
@@ -72,6 +74,7 @@ declare const uploadProps: {
         readonly type: BooleanConstructor;
         readonly default: true;
     };
+    readonly imageGroupProps: PropType<ImageGroupProps>;
     readonly theme: PropType<import("../../_mixins").Theme<"Upload", {
         fontSize: string;
         lineHeight: string;
@@ -836,6 +839,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly onChange: PropType<OnChange>;
     readonly onRemove: PropType<OnRemove>;
     readonly onFinish: PropType<OnFinish>;
+    readonly onError: PropType<OnError>;
     readonly onBeforeUpload: PropType<OnBeforeUpload>;
     /** currently of no usage */
     readonly onDownload: PropType<OnDownload>;
@@ -869,7 +873,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: true;
     };
     readonly listType: {
-        readonly type: PropType<listType>;
+        readonly type: PropType<ListType>;
         readonly default: "text";
     };
     readonly onPreview: PropType<OnPreview>;
@@ -880,6 +884,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: BooleanConstructor;
         readonly default: true;
     };
+    readonly imageGroupProps: PropType<ImageGroupProps>;
     readonly theme: PropType<import("../../_mixins").Theme<"Upload", {
         fontSize: string;
         lineHeight: string;
@@ -2004,6 +2009,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly onChange?: unknown;
     readonly onRemove?: unknown;
     readonly onFinish?: unknown;
+    readonly onError?: unknown;
     readonly onBeforeUpload?: unknown;
     readonly onDownload?: unknown;
     readonly defaultUpload?: unknown;
@@ -2023,6 +2029,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly abstract?: unknown;
     readonly max?: unknown;
     readonly showTrigger?: unknown;
+    readonly imageGroupProps?: unknown;
     readonly theme?: unknown;
     readonly themeOverrides?: unknown;
     readonly builtinThemeOverrides?: unknown;
@@ -2032,7 +2039,7 @@ declare const _default: import("vue").DefineComponent<{
     name: string;
     multiple: boolean;
     showTrigger: boolean;
-    listType: listType;
+    listType: ListType;
     showCancelButton: boolean;
     showRemoveButton: boolean;
     showDownloadButton: boolean;
@@ -2043,6 +2050,7 @@ declare const _default: import("vue").DefineComponent<{
     defaultUpload: boolean;
     defaultFileList: FileInfo[];
 } & {
+    onError?: OnError | undefined;
     data?: FuncOrRecordOrUndef;
     disabled?: boolean | undefined;
     onChange?: OnChange | undefined;
@@ -2785,9 +2793,9 @@ declare const _default: import("vue").DefineComponent<{
             lineBgProcessing: string;
         }, any>;
     }>> | undefined;
+    onFinish?: OnFinish | undefined;
     onRemove?: OnRemove | undefined;
     customRequest?: CustomRequest | undefined;
-    onFinish?: OnFinish | undefined;
     onBeforeUpload?: OnBeforeUpload | undefined;
     onDownload?: OnDownload | undefined;
     fileList?: FileInfo[] | undefined;
@@ -2796,6 +2804,7 @@ declare const _default: import("vue").DefineComponent<{
     fileListStyle?: string | CSSProperties | undefined;
     onPreview?: OnPreview | undefined;
     createThumbnailUrl?: CreateThumbnailUrl | undefined;
+    imageGroupProps?: ImageGroupProps | undefined;
 }>, {
     method: string;
     abstract: boolean;
@@ -2803,7 +2812,7 @@ declare const _default: import("vue").DefineComponent<{
     multiple: boolean;
     disabled: boolean | undefined;
     showTrigger: boolean;
-    listType: listType;
+    listType: ListType;
     showCancelButton: boolean;
     showRemoveButton: boolean;
     showDownloadButton: boolean;

package/lib/upload/src/Upload.js

@@ -19,11 +19,11 @@ const _mixins_1 = require("../../_mixins");
 const _utils_1 = require("../../_utils");
 const styles_1 = require("../styles");
 const UploadDragger_1 = require("./UploadDragger");
-const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
 const interface_1 = require("./interface");
 const utils_1 = require("./utils");
 const UploadTrigger_1 = __importDefault(require("./UploadTrigger"));
 const UploadFileList_1 = __importDefault(require("./UploadFileList"));
+const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
 /**
  * fils status ['pending', 'uploading', 'finished', 'removed', 'error']
  */
@@ -31,16 +31,19 @@ function createXhrHandlers(inst, file, XHR) {
     const { doChange, XhrMap } = inst;
     let percentage = 0;
     function handleXHRError(e) {
-        const fileAfterChange = Object.assign({}, file, {
+        var _a;
+        let fileAfterChange = Object.assign({}, file, {
             status: 'error',
             percentage
         });
         XhrMap.delete(file.id);
+        fileAfterChange =
+            ((_a = inst.onError) === null || _a === void 0 ? void 0 : _a.call(inst, { file: fileAfterChange, event: e })) || fileAfterChange;
         doChange(fileAfterChange, e);
     }
     function handleXHRLoad(e) {
         var _a;
-        if (XHR.status !== 200) {
+        if (XHR.status < 200 || XHR.status >= 300) {
             handleXHRError(e);
             return;
         }
@@ -110,10 +113,13 @@ function customSubmitImpl(options) {
             doChange(fileAfterChange);
         },
         onError() {
-            const fileAfterChange = Object.assign({}, file, {
+            var _a;
+            let fileAfterChange = Object.assign({}, file, {
                 status: 'error',
                 percentage
             });
+            fileAfterChange =
+                ((_a = inst.onError) === null || _a === void 0 ? void 0 : _a.call(inst, { file: fileAfterChange })) || fileAfterChange;
             doChange(fileAfterChange);
         }
     });
@@ -185,7 +191,7 @@ const uploadProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), {
     }, data: [Object, Function], headers: [Object, Function], withCredentials: Boolean, disabled: {
         type: Boolean,
         default: undefined
-    }, onChange: Function, onRemove: Function, onFinish: Function, onBeforeUpload: Function, 
+    }, onChange: Function, onRemove: Function, onFinish: Function, onError: Function, onBeforeUpload: Function, 
     /** currently of no usage */
     onDownload: Function, defaultUpload: {
         type: Boolean,
@@ -211,7 +217,7 @@ const uploadProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), {
     }, onPreview: Function, createThumbnailUrl: Function, abstract: Boolean, max: Number, showTrigger: {
         type: Boolean,
         default: true
-    } });
+    }, imageGroupProps: Object });
 exports.default = (0, vue_1.defineComponent)({
     name: 'Upload',
     props: uploadProps,
@@ -319,7 +325,8 @@ exports.default = (0, vue_1.defineComponent)({
                             inst: {
                                 doChange,
                                 XhrMap,
-                                onFinish: props.onFinish
+                                onFinish: props.onFinish,
+                                onError: props.onError
                             },
                             file,
                             action,
@@ -333,7 +340,8 @@ exports.default = (0, vue_1.defineComponent)({
                         submitImpl({
                             doChange,
                             XhrMap,
-                            onFinish: props.onFinish
+                            onFinish: props.onFinish,
+                            onError: props.onError
                         }, file, formData, {
                             method,
                             action,
@@ -387,22 +395,22 @@ exports.default = (0, vue_1.defineComponent)({
         const cssVarsRef = (0, vue_1.computed)(() => {
             const { common: { cubicBezierEaseInOut }, self: { draggerColor, draggerBorder, draggerBorderHover, itemColorHover, itemColorHoverError, itemTextColorError, itemTextColorSuccess, itemTextColor, itemIconColor, itemDisabledOpacity, lineHeight, borderRadius, fontSize, itemBorderImageCardError, itemBorderImageCard } } = themeRef.value;
             return {
-                '--bezier': cubicBezierEaseInOut,
-                '--border-radius': borderRadius,
-                '--dragger-border': draggerBorder,
-                '--dragger-border-hover': draggerBorderHover,
-                '--dragger-color': draggerColor,
-                '--font-size': fontSize,
-                '--item-color-hover': itemColorHover,
-                '--item-color-hover-error': itemColorHoverError,
-                '--item-disabled-opacity': itemDisabledOpacity,
-                '--item-icon-color': itemIconColor,
-                '--item-text-color': itemTextColor,
-                '--item-text-color-error': itemTextColorError,
-                '--item-text-color-success': itemTextColorSuccess,
-                '--line-height': lineHeight,
-                '--item-border-image-card-error': itemBorderImageCardError,
-                '--item-border-image-card': itemBorderImageCard
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-border-radius': borderRadius,
+                '--n-dragger-border': draggerBorder,
+                '--n-dragger-border-hover': draggerBorderHover,
+                '--n-dragger-color': draggerColor,
+                '--n-font-size': fontSize,
+                '--n-item-color-hover': itemColorHover,
+                '--n-item-color-hover-error': itemColorHoverError,
+                '--n-item-disabled-opacity': itemDisabledOpacity,
+                '--n-item-icon-color': itemIconColor,
+                '--n-item-text-color': itemTextColor,
+                '--n-item-text-color-error': itemTextColorError,
+                '--n-item-text-color-success': itemTextColorSuccess,
+                '--n-line-height': lineHeight,
+                '--n-item-border-image-card-error': itemBorderImageCardError,
+                '--n-item-border-image-card': itemBorderImageCard
             };
         });
         (0, vue_1.provide)(interface_1.uploadInjectionKey, {
@@ -431,7 +439,8 @@ exports.default = (0, vue_1.defineComponent)({
             fileListStyleRef: (0, vue_1.toRef)(props, 'fileListStyle'),
             abstractRef: (0, vue_1.toRef)(props, 'abstract'),
             cssVarsRef,
-            showTriggerRef: (0, vue_1.toRef)(props, 'showTrigger')
+            showTriggerRef: (0, vue_1.toRef)(props, 'showTrigger'),
+            imageGroupPropsRef: (0, vue_1.toRef)(props, 'imageGroupProps')
         });
         const exposedMethods = {
             submit,

package/lib/upload/src/UploadFile.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { FileInfo, listType } from './interface';
+import type { FileInfo, ListType } from './interface';
 declare const _default: import("vue").DefineComponent<{
     clsPrefix: {
         type: StringConstructor;
@@ -10,7 +10,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     listType: {
-        type: PropType<listType>;
+        type: PropType<ListType>;
         required: true;
     };
 }, {
@@ -66,7 +66,7 @@ declare const _default: import("vue").DefineComponent<{
             scrollbarColorHover: string;
             scrollbarWidth: string;
             scrollbarHeight: string;
-            scrollbarBorderRadius: string;
+            scrollbarBorderRadius: string; /** I haven't figure out its usage, so just leave it here */
             progressRailColor: string;
             railColor: string;
             popoverColor: string;
@@ -220,7 +220,7 @@ declare const _default: import("vue").DefineComponent<{
                 colorPressedInfo: string;
                 colorFocusInfo: string;
                 colorDisabledInfo: string;
-                textColorInfo: string;
+                textColorInfo: string; /** I haven't figure out its usage, so just leave it here */
                 textColorHoverInfo: string;
                 textColorPressedInfo: string;
                 textColorFocusInfo: string;
@@ -401,6 +401,6 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     clsPrefix: string;
     file: FileInfo;
-    listType: listType;
+    listType: ListType;
 } & {}>, {}>;
 export default _default;

package/lib/upload/src/UploadFileList.js

@@ -17,10 +17,10 @@ exports.default = (0, vue_1.defineComponent)({
         if (!NUpload) {
             (0, _utils_1.throwError)('upload-file-list', '`n-upload-file-list` must be placed inside `n-upload`.');
         }
-        const { mergedClsPrefixRef, listTypeRef, mergedFileListRef, fileListStyleRef, cssVarsRef, maxReachedRef, showTriggerRef } = NUpload;
+        const { mergedClsPrefixRef, listTypeRef, mergedFileListRef, fileListStyleRef, cssVarsRef, maxReachedRef, showTriggerRef, imageGroupPropsRef } = NUpload;
         const isImageCardTypeRef = (0, vue_1.computed)(() => listTypeRef.value === 'image-card');
         const renderFileList = () => mergedFileListRef.value.map((file) => ((0, vue_1.h)(UploadFile_1.default, { clsPrefix: mergedClsPrefixRef.value, key: file.id, file: file, listType: listTypeRef.value })));
-        const renderUploadFileList = () => isImageCardTypeRef.value ? ((0, vue_1.h)(image_1.NImageGroup, null, { default: renderFileList })) : ((0, vue_1.h)(_internal_1.NFadeInExpandTransition, { group: true }, {
+        const renderUploadFileList = () => isImageCardTypeRef.value ? ((0, vue_1.h)(image_1.NImageGroup, Object.assign({}, imageGroupPropsRef.value), { default: renderFileList })) : ((0, vue_1.h)(_internal_1.NFadeInExpandTransition, { group: true }, {
             default: renderFileList
         }));
         return () => {

package/lib/upload/src/interface.d.ts

@@ -1,4 +1,5 @@
 import { Ref, InjectionKey, CSSProperties } from 'vue';
+import { ImageGroupProps } from '../../image';
 import type { MergedTheme } from '../../_mixins';
 import type { UploadTheme } from '../styles';
 export interface FileInfo {
@@ -21,7 +22,7 @@ export declare type OnChange = (data: {
 }) => void;
 export declare type OnFinish = ({ file, event }: {
     file: FileInfo;
-    event?: Event;
+    event?: ProgressEvent;
 }) => FileInfo | undefined;
 export declare type OnRemove = (data: {
     file: FileInfo;
@@ -31,7 +32,8 @@ export declare type OnDownload = (file: FileInfo) => Promise<boolean> | boolean
 export interface UploadInternalInst {
     doChange: DoChange;
     XhrMap: Map<string, XMLHttpRequest>;
-    onFinish?: OnFinish;
+    onError: OnError | undefined;
+    onFinish: OnFinish | undefined;
 }
 export declare type DoChange = (fileAfterChange: FileInfo, event?: ProgressEvent | Event, options?: {
     append?: boolean;
@@ -53,7 +55,7 @@ export interface UploadInjection {
     doChange: DoChange;
     showPreviewButtonRef: Ref<boolean>;
     onPreviewRef: Ref<OnPreview | undefined>;
-    listTypeRef: Ref<listType>;
+    listTypeRef: Ref<ListType>;
     dragOverRef: Ref<boolean>;
     draggerInsideRef: {
         value: boolean;
@@ -62,6 +64,7 @@ export interface UploadInjection {
     mergedDisabledRef: Ref<boolean>;
     maxReachedRef: Ref<boolean>;
     abstractRef: Ref<boolean>;
+    imageGroupPropsRef: Ref<ImageGroupProps | undefined>;
     cssVarsRef: Ref<CSSProperties>;
     submit: (fileId?: string) => void;
     getFileThumbnailUrl: (file: FileInfo) => Promise<string>;
@@ -83,7 +86,7 @@ export declare type OnBeforeUpload = (data: {
     file: FileInfo;
     fileList: FileInfo[];
 }) => Promise<unknown>;
-export declare type listType = 'text' | 'image' | 'image-card';
+export declare type ListType = 'text' | 'image' | 'image-card';
 export declare type OnPreview = (file: FileInfo) => void;
 export declare type CreateThumbnailUrl = (file: File) => Promise<string>;
 export interface CustomRequestOptions {
@@ -99,3 +102,7 @@ export interface CustomRequestOptions {
     onError: () => void;
 }
 export declare type CustomRequest = (options: CustomRequestOptions) => void;
+export declare type OnError = ({ file, event }: {
+    file: FileInfo;
+    event?: ProgressEvent;
+}) => FileInfo | undefined;