antdv-next 1.5.4 → 1.5.6

package/dist/_util/PurePanel.js

@@ -1,4 +1,5 @@
 import { useBaseConfig } from "../config-provider/context.js";
+import { normalizeStyle as normalizeStyle$1 } from "./styleUtils.js";
 import ConfigProvider from "../config-provider/index.js";
 import { createVNode, defineComponent, mergeProps, shallowRef, useAttrs, useSlots, watch } from "vue";
 //#region src/_util/PurePanel.tsx
@@ -60,7 +61,7 @@ function genPurePanel(Component, alignPropName, postProps, defaultPrefixCls, get
 			let mergedProps = {
 				...props,
 				style: {
-					...style,
+					...normalizeStyle$1(style) || {},
 					margin: 0
 				},
 				open: open.value,

package/dist/_util/hooks/useMergeSemantic.js

@@ -1,3 +1,4 @@
+import { normalizeStyle as normalizeStyle$1 } from "../styleUtils.js";
 import { computed, unref } from "vue";
 import { classNames } from "@v-c/util";
 import { omit } from "es-toolkit";
@@ -29,7 +30,7 @@ function mergeStyles(...styles) {
 		Object.keys(cur).forEach((key) => {
 			acc[key] = {
 				...acc[key],
-				...cur[key]
+				...normalizeStyle$1(cur[key])
 			};
 		});
 		return acc;
@@ -121,7 +122,7 @@ function pureAttrs(attrs, options = defaultOptions) {
 function getAttrStyleAndClass(attrs, options, props) {
 	return {
 		className: attrs.class ?? props?.class,
-		style: attrs.style ?? props?.style,
+		style: normalizeStyle$1(attrs.style ?? props?.style),
 		restAttrs: pureAttrs(attrs, options)
 	};
 }

package/dist/_util/statusUtils.d.ts

@@ -3,6 +3,6 @@ import { ValidateStatus } from "../form/FormItem/index.js";
 declare const _InputStatuses: readonly ["warning", "error", "", "success", "validating"];
 type InputStatus = (typeof _InputStatuses)[number];
 declare function getStatusClassNames(prefixCls: string, status?: ValidateStatus, hasFeedback?: boolean): string;
-declare function getMergedStatus(contextStatus?: ValidateStatus, customStatus?: InputStatus): "" | "success" | "warning" | "error" | "validating" | undefined;
+declare function getMergedStatus(contextStatus?: ValidateStatus, customStatus?: InputStatus): "" | "error" | "success" | "warning" | "validating" | undefined;
 //#endregion
 export { InputStatus, getMergedStatus, getStatusClassNames };

package/dist/_util/styleUtils.d.ts

@@ -1,4 +1,22 @@
 //#region src/_util/styleUtils.d.ts
 declare function formatUnit(value: string | number | undefined | null): string | undefined;
+/**
+ * Normalize a user-provided `style` (string | object | array of them) into a
+ * plain style object.
+ *
+ * Vue passes string styles through `props.style` untouched (a string is a
+ * legal vnode style, applied as `cssText`), so components that spread or
+ * merge the user style into an object must normalize it first: spreading a
+ * string produces numeric keys (`{0:'w', 1:'i', ...}`) which makes Vue's
+ * `patchStyle` throw "Failed to set an indexed property [0] on
+ * 'CSSStyleDeclaration'".
+ *
+ * Delegates to Vue's own `normalizeStyle`, which merges arrays (parsing each
+ * string entry with its parenthesis-aware cssText split, so values like
+ * `background-image: url("data:image/svg+xml;...")` stay intact). The only
+ * addition here is parsing a *top-level* string, which Vue intentionally
+ * leaves as-is because `patchStyle` can apply it directly as `cssText`.
+ */
+declare function normalizeStyle(style?: unknown): Record<PropertyKey, unknown> | undefined;
 //#endregion
-export { formatUnit };
+export { formatUnit, normalizeStyle };

package/dist/_util/styleUtils.js

@@ -1,3 +1,4 @@
+import { normalizeStyle as normalizeStyle$1 } from "vue";
 //#region src/_util/styleUtils.ts
 function formatUnit(value) {
 	if (value === void 0 || value === null) return;
@@ -5,5 +6,27 @@ function formatUnit(value) {
 	if (typeof value === "string" && !value.endsWith("px") && !Number.isNaN(Number(value))) return `${value}px`;
 	return value;
 }
+/**
+* Normalize a user-provided `style` (string | object | array of them) into a
+* plain style object.
+*
+* Vue passes string styles through `props.style` untouched (a string is a
+* legal vnode style, applied as `cssText`), so components that spread or
+* merge the user style into an object must normalize it first: spreading a
+* string produces numeric keys (`{0:'w', 1:'i', ...}`) which makes Vue's
+* `patchStyle` throw "Failed to set an indexed property [0] on
+* 'CSSStyleDeclaration'".
+*
+* Delegates to Vue's own `normalizeStyle`, which merges arrays (parsing each
+* string entry with its parenthesis-aware cssText split, so values like
+* `background-image: url("data:image/svg+xml;...")` stay intact). The only
+* addition here is parsing a *top-level* string, which Vue intentionally
+* leaves as-is because `patchStyle` can apply it directly as `cssText`.
+*/
+function normalizeStyle(style) {
+	const normalized = normalizeStyle$1(style);
+	if (typeof normalized === "string") return normalizeStyle$1([normalized]);
+	return normalized || void 0;
+}
 //#endregion
-export { formatUnit };
+export { formatUnit, normalizeStyle };

package/dist/_util/vnode/index.js

@@ -8,7 +8,7 @@ function hasOwn(obj, key) {
 function isFunction(value) {
 	return typeof value === "function";
 }
-function camelize(str) {
+function camelize$1(str) {
 	return str.replace(/-(\w)/g, (_, c) => c ? c.toUpperCase() : "");
 }
 function hyphenate(str) {
@@ -46,10 +46,10 @@ function normalizePropsOptions(vnode) {
 	const needCastKeys = [];
 	if (Array.isArray(raw)) raw.forEach((key) => {
 		if (typeof key !== "string") return;
-		normalized[camelize(key)] = {};
+		normalized[camelize$1(key)] = {};
 	});
 	else if (typeof raw === "object") Object.keys(raw).forEach((key) => {
-		const normalizedKey = camelize(key);
+		const normalizedKey = camelize$1(key);
 		const opt = raw[key];
 		const prop = Array.isArray(opt) || isFunction(opt) ? { type: opt } : opt ? { ...opt } : {};
 		const propType = prop.type;
@@ -105,7 +105,7 @@ function resolveVNodeProps(vnode, name, markerKey) {
 		Object.keys(rawProps).forEach((key) => {
 			if (isReservedProp(key)) return;
 			const value = rawProps[key];
-			const camelKey = camelize(key);
+			const camelKey = camelize$1(key);
 			if (hasOwn(options, camelKey)) if (!needCastKeySet.has(camelKey)) resolvedProps[camelKey] = value;
 			else rawCastValues[camelKey] = value;
 			else attrs[key] = value;
@@ -134,7 +134,7 @@ function resolveVNodeProps(vnode, name, markerKey) {
 			result.children = value;
 			return;
 		}
-		result[camelize(slotName)] = value;
+		result[camelize$1(slotName)] = value;
 	});
 	return result;
 }

package/dist/_util/warning.d.ts

@@ -19,7 +19,6 @@ interface WarningContextProps {
   /**
    * @descCN 设置警告等级，设置 `false` 时会将废弃相关信息聚合为单条信息。
    * @descEN Set the warning level. When set to `false`, discard related information will be aggregated into a single message.
-   * @since 5.10.0
    */
   strict?: boolean;
 }

package/dist/affix/index.js

@@ -40,7 +40,7 @@ const Affix = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose, em
 		return offsetBottom === void 0 && offsetTop === void 0 ? 0 : offsetTop;
 	});
 	const measure = () => {
-		if (status.value !== AFFIX_STATUS_PREPARE || !fixedNodeRef.value || !placeholderNodeRef.value || !targetFunc.value) return;
+		if (status.value !== AFFIX_STATUS_PREPARE || !fixedNodeRef.value || !placeholderNodeRef.value) return;
 		const targetNode = targetFunc.value();
 		if (targetNode) {
 			const newState = { status: AFFIX_STATUS_NONE };
@@ -50,21 +50,10 @@ const Affix = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose, em
 			const targetRect = getTargetRect(targetNode);
 			const fixedTop = getFixedTop(placeholderRect, targetRect, internalOffsetTop.value);
 			const fixedBottom = getFixedBottom(placeholderRect, targetRect, props.offsetBottom);
-			if (fixedTop !== void 0) {
+			if (fixedTop !== void 0 || fixedBottom !== void 0) {
 				newState.affixStyle = {
 					position: "fixed",
-					top: `${fixedTop}px`,
-					width: `${placeholderRect.width}px`,
-					height: `${contentHeight}px`
-				};
-				newState.placeholderStyle = {
-					width: `${placeholderRect.width}px`,
-					height: `${contentHeight}px`
-				};
-			} else if (fixedBottom !== void 0) {
-				newState.affixStyle = {
-					position: "fixed",
-					bottom: `${fixedBottom}px`,
+					...fixedTop !== void 0 ? { top: `${fixedTop}px` } : { bottom: `${fixedBottom}px` },
 					width: `${placeholderRect.width}px`,
 					height: `${contentHeight}px`
 				};
@@ -89,20 +78,20 @@ const Affix = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose, em
 		prepareMeasure();
 	});
 	const lazyUpdatePosition = throttleByAnimationFrame(() => {
-		if (targetFunc.value && affixStyle.value) {
+		if (affixStyle.value) {
 			const targetNode = targetFunc.value();
 			if (targetNode && placeholderNodeRef.value) {
 				const targetRect = getTargetRect(targetNode);
 				const placeholderRect = getTargetRect(placeholderNodeRef.value);
 				const fixedTop = getFixedTop(placeholderRect, targetRect, internalOffsetTop.value);
 				const fixedBottom = getFixedBottom(placeholderRect, targetRect, props.offsetBottom);
-				if (fixedTop !== void 0 && affixStyle.value.top === fixedTop || fixedBottom !== void 0 && affixStyle.value.bottom === fixedBottom) return;
+				if (fixedTop !== void 0 && affixStyle.value.top === `${fixedTop}px` || fixedBottom !== void 0 && affixStyle.value.bottom === `${fixedBottom}px`) return;
 			}
 		}
 		prepareMeasure();
 	});
 	const addListeners = () => {
-		const listenerTarget = targetFunc.value?.();
+		const listenerTarget = targetFunc.value();
 		if (!listenerTarget) return;
 		TRIGGER_EVENTS.forEach((eventName) => {
 			if (prevListener.value) prevTarget.value?.removeEventListener(eventName, prevListener.value);
@@ -112,7 +101,7 @@ const Affix = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose, em
 		prevListener.value = lazyUpdatePosition;
 	};
 	const removeListeners = () => {
-		const newTarget = targetFunc.value?.();
+		const newTarget = targetFunc.value();
 		TRIGGER_EVENTS.forEach((eventName) => {
 			newTarget?.removeEventListener(eventName, lazyUpdatePosition);
 			if (prevListener.value) prevTarget.value?.removeEventListener(eventName, prevListener.value);

package/dist/alert/Alert.js

@@ -1,11 +1,11 @@
 import { useComponentBaseConfig } from "../config-provider/context.js";
-import { pureAttrs, useMergeSemanticNoRef } from "../_util/hooks/useMergeSemantic.js";
+import { getAttrStyleAndClass, pureAttrs, useMergeSemanticNoRef } from "../_util/hooks/useMergeSemantic.js";
 import { getSlotPropFn, getSlotPropsFnRun, toPropsRefs as toPropsRefs$1 } from "../_util/tools.js";
 import { isRenderable } from "../_util/is.js";
 import style_default from "./style/index.js";
 import { Transition, computed, createVNode, defineComponent, mergeDefaults, mergeProps, shallowRef } from "vue";
 import { classNames, clsx } from "@v-c/util";
-import { filterEmpty, getAttrStyleAndClass } from "@v-c/util/dist/props-util";
+import { filterEmpty } from "@v-c/util/dist/props-util";
 import { CheckCircleFilled, CloseCircleFilled, CloseOutlined, ExclamationCircleFilled, InfoCircleFilled } from "@antdv-next/icons";
 //#region src/alert/Alert.tsx
 const alertDefaultProps = { showIcon: void 0 };
@@ -199,6 +199,7 @@ const Alert = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =>
 		const mergedTitle = getSlotPropsFnRun(slots, props, "title") ?? message;
 		const description = getSlotPropsFnRun(slots, props, "description");
 		const action = getSlotPropsFnRun(slots, props, "action");
+		const icon = getSlotPropsFnRun(slots, props, "icon");
 		const isShowIcon = banner && showIcon === void 0 ? true : showIcon;
 		const mergedProps = {
 			...props,
@@ -240,9 +241,9 @@ const Alert = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =>
 		return createVNode(Transition, {
 			"name": `${prefixCls.value}-motion`,
 			"appear": false,
-			"leaveFromClass": "ant-alert-motion-leave",
-			"leaveActiveClass": "ant-alert-motion-leave ant-alert-motion-leave-active",
-			"leaveToClass": "ant-alert-motion-leave ant-alert-motion-leave-active",
+			"leaveFromClass": `${prefixCls.value}-motion-leave`,
+			"leaveActiveClass": `${prefixCls.value}-motion-leave ${prefixCls.value}-motion-leave-active`,
+			"leaveToClass": `${prefixCls.value}-motion-leave ${prefixCls.value}-motion-leave-active`,
 			"onBeforeLeave": handleBeforeLeave,
 			"onAfterLeave": () => props?.afterClose?.()
 		}, { default: () => [!closed.value ? createVNode("div", mergeProps({
@@ -257,7 +258,7 @@ const Alert = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =>
 				"class": mergedClassNames.icon,
 				"style": mergedStyles.icon,
 				"description": description,
-				"icon": props.icon,
+				"icon": icon,
 				"prefixCls": prefixCls.value,
 				"type": type.value,
 				"successIcon": successIcon.value,
@@ -355,14 +356,12 @@ const Alert = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =>
 			required: false
 		},
 		classes: {
-			type: Function,
-			required: false,
-			skipCheck: true
+			type: [Object, Function],
+			required: false
 		},
 		styles: {
-			type: Function,
-			required: false,
-			skipCheck: true
+			type: [Object, Function],
+			required: false
 		},
 		banner: {
 			type: Boolean,

package/dist/anchor/Anchor.d.ts

@@ -58,7 +58,7 @@ type AnchorSlots = SlotsDefineType<{
   item: (item: AnchorLinkItemProps) => any;
 }>;
 interface AntAnchor {
-  registerLink: (link: string) => void;
+  registerLink: (link: string, targetOffset?: number) => void;
   unregisterLink: (link: string) => void;
   activeLink: string | null;
   scrollTo: (link: string, linkTargetOffset?: number) => void;

package/dist/anchor/Anchor.js

@@ -36,6 +36,7 @@ function getOffsetTop(element, container) {
 }
 const Anchor = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) => {
 	const links = ref([]);
+	const linkTargetOffsetRef = ref({});
 	const activeLink = shallowRef();
 	const _activeLink = shallowRef(activeLink.value);
 	const activeLinkRef = computed({
@@ -47,18 +48,21 @@ const Anchor = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =
 	const rawActiveLink = shallowRef(activeLink.value);
 	const wrapperRef = shallowRef();
 	const spanLinkNode = shallowRef();
-	const animating = shallowRef(false);
+	const animatingRef = shallowRef(false);
+	const scrollRequestIdRef = shallowRef(null);
 	const { prefixCls, direction, class: contextClassName, style: contextStyle, classes: contextClassNames, styles: contextStyles, getTargetContainer } = useComponentBaseConfig("anchor", props);
 	const { direction: anchorDirection, classes, styles } = toPropsRefs$1(props, "direction", "classes", "styles");
 	const rootCls = useCSSVarCls(prefixCls);
 	const [hashId, cssVarCls] = style_default(prefixCls, rootCls);
 	const getCurrentContainer = () => props?.getContainer?.() ?? getTargetContainer?.() ?? getDefaultContainer?.();
 	const dependencyListItem = computed(() => JSON.stringify(links.value));
-	const registerLink = (link) => {
+	const registerLink = (link, targetOffset) => {
 		if (!links.value.includes(link)) links.value.push(link);
+		if (targetOffset !== void 0) linkTargetOffsetRef.value[link] = targetOffset;
 	};
 	const unregisterLink = (link) => {
 		links.value = links.value.filter((item) => item !== link);
+		delete linkTargetOffsetRef.value[link];
 	};
 	const updateInk = () => {
 		const linkNode = wrapperRef.value?.querySelector(`.${prefixCls.value}-link-title-active`);
@@ -84,7 +88,7 @@ const Anchor = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =
 			const target = document.getElementById(sharpLinkMatch[1]);
 			if (target) {
 				const top = getOffsetTop(target, container);
-				if (top <= _offsetTop + _bounds) linkSections.push({
+				if (top <= (linkTargetOffsetRef.value[link] ?? _offsetTop) + _bounds) linkSections.push({
 					link,
 					top
 				});
@@ -106,7 +110,7 @@ const Anchor = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =
 		emit("change", link);
 	};
 	const handleScroll = () => {
-		if (animating.value) return;
+		if (animatingRef.value) return;
 		const currentActiveLink = getInternalCurrentAnchor(links.value, props.targetOffset !== void 0 ? props.targetOffset : props.offsetTop || 0, props.bounds);
 		setCurrentActiveLink(currentActiveLink);
 	};
@@ -118,14 +122,19 @@ const Anchor = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =
 		if (!sharpLinkMatch) return;
 		const targetElement = document.getElementById(sharpLinkMatch[1]);
 		if (!targetElement) return;
+		if (animatingRef.value) {
+			if (previousRawActiveLink === link) return;
+			scrollRequestIdRef.value?.();
+		}
 		const container = getCurrentContainer();
 		let y = getScroll(container) + getOffsetTop(targetElement, container);
 		y -= linkTargetOffset ?? (targetOffset !== void 0 ? targetOffset : offsetTop || 0);
-		animating.value = true;
-		scrollTo(y, {
+		animatingRef.value = true;
+		scrollRequestIdRef.value = scrollTo(y, {
 			getContainer: getCurrentContainer,
 			callback() {
-				animating.value = false;
+				animatingRef.value = false;
+				scrollRequestIdRef.value = null;
 			}
 		});
 	};

package/dist/anchor/AnchorLink.js

@@ -7,9 +7,9 @@ import { classNames } from "@v-c/util";
 const AnchorLink = /* @__PURE__ */ defineComponent((props, { slots, attrs }) => {
 	const { registerLink, direction, unregisterLink, activeLink, scrollTo, onClick, classes: mergedClassNames, styles: mergedStyles } = useAnchorContext() ?? {};
 	const { prefixCls } = useBaseConfig("anchor", props);
-	watch(() => props.href, async (href, _, onCleanup) => {
+	watch([() => props.href, () => props.targetOffset], async ([href, targetOffset], _, onCleanup) => {
 		await nextTick();
-		registerLink?.(href);
+		registerLink?.(href, targetOffset);
 		onCleanup(() => {
 			unregisterLink?.(href);
 		});
@@ -28,6 +28,7 @@ const AnchorLink = /* @__PURE__ */ defineComponent((props, { slots, attrs }) =>
 				e.preventDefault();
 				window.location.replace(href);
 			}
+			return;
 		}
 		e.preventDefault();
 		const historyMethod = replace ? "replaceState" : "pushState";