Skip to content

fix: fix scroll on select meridiem #692

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.

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions docs/examples/time.tsx
Original file line number Diff line number Diff line change
@@ -33,6 +33,18 @@ export default () => {
generateConfig={momentGenerateConfig}
/>

<h3>TimePicker 12 Hours</h3>
<Picker
defaultValue={defaultValue}
picker="time"
locale={zhCN}
disabledTime={(now) => ({
disabledHours: () => [now.hours()],
})}
generateConfig={momentGenerateConfig}
use12Hours
/>

<h3>RangePicker</h3>
<RangePicker
defaultValue={[defaultValue, defaultValue]}
31 changes: 17 additions & 14 deletions src/panels/TimePanel/TimeUnitColumn.tsx
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@ export type TimeUnitColumnProps<DateType> = {
onSelect?: (value: number) => void;
type: 'hour' | 'minute' | 'second' | 'meridiem';
info: {
today: DateType,
locale: Locale,
cellRender: CellRender<DateType, number>,
}
today: DateType;
locale: Locale;
cellRender: CellRender<DateType, number>;
};
};

function TimeUnitColumn<DateType>(props: TimeUnitColumnProps<DateType>) {
@@ -38,13 +38,13 @@ function TimeUnitColumn<DateType>(props: TimeUnitColumnProps<DateType>) {
// `useLayoutEffect` here to avoid blink by duration is 0
useLayoutEffect(() => {
const li = liRefs.current.get(value!);
if (li && open !== false) {
if (li && open !== false && type !== 'meridiem') {
scrollTo(ulRef.current!, li.offsetTop, 120);
}
}, [value]);

useLayoutEffect(() => {
if (open) {
if (open && type !== 'meridiem') {
const li = liRefs.current.get(value!);
if (li) {
scrollRef.current = waitElementReady(li, () => {
@@ -88,14 +88,17 @@ function TimeUnitColumn<DateType>(props: TimeUnitColumnProps<DateType>) {
onSelect!(unit.value);
}}
>
{info.cellRender ? info.cellRender(unit.value, {
today: info.today,
locale: info.locale,
originNode: <div className={`${cellPrefixCls}-inner`}>{unit.label}</div>,
type: 'time',
subType: type
}) : <div className={`${cellPrefixCls}-inner`}>{unit.label}</div>}

{info.cellRender ? (
info.cellRender(unit.value, {
today: info.today,
locale: info.locale,
originNode: <div className={`${cellPrefixCls}-inner`}>{unit.label}</div>,
type: 'time',
subType: type,
})
) : (
<div className={`${cellPrefixCls}-inner`}>{unit.label}</div>
)}
</li>
);
})}