niuma-ui 2.0.4 → 2.1.0

package/dist/components/alert/src/RsAlert.d.ts

@@ -1,26 +1,45 @@
-import type { RsFeedbackTone } from '../../_shared/src/overlay-utils';
+import { type RsComponentSize, type RsRadius } from '../../../theme/types';
+import { type RsAlertExpose, type RsAlertTone, type RsAlertVariant } from './alert-utils';
+export type { RsAlertExpose, RsAlertTone, RsAlertVariant };
 type __VLS_Props = {
-    type?: RsFeedbackTone;
+    /** 色相。与 type 同时传时以 tone 为准。 */
+    tone?: RsAlertTone;
+    /** type 的兼容别名，语义与 tone 相同。 */
+    type?: RsAlertTone;
+    variant?: RsAlertVariant;
     title?: string;
+    description?: string;
     closable?: boolean;
     bordered?: boolean;
+    showIcon?: boolean;
+    banner?: boolean;
+    closeText?: string;
+    size?: RsComponentSize;
+    radius?: RsRadius;
+    id?: string;
+    ariaLabel?: string;
 };
-declare var __VLS_1: {}, __VLS_8: {}, __VLS_10: {};
+declare var __VLS_1: {}, __VLS_8: {}, __VLS_10: {}, __VLS_12: {}, __VLS_14: {};
 type __VLS_Slots = {} & {
     icon?: (props: typeof __VLS_1) => any;
 } & {
     title?: (props: typeof __VLS_8) => any;
 } & {
     default?: (props: typeof __VLS_10) => any;
+} & {
+    action?: (props: typeof __VLS_12) => any;
+} & {
+    close?: (props: typeof __VLS_14) => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, RsAlertExpose, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (event: MouseEvent) => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onClose?: ((event: MouseEvent) => any) | undefined;
 }>, {
-    type: RsFeedbackTone;
     bordered: boolean;
     closable: boolean;
+    showIcon: boolean;
+    banner: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/components/alert/src/RsAlert.impl.js

@@ -1,26 +1,42 @@
+import { RS_COMPONENT_SIZE_ICON_PX } from "../../../theme/types.js";
 import { useRsI18n } from "../../../composables/useRsI18n.js";
 import RsIcon_default from "../../icon/src/RsIcon.js";
-import { computed, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeClass, openBlock, renderSlot, toDisplayString, unref } from "vue";
+import { useResolvedRsComponentSize } from "../../_shared/src/resolve-size.js";
+import { rsRadiusCss, useResolvedRsRadius } from "../../_shared/src/resolve-radius.js";
+import { hasAlertDescription, hasAlertTitle, resolveAlertIcon, resolveAlertRole, resolveAlertSize, resolveAlertTone, resolveAlertVariant, shouldShowAlertIcon } from "./alert-utils.js";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeClass, normalizeStyle, openBlock, ref, renderSlot, toDisplayString, useId, useSlots } from "vue";
 //#region src/components/alert/src/RsAlert.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = {
+var _hoisted_1 = [
+	"id",
+	"role",
+	"aria-label",
+	"aria-labelledby",
+	"aria-describedby",
+	"tabindex"
+];
+var _hoisted_2 = {
+	key: 0,
 	class: "rs-alert__icon",
 	"aria-hidden": "true"
 };
-var _hoisted_2 = { class: "rs-alert__body" };
-var _hoisted_3 = {
-	key: 0,
-	class: "rs-alert__title"
-};
-var _hoisted_4 = {
+var _hoisted_3 = { class: "rs-alert__body" };
+var _hoisted_4 = ["id"];
+var _hoisted_5 = ["id"];
+var _hoisted_6 = {
 	key: 1,
-	class: "rs-alert__content"
+	class: "rs-alert__action"
 };
-var _hoisted_5 = ["aria-label"];
+var _hoisted_7 = ["aria-label"];
+var _hoisted_8 = { key: 0 };
 var RsAlert_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
+	name: "RsAlert",
 	__name: "RsAlert",
 	props: {
-		type: { default: "info" },
+		tone: {},
+		type: {},
+		variant: {},
 		title: {},
+		description: {},
 		closable: {
 			type: Boolean,
 			default: false
@@ -28,54 +44,110 @@ var RsAlert_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 		bordered: {
 			type: Boolean,
 			default: true
-		}
+		},
+		showIcon: {
+			type: Boolean,
+			default: true
+		},
+		banner: {
+			type: Boolean,
+			default: false
+		},
+		closeText: {},
+		size: {},
+		radius: {},
+		id: {},
+		ariaLabel: {}
 	},
 	emits: ["close"],
-	setup(__props, { emit: __emit }) {
+	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
 		const { t } = useRsI18n();
-		const iconName = computed(() => {
-			switch (props.type) {
-				case "success": return "circle-check";
-				case "warning": return "triangle-alert";
-				case "danger": return "circle-alert";
-				case "default": return "info";
-				default: return "info";
-			}
-		});
+		const slots = useSlots();
+		const uid = useId();
+		const rootRef = ref(null);
+		const closeRef = ref(null);
+		const inheritedSize = useResolvedRsComponentSize(() => props.size);
+		const resolvedSize = computed(() => resolveAlertSize(inheritedSize.value));
+		const resolvedRadius = useResolvedRsRadius(() => props.banner ? "none" : props.radius, "md");
+		const resolvedTone = computed(() => resolveAlertTone(props.tone, props.type));
+		const resolvedVariant = computed(() => resolveAlertVariant(props.variant));
+		const iconName = computed(() => resolveAlertIcon(resolvedTone.value));
+		const liveRole = computed(() => resolveAlertRole(resolvedTone.value));
+		const showIcon = computed(() => shouldShowAlertIcon(props.showIcon, Boolean(slots.icon)));
+		const showTitle = computed(() => hasAlertTitle(props.title, Boolean(slots.title)));
+		const showDescription = computed(() => hasAlertDescription(props.description, Boolean(slots.default)));
+		const iconSize = computed(() => RS_COMPONENT_SIZE_ICON_PX[resolvedSize.value === "sm" ? "sm" : resolvedSize.value]);
+		const closeIconSize = computed(() => RS_COMPONENT_SIZE_ICON_PX[resolvedSize.value === "lg" ? "md" : "ssm"]);
+		const titleDomId = computed(() => showTitle.value ? `${props.id || uid}-title` : void 0);
+		const descDomId = computed(() => showDescription.value ? `${props.id || uid}-desc` : void 0);
+		const closeLabel = computed(() => props.closeText || t("alert.close"));
 		const rootClass = computed(() => [
 			"rs-alert",
-			`rs-alert--${props.type}`,
+			`rs-alert--${resolvedTone.value}`,
+			`rs-alert--${resolvedVariant.value}`,
+			`rs-alert--${resolvedSize.value}`,
 			{
 				"rs-alert--bordered": props.bordered,
-				"rs-alert--closable": props.closable
+				"rs-alert--closable": props.closable,
+				"rs-alert--banner": props.banner,
+				"rs-alert--no-icon": !showIcon.value
 			}
 		]);
+		const rootStyle = computed(() => ({ "--rs-alert-radius": props.banner ? "0" : rsRadiusCss(resolvedRadius.value) }));
 		function onClose(event) {
 			emit("close", event);
 		}
+		function focus() {
+			if (closeRef.value) {
+				closeRef.value.focus();
+				return;
+			}
+			rootRef.value?.focus();
+		}
+		__expose({ focus });
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", {
+				id: __props.id,
+				ref_key: "rootRef",
+				ref: rootRef,
 				class: normalizeClass(rootClass.value),
-				role: "alert"
+				style: normalizeStyle(rootStyle.value),
+				role: liveRole.value,
+				"aria-label": __props.ariaLabel,
+				"aria-labelledby": titleDomId.value,
+				"aria-describedby": descDomId.value,
+				tabindex: __props.closable ? void 0 : -1
 			}, [
-				createElementVNode("span", _hoisted_1, [renderSlot(_ctx.$slots, "icon", {}, () => [createVNode(RsIcon_default, {
+				showIcon.value ? (openBlock(), createElementBlock("span", _hoisted_2, [renderSlot(_ctx.$slots, "icon", {}, () => [createVNode(RsIcon_default, {
 					name: iconName.value,
-					size: 16
-				}, null, 8, ["name"])], true)]),
-				createElementVNode("div", _hoisted_2, [__props.title || _ctx.$slots.title ? (openBlock(), createElementBlock("div", _hoisted_3, [renderSlot(_ctx.$slots, "title", {}, () => [createTextVNode(toDisplayString(__props.title), 1)], true)])) : createCommentVNode("", true), _ctx.$slots.default ? (openBlock(), createElementBlock("div", _hoisted_4, [renderSlot(_ctx.$slots, "default", {}, void 0, true)])) : createCommentVNode("", true)]),
-				__props.closable ? (openBlock(), createElementBlock("button", {
+					size: iconSize.value
+				}, null, 8, ["name", "size"])], true)])) : createCommentVNode("", true),
+				createElementVNode("div", _hoisted_3, [showTitle.value ? (openBlock(), createElementBlock("div", {
 					key: 0,
+					id: titleDomId.value,
+					class: "rs-alert__title"
+				}, [renderSlot(_ctx.$slots, "title", {}, () => [createTextVNode(toDisplayString(__props.title), 1)], true)], 8, _hoisted_4)) : createCommentVNode("", true), showDescription.value ? (openBlock(), createElementBlock("div", {
+					key: 1,
+					id: descDomId.value,
+					class: "rs-alert__content"
+				}, [renderSlot(_ctx.$slots, "default", {}, () => [createTextVNode(toDisplayString(__props.description), 1)], true)], 8, _hoisted_5)) : createCommentVNode("", true)]),
+				_ctx.$slots.action ? (openBlock(), createElementBlock("div", _hoisted_6, [renderSlot(_ctx.$slots, "action", {}, void 0, true)])) : createCommentVNode("", true),
+				__props.closable ? (openBlock(), createElementBlock("button", {
+					key: 2,
+					ref_key: "closeRef",
+					ref: closeRef,
 					type: "button",
-					class: "rs-alert__close",
-					"aria-label": unref(t)("alert.close"),
+					class: normalizeClass(["rs-alert__close", { "rs-alert__close--text": Boolean(__props.closeText || _ctx.$slots.close) }]),
+					"aria-label": closeLabel.value,
 					onClick: onClose
-				}, [createVNode(RsIcon_default, {
+				}, [renderSlot(_ctx.$slots, "close", {}, () => [__props.closeText ? (openBlock(), createElementBlock("span", _hoisted_8, toDisplayString(__props.closeText), 1)) : (openBlock(), createBlock(RsIcon_default, {
+					key: 1,
 					name: "x",
-					size: 14
-				})], 8, _hoisted_5)) : createCommentVNode("", true)
-			], 2);
+					size: closeIconSize.value
+				}, null, 8, ["size"]))], true)], 10, _hoisted_7)) : createCommentVNode("", true)
+			], 14, _hoisted_1);
 		};
 	}
 });

package/dist/components/alert/src/RsAlert.js

@@ -3,6 +3,6 @@ import _plugin_vue_export_helper_default from "../../../_virtual/_plugin-vue_exp
 import RsAlert_vue_vue_type_script_setup_true_lang_default from "./RsAlert.impl.js";
 
 //#region src/components/alert/src/RsAlert.vue
-var RsAlert_default = /*#__PURE__*/ _plugin_vue_export_helper_default(RsAlert_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-2fd45305"]]);
+var RsAlert_default = /*#__PURE__*/ _plugin_vue_export_helper_default(RsAlert_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-8c18fdd0"]]);
 //#endregion
 export { RsAlert_default as default };

package/dist/components/alert/src/alert-utils.d.ts

@@ -0,0 +1,37 @@
+import type { RsComponentSize } from '../../../theme/types';
+/** 与 RsFeedbackTone 同一套色相。历史 prop 名是 type，新代码用 tone。 */
+export type RsAlertTone = 'default' | 'info' | 'success' | 'warning' | 'danger';
+/** 形态轴：浅底 / 描边 / 实心。色相走 tone，不要用 variant 表示危险。 */
+export type RsAlertVariant = 'soft' | 'outline' | 'solid';
+/** 密度。ssm 落到 sm，避免提示条做成控件极小档。 */
+export type RsAlertSize = 'sm' | 'md' | 'lg';
+export type RsAlertRole = 'alert' | 'status';
+export interface RsAlertExpose {
+    /** 焦点落到关闭钮；没有关闭钮时落到根节点。 */
+    focus: () => void;
+}
+export type RsAlertInstance = RsAlertExpose & {
+    $el: HTMLElement;
+};
+export declare const RS_ALERT_TONES: readonly ["default", "info", "success", "warning", "danger"];
+export declare const RS_ALERT_VARIANTS: readonly ["soft", "outline", "solid"];
+export declare const RS_ALERT_SIZES: readonly ["sm", "md", "lg"];
+export declare const RS_ALERT_DEFAULT_TONE: RsAlertTone;
+export declare const RS_ALERT_DEFAULT_VARIANT: RsAlertVariant;
+export declare const RS_ALERT_DEFAULT_SIZE: RsAlertSize;
+export declare function isRsAlertTone(value: unknown): value is RsAlertTone;
+export declare function isRsAlertVariant(value: unknown): value is RsAlertVariant;
+export declare function isRsAlertSize(value: unknown): value is RsAlertSize;
+/**
+ * tone 优先，type 是兼容别名。两边都无效时回落 info（与旧默认一致）。
+ */
+export declare function resolveAlertTone(tone?: string | null, type?: string | null): RsAlertTone;
+export declare function resolveAlertVariant(variant?: string | null): RsAlertVariant;
+/** 未传或非法落到 md；ssm 并到 sm。 */
+export declare function resolveAlertSize(size?: RsComponentSize | RsAlertSize | null): RsAlertSize;
+export declare function resolveAlertIcon(tone: RsAlertTone): string;
+/** 警告 / 错误用 alert（断言）；信息 / 成功 / 中性用 status，避免进页就打断读屏。 */
+export declare function resolveAlertRole(tone: RsAlertTone): RsAlertRole;
+export declare function shouldShowAlertIcon(showIcon: boolean, hasIconSlot: boolean): boolean;
+export declare function hasAlertTitle(title?: string | null, hasTitleSlot?: boolean): boolean;
+export declare function hasAlertDescription(description?: string | null, hasDefaultSlot?: boolean): boolean;

package/dist/components/alert/src/alert-utils.js

@@ -0,0 +1,71 @@
+//#region src/components/alert/src/alert-utils.ts
+var RS_ALERT_TONES = [
+	"default",
+	"info",
+	"success",
+	"warning",
+	"danger"
+];
+var RS_ALERT_VARIANTS = [
+	"soft",
+	"outline",
+	"solid"
+];
+var RS_ALERT_SIZES = [
+	"sm",
+	"md",
+	"lg"
+];
+var RS_ALERT_DEFAULT_TONE = "info";
+var RS_ALERT_DEFAULT_VARIANT = "soft";
+var ALERT_ICONS = {
+	default: "info",
+	info: "info",
+	success: "circle-check",
+	warning: "triangle-alert",
+	danger: "circle-alert"
+};
+function isRsAlertTone(value) {
+	return typeof value === "string" && RS_ALERT_TONES.includes(value);
+}
+function isRsAlertVariant(value) {
+	return typeof value === "string" && RS_ALERT_VARIANTS.includes(value);
+}
+function isRsAlertSize(value) {
+	return typeof value === "string" && RS_ALERT_SIZES.includes(value);
+}
+/**
+* tone 优先，type 是兼容别名。两边都无效时回落 info（与旧默认一致）。
+*/
+function resolveAlertTone(tone, type) {
+	if (isRsAlertTone(tone)) return tone;
+	if (isRsAlertTone(type)) return type;
+	return RS_ALERT_DEFAULT_TONE;
+}
+function resolveAlertVariant(variant) {
+	return isRsAlertVariant(variant) ? variant : RS_ALERT_DEFAULT_VARIANT;
+}
+/** 未传或非法落到 md；ssm 并到 sm。 */
+function resolveAlertSize(size) {
+	if (size === "ssm" || size === "sm") return "sm";
+	if (isRsAlertSize(size)) return size;
+	return "md";
+}
+function resolveAlertIcon(tone) {
+	return ALERT_ICONS[tone];
+}
+/** 警告 / 错误用 alert（断言）；信息 / 成功 / 中性用 status，避免进页就打断读屏。 */
+function resolveAlertRole(tone) {
+	return tone === "warning" || tone === "danger" ? "alert" : "status";
+}
+function shouldShowAlertIcon(showIcon, hasIconSlot) {
+	return hasIconSlot || showIcon;
+}
+function hasAlertTitle(title, hasTitleSlot = false) {
+	return hasTitleSlot || Boolean(title);
+}
+function hasAlertDescription(description, hasDefaultSlot = false) {
+	return hasDefaultSlot || Boolean(description);
+}
+//#endregion
+export { RS_ALERT_DEFAULT_TONE, RS_ALERT_DEFAULT_VARIANT, RS_ALERT_SIZES, RS_ALERT_TONES, RS_ALERT_VARIANTS, hasAlertDescription, hasAlertTitle, isRsAlertSize, isRsAlertTone, isRsAlertVariant, resolveAlertIcon, resolveAlertRole, resolveAlertSize, resolveAlertTone, resolveAlertVariant, shouldShowAlertIcon };

package/dist/components/auto-complete/src/RsAutoComplete.d.ts

@@ -64,8 +64,8 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, RsAut
     disabled: boolean;
     loading: boolean;
     allowClear: boolean;
-    options: ReadonlyArray<RsAutoCompleteOptionInput>;
     emptyText: string;
+    options: ReadonlyArray<RsAutoCompleteOptionInput>;
     filterOption: RsAutoCompleteFilterOption | boolean;
     debounce: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;