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

feat: calendar picker view scroll #6521

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+4,223 −4
Open

feat: calendar picker view scroll #6521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
477b31b
feat: add calendar scrollTo
Yueyanc Jan 11, 2024
f293aee
feat: add calendar-picker-view scrollTo
Yueyanc Jan 11, 2024
47ca7a4
Merge branch 'ant-design:master' into feat/calendar-picker-view-scroll
Yueyanc Jan 13, 2024
45cd1d1
feat: add calendar scrollTo
Yueyanc Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/components/calendar-picker-view/calendar-picker-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, {
useState,
useImperativeHandle,
useMemo,
useRef,
} from 'react'
import type { ReactNode } from 'react'
import { NativeProps, withNativeProps } from '../../utils/native-props'
Expand All @@ -28,6 +29,7 @@ const classPrefix = 'adm-calendar-picker-view'
export type CalendarPickerViewRef = {
jumpTo: (page: Page | ((page: Page) => Page)) => void
jumpToToday: () => void
scrollTo: (date: Date) => void
getDateRange: () => DateRange
}

Expand Down Expand Up @@ -76,6 +78,7 @@ export const CalendarPickerView = forwardRef<
CalendarPickerViewRef,
CalendarPickerViewProps
>((p, ref) => {
const rootRef = useRef<HTMLDivElement>(null)
const today = dayjs()
const props = mergeProps(defaultProps, p)
const { locale } = useConfig()
Expand Down Expand Up @@ -123,6 +126,14 @@ export const CalendarPickerView = forwardRef<
setCurrent(dayjs().date(1))
},
getDateRange: () => dateRange,
scrollTo: (date: Date) => {
const cell = rootRef.current?.querySelector(
`[data-date="${dayjs(date).format('YYYY-MM-DD')}"]`
)
if (cell) {
cell.scrollIntoView({ block: 'center' })
}
},
}))

const header = (
Expand Down Expand Up @@ -286,7 +297,10 @@ export const CalendarPickerView = forwardRef<
<div className={`${classPrefix}-cell-top`}>
{renderTop()}
</div>
<div className={`${classPrefix}-cell-date`}>
<div
data-date={d.format('YYYY-MM-DD')}
className={`${classPrefix}-cell-date`}
>
{props.renderDate
? props.renderDate(d.toDate())
: d.date()}
Expand Down Expand Up @@ -320,7 +334,7 @@ export const CalendarPickerView = forwardRef<

return withNativeProps(
props,
<div className={classPrefix}>
<div ref={rootRef} className={classPrefix}>
{header}
{mark}
{body}
Expand Down
1 change: 1 addition & 0 deletions src/components/calendar-picker-view/calendar-picker-view.zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ CalendarPickerView 是 [CalendarPicker](/zh/components/calendar-picker) 的内
| jumpTo | 跳转至指定日期的区间 | `(page: Page \| ((page: Page) => Page)) => void` |
| jumpToToday | 跳转至今日 | `() => void` |
| getDateRange | 获取日期 | `[Date, Date]` |
| scrollTo | 视图滚动至指定日期 | `(date:Date) => void` |

```ts
type Page = { month: number; year: number }
Expand Down