naive-ui 2.25.4 → 2.25.7

package/lib/tree-select/src/TreeSelect.d.ts

@@ -126,6 +126,7 @@ declare const props: {
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -264,6 +265,7 @@ declare const props: {
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -402,6 +404,7 @@ declare const props: {
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -640,6 +643,7 @@ declare const _default: import("vue").DefineComponent<{
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -778,6 +782,7 @@ declare const _default: import("vue").DefineComponent<{
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -916,6 +921,7 @@ declare const _default: import("vue").DefineComponent<{
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -1091,16 +1097,6 @@ declare const _default: import("vue").DefineComponent<{
     handleKeyup: (e: KeyboardEvent) => void;
     handleTabOut: () => void;
     handleMenuMousedown: (e: MouseEvent) => void;
-    cssVars: import("vue").ComputedRef<{
-        '--n-menu-box-shadow': string;
-        '--n-menu-border-radius': string;
-        '--n-menu-color': string;
-        '--n-menu-height': string;
-        '--n-bezier': string;
-        '--n-action-padding': string;
-        '--n-action-text-color': string;
-        '--n-action-divider-color': string;
-    }>;
     mergedTheme: import("vue").ComputedRef<{
         common: {
             baseColor: string;
@@ -1229,6 +1225,7 @@ declare const _default: import("vue").DefineComponent<{
                 dropMarkColor: string;
             }, {
                 Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                    labelLineHeight: string;
                     fontSizeSmall: string;
                     fontSizeMedium: string;
                     fontSizeLarge: string;
@@ -1348,6 +1345,7 @@ declare const _default: import("vue").DefineComponent<{
             Tree?: {
                 peers?: {
                     Checkbox?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Checkbox", {
+                        labelLineHeight: string;
                         fontSizeSmall: string;
                         fontSizeMedium: string;
                         fontSizeLarge: string;
@@ -1406,6 +1404,18 @@ declare const _default: import("vue").DefineComponent<{
             } | undefined;
         };
     }>;
+    cssVars: import("vue").ComputedRef<{
+        '--n-menu-box-shadow': string;
+        '--n-menu-border-radius': string;
+        '--n-menu-color': string;
+        '--n-menu-height': string;
+        '--n-bezier': string;
+        '--n-action-padding': string;
+        '--n-action-text-color': string;
+        '--n-action-divider-color': string;
+    }> | undefined;
+    themeClass: import("vue").Ref<string> | undefined;
+    onRender: (() => void) | undefined;
 }, 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 onBlur: PropType<(e: FocusEvent) => void>;
     readonly onFocus: PropType<(e: FocusEvent) => void>;
@@ -1527,6 +1537,7 @@ declare const _default: import("vue").DefineComponent<{
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -1665,6 +1676,7 @@ declare const _default: import("vue").DefineComponent<{
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
@@ -1803,6 +1815,7 @@ declare const _default: import("vue").DefineComponent<{
             dropMarkColor: string;
         }, {
             Checkbox: import("../../_mixins").Theme<"Checkbox", {
+                labelLineHeight: string;
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;

package/lib/tree-select/src/TreeSelect.js

@@ -75,7 +75,7 @@ exports.default = (0, vue_1.defineComponent)({
         const triggerInstRef = (0, vue_1.ref)(null);
         const treeInstRef = (0, vue_1.ref)(null);
         const menuElRef = (0, vue_1.ref)(null);
-        const { mergedClsPrefixRef, namespaceRef } = (0, _mixins_1.useConfig)(props);
+        const { mergedClsPrefixRef, namespaceRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)(props);
         const { localeRef } = (0, _mixins_1.useLocale)('Select');
         const { mergedSizeRef, mergedDisabledRef, mergedStatusRef, nTriggerFormBlur, nTriggerFormChange, nTriggerFormFocus, nTriggerFormInput } = (0, _mixins_1.useFormItem)(props);
         const uncontrolledValueRef = (0, vue_1.ref)(props.defaultValue);
@@ -482,6 +482,22 @@ exports.default = (0, vue_1.defineComponent)({
             }
         });
         const themeRef = (0, _mixins_1.useTheme)('TreeSelect', '-tree-select', index_cssr_1.default, styles_1.treeSelectLight, props, mergedClsPrefixRef);
+        const cssVarsRef = (0, vue_1.computed)(() => {
+            const { common: { cubicBezierEaseInOut }, self: { menuBoxShadow, menuBorderRadius, menuColor, menuHeight, actionPadding, actionDividerColor, actionTextColor } } = themeRef.value;
+            return {
+                '--n-menu-box-shadow': menuBoxShadow,
+                '--n-menu-border-radius': menuBorderRadius,
+                '--n-menu-color': menuColor,
+                '--n-menu-height': menuHeight,
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-action-padding': actionPadding,
+                '--n-action-text-color': actionTextColor,
+                '--n-action-divider-color': actionDividerColor
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? (0, _mixins_1.useThemeClass)('tree-select', undefined, cssVarsRef, props)
+            : undefined;
         return {
             menuElRef,
             mergedStatus: mergedStatusRef,
@@ -527,20 +543,10 @@ exports.default = (0, vue_1.defineComponent)({
             handleKeyup,
             handleTabOut,
             handleMenuMousedown,
-            cssVars: (0, vue_1.computed)(() => {
-                const { common: { cubicBezierEaseInOut }, self: { menuBoxShadow, menuBorderRadius, menuColor, menuHeight, actionPadding, actionDividerColor, actionTextColor } } = themeRef.value;
-                return {
-                    '--n-menu-box-shadow': menuBoxShadow,
-                    '--n-menu-border-radius': menuBorderRadius,
-                    '--n-menu-color': menuColor,
-                    '--n-menu-height': menuHeight,
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-action-padding': actionPadding,
-                    '--n-action-text-color': actionTextColor,
-                    '--n-action-divider-color': actionDividerColor
-                };
-            }),
-            mergedTheme: themeRef
+            mergedTheme: themeRef,
+            cssVars: inlineThemeDisabled ? undefined : cssVarsRef,
+            themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass,
+            onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender
         };
     },
     render() {
@@ -554,12 +560,15 @@ exports.default = (0, vue_1.defineComponent)({
                     (0, vue_1.h)(vueuc_1.VFollower, { ref: "followerInstRef", show: this.mergedShow, placement: this.placement, to: this.adjustedTo, teleportDisabled: this.adjustedTo === _utils_1.useAdjustedTo.tdkey, containerClass: this.namespace, width: this.consistentMenuWidth ? 'target' : undefined, minWidth: "target" }, {
                         default: () => ((0, vue_1.h)(vue_1.Transition, { name: "fade-in-scale-up-transition", appear: this.isMounted, onLeave: this.handleMenuLeave }, {
                             default: () => {
+                                var _a;
                                 if (!this.mergedShow)
                                     return null;
                                 const { mergedClsPrefix, filteredTreeInfo, checkable, multiple, menuProps } = this;
+                                (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
                                 return (0, vue_1.withDirectives)((0, vue_1.h)("div", Object.assign({}, menuProps, { class: [
                                         `${mergedClsPrefix}-tree-select-menu`,
-                                        menuProps === null || menuProps === void 0 ? void 0 : menuProps.class
+                                        menuProps === null || menuProps === void 0 ? void 0 : menuProps.class,
+                                        this.themeClass
                                     ], ref: "menuElRef", style: [
                                         (menuProps === null || menuProps === void 0 ? void 0 : menuProps.style) || '',
                                         this.cssVars

package/lib/tree-select/styles/light.d.ts

@@ -33,6 +33,7 @@ declare const treeSelectLight: import("../../_mixins/use-theme").Theme<"TreeSele
         dropMarkColor: string;
     }, {
         Checkbox: import("../../_mixins/use-theme").Theme<"Checkbox", {
+            labelLineHeight: string;
             fontSizeSmall: string;
             fontSizeMedium: string;
             fontSizeLarge: string;

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

@@ -1996,7 +1996,9 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     dragOver: import("vue").Ref<boolean>;
     handleFileInputChange: (e: Event) => void;
-    cssVars: import("vue").ComputedRef<any>;
+    cssVars: import("vue").ComputedRef<any> | undefined;
+    themeClass: import("vue").Ref<string> | undefined;
+    onRender: (() => void) | undefined;
 }, 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 name: {
         readonly type: StringConstructor;

package/lib/upload/src/Upload.js

@@ -157,11 +157,13 @@ function appendData(formData, data, file) {
         formData.append(key, dataObject[key]);
     });
 }
-function submitImpl(inst, file, formData, { method, action, withCredentials, headers, data }) {
+function submitImpl(inst, fieldName, file, { method, action, withCredentials, headers, data }) {
     const request = new XMLHttpRequest();
     inst.XhrMap.set(file.id, request);
     request.withCredentials = withCredentials;
+    const formData = new FormData();
     appendData(formData, data, file);
+    formData.append(fieldName, file.file);
     registerHandler(inst, file, request);
     if (action !== undefined) {
         request.open(method.toUpperCase(), action);
@@ -225,7 +227,7 @@ exports.default = (0, vue_1.defineComponent)({
         if (props.abstract && props.listType === 'image-card') {
             (0, _utils_1.throwError)('upload', 'when the list-type is image-card, abstract is not supported.');
         }
-        const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
+        const { mergedClsPrefixRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)(props);
         const themeRef = (0, _mixins_1.useTheme)('Upload', '-upload', index_cssr_1.default, styles_1.uploadLight, props, mergedClsPrefixRef);
         const formItem = (0, _mixins_1.useFormItem)(props);
         const maxReachedRef = (0, vue_1.computed)(() => {
@@ -318,8 +320,6 @@ exports.default = (0, vue_1.defineComponent)({
             filesToUpload.forEach((file) => {
                 const { status } = file;
                 if (status === 'pending' || (status === 'error' && shouldReupload)) {
-                    const formData = new FormData();
-                    formData.append(fieldName, file.file);
                     if (props.customRequest) {
                         customSubmitImpl({
                             inst: {
@@ -342,7 +342,7 @@ exports.default = (0, vue_1.defineComponent)({
                             XhrMap,
                             onFinish: props.onFinish,
                             onError: props.onError
-                        }, file, formData, {
+                        }, fieldName, file, {
                             method,
                             action,
                             withCredentials,
@@ -413,6 +413,9 @@ exports.default = (0, vue_1.defineComponent)({
                 '--n-item-border-image-card': itemBorderImageCard
             };
         });
+        const themeClassHandle = inlineThemeDisabled
+            ? (0, _mixins_1.useThemeClass)('upload', undefined, cssVarsRef, props)
+            : undefined;
         (0, vue_1.provide)(interface_1.uploadInjectionKey, {
             mergedClsPrefixRef,
             mergedThemeRef: themeRef,
@@ -438,7 +441,9 @@ exports.default = (0, vue_1.defineComponent)({
             maxReachedRef,
             fileListStyleRef: (0, vue_1.toRef)(props, 'fileListStyle'),
             abstractRef: (0, vue_1.toRef)(props, 'abstract'),
-            cssVarsRef,
+            cssVarsRef: inlineThemeDisabled ? undefined : cssVarsRef,
+            themeClassRef: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass,
+            onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender,
             showTriggerRef: (0, vue_1.toRef)(props, 'showTrigger'),
             imageGroupPropsRef: (0, vue_1.toRef)(props, 'imageGroupProps')
         });
@@ -450,11 +455,11 @@ exports.default = (0, vue_1.defineComponent)({
             openOpenFileDialog
         };
         return Object.assign({ mergedClsPrefix: mergedClsPrefixRef, draggerInsideRef,
-            inputElRef, mergedTheme: themeRef, dragOver: dragOverRef, handleFileInputChange, cssVars: cssVarsRef }, exposedMethods);
+            inputElRef, mergedTheme: themeRef, dragOver: dragOverRef, handleFileInputChange, cssVars: inlineThemeDisabled ? undefined : cssVarsRef, themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass, onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender }, exposedMethods);
     },
     render() {
         var _a, _b, _c;
-        const { draggerInsideRef, mergedClsPrefix, $slots } = this;
+        const { draggerInsideRef, mergedClsPrefix, $slots, onRender } = this;
         if ($slots.default && !this.abstract) {
             const firstChild = $slots.default()[0];
             if ((_b = (_a = firstChild) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b[UploadDragger_1.uploadDraggerKey]) {
@@ -462,12 +467,17 @@ exports.default = (0, vue_1.defineComponent)({
             }
         }
         const inputNode = ((0, vue_1.h)("input", Object.assign({}, this.inputProps, { ref: "inputElRef", type: "file", class: `${mergedClsPrefix}-upload-file-input`, accept: this.accept, multiple: this.multiple, onChange: this.handleFileInputChange })));
-        return this.abstract ? ((0, vue_1.h)(vue_1.Fragment, null, (_c = $slots.default) === null || _c === void 0 ? void 0 :
-            _c.call($slots),
-            (0, vue_1.h)(vue_1.Teleport, { to: "body" }, inputNode))) : ((0, vue_1.h)("div", { class: [
+        if (this.abstract) {
+            return ((0, vue_1.h)(vue_1.Fragment, null, (_c = $slots.default) === null || _c === void 0 ? void 0 :
+                _c.call($slots),
+                (0, vue_1.h)(vue_1.Teleport, { to: "body" }, inputNode)));
+        }
+        onRender === null || onRender === void 0 ? void 0 : onRender();
+        return ((0, vue_1.h)("div", { class: [
                 `${mergedClsPrefix}-upload`,
                 draggerInsideRef.value && `${mergedClsPrefix}-upload--dragger-inside`,
-                this.dragOver && `${mergedClsPrefix}-upload--drag-over`
+                this.dragOver && `${mergedClsPrefix}-upload--drag-over`,
+                this.themeClass
             ], style: this.cssVars },
             inputNode,
             this.showTrigger && this.listType !== 'image-card' && ((0, vue_1.h)(UploadTrigger_1.default, null, $slots)),

package/lib/upload/src/UploadFileList.js

@@ -17,7 +17,7 @@ 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, imageGroupPropsRef } = NUpload;
+        const { abstractRef, mergedClsPrefixRef, listTypeRef, mergedFileListRef, fileListStyleRef, cssVarsRef, themeClassRef, 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, Object.assign({}, imageGroupPropsRef.value), { default: renderFileList })) : ((0, vue_1.h)(_internal_1.NFadeInExpandTransition, { group: true }, {
@@ -25,11 +25,16 @@ exports.default = (0, vue_1.defineComponent)({
         }));
         return () => {
             const { value: mergedClsPrefix } = mergedClsPrefixRef;
+            const { value: abstract } = abstractRef;
             return ((0, vue_1.h)("div", { class: [
                     `${mergedClsPrefix}-upload-file-list`,
                     isImageCardTypeRef.value &&
-                        `${mergedClsPrefix}-upload-file-list--grid`
-                ], style: [cssVarsRef.value, fileListStyleRef.value] },
+                        `${mergedClsPrefix}-upload-file-list--grid`,
+                    abstract ? themeClassRef === null || themeClassRef === void 0 ? void 0 : themeClassRef.value : undefined
+                ], style: [
+                    abstract && cssVarsRef ? cssVarsRef.value : '',
+                    fileListStyleRef.value
+                ] },
                 renderUploadFileList(),
                 showTriggerRef.value &&
                     !maxReachedRef.value &&

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

@@ -65,7 +65,9 @@ export interface UploadInjection {
     maxReachedRef: Ref<boolean>;
     abstractRef: Ref<boolean>;
     imageGroupPropsRef: Ref<ImageGroupProps | undefined>;
-    cssVarsRef: Ref<CSSProperties>;
+    cssVarsRef: undefined | Ref<CSSProperties>;
+    themeClassRef: undefined | Ref<string>;
+    onRender: undefined | (() => void);
     submit: (fileId?: string) => void;
     getFileThumbnailUrl: (file: FileInfo) => Promise<string>;
     handleFileAddition: (files: FileList | null, e?: Event) => void;

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.25.4";
+declare const _default: "2.25.7";
 export default _default;

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "2.25.4",
+  "version": "2.25.7",
   "description": "A Vue 3 Component Library. Fairly Complete, Customizable Themes, Uses TypeScript, Not Too Slow",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -93,7 +93,7 @@
     "vite": "^2.1.3",
     "vue": "^3.2.12",
     "vue-router": "^4.0.5",
-    "vue-tsc": "^0.31.1"
+    "vue-tsc": "^0.32.0"
   },
   "peerDependencies": {
     "vue": "^3.0.0"

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.25.4",
+  "version": "2.25.7",
   "contributions": {
     "html": {
       "elements": [