Skip to content

Commit

Permalink
fix(date-picker): will cancel selecting in range mode if click at dis…
Browse files Browse the repository at this point in the history
…abled confirm button, closes #3254
  • Loading branch information
07akioni committed Jul 17, 2022
1 parent a3e85fa commit 91edef4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## NEXT_VERSION

- Fix `n-date-picker` will cancel selecting in range mode if click at disabled confirm button, closes [#3254](https://github.com/TuSimple/naive-ui/issues/3254).

## 2.31.0

### Breaking Changes
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG

## NEXT_VERSION

### Fixes

- 修复 `n-date-picker` 在范围模式下点击禁用的确认按钮会取消选择中的状态,关闭 [#3254](https://github.com/TuSimple/naive-ui/issues/3254)

## 2.31.0

### Breaking Changes
Expand Down
1 change: 1 addition & 0 deletions design-notes/todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Urgent

- message fullscreen
- use resolve slot!!!
- manual trigger style

Expand Down
2 changes: 0 additions & 2 deletions src/date-picker/src/panel/use-dual-calendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,6 @@ function useDualCalendar (
endDatesElRef.value?.contains(e.target as Node)
) {
// do nothing
} else {
isSelectingRef.value = false
}
}
function syncCalendarTimeWithValue (value: [number, number] | null): void {
Expand Down

0 comments on commit 91edef4

Please sign in to comment.