Skip to content

Commit 7ce0f11

Browse files
authored
fix(cascader): remove outdated compatibility code(#7532) (#7534)
1 parent 54434b0 commit 7ce0f11

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

components/vc-cascader/Cascader.tsx

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ function baseCascaderProps<OptionType extends BaseOptionType = DefaultOptionType
102102
/** @deprecated Use `open` instead */
103103
popupVisible: { type: Boolean, default: undefined },
104104

105-
/** @deprecated Use `dropdownClassName` instead */
106-
popupClassName: String,
107105
dropdownClassName: String,
108106
dropdownMenuColumnStyle: {
109107
type: Object as PropType<CSSProperties>,
@@ -422,11 +420,6 @@ export default defineComponent({
422420
'Cascader',
423421
'`popupVisible` is deprecated. Please use `open` instead.',
424422
);
425-
devWarning(
426-
props.popupClassName === undefined,
427-
'Cascader',
428-
'`popupClassName` is deprecated. Please use `dropdownClassName` instead.',
429-
);
430423
devWarning(
431424
props.popupPlacement === undefined,
432425
'Cascader',
@@ -442,8 +435,6 @@ export default defineComponent({
442435

443436
const mergedOpen = computed(() => (props.open !== undefined ? props.open : props.popupVisible));
444437

445-
const mergedDropdownClassName = computed(() => props.dropdownClassName || props.popupClassName);
446-
447438
const mergedDropdownStyle = computed(() => props.dropdownStyle || props.popupStyle || {});
448439

449440
const mergedPlacement = computed(() => props.placement || props.popupPlacement);
@@ -462,6 +453,7 @@ export default defineComponent({
462453
loadingIcon,
463454
dropdownMenuColumnStyle,
464455
customSlots,
456+
dropdownClassName,
465457
} = toRefs(props);
466458
useProvideCascader({
467459
options: mergedOptions,
@@ -525,7 +517,6 @@ export default defineComponent({
525517
'popupVisible',
526518
'open',
527519

528-
'popupClassName',
529520
'dropdownClassName',
530521
'dropdownMenuColumnStyle',
531522

@@ -581,7 +572,7 @@ export default defineComponent({
581572
emptyOptions={emptyOptions}
582573
// Open
583574
open={mergedOpen.value}
584-
dropdownClassName={mergedDropdownClassName.value}
575+
dropdownClassName={dropdownClassName.value}
585576
placement={mergedPlacement.value}
586577
onDropdownVisibleChange={onInternalDropdownVisibleChange}
587578
// Children

0 commit comments

Comments
 (0)