Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cascader): remove outdated compatibility code(#7532) #7534

Merged
merged 1 commit into from
Apr 30, 2024
Merged

fix(cascader): remove outdated compatibility code(#7532) #7534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions components/vc-cascader/Cascader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ function baseCascaderProps<OptionType extends BaseOptionType = DefaultOptionType
/** @deprecated Use `open` instead */
popupVisible: { type: Boolean, default: undefined },

/** @deprecated Use `dropdownClassName` instead */
popupClassName: String,
dropdownClassName: String,
dropdownMenuColumnStyle: {
type: Object as PropType<CSSProperties>,
Expand Down Expand Up @@ -422,11 +420,6 @@ export default defineComponent({
'Cascader',
'`popupVisible` is deprecated. Please use `open` instead.',
);
devWarning(
props.popupClassName === undefined,
'Cascader',
'`popupClassName` is deprecated. Please use `dropdownClassName` instead.',
);
devWarning(
props.popupPlacement === undefined,
'Cascader',
Expand All @@ -442,8 +435,6 @@ export default defineComponent({

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

const mergedDropdownClassName = computed(() => props.dropdownClassName || props.popupClassName);

const mergedDropdownStyle = computed(() => props.dropdownStyle || props.popupStyle || {});

const mergedPlacement = computed(() => props.placement || props.popupPlacement);
Expand All @@ -462,6 +453,7 @@ export default defineComponent({
loadingIcon,
dropdownMenuColumnStyle,
customSlots,
dropdownClassName,
} = toRefs(props);
useProvideCascader({
options: mergedOptions,
Expand Down Expand Up @@ -525,7 +517,6 @@ export default defineComponent({
'popupVisible',
'open',

'popupClassName',
'dropdownClassName',
'dropdownMenuColumnStyle',

Expand Down Expand Up @@ -581,7 +572,7 @@ export default defineComponent({
emptyOptions={emptyOptions}
// Open
open={mergedOpen.value}
dropdownClassName={mergedDropdownClassName.value}
dropdownClassName={dropdownClassName.value}
placement={mergedPlacement.value}
onDropdownVisibleChange={onInternalDropdownVisibleChange}
// Children
Expand Down
Loading