antdv-next 1.4.6 → 1.5.1

package/dist/_util/hooks/useMergeSemantic.d.ts

@@ -48,11 +48,14 @@ declare function useToProps<T>(props: Ref<T>): import("vue").ComputedRef<{
  * semantic `{ root: style }` object so it can be merged into the `styles` list at a
  * defined priority instead of being applied directly on the root element (which would
  * clobber the semantic `styles.root`). Aligns root semantic style priority.
- * sync ant-design#58474
+ *
+ * `key` lets components whose legacy inline `style` targets a non-root semantic node
+ * (e.g. Drawer `section`, Upload `trigger`, Badge `indicator`) reuse the same wrapper.
+ * It accepts a ref for the cases where the target node depends on the current props
+ * (e.g. Badge switches between `root` and `indicator`).
+ * sync ant-design#58474 ant-design#58564
  */
-declare function useSemanticRootStyle<Style = CSSProperties>(style: Ref<Style | undefined>): import("vue").ComputedRef<{
-  root: NonNullable<Style>;
-} | undefined>;
+declare function useSemanticRootStyle<Style = CSSProperties, Key extends string = 'root'>(style: Ref<Style | undefined>, key?: Key | Ref<Key>): import("vue").ComputedRef<Partial<Record<Key, Style>> | undefined>;
 interface RemoveBaseAttributesOptions {
   class?: boolean;
   style?: boolean;

package/dist/_util/hooks/useMergeSemantic.js

@@ -97,10 +97,15 @@ function useToProps(props) {
 * semantic `{ root: style }` object so it can be merged into the `styles` list at a
 * defined priority instead of being applied directly on the root element (which would
 * clobber the semantic `styles.root`). Aligns root semantic style priority.
-* sync ant-design#58474
+*
+* `key` lets components whose legacy inline `style` targets a non-root semantic node
+* (e.g. Drawer `section`, Upload `trigger`, Badge `indicator`) reuse the same wrapper.
+* It accepts a ref for the cases where the target node depends on the current props
+* (e.g. Badge switches between `root` and `indicator`).
+* sync ant-design#58474 ant-design#58564
 */
-function useSemanticRootStyle(style) {
-	return computed(() => style.value ? { root: style.value } : void 0);
+function useSemanticRootStyle(style, key = "root") {
+	return computed(() => style.value ? { [unref(key)]: style.value } : void 0);
 }
 const defaultOptions = {
 	class: true,

package/dist/_util/is.d.ts

@@ -1,4 +1,12 @@
 //#region src/_util/is.d.ts
+declare function isNonNullable<T>(val: T): val is NonNullable<T>;
 declare function isRenderable<T>(val: T): val is Exclude<NonNullable<T>, false | ''>;
+declare function isNumber(val: any): val is number;
+declare function isString(val: any): val is string;
+declare function isPlainObject<T extends object = object>(val: any): val is T;
+declare function isFunction<Value, Args extends unknown[], Result>(val: Value | ((...args: Args) => Result)): val is (...args: Args) => Result;
+declare function isThenable<T>(val?: PromiseLike<T>): val is PromiseLike<T>;
+declare function isPrimitive(val: any): boolean;
+declare function isTransitionEvent(event: Event): event is TransitionEvent;
 //#endregion
-export { isRenderable };
+export { isFunction, isNonNullable, isNumber, isPlainObject, isPrimitive, isRenderable, isString, isThenable, isTransitionEvent };

package/dist/_util/is.js

@@ -1,7 +1,30 @@
-import isNonNullable from "./isNonNullable.js";
 //#region src/_util/is.ts
+function isNonNullable(val) {
+	return val !== void 0 && val !== null;
+}
 function isRenderable(val) {
 	return isNonNullable(val) && val !== false && val !== "";
 }
+function isNumber(val) {
+	return typeof val === "number" && !Number.isNaN(val);
+}
+function isString(val) {
+	return typeof val === "string";
+}
+function isPlainObject(val) {
+	return val !== null && typeof val === "object";
+}
+function isFunction(val) {
+	return typeof val === "function";
+}
+function isThenable(val) {
+	return isNonNullable(val) && isFunction(val.then);
+}
+function isPrimitive(val) {
+	return typeof val !== "object" && !isFunction(val) || val === null;
+}
+function isTransitionEvent(event) {
+	return isPlainObject(event) && "propertyName" in event && isString(event.propertyName);
+}
 //#endregion
-export { isRenderable };
+export { isFunction, isNonNullable, isNumber, isPlainObject, isPrimitive, isRenderable, isString, isThenable, isTransitionEvent };

package/dist/_util/scrollTo.d.ts

@@ -7,6 +7,6 @@ interface ScrollToOptions {
   /** Animation duration, default as 450 */
   duration?: number;
 }
-declare function scrollTo(y: number, options?: ScrollToOptions): void;
+declare function scrollTo(y: number, options?: ScrollToOptions): () => void;
 //#endregion
 export { scrollTo as default };

package/dist/_util/scrollTo.js

@@ -6,17 +6,29 @@ function scrollTo(y, options = {}) {
 	const { getContainer = () => window, callback, duration = 450 } = options;
 	const container = getContainer();
 	const scrollTop = getScroll(container);
+	const scroll = (top) => {
+		if (isWindow(container)) container.scrollTo(window.pageXOffset, top);
+		else if (isDocument(container)) container.documentElement.scrollTop = top;
+		else container.scrollTop = top;
+	};
+	if (duration <= 0) {
+		scroll(y);
+		if (typeof callback === "function") callback();
+		return () => {};
+	}
 	const startTime = Date.now();
+	let rafId;
 	const frameFunc = () => {
 		const time = Date.now() - startTime;
 		const nextScrollTop = easeInOutCubic(time > duration ? duration : time, scrollTop, y, duration);
-		if (isWindow(container)) container.scrollTo(window.pageXOffset, nextScrollTop);
-		else if (isDocument(container)) container.documentElement.scrollTop = nextScrollTop;
-		else container.scrollTop = nextScrollTop;
-		if (time < duration) raf(frameFunc);
+		scroll(nextScrollTop);
+		if (time < duration) rafId = raf(frameFunc);
 		else if (typeof callback === "function") callback();
 	};
-	raf(frameFunc);
+	rafId = raf(frameFunc);
+	return () => {
+		raf.cancel(rafId);
+	};
 }
 //#endregion
 export { scrollTo as default };

package/dist/_util/vueNode.d.ts

@@ -3,8 +3,12 @@ import { VNodeChild } from "vue";
 import { isFragment } from "@v-c/util/dist/Children/isFragment";
 //#region src/_util/vueNode.d.ts
 type RenderProps = AnyObject | ((originProps: AnyObject) => AnyObject | undefined);
-declare function replaceElement(element: VNodeChild, replacement: VNodeChild, props?: RenderProps): VNodeChild;
-declare function cloneElement(element: VNodeChild, props?: RenderProps): VNodeChild;
+declare function replaceElement(element: VNodeChild, replacement: VNodeChild, props?: RenderProps): string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+  [key: string]: any;
+}> | import("vue").VNodeArrayChildren | null;
+declare function cloneElement(element: VNodeChild, props?: RenderProps): string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+  [key: string]: any;
+}> | import("vue").VNodeArrayChildren | null;
 declare function getVNode(node: VueNode): VNodeChild;
 declare function checkRenderNode(node: any): any;
 declare function getTextByNode(node: any): any;

package/dist/alert/Alert.js

@@ -185,7 +185,7 @@ const Alert = /* @__PURE__ */ defineComponent((props, { slots, emit, attrs }) =>
 		const { className, style } = getAttrStyleAndClass(attrs);
 		const isClosableFn = () => {
 			const closeIcon = getSlotPropsFnRun(slots, props, "closeIcon");
-			if (typeof closable === "object" && closable.closeIcon) return true;
+			if (typeof closable === "object") return true;
 			if (typeof closable === "boolean") return closable;
 			const closeIconNode = typeof closeIcon === "function" ? filterEmpty(closeIcon()) : closeIcon;
 			if (Array.isArray(closeIconNode) && closeIconNode.length > 0) return true;

package/dist/alert/style/index.d.ts

@@ -5,6 +5,11 @@ import { CSSProperties } from "vue";
 import { CSSObject } from "@antdv-next/cssinjs";
 //#region src/alert/style/index.d.ts
 interface ComponentToken {
+  /**
+   * @desc 组件圆角
+   * @descEN Border radius of alert
+   */
+  borderRadius: CSSProperties['borderRadius'];
   /**
    * @desc 默认内间距
    * @descEN Default padding

package/dist/alert/style/index.js

@@ -10,7 +10,7 @@ function genAlertTypeStyle(bgColor, borderColor, iconColor, token, alertCls) {
 	};
 }
 const genBaseStyle = (token) => {
-	const { componentCls, motionDurationSlow: duration, marginXS, marginSM, fontSize, fontSizeLG, lineHeight, borderRadiusLG: borderRadius, motionEaseInOutCirc, withDescriptionIconSize, colorText, colorTextHeading, withDescriptionPadding, defaultPadding } = token;
+	const { componentCls, motionDurationSlow: duration, marginXS, marginSM, fontSize, fontSizeLG, lineHeight, motionEaseInOutCirc, borderRadius, withDescriptionIconSize, colorText, colorTextHeading, withDescriptionPadding, defaultPadding } = token;
 	return { [componentCls]: {
 		...resetComponent(token),
 		position: "relative",
@@ -122,6 +122,7 @@ const genActionStyle = (token) => {
 };
 const prepareComponentToken = (token) => {
 	return {
+		borderRadius: token.borderRadiusLG,
 		withDescriptionIconSize: token.fontSizeHeading3,
 		defaultPadding: `${token.paddingContentVerticalSM}px 12px`,
 		withDescriptionPadding: `${token.paddingMD}px ${token.paddingContentHorizontalLG}px`