naive-ui 2.25.0 → 2.25.3

package/lib/code/src/Code.js

@@ -21,7 +21,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: codeProps,
     setup(props, { slots }) {
         const { internalNoHighlight } = props;
-        const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)();
+        const { mergedClsPrefixRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)();
         const codeRef = (0, vue_1.ref)(null);
         const hljsRef = internalNoHighlight ? { value: undefined } : (0, _mixins_1.useHljs)(props);
         const createCodeHtml = (language, code, trim) => {
@@ -74,39 +74,45 @@ exports.default = (0, vue_1.defineComponent)({
         if (!internalNoHighlight)
             (0, vue_1.watch)(hljsRef, setCode);
         const themeRef = (0, _mixins_1.useTheme)('Code', '-code', index_cssr_1.default, styles_1.codeLight, props, mergedClsPrefixRef);
+        const cssVarsRef = (0, vue_1.computed)(() => {
+            const { common: { cubicBezierEaseInOut, fontFamilyMono }, self: { textColor, fontSize, fontWeightStrong, 
+            // extracted from hljs atom-one-light.scss
+            'mono-3': $1, 'hue-1': $2, 'hue-2': $3, 'hue-3': $4, 'hue-4': $5, 'hue-5': $6, 'hue-5-2': $7, 'hue-6': $8, 'hue-6-2': $9 } } = themeRef.value;
+            const { internalFontSize } = props;
+            return {
+                '--n-font-size': internalFontSize ? `${internalFontSize}px` : fontSize,
+                '--n-font-family': fontFamilyMono,
+                '--n-font-weight-strong': fontWeightStrong,
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-text-color': textColor,
+                '--n-mono-3': $1,
+                '--n-hue-1': $2,
+                '--n-hue-2': $3,
+                '--n-hue-3': $4,
+                '--n-hue-4': $5,
+                '--n-hue-5': $6,
+                '--n-hue-5-2': $7,
+                '--n-hue-6': $8,
+                '--n-hue-6-2': $9
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? (0, _mixins_1.useThemeClass)('code', undefined, cssVarsRef, props)
+            : undefined;
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             codeRef,
-            cssVars: (0, vue_1.computed)(() => {
-                const { common: { cubicBezierEaseInOut, fontFamilyMono }, self: { textColor, fontSize, fontWeightStrong, 
-                // extracted from hljs atom-one-light.scss
-                'mono-3': $1, 'hue-1': $2, 'hue-2': $3, 'hue-3': $4, 'hue-4': $5, 'hue-5': $6, 'hue-5-2': $7, 'hue-6': $8, 'hue-6-2': $9 } } = themeRef.value;
-                const { internalFontSize } = props;
-                return {
-                    '--n-font-size': internalFontSize
-                        ? `${internalFontSize}px`
-                        : fontSize,
-                    '--n-font-family': fontFamilyMono,
-                    '--n-font-weight-strong': fontWeightStrong,
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-text-color': textColor,
-                    '--n-mono-3': $1,
-                    '--n-hue-1': $2,
-                    '--n-hue-2': $3,
-                    '--n-hue-3': $4,
-                    '--n-hue-4': $5,
-                    '--n-hue-5': $6,
-                    '--n-hue-5-2': $7,
-                    '--n-hue-6': $8,
-                    '--n-hue-6-2': $9
-                };
-            })
+            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() {
-        const { mergedClsPrefix, wordWrap } = this;
+        const { mergedClsPrefix, wordWrap, onRender } = this;
+        onRender === null || onRender === void 0 ? void 0 : onRender();
         return ((0, vue_1.h)("code", { class: [
                 `${mergedClsPrefix}-code`,
+                this.themeClass,
                 wordWrap && `${mergedClsPrefix}-code--word-wrap`
             ], style: this.cssVars, ref: "codeRef" }, this.$slots));
     }

package/lib/collapse/src/Collapse.d.ts

@@ -247,7 +247,9 @@ declare const _default: import("vue").DefineComponent<{
         '--n-title-text-color': string;
         '--n-title-font-weight': string;
         '--n-arrow-color': string;
-    }>;
+    }> | undefined;
+    themeClass: 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<ExtractPropTypes<{
     readonly defaultExpandedNames: {
         readonly type: PropType<string | number | (string | number)[] | null>;

package/lib/collapse/src/Collapse.js

@@ -39,7 +39,7 @@ exports.default = (0, vue_1.defineComponent)({
     name: 'Collapse',
     props: collapseProps,
     setup(props, { slots }) {
-        const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
+        const { mergedClsPrefixRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)(props);
         const uncontrolledExpandedNamesRef = (0, vue_1.ref)(props.defaultExpandedNames);
         const controlledExpandedNamesRef = (0, vue_1.computed)(() => props.expandedNames);
         const mergedExpandedNamesRef = (0, vooks_1.useMergedState)(controlledExpandedNamesRef, uncontrolledExpandedNamesRef);
@@ -104,25 +104,33 @@ exports.default = (0, vue_1.defineComponent)({
             slots,
             toggleItem
         });
+        const cssVarsRef = (0, vue_1.computed)(() => {
+            const { common: { cubicBezierEaseInOut }, self: { titleFontWeight, dividerColor, titleTextColor, textColor, arrowColor, fontSize, titleFontSize } } = themeRef.value;
+            return {
+                '--n-font-size': fontSize,
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-text-color': textColor,
+                '--n-divider-color': dividerColor,
+                '--n-title-font-size': titleFontSize,
+                '--n-title-text-color': titleTextColor,
+                '--n-title-font-weight': titleFontWeight,
+                '--n-arrow-color': arrowColor
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? (0, _mixins_1.useThemeClass)('collapse', undefined, cssVarsRef, props)
+            : undefined;
         return {
             mergedTheme: themeRef,
             mergedClsPrefix: mergedClsPrefixRef,
-            cssVars: (0, vue_1.computed)(() => {
-                const { common: { cubicBezierEaseInOut }, self: { titleFontWeight, dividerColor, titleTextColor, textColor, arrowColor, fontSize, titleFontSize } } = themeRef.value;
-                return {
-                    '--n-font-size': fontSize,
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-text-color': textColor,
-                    '--n-divider-color': dividerColor,
-                    '--n-title-font-size': titleFontSize,
-                    '--n-title-text-color': titleTextColor,
-                    '--n-title-font-weight': titleFontWeight,
-                    '--n-arrow-color': arrowColor
-                };
-            })
+            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() {
-        return ((0, vue_1.h)("div", { class: `${this.mergedClsPrefix}-collapse`, style: this.cssVars }, this.$slots));
+        var _a;
+        (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
+        return ((0, vue_1.h)("div", { class: [`${this.mergedClsPrefix}-collapse`, this.themeClass], style: this.cssVars }, this.$slots));
     }
 });

package/lib/color-picker/src/ColorPicker.d.ts

@@ -1801,7 +1801,9 @@ declare const _default: import("vue").DefineComponent<{
         '--n-border-radius': string;
         '--n-height': string;
         '--n-divider-color': string;
-    }>;
+    }> | undefined;
+    themeClass: 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 value: StringConstructor;
     readonly show: {

package/lib/color-picker/src/ColorPicker.js

@@ -55,7 +55,7 @@ exports.default = (0, vue_1.defineComponent)({
         const formItem = (0, _mixins_1.useFormItem)(props);
         const { mergedSizeRef, mergedDisabledRef } = formItem;
         const { localeRef } = (0, _mixins_1.useLocale)('global');
-        const { mergedClsPrefixRef, namespaceRef } = (0, _mixins_1.useConfig)(props);
+        const { mergedClsPrefixRef, namespaceRef, inlineThemeDisabled } = (0, _mixins_1.useConfig)(props);
         const themeRef = (0, _mixins_1.useTheme)('ColorPicker', '-color-picker', index_cssr_1.default, styles_1.colorPickerLight, props, mergedClsPrefixRef);
         (0, vue_1.provide)(context_1.colorPickerInjectionKey, {
             themeRef,
@@ -358,6 +358,11 @@ exports.default = (0, vue_1.defineComponent)({
                 '--n-divider-color': dividerColor
             };
         });
+        const themeClassHandle = inlineThemeDisabled
+            ? (0, _mixins_1.useThemeClass)('color-picker', (0, vue_1.computed)(() => {
+                return mergedSizeRef.value[0];
+            }), cssVarsRef, props)
+            : undefined;
         function renderPanel() {
             var _a;
             const { value: rgba } = rgbaRef;
@@ -365,9 +370,14 @@ exports.default = (0, vue_1.defineComponent)({
             const { internalActions, modes, actions } = props;
             const { value: mergedTheme } = themeRef;
             const { value: mergedClsPrefix } = mergedClsPrefixRef;
-            return ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker-panel`, onDragstart: (e) => {
+            return ((0, vue_1.h)("div", { class: [
+                    `${mergedClsPrefix}-color-picker-panel`,
+                    themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value
+                ], onDragstart: (e) => {
                     e.preventDefault();
-                }, style: cssVarsRef.value },
+                }, style: inlineThemeDisabled
+                    ? undefined
+                    : cssVarsRef.value },
                 (0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker-control` },
                     (0, vue_1.h)(Pallete_1.default, { clsPrefix: mergedClsPrefix, rgba: rgba, displayedHue: displayedHue, displayedSv: displayedSvRef.value, onUpdateSV: handleUpdateSv, onComplete: handleComplete }),
                     (0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker-preview` },
@@ -403,12 +413,15 @@ exports.default = (0, vue_1.defineComponent)({
                 doUpdateShow(false);
             },
             renderPanel,
-            cssVars: cssVarsRef
+            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() {
-        const { $slots, mergedClsPrefix } = this;
-        return ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-color-picker`, ref: "selfRef", style: this.cssVars },
+        const { $slots, mergedClsPrefix, onRender } = this;
+        onRender === null || onRender === void 0 ? void 0 : onRender();
+        return ((0, vue_1.h)("div", { class: [this.themeClass, `${mergedClsPrefix}-color-picker`], ref: "selfRef", style: this.cssVars },
             (0, vue_1.h)(vueuc_1.VBinder, null, {
                 default: () => [
                     (0, vue_1.h)(vueuc_1.VTarget, null, {

package/lib/components.d.ts

@@ -81,3 +81,4 @@ export * from './tree';
 export * from './tree-select';
 export * from './typography';
 export * from './upload';
+export * from './watermark';

package/lib/components.js

@@ -93,3 +93,4 @@ __exportStar(require("./tree"), exports);
 __exportStar(require("./tree-select"), exports);
 __exportStar(require("./typography"), exports);
 __exportStar(require("./upload"), exports);
+__exportStar(require("./watermark"), exports);

package/lib/config-provider/src/ConfigProvider.d.ts

@@ -132,7 +132,7 @@ export declare const configProviderProps: {
     readonly componentOptions: PropType<GlobalComponentConfig>;
     readonly icons: PropType<GlobalIconConfig>;
     readonly breakpoints: PropType<Breakpoints>;
-    readonly disableInlineTheme: {
+    readonly inlineThemeDisabled: {
         readonly type: BooleanConstructor;
         readonly default: undefined;
     };
@@ -271,7 +271,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly componentOptions: PropType<GlobalComponentConfig>;
     readonly icons: PropType<GlobalIconConfig>;
     readonly breakpoints: PropType<Breakpoints>;
-    readonly disableInlineTheme: {
+    readonly inlineThemeDisabled: {
         readonly type: BooleanConstructor;
         readonly default: undefined;
     };
@@ -414,7 +414,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly componentOptions: PropType<GlobalComponentConfig>;
     readonly icons: PropType<GlobalIconConfig>;
     readonly breakpoints: PropType<Breakpoints>;
-    readonly disableInlineTheme: {
+    readonly inlineThemeDisabled: {
         readonly type: BooleanConstructor;
         readonly default: undefined;
     };
@@ -428,6 +428,6 @@ declare const _default: import("vue").DefineComponent<{
     tag: string;
     as: string | undefined;
     bordered: boolean | undefined;
-    disableInlineTheme: boolean;
+    inlineThemeDisabled: boolean;
 }>;
 export default _default;

package/lib/config-provider/src/ConfigProvider.js

@@ -29,7 +29,7 @@ exports.configProviderProps = {
     componentOptions: Object,
     icons: Object,
     breakpoints: Object,
-    disableInlineTheme: {
+    inlineThemeDisabled: {
         type: Boolean,
         default: undefined
     },
@@ -123,7 +123,7 @@ exports.default = (0, vue_1.defineComponent)({
         const mergedBreakpointsRef = (0, vue_1.computed)(() => {
             return props.breakpoints || (NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.mergedBreakpointsRef.value);
         });
-        const disableInlineTheme = props.disableInlineTheme || (NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.disableInlineTheme);
+        const inlineThemeDisabled = props.inlineThemeDisabled || (NConfigProvider === null || NConfigProvider === void 0 ? void 0 : NConfigProvider.inlineThemeDisabled);
         const mergedThemeHashRef = (0, vue_1.computed)(() => {
             const { value: theme } = mergedThemeRef;
             const { value: mergedThemeOverrides } = mergedThemeOverridesRef;
@@ -173,7 +173,7 @@ exports.default = (0, vue_1.defineComponent)({
             }),
             mergedThemeRef,
             mergedThemeOverridesRef,
-            disableInlineTheme: disableInlineTheme || false
+            inlineThemeDisabled: inlineThemeDisabled || false
         });
         return {
             mergedClsPrefix: mergedClsPrefixRef,

package/lib/config-provider/src/internal-interface.d.ts

@@ -74,6 +74,7 @@ import type { TreeTheme } from '../../tree/styles';
 import type { TreeSelectTheme } from '../../tree-select/styles';
 import type { TypographyTheme } from '../../typography/styles';
 import type { UploadTheme } from '../../upload/styles';
+import type { WatermarkTheme } from '../../watermark/styles';
 import type { InternalSelectMenuTheme } from '../../_internal/select-menu/styles';
 import type { InternalSelectionTheme } from '../../_internal/selection/styles';
 import type { NDateLocale, NLocale } from '../../locales';
@@ -163,6 +164,7 @@ export interface GlobalThemeWithoutCommon {
     TreeSelect?: TreeSelectTheme;
     Typography?: TypographyTheme;
     Upload?: UploadTheme;
+    Watermark?: WatermarkTheme;
     InternalSelectMenu?: InternalSelectMenuTheme;
     InternalSelection?: InternalSelectionTheme;
 }
@@ -229,5 +231,5 @@ export interface ConfigProviderInjection {
     mergedThemeOverridesRef: Ref<GlobalThemeOverrides | undefined>;
     mergedRtlRef: Ref<RtlEnabledState | undefined>;
     mergedThemeHashRef: Ref<string>;
-    disableInlineTheme: boolean;
+    inlineThemeDisabled: boolean;
 }

package/lib/countdown/src/Countdown.d.ts

@@ -1,7 +1,6 @@
 import { PropType, VNodeChild } from 'vue';
 import type { ExtractPublicPropTypes } from '../../_utils';
 declare const countdownProps: {
-    label: StringConstructor;
     duration: {
         type: NumberConstructor;
         default: number;
@@ -24,7 +23,6 @@ declare const countdownProps: {
 };
 export declare type CountdownProps = ExtractPublicPropTypes<typeof countdownProps>;
 declare const _default: import("vue").DefineComponent<{
-    label: StringConstructor;
     duration: {
         type: NumberConstructor;
         default: number;
@@ -45,7 +43,6 @@ declare const _default: import("vue").DefineComponent<{
     }) => VNodeChild>;
     onFinish: PropType<() => void>;
 }, () => VNodeChild, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    label: StringConstructor;
     duration: {
         type: NumberConstructor;
         default: number;

package/lib/countdown/src/Countdown.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const vue_1 = require("vue");
 const countdownProps = {
-    label: String,
     duration: {
         type: Number,
         default: 0