Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/hooks/useTimeConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function getTimeConfig<Config extends object>(

return {
format: 'HH:mm:ss',
...timeConfig,
...pickProps(timeConfig),
};
}

Expand Down
8 changes: 6 additions & 2 deletions src/utils/miscUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@ export function fillIndex<T extends any[]>(ori: T, index: number, value: T[numbe
return clone;
}

export function pickProps<T extends object>(props: T, keys: (keyof T)[] | readonly (keyof T)[]) {
/** Pick props from the key list. Will filter empty value */
export function pickProps<T extends object>(props: T, keys?: (keyof T)[] | readonly (keyof T)[]) {
const clone = {} as T;
keys.forEach((key) => {

const mergedKeys = (keys || Object.keys(props)) as typeof keys;

mergedKeys.forEach((key) => {
if (props[key] !== undefined) {
clone[key] = props[key];
}
Expand Down
18 changes: 18 additions & 0 deletions tests/picker.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1275,4 +1275,22 @@ describe('Picker.Basic', () => {

expect(document.querySelector('.rc-picker-dropdown')).toHaveClass('bamboo');
});

it('showTime config should have format', () => {
render(
<DayPicker
showTime={{
format: undefined,
}}
open
defaultValue={getDay('2000-01-01 03:05:07')}
/>,
);

// console.log(document.body.innerHTML);

expect(document.querySelector('.rc-picker-time-panel .rc-picker-header').textContent).toBe(
'03:05:07',
);
});
});