antdv-next 1.5.5 → 1.6.0

package/dist/config-provider/context.js

@@ -1,4 +1,4 @@
-import { computed, inject, provide, ref } from "vue";
+import { computed, inject, provide, ref, toRef } from "vue";
 //#region src/config-provider/context.ts
 const defaultPrefixCls = "ant";
 const defaultIconPrefixCls = "anticon";
@@ -17,26 +17,23 @@ function defaultGetPrefixCls(suffixCls, customizePrefixCls) {
 	if (customizePrefixCls) return customizePrefixCls;
 	return suffixCls ? `ant-${suffixCls}` : "ant";
 }
+const defaultConfigRef = ref({
+	getPrefixCls: defaultGetPrefixCls,
+	iconPrefixCls: defaultIconPrefixCls
+});
 function useConfig() {
-	return inject(ConfigConsumerKey, ref({
-		getPrefixCls: defaultGetPrefixCls,
-		iconPrefixCls: defaultIconPrefixCls
-	}));
+	return inject(ConfigConsumerKey, defaultConfigRef);
 }
 function useBaseConfig(suffixCls, props) {
 	const config = useConfig();
 	return {
-		result: computed(() => config.value?.result),
-		modal: computed(() => config.value?.modal),
-		timeline: computed(() => config.value?.timeline),
-		notification: computed(() => config.value?.notification),
+		result: toRef(() => config.value?.result),
+		modal: toRef(() => config.value?.modal),
+		timeline: toRef(() => config.value?.timeline),
+		notification: toRef(() => config.value?.notification),
 		getPrefixCls: (suffixCls, prefixCls) => config.value?.getPrefixCls(suffixCls, prefixCls),
-		prefixCls: computed(() => {
-			return config.value?.getPrefixCls(suffixCls, props?.prefixCls);
-		}),
-		direction: computed(() => {
-			return config.value?.direction;
-		}),
+		prefixCls: toRef(() => config.value?.getPrefixCls(suffixCls, props?.prefixCls)),
+		direction: toRef(() => config.value?.direction),
 		getPopupContainer: config?.value.getPopupContainer
 	};
 }
@@ -65,37 +62,34 @@ function useComponentConfig(propName) {
 }
 function useComponentBaseConfig(propName, props, keys, suffixCls) {
 	const context = useConfig();
-	const propValue = computed(() => {
-		return context.value[propName];
-	});
-	const toRefs = (propValues) => {
+	const getPropValue = () => context.value[propName];
+	const toRefs = (getPropValues) => {
 		const result = {
-			classes: computed(() => propValues.value?.classes ?? EMPTY_OBJECT),
-			styles: computed(() => propValues.value?.styles ?? EMPTY_OBJECT),
-			class: computed(() => propValues.value?.class),
-			style: computed(() => propValues.value?.style)
+			classes: toRef(() => getPropValues()?.classes ?? EMPTY_OBJECT),
+			styles: toRef(() => getPropValues()?.styles ?? EMPTY_OBJECT),
+			class: toRef(() => getPropValues()?.class),
+			style: toRef(() => getPropValues()?.style)
+		};
+		const addKey = (key) => {
+			if (!result[key]) result[key] = toRef(() => getPropValues()?.[key]);
 		};
-		const __keys = Object.keys(result);
-		for (const key in propValues.value) if (!__keys.includes(key)) result[key] = computed(() => propValues.value[key]);
-		if (keys && keys.length) keys.forEach((key) => {
-			if (!result[key]) result[key] = computed(() => propValues.value?.[key]);
-		});
+		const current = getPropValues();
+		if (current) Object.keys(current).forEach(addKey);
+		keys?.forEach((key) => addKey(key));
 		return result;
 	};
 	return {
-		...toRefs(propValue),
-		direction: computed(() => context.value.direction),
-		prefixCls: computed(() => {
-			return context.value?.getPrefixCls(suffixCls ?? propName, props?.prefixCls);
-		}),
-		rootPrefixCls: computed(() => context.value?.getPrefixCls()),
+		...toRefs(getPropValue),
+		direction: toRef(() => context.value.direction),
+		prefixCls: toRef(() => context.value?.getPrefixCls(suffixCls ?? propName, props?.prefixCls)),
+		rootPrefixCls: toRef(() => context.value?.getPrefixCls()),
 		getPopupContainer: context.value.getPopupContainer,
 		getPrefixCls: context.value.getPrefixCls,
 		getTargetContainer: context.value.getTargetContainer,
-		virtual: computed(() => context.value.virtual),
-		renderEmpty: computed(() => context.value.renderEmpty),
-		popupMatchSelectWidth: computed(() => context.value.popupMatchSelectWidth),
-		popupOverflow: computed(() => context.value.popupOverflow)
+		virtual: toRef(() => context.value.virtual),
+		renderEmpty: toRef(() => context.value.renderEmpty),
+		popupMatchSelectWidth: toRef(() => context.value.popupMatchSelectWidth),
+		popupOverflow: toRef(() => context.value.popupOverflow)
 	};
 }
 //#endregion

package/dist/config-provider/define.d.ts

@@ -4,7 +4,7 @@ import { ColumnType } from "../table/interface.js";
 import "../table/index.js";
 import { Locale } from "../locale/index.js";
 import { RenderEmptyHandler } from "./defaultRenderEmpty.js";
-import { AlertConfig, AnchorStyleConfig, BadgeConfig, BreadcrumbConfig, ButtonConfig, CSPConfig, CalendarConfig, CardConfig, CascaderConfig, CheckboxConfig, CollapseConfig, ColorPickerConfig, ComponentStyleConfig, DatePickerConfig, DescriptionsConfig, DirectionType, DividerConfig, DrawerConfig, DropdownConfig, EmptyConfig, FlexConfig, FloatButtonConfig, FloatButtonGroupConfig, FormConfig, ImageConfig, InputConfig, InputNumberConfig, InputPasswordConfig, InputSearchConfig, ListyConfig, MasonryConfig, MentionsConfig, MenuConfig, ModalConfig, NotificationConfig, OTPConfig, PaginationConfig, PopconfirmConfig, PopoverConfig, PopupOverflow, ProgressConfig, RadioConfig, RangePickerConfig, ResultConfig, SegmentedConfig, SelectConfig, SkeletonConfig, SliderConfig, SpaceConfig, SpinConfig, SplitterConfig, StatisticConfig, StepsConfig, SwitchStyleConfig, TableConfig, TabsConfig, TagConfig, TextAreaConfig, ThemeConfig, TimePickerConfig, TimelineConfig, TooltipConfig, TourConfig, TransferConfig, TreeConfig, TreeSelectConfig, TypographyConfig, UploadConfig, Variant, WaveConfig } from "./context.js";
+import { AlertConfig, AnchorStyleConfig, BadgeConfig, BreadcrumbConfig, ButtonConfig, CSPConfig, CalendarConfig, CardConfig, CardMetaConfig, CascaderConfig, CheckboxConfig, CollapseConfig, ColorPickerConfig, ComponentStyleConfig, DatePickerConfig, DescriptionsConfig, DirectionType, DividerConfig, DrawerConfig, DropdownConfig, EmptyConfig, FlexConfig, FloatButtonConfig, FloatButtonGroupConfig, FormConfig, ImageConfig, InputConfig, InputNumberConfig, InputPasswordConfig, InputSearchConfig, ListyConfig, MasonryConfig, MentionsConfig, MenuConfig, ModalConfig, NotificationConfig, OTPConfig, PaginationConfig, PopconfirmConfig, PopoverConfig, PopupOverflow, ProgressConfig, RadioConfig, RangePickerConfig, ResultConfig, RibbonConfig, SegmentedConfig, SelectConfig, SkeletonConfig, SliderConfig, SpaceConfig, SpinConfig, SplitterConfig, StatisticConfig, StepsConfig, SwitchStyleConfig, TableConfig, TabsConfig, TagConfig, TextAreaConfig, ThemeConfig, TimePickerConfig, TimelineConfig, TooltipConfig, TourConfig, TransferConfig, TreeConfig, TreeSelectConfig, TypographyConfig, UploadConfig, Variant, WaveConfig } from "./context.js";
 //#region src/config-provider/define.d.ts
 interface ConfigProviderProps {
   getTargetContainer?: () => HTMLElement | Window;
@@ -89,6 +89,7 @@ interface ConfigProviderProps {
   badge?: BadgeConfig;
   radio?: RadioConfig;
   rate?: ComponentStyleConfig;
+  ribbon?: RibbonConfig;
   switch?: SwitchStyleConfig;
   transfer?: TransferConfig;
   avatar?: ComponentStyleConfig;
@@ -96,6 +97,7 @@ interface ConfigProviderProps {
   tag?: TagConfig;
   table?: TableConfig;
   card?: CardConfig;
+  cardMeta?: CardMetaConfig;
   tabs?: TabsConfig;
   timeline?: TimelineConfig;
   timePicker?: TimePickerConfig;

package/dist/config-provider/hooks/useCSSVarCls.d.ts

@@ -3,6 +3,9 @@ import { Ref } from "vue";
 /**
  * This hook is only for cssVar to add root className for components.
  * If root ClassName is needed, this hook could be refactored with `-root`
+ *
+ * antd 6 always runs with CSS variables enabled (`useToken()` always yields a
+ * cssVar config), so the class is unconditional and no token lookup is needed.
  * @param prefixCls
  */
 declare function useCSSVarCls(prefixCls: Ref<string>): import("vue").ComputedRef<string>;

package/dist/config-provider/hooks/useCSSVarCls.js

@@ -1,14 +1,15 @@
-import useToken from "../../theme/useToken.js";
 import { computed } from "vue";
 //#region src/config-provider/hooks/useCSSVarCls.ts
 /**
 * This hook is only for cssVar to add root className for components.
 * If root ClassName is needed, this hook could be refactored with `-root`
+*
+* antd 6 always runs with CSS variables enabled (`useToken()` always yields a
+* cssVar config), so the class is unconditional and no token lookup is needed.
 * @param prefixCls
 */
 function useCSSVarCls(prefixCls) {
-	const [, , , , cssVar] = useToken();
-	return computed(() => cssVar?.value ? `${prefixCls.value}-css-var` : "");
+	return computed(() => `${prefixCls.value}-css-var`);
 }
 //#endregion
 export { useCSSVarCls as default };

package/dist/config-provider/index.d.ts

@@ -30,8 +30,8 @@ declare function globalConfig(): {
   getPrefixCls: (suffixCls?: string, customizePrefixCls?: string) => string;
   getIconPrefixCls: typeof getGlobalIconPrefixCls;
   getRootPrefixCls: () => string;
-  getTheme: () => ThemeConfig | Theme;
-  theme: import("vue").ComputedRef<ThemeConfig | Theme>;
+  getTheme: () => Theme | ThemeConfig;
+  theme: import("vue").ComputedRef<Theme | ThemeConfig>;
   locale: Locale | undefined;
   holderRender: holderRenderType | undefined;
   readonly appContext: AppContext | undefined;

package/dist/config-provider/index.js

@@ -154,9 +154,16 @@ const ProviderChildren = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			theme: mergedTheme.value,
 			direction: props.direction,
 			virtual: props.virtual,
+			popupMatchSelectWidth: props.popupMatchSelectWidth,
+			popupOverflow: props.popupOverflow,
 			locale: locale.value || props.legacyLocale,
 			space: props.space,
-			variant: props.variant
+			variant: props.variant,
+			calendar: props.calendar,
+			carousel: props.carousel,
+			cardMeta: props.cardMeta,
+			ribbon: props.ribbon,
+			warning: props.warning
 		};
 		const config = { ...parentConfig };
 		Object.keys(baseConfig).forEach((key) => {
@@ -515,6 +522,10 @@ const ProviderChildren = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			type: Object,
 			required: false
 		},
+		ribbon: {
+			type: Object,
+			required: false
+		},
 		switch: {
 			type: Object,
 			required: false
@@ -543,6 +554,10 @@ const ProviderChildren = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			type: Object,
 			required: false
 		},
+		cardMeta: {
+			type: Object,
+			required: false
+		},
 		tabs: {
 			type: Object,
 			required: false
@@ -883,6 +898,10 @@ const ConfigProvider = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			type: Object,
 			required: false
 		},
+		ribbon: {
+			type: Object,
+			required: false
+		},
 		switch: {
 			type: Object,
 			required: false
@@ -911,6 +930,10 @@ const ConfigProvider = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			type: Object,
 			required: false
 		},
+		cardMeta: {
+			type: Object,
+			required: false
+		},
 		tabs: {
 			type: Object,
 			required: false

package/dist/date-picker/generatePicker/generateRangePicker.js

@@ -31,6 +31,7 @@ function generateRangePicker(generateConfig) {
 		const { size: customizeSize, disabled: customDisabled, status: customStatus, variant: customVariant, classes, styles, rootClass, bordered } = toPropsRefs(props, "size", "disabled", "status", "variant", "classes", "styles", "rootClass", "bordered", "separator");
 		const pickerType = computed(() => props.picker === TIME ? "timePicker" : "datePicker");
 		const { prefixCls, direction, getPopupContainer, rootPrefixCls, class: contextClassName, style: contextStyle, separator: contextSeparator } = useComponentBaseConfig("rangePicker", props, ["separator"], "picker");
+		const { allowClear: contextAllowClear, clearIcon: contextClearIcon } = useComponentBaseConfig(pickerType.value, props, ["allowClear", "clearIcon"], "picker");
 		const { compactSize, compactItemClassnames } = useCompactItemContext(prefixCls, direction);
 		const mergedSize = useSize((ctx) => customizeSize.value ?? compactSize.value ?? ctx);
 		const disabled = useDisabledContext();
@@ -50,7 +51,7 @@ function generateRangePicker(generateConfig) {
 		const rootCls = useCSSVarCls(prefixCls);
 		const [hashId, cssVarCls] = style_default(prefixCls, rootCls);
 		const mergedRootClassName = computed(() => clsx(hashId.value, cssVarCls.value, rootCls.value, rootClass.value));
-		const [contextLocale] = useLocale("Calendar", locale);
+		const [contextLocale] = useLocale("DatePicker", locale);
 		const locale$1 = computed(() => ({
 			...contextLocale?.value,
 			...props.locale ?? {}
@@ -108,11 +109,17 @@ function generateRangePicker(generateConfig) {
 			nativeElement: computed(() => innerRef.value?.nativeElement)
 		});
 		return () => {
-			const { placeholder, components, placement, suffixIcon, prefix, allowClear, popupClassName: _popupClassName, dropdownClassName: _dropdownClassName, popupStyle: _popupStyle, rootClass: _rootClass, classes: _classes, styles: _styles, status: _status, variant: _variant, bordered: _bordered, size: _size, disabled: _disabled, locale: _locale, getPopupContainer: _getPopupContainer, ...restProps } = props;
+			const { placeholder, components, placement, suffixIcon, prefix, allowClear, clearIcon, popupClassName: _popupClassName, dropdownClassName: _dropdownClassName, popupStyle: _popupStyle, rootClass: _rootClass, classes: _classes, styles: _styles, status: _status, variant: _variant, bordered: _bordered, size: _size, disabled: _disabled, locale: _locale, getPopupContainer: _getPopupContainer, ...restProps } = props;
 			const { className, style, restAttrs } = getAttrStyleAndClass(attrs, void 0, props);
 			const mergedSuffixIcon = getSlotPropsFnRun(slots, { suffixIcon }, "suffixIcon", false);
 			const mergedPrefix = getSlotPropsFnRun(slots, { prefix }, "prefix", false);
-			const [mergedAllowClear] = useIcons({ allowClear }, prefixCls.value);
+			const [mergedAllowClear] = useIcons({
+				allowClear,
+				clearIcon
+			}, prefixCls.value, {
+				allowClear: contextAllowClear?.value,
+				clearIcon: contextClearIcon?.value
+			});
 			const mergedComponents = useComponents(components);
 			const { hasFeedback, status: contextStatus, feedbackIcon } = useFormItemInputContext().value;
 			const mergedStatus = getMergedStatus(contextStatus, customStatus.value);

package/dist/date-picker/generatePicker/generateSinglePicker.js

@@ -10,6 +10,7 @@ import useCSSVarCls from "../../config-provider/hooks/useCSSVarCls.js";
 import { useDisabledContext } from "../../config-provider/DisabledContext.js";
 import locale from "../locale/en_US.js";
 import useLocale from "../../locale/useLocale.js";
+import { omitUndefined } from "../../_util/omitUndefined.js";
 import { getMergedStatus, getStatusClassNames } from "../../_util/statusUtils.js";
 import { useFormItemInputContext } from "../../form/context.js";
 import { useVariants } from "../../form/hooks/useVariant.js";
@@ -22,7 +23,6 @@ import useComponents from "./useComponents.js";
 import { computed, createVNode, defineComponent, mergeProps, shallowRef } from "vue";
 import { clsx } from "@v-c/util";
 import { getTransitionName } from "@v-c/util/dist/utils/transition";
-import { omit } from "es-toolkit/compat";
 import Picker from "@v-c/picker";
 //#region src/date-picker/generatePicker/generateSinglePicker.tsx
 function generatePicker(generateConfig) {
@@ -31,7 +31,11 @@ function generatePicker(generateConfig) {
 		const name = displayName ? `A${displayName}` : "ADatePicker";
 		return /* @__PURE__ */ defineComponent((props, { slots, attrs, emit, expose }) => {
 			const { getPopupContainer: customGetPopupContainer, size: customizeSize, disabled: customDisabled, status: customStatus, variant: customVariant, classes, styles, rootClass, bordered } = toPropsRefs(props, "prefixCls", "getPopupContainer", "size", "disabled", "status", "variant", "classes", "styles", "rootClass", "bordered");
-			const { prefixCls, direction, getPopupContainer, rootPrefixCls, class: contextClassName, style: contextStyle, suffixIcon: contextSuffixIcon } = useComponentBaseConfig(pickerType, props, ["suffixIcon"], "picker");
+			const { prefixCls, direction, getPopupContainer, rootPrefixCls, class: contextClassName, style: contextStyle, suffixIcon: contextSuffixIcon, allowClear: contextAllowClear, clearIcon: contextClearIcon } = useComponentBaseConfig(pickerType, props, [
+				"suffixIcon",
+				"allowClear",
+				"clearIcon"
+			], "picker");
 			const { compactSize, compactItemClassnames } = useCompactItemContext(prefixCls, direction);
 			const mergedSize = useSize((ctx) => customizeSize.value ?? compactSize.value ?? ctx);
 			const disabled = useDisabledContext();
@@ -117,14 +121,18 @@ function generatePicker(generateConfig) {
 				nativeElement: computed(() => innerRef.value?.nativeElement)
 			});
 			return () => {
-				const { placeholder, components, placement, suffixIcon, prefix, allowClear, popupClassName: _popupClassName, dropdownClassName: _dropdownClassName, popupStyle: _popupStyle, rootClass: _rootClass, classes: _classes, styles: _styles, status: _status, variant: _variant, bordered: _bordered, size: _size, disabled: _disabled, locale: _locale, getPopupContainer: _getPopupContainer, ...restProps } = props;
+				const { placeholder, components, placement, suffixIcon, prefix, allowClear, clearIcon, popupClassName: _popupClassName, dropdownClassName: _dropdownClassName, popupStyle: _popupStyle, rootClass: _rootClass, classes: _classes, styles: _styles, status: _status, variant: _variant, bordered: _bordered, size: _size, disabled: _disabled, locale: _locale, getPopupContainer: _getPopupContainer, ...restProps } = props;
 				const { className, style, restAttrs } = getAttrStyleAndClass(attrs, void 0, props);
 				const mergedSuffixIcon = getSlotPropsFnRun(slots, { suffixIcon }, "suffixIcon", false);
 				const mergedPrefix = getSlotPropsFnRun(slots, { prefix }, "prefix", false);
 				const [mergedAllowClear, removeIcon] = useIcons({
 					allowClear,
+					clearIcon,
 					removeIcon: props.removeIcon
-				}, prefixCls.value);
+				}, prefixCls.value, {
+					allowClear: contextAllowClear?.value,
+					clearIcon: contextClearIcon?.value
+				});
 				const mergedComponents = useComponents(components);
 				const { hasFeedback, status: contextStatus, feedbackIcon } = useFormItemInputContext().value;
 				const mergedStatus = getMergedStatus(contextStatus, customStatus.value);
@@ -154,7 +162,7 @@ function generatePicker(generateConfig) {
 				const renderExtraFooter = slots.renderExtraFooter || props.renderExtraFooter ? (mode) => resolveRender("renderExtraFooter", [mode], mode) : void 0;
 				const panelRender = slots.panelRender || props.panelRender ? (panel) => resolveRender("panelRender", [panel], panel) : void 0;
 				const inputRender = slots.inputRender || props.inputRender ? (inputProps) => resolveRender("inputRender", [inputProps], inputProps) : void 0;
-				return createVNode(ContextIsolator, { "space": true }, { default: () => [createVNode(Picker, mergeProps(restAttrs, additionalProps, omit(restProps, ["onKeydown"]), {
+				return createVNode(ContextIsolator, { "space": true }, { default: () => [createVNode(Picker, mergeProps(restAttrs, additionalProps, omitUndefined(restProps, ["onKeydown"]), {
 					"ref": innerRef,
 					"placeholder": getPlaceholder(locale$1.value, mergedPicker.value, placeholder),
 					"suffix": suffixNode,

package/dist/date-picker/generatePicker/useComponents.d.ts

@@ -3,12 +3,12 @@ import "../../index.js";
 import { Components } from "@v-c/picker";
 //#region src/date-picker/generatePicker/useComponents.d.ts
 declare function useComponents(components?: Components): {
-  date?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
   time?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
-  week?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
+  year?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
   month?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
+  date?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
+  week?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
   quarter?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
-  year?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
   decade?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
   datetime?: import("vue").DefineComponent<import("@v-c/picker/dist/interface").SharedPanelProps<any>> | undefined;
   button: string | import("vue").DefineSetupFnComponent<ButtonProps, {}, {}, ButtonProps & {}, import("vue").PublicProps> | import("vue").DefineComponent;

package/dist/date-picker/style/index.d.ts

@@ -1,6 +1,10 @@
+import { SeedToken } from "../../theme/interface/seeds.js";
+import { AliasToken } from "../../theme/interface/alias.js";
 import { ComponentToken, PanelComponentToken, PickerPanelToken, initPanelComponentToken, initPickerPanelToken } from "./token.js";
 import { genPanelStyle } from "./panel.js";
+import { ComponentTokenMap } from "../../theme/interface/components.js";
+import "../../theme/interface/index.js";
 //#region src/date-picker/style/index.d.ts
-declare const _default: (prefixCls: import("vue").Ref<string>, rootCls?: import("vue").Ref<string | undefined>) => readonly [import("vue").Ref<string, string>, import("vue").ComputedRef<string | undefined>];
+declare const _default: (prefixCls: import("vue").Ref<string>, rootCls?: import("vue").Ref<string | undefined>, tokenResult?: import("@antdv-next/cssinjs").UseTokenReturn<ComponentTokenMap, AliasToken, SeedToken> | undefined) => readonly [import("vue").Ref<string, string>, import("vue").ComputedRef<string | undefined>];
 //#endregion
 export { type ComponentToken, type PanelComponentToken, type PickerPanelToken, _default as default, genPanelStyle, initPanelComponentToken, initPickerPanelToken };

package/dist/date-picker/util.d.ts

@@ -1,21 +1,17 @@
-import { RenderNodeFn } from "../_util/type.js";
+import { RenderNodeFn, VueNode } from "../_util/type.js";
 import "./generatePicker/index.js";
 import { PickerLocale, PickerProps as PickerProps$1 } from "./generatePicker/interface.js";
+import { AllowClear } from "../_util/hooks/useAllowClear.js";
 import { PickerMode } from "@v-c/picker";
 //#region src/date-picker/util.d.ts
 declare function getPlaceholder(locale: PickerLocale, picker?: PickerMode, customizePlaceholder?: string): string;
 declare function getRangePlaceholder(locale: PickerLocale, picker?: PickerMode, customizePlaceholder?: [string, string]): [string, string] | undefined;
-declare function useIcons(props: Pick<PickerProps$1, 'allowClear' | 'removeIcon'>, prefixCls: string): readonly [false, string | number | boolean | import("vue/jsx-runtime").JSX.Element | RenderNodeFn<any[]> | null] | readonly [{
-  clearIcon: string | number | boolean | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-    [key: string]: any;
-  }> | import("vue").ComponentOptions<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, any, any, any, string, {}, {}, string, {}, {}, {}, string, import("vue").ComponentProvideOptions> | import("vue").FunctionalComponent<any, {}, any, {}> | {
-    new (...args: any[]): any;
-    __isFragment?: never;
-    __isTeleport?: never;
-    __isSuspense?: never;
-  } | RenderNodeFn<any[]> | (string | number | boolean | void | import("vue").Component | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-    [key: string]: any;
-  }> | null | undefined)[] | null | undefined;
+declare function useIcons(props: Pick<PickerProps$1, 'allowClear' | 'clearIcon' | 'removeIcon'>, prefixCls: string, context?: {
+  allowClear?: AllowClear;
+  clearIcon?: VueNode;
+}): readonly [false, string | number | boolean | import("vue/jsx-runtime").JSX.Element | RenderNodeFn<any[]> | null] | readonly [{
+  readonly disabled?: boolean;
+  readonly clearIcon: any;
 }, string | number | boolean | import("vue/jsx-runtime").JSX.Element | RenderNodeFn<any[]> | null];
 //#endregion
 export { getPlaceholder, getRangePlaceholder, useIcons };

package/dist/date-picker/util.js

@@ -1,4 +1,5 @@
 import useIcons$1 from "../select/useIcons.js";
+import useAllowClear from "../_util/hooks/useAllowClear.js";
 import { cloneVNode, isVNode } from "vue";
 //#region src/date-picker/util.ts
 function getPlaceholder(locale, picker, customizePlaceholder) {
@@ -19,18 +20,24 @@ function getRangePlaceholder(locale, picker, customizePlaceholder) {
 	if (picker === "time" && locale.timePickerLocale.rangePlaceholder) return locale.timePickerLocale.rangePlaceholder;
 	return locale.lang.rangePlaceholder;
 }
-function useIcons(props, prefixCls) {
-	const { allowClear = true } = props;
-	const { clearIcon, removeIcon } = useIcons$1({
+function useIcons(props, prefixCls, context) {
+	const { removeIcon } = useIcons$1({
 		...props,
 		prefixCls,
 		componentName: "DatePicker"
 	});
-	if (allowClear === false) return [false, removeIcon];
-	const allowClearConfig = allowClear === true ? {} : allowClear;
+	const mergedAllowClear = useAllowClear({
+		allowClear: props.allowClear,
+		clearIcon: props.clearIcon,
+		contextAllowClear: context?.allowClear,
+		contextClearIcon: context?.clearIcon,
+		defaultAllowClear: true
+	});
+	if (!mergedAllowClear) return [false, removeIcon];
+	const { clearIcon: mergedClearIcon, ...rest } = mergedAllowClear;
 	return [{
-		clearIcon: isVNode(clearIcon) ? cloneVNode(clearIcon) : clearIcon,
-		...allowClearConfig
+		clearIcon: isVNode(mergedClearIcon) ? cloneVNode(mergedClearIcon) : mergedClearIcon,
+		...rest
 	}, removeIcon];
 }
 //#endregion

package/dist/descriptions/Cell.js

@@ -1,11 +1,10 @@
+import { normalizeStyle as normalizeStyle$1 } from "../_util/styleUtils.js";
 import { getSlotPropsFnRun } from "../_util/tools.js";
+import { isRenderable } from "../_util/is.js";
 import { useDescriptionsCtx } from "./DescriptionsContext.js";
 import { createVNode, defineComponent, mergeProps } from "vue";
 import { classNames } from "@v-c/util";
 //#region src/descriptions/Cell.tsx
-function notEmpty(val) {
-	return val !== void 0 && val !== null;
-}
 const Cell = /* @__PURE__ */ defineComponent((props, { attrs, slots }) => {
 	const descContext = useDescriptionsCtx();
 	return () => {
@@ -14,19 +13,22 @@ const Cell = /* @__PURE__ */ defineComponent((props, { attrs, slots }) => {
 		const Component = component;
 		const label = getSlotPropsFnRun(slots, props, "label");
 		const content = getSlotPropsFnRun(slots, props, "content");
-		if (bordered) return createVNode(Component, mergeProps({
-			"class": classNames({
-				[`${itemPrefixCls}-item-label`]: type === "label",
-				[`${itemPrefixCls}-item-content`]: type === "content"
-			}, type === "label" ? descriptionsClassNames?.label : void 0, type === "content" ? descriptionsClassNames?.content : void 0),
-			"colSpan": span
-		}, attrs), { default: () => [notEmpty(label) && createVNode("span", {
-			"style": styles?.label,
-			"class": classes?.label
-		}, [label]), notEmpty(content) && createVNode("span", {
-			"style": styles?.content,
-			"class": classes?.content
-		}, [content])] });
+		if (bordered) {
+			let typeStyle;
+			if (type === "label") typeStyle = styles?.label;
+			if (type === "content") typeStyle = styles?.content;
+			const mergedCellStyle = {
+				...normalizeStyle$1(attrs.style),
+				...typeStyle
+			};
+			return createVNode(Component, mergeProps({
+				"class": classNames({
+					[`${itemPrefixCls}-item-label`]: type === "label",
+					[`${itemPrefixCls}-item-content`]: type === "content"
+				}, type === "label" ? descriptionsClassNames?.label : void 0, type === "content" ? descriptionsClassNames?.content : void 0),
+				"colSpan": span
+			}, attrs, { "style": mergedCellStyle }), { default: () => [isRenderable(label) && createVNode("span", null, [label]), isRenderable(content) && createVNode("span", null, [content])] });
+		}
 		return createVNode(Component, mergeProps({ "class": classNames(`${itemPrefixCls}-item`) }, attrs, { "colSpan": span }), { default: () => [createVNode("div", { "class": `${itemPrefixCls}-item-container` }, [(label || label === 0) && createVNode("span", {
 			"class": classNames(`${itemPrefixCls}-item-label`, descriptionsClassNames?.label, { [`${itemPrefixCls}-item-no-colon`]: !colon }, classes?.label),
 			"style": styles?.label
@@ -35,65 +37,68 @@ const Cell = /* @__PURE__ */ defineComponent((props, { attrs, slots }) => {
 			"style": styles?.content
 		}, [content])])] });
 	};
-}, { props: {
-	itemPrefixCls: {
-		type: String,
-		required: true
+}, {
+	props: {
+		itemPrefixCls: {
+			type: String,
+			required: true
+		},
+		span: {
+			type: Number,
+			required: true
+		},
+		component: {
+			type: String,
+			required: true
+		},
+		classes: {
+			type: Object,
+			required: false
+		},
+		styles: {
+			type: Object,
+			required: false
+		},
+		bordered: {
+			type: Boolean,
+			required: false,
+			default: void 0
+		},
+		label: {
+			type: [
+				Function,
+				String,
+				Number,
+				null,
+				Object,
+				Boolean
+			],
+			required: false,
+			default: void 0
+		},
+		content: {
+			type: [
+				Function,
+				String,
+				Number,
+				null,
+				Object,
+				Boolean
+			],
+			required: false,
+			default: void 0
+		},
+		type: {
+			type: String,
+			required: false
+		},
+		colon: {
+			type: Boolean,
+			required: false,
+			default: void 0
+		}
 	},
-	span: {
-		type: Number,
-		required: true
-	},
-	component: {
-		type: String,
-		required: true
-	},
-	classes: {
-		type: Object,
-		required: false
-	},
-	styles: {
-		type: Object,
-		required: false
-	},
-	bordered: {
-		type: Boolean,
-		required: false,
-		default: void 0
-	},
-	label: {
-		type: [
-			Function,
-			String,
-			Number,
-			null,
-			Object,
-			Boolean
-		],
-		required: false,
-		default: void 0
-	},
-	content: {
-		type: [
-			Function,
-			String,
-			Number,
-			null,
-			Object,
-			Boolean
-		],
-		required: false,
-		default: void 0
-	},
-	type: {
-		type: String,
-		required: false
-	},
-	colon: {
-		type: Boolean,
-		required: false,
-		default: void 0
-	}
-} });
+	inheritAttrs: false
+});
 //#endregion
 export { Cell as default };

package/dist/descriptions/Row.js

@@ -1,4 +1,3 @@
-import { normalizeStyle as normalizeStyle$1 } from "../_util/styleUtils.js";
 import { getSlotPropsFnRun } from "../_util/tools.js";
 import { useDescriptionsCtx } from "./DescriptionsContext.js";
 import Cell from "./Cell.js";
@@ -55,14 +54,21 @@ function renderCells(items, { colon, prefixCls, bordered, labelRender, contentRe
 			"content": showContent ? children : null,
 			"type": type
 		}, null);
-		return [createVNode(Cell, {
-			"key": `label-${mergedKey}`,
-			"class": className,
-			"style": {
+		const mergedStyles = {
+			label: {
 				...rootStyles?.label,
-				...normalizeStyle$1(style) || {},
 				...styles?.label
 			},
+			content: {
+				...rootStyles?.content,
+				...styles?.content
+			}
+		};
+		return [createVNode(Cell, {
+			"key": `label-${mergedKey}`,
+			"class": className,
+			"style": style,
+			"styles": mergedStyles,
 			"span": 1,
 			"colon": colon,
 			"component": component[0],
@@ -73,11 +79,8 @@ function renderCells(items, { colon, prefixCls, bordered, labelRender, contentRe
 		}, null), createVNode(Cell, {
 			"key": `content-${mergedKey}`,
 			"class": className,
-			"style": {
-				...rootStyles?.content,
-				...normalizeStyle$1(style) || {},
-				...styles?.content
-			},
+			"style": style,
+			"styles": mergedStyles,
 			"span": span * 2 - 1,
 			"component": component[1],
 			"itemPrefixCls": itemPrefixCls,