fix: 修复 calendar-picker-view 的一些问题 #6760
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
yuanjiu041
commented
Oct 14, 2024
yuanjiu041
commented
- 修复了默认的 minDay 和 maxDay 会随着 current 变化的问题 CalendarPickerView 相关的一些问题 #6759
- 修复了 view 打开时不会自动滚动到选中值的问题 CalendarPickerView 相关的一些问题 #6759
zombieJ
reviewed
Oct 15, 2024
| const maxDay = useMemo( | ||
| () => (props.max ? dayjs(props.max) : current.add(6, 'month')), | ||
| [props.max, current] | ||
| () => (props.max ? dayjs(props.max) : defaultMin.add(6, 'month')), |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6760 +/- ##
==========================================
+ Coverage 92.68% 92.74% +0.05%
==========================================
Files 334 334
Lines 7191 7204 +13
Branches 1795 1763 -32
==========================================
+ Hits 6665 6681 +16
+ Misses 517 515 -2
+ Partials 9 8 -1 ☔ View full report in Codecov by Sentry. |
zombieJ
reviewed
Oct 15, 2024
| @@ -124,20 +128,23 @@ export const CalendarPickerView = forwardRef< | |||
| const scrollTo = useSyncScroll(current, context.visible, bodyRef) | |||
|
|
|||
| // ============================== Boundary ============================== | |||
| // 记录默认的 current，防止后续 current 更新影响到下面的 minDay 和 maxDay 的计算 | |||
| const defaultMin = useMemo(() => current, []) | |||
There was a problem hiding this comment.
这个有点怪，如果不设置 min 的时候，defaultMin 锁死是当前日期。至少也是这个月的开始才对？如果留有余量的话，应该是范围默认正负半年比较好
There was a problem hiding this comment.
历史设计就是当前，他会取到这个月的第一天
There was a problem hiding this comment.
current 取值的时候，默认会选到第一天，所以这个 defaultMin 依赖的 moment 本来就是 x月1号
这里 defaultMin 的操作就是在原来 current 的基础上，保证他不随后续 current 的变化而变化，其他逻辑没变
There was a problem hiding this comment.
OK，那如果 current 受控小于当前日期呢？是不是需要刷新一下~
zombieJ
reviewed
Oct 15, 2024
| ) | ||
|
|
||
| // ================================ Refs ================================ | ||
| useImperativeHandle(ref, () => ({ | ||
| jumpTo: pageOrPageGenerator => { | ||
| let page: Page | ||
| if (typeof pageOrPageGenerator === 'function') { | ||
| console.log('cccc: ', current) |
zombieJ
reviewed
Oct 15, 2024
zombieJ
reviewed
Oct 15, 2024
zombieJ
approved these changes
Oct 16, 2024
added 7 commits
October 16, 2024 19:03
- 修复了默认的 minDay 和 maxDay 会随着 current 变化的问题 - 修复了 view 打开时不会自动滚动到选中值的问题
yuanjiu041
force-pushed
the
fix/calendar-picker-view
branch
from
263deae
to
713da41
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.