Skip to content

fix(date-picker): popupProps.onVisibleChange not fired on popup close #6774

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

Open
RSS1102 wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

fix(date-picker): popupProps.onVisibleChange not fired on popup close #6774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
69c25bc
fix(date-range-picker): 选完日期关闭面板时触发 onVisibleChange
RSS1102 Jul 2, 2026
19b0889
fix(date-range-picker): remove unnecessary comment in DateRangePicker…
RSS1102 Jul 2, 2026
7447fc0
fix(date-picker): trigger popupProps.onVisibleChange on close
RSS1102 Jul 2, 2026
2309a01
test(date-picker): enhance useRange tests with improved hook props an…
RSS1102 Jul 3, 2026
ae7a7d2
test(date-picker): update `createPopupProps` for better type safety
RSS1102 Jul 3, 2026
5032fcc
feat(date-picker): extract usePopupVisibleChange hook
RSS1102 Jul 7, 2026
2d65e8e
test: add test
RSS1102 Jul 7, 2026
3c696bf
fix: 修复选择器错误
RSS1102 Jul 7, 2026
f258919
test: 修复关闭测试方案
RSS1102 Jul 7, 2026
69ad3c7
refactor(popup): narrow PopupTriggerEvent type from Event to specific…
RSS1102 Jul 7, 2026
75a5df2
Merge branch 'develop' into rss1102/fix/date-range-picker/cell-click/…
RSS1102 Jul 7, 2026
073d01e
fix(date-picker): pass MouseEvent to `closePopup` and update tests
RSS1102 Jul 7, 2026
dceeae9
fix(date-picker): enhance `onVisibleChange` handling in hooks
RSS1102 Jul 7, 2026
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
11 changes: 6 additions & 5 deletions packages/components/date-picker/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export default defineComponent({
time,
inputRef,
onChange,
closePopup,
} = useSingle(props);

const isDisabled = useDisabled() as ComputedRef<boolean>;
Expand Down Expand Up @@ -169,7 +170,7 @@ export default defineComponent({
}

// 日期点击
function onCellClick(date: Date) {
function onCellClick(date: Date, { e }: { e: MouseEvent }) {
isHoverCell.value = false;
// date 模式自动切换年月
if (props.mode === 'date') {
Expand Down Expand Up @@ -201,7 +202,7 @@ export default defineComponent({
trigger: 'pick',
},
);
popupVisible.value = false;
closePopup({ e });
}

props.onPick?.(date);
Expand Down Expand Up @@ -263,7 +264,7 @@ export default defineComponent({

function onTagClearClick({ e }: { e: MouseEvent }) {
e.stopPropagation();
popupVisible.value = false;
closePopup({ e, trigger: 'trigger-element-close' });
onChange?.(props.multiple ? [] : '', { dayjsValue: dayjs(), trigger: 'clear' });
props.onClear?.({ e });
}
Expand Down Expand Up @@ -365,7 +366,7 @@ export default defineComponent({
format: formatRef.value.format,
});
}
popupVisible.value = false;
closePopup({ e, trigger: 'trigger-element-close' });
}

// 预设
Expand All @@ -385,7 +386,7 @@ export default defineComponent({
inputValue.value = formatDate(presetVal, {
format: formatRef.value.format,
});
popupVisible.value = false;
closePopup({ e: context.e, trigger: 'trigger-element-close' });
props.onPresetClick?.(context);
}

Expand Down
9 changes: 5 additions & 4 deletions packages/components/date-picker/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export default defineComponent({
isHoverCell,
isFirstValueSelected,
onRawChange,
closePopup,
} = useRange(props);

const isDisabled = useDisabled() as ComputedRef<boolean | Array<boolean>>;
Expand Down Expand Up @@ -297,7 +298,7 @@ export default defineComponent({
activeIndex.value = nextIndex as 0 | 1;
isFirstValueSelected.value = normalizedValue.some((v) => !!v);
} else {
popupVisible.value = false;
closePopup({ e, trigger: 'trigger-element-close' });
}
}

Expand Down Expand Up @@ -448,15 +449,15 @@ export default defineComponent({
const notValidIndex = getInvalidIndex(nextValue);

if (isSingleSideDisabled()) {
popupVisible.value = false;
closePopup({ e, trigger: 'trigger-element-close' });
} else if (!isFirstValueSelected.value) {
// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
let nextIndex = notValidIndex;
if (nextIndex === -1) nextIndex = activeIndex.value ? 0 : 1;
activeIndex.value = nextIndex as 0 | 1;
isFirstValueSelected.value = nextValue.some((v) => !!v);
} else if (nextValue.length === 2) {
popupVisible.value = false;
closePopup({ e, trigger: 'trigger-element-close' });
}
}

Expand Down Expand Up @@ -487,7 +488,7 @@ export default defineComponent({
inputValue.value = formatDate(presetValue, {
format: formatRef.value.format,
});
popupVisible.value = false;
closePopup({ e: context.e, trigger: 'trigger-element-close' });
props.onPresetClick?.(context);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/components/date-picker/DateRangePickerPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default defineComponent({
// 有时间选择器走 confirm 逻辑
if (props.enableTimePicker) return;

// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
// 首次点击不提交 value，两端都有有效值且无时间选择器时第二次点击触发 onChange
if (nextValue.length === 2 && isFirstValueSelected.value) {
onRawChange?.(
formatDate(nextValue, {
Expand Down Expand Up @@ -218,7 +218,7 @@ export default defineComponent({
function onConfirmClick({ e }: { e: MouseEvent }) {
const nextValue = [...(cacheValue.value as string[])];

// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
// 首次点击不提交 value，两端都有有效值且无时间选择器时第二次点击触发 onChange
if (nextValue.length === 2 && isFirstValueSelected.value) {
onRawChange?.(
formatDate(nextValue, {
Expand Down
Loading
Loading