naive-ui 2.43.1 → 2.44.0

package/lib/descriptions/src/Descriptions.js

@@ -24,20 +24,24 @@ exports.descriptionsProps = Object.assign(Object.assign({}, _mixins_1.useTheme.p
     }, separator: {
         type: String,
         default: ':'
-    }, size: {
-        type: String,
-        default: 'medium'
-    }, bordered: Boolean, labelClass: String, labelStyle: [Object, String], contentClass: String, contentStyle: [Object, String] });
+    }, size: String, bordered: Boolean, labelClass: String, labelStyle: [Object, String], contentClass: String, contentStyle: [Object, String] });
 exports.default = (0, vue_1.defineComponent)({
     name: 'Descriptions',
     props: exports.descriptionsProps,
     slots: Object,
     setup(props) {
-        const { mergedClsPrefixRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)(props);
+        const { mergedClsPrefixRef, inlineThemeDisabled, mergedComponentPropsRef } = (0, _mixins_1.useConfig)(props);
+        const mergedSizeRef = (0, vue_1.computed)(() => {
+            var _a, _b;
+            return (props.size
+                || ((_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.Descriptions) === null || _b === void 0 ? void 0 : _b.size)
+                || 'medium');
+        });
         const themeRef = (0, _mixins_1.useTheme)('Descriptions', '-descriptions', index_cssr_1.default, styles_1.descriptionsLight, props, mergedClsPrefixRef);
         const cssVarsRef = (0, vue_1.computed)(() => {
-            const { size, bordered } = props;
-            const { common: { cubicBezierEaseInOut }, self: { titleTextColor, thColor, thColorModal, thColorPopover, thTextColor, thFontWeight, tdTextColor, tdColor, tdColorModal, tdColorPopover, borderColor, borderColorModal, borderColorPopover, borderRadius, lineHeight, [(0, _utils_1.createKey)('fontSize', size)]: fontSize, [(0, _utils_1.createKey)(bordered ? 'thPaddingBordered' : 'thPadding', size)]: thPadding, [(0, _utils_1.createKey)(bordered ? 'tdPaddingBordered' : 'tdPadding', size)]: tdPadding } } = themeRef.value;
+            const { bordered } = props;
+            const mergedSize = mergedSizeRef.value;
+            const { common: { cubicBezierEaseInOut }, self: { titleTextColor, thColor, thColorModal, thColorPopover, thTextColor, thFontWeight, tdTextColor, tdColor, tdColorModal, tdColorPopover, borderColor, borderColorModal, borderColorPopover, borderRadius, lineHeight, [(0, _utils_1.createKey)('fontSize', mergedSize)]: fontSize, [(0, _utils_1.createKey)(bordered ? 'thPaddingBordered' : 'thPadding', mergedSize)]: thPadding, [(0, _utils_1.createKey)(bordered ? 'tdPaddingBordered' : 'tdPadding', mergedSize)]: tdPadding } } = themeRef.value;
             return {
                 '--n-title-text-color': titleTextColor,
                 '--n-th-padding': thPadding,
@@ -63,10 +67,10 @@ exports.default = (0, vue_1.defineComponent)({
         const themeClassHandle = inlineThemeDisabled
             ? (0, _mixins_1.useThemeClass)('descriptions', (0, vue_1.computed)(() => {
                 let hash = '';
-                const { size, bordered } = props;
+                const { bordered } = props;
                 if (bordered)
                     hash += 'a';
-                hash += size[0];
+                hash += mergedSizeRef.value[0];
                 return hash;
             }), cssVarsRef, props)
             : undefined;
@@ -76,14 +80,15 @@ exports.default = (0, vue_1.defineComponent)({
             themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass,
             onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender,
             compitableColumn: (0, vooks_1.useCompitable)(props, ['columns', 'column']),
-            inlineThemeDisabled
+            inlineThemeDisabled,
+            mergedSize: mergedSizeRef
         };
     },
     render() {
         const defaultSlots = this.$slots.default;
         const children = defaultSlots ? (0, _utils_1.flatten)(defaultSlots()) : [];
         const memorizedLength = children.length;
-        const { contentClass, labelClass, compitableColumn, labelPlacement, labelAlign, size, bordered, title, cssVars, mergedClsPrefix, separator, onRender } = this;
+        const { contentClass, labelClass, compitableColumn, labelPlacement, labelAlign, mergedSize, bordered, title, cssVars, mergedClsPrefix, separator, onRender } = this;
         onRender === null || onRender === void 0 ? void 0 : onRender();
         const filteredChildren = children.filter(child => (0, utils_1.isDescriptionsItem)(child));
         if (process.env.NODE_ENV !== 'production' && memorizedLength !== filteredChildren.length) {
@@ -167,7 +172,7 @@ exports.default = (0, vue_1.defineComponent)({
                 this.themeClass,
                 `${mergedClsPrefix}-descriptions--${labelPlacement}-label-placement`,
                 `${mergedClsPrefix}-descriptions--${labelAlign}-label-align`,
-                `${mergedClsPrefix}-descriptions--${size}-size`,
+                `${mergedClsPrefix}-descriptions--${mergedSize}-size`,
                 bordered && `${mergedClsPrefix}-descriptions--bordered`
             ] },
             title || this.$slots.header ? ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-descriptions-header` }, title || (0, _utils_1.getSlot)(this, 'header'))) : null,

package/lib/descriptions/src/public-types.d.ts

@@ -0,0 +1 @@
+export type DescriptionsSize = 'small' | 'medium' | 'large';

package/lib/descriptions/src/public-types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1784,10 +1784,10 @@ export declare const NDialog: import("vue").DefineComponent<import("vue").Extrac
         }, any>;
     }>>>;
 }>> & Readonly<{}>, {
-    type: "default" | "error" | "info" | "warning" | "success";
-    loading: boolean;
+    type: "default" | "info" | "warning" | "error" | "success";
     showIcon: boolean;
     bordered: boolean;
     closable: boolean;
+    loading: boolean;
     closeFocusable: boolean;
 }, SlotsType<DialogSlots>, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

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

@@ -204,14 +204,14 @@ export declare const NDialogEnvironment: import("vue").DefineComponent<import("v
     actionStyle: PropType<string | CSSProperties>;
     closeFocusable: BooleanConstructor;
 }>> & Readonly<{}>, {
-    type: "default" | "error" | "info" | "warning" | "success";
-    loading: boolean;
-    autoFocus: boolean;
+    type: "default" | "info" | "warning" | "error" | "success";
     showIcon: boolean;
     bordered: boolean;
     closable: boolean;
+    loading: boolean;
     closeFocusable: boolean;
     blockScroll: boolean;
     closeOnEsc: boolean;
+    autoFocus: boolean;
     maskClosable: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;