Skip to content

Commit d26e721

Browse files
authored
fix: kk format support (#714)
1 parent d964c52 commit d26e721

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

docs/examples/debug.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ export default () => {
151151
{...sharedLocale}
152152
// picker="week"
153153
// multiple
154+
format="YYYY-MM-DD"
154155
showTime
155156
defaultValue={[
156157
dayjs(),

src/hooks/useTimeInfo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { warning } from 'rc-util';
22
import * as React from 'react';
33
import type { GenerateConfig } from '../generate';
4-
import { leftPad } from '../utils/miscUtil';
54
import type { DisabledTimes, SharedTimeProps } from '../interface';
65
import { findValidateTime } from '../PickerPanel/TimePanel/TimePanelBody/util';
6+
import { leftPad } from '../utils/miscUtil';
77

88
export type Unit<ValueType = number | string> = {
99
label: React.ReactText;
@@ -96,7 +96,7 @@ export default function useTimeInfo<DateType extends object = any>(
9696
}
9797

9898
// ========================== Show ==========================
99-
let mergedShowHour = checkShow(format, ['H', 'LT', 'LLL'], showHour);
99+
let mergedShowHour = checkShow(format, ['H', 'h', 'k', 'LT', 'LLL'], showHour);
100100
let mergedShowMinute = checkShow(format, ['m', 'LT', 'LLL'], showMinute);
101101
let mergedShowSecond = checkShow(format, ['s', 'LTS'], showSecond);
102102
const mergedShowMillisecond = checkShow(format, ['SSS'], showMillisecond);

tests/picker.spec.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,4 +1319,13 @@ describe('Picker.Basic', () => {
13191319
expect.anything(),
13201320
);
13211321
});
1322+
1323+
it('showTime kk format', () => {
1324+
const { container } = render(
1325+
<DayPicker picker="time" defaultValue={getDay('2000-01-01 00:23:00')} format="kk:mm" open />,
1326+
);
1327+
expect(container.querySelector('input')).toHaveValue('24:23');
1328+
1329+
expect(document.querySelectorAll('.rc-picker-time-panel-column')).toHaveLength(2);
1330+
});
13221331
});

0 commit comments

Comments
 (0)