Skip to content

Commit db75cb7

Browse files
Jiny3213liangjiajin
andauthored
fix: allow showWeek=false when picker=week (antd#50157) (#853)
* fix: allow showWeek=false when picker=week (antd#50157) * fix: Avoid changing default behavior when picker=week --------- Co-authored-by: liangjiajin <[email protected]>
1 parent b489cd3 commit db75cb7

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

src/PickerPanel/DatePanel/index.tsx

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,42 +51,42 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
5151
const month = generateConfig.getMonth(pickerValue);
5252

5353
// =========================== PrefixColumn ===========================
54-
const prefixColumn =
55-
isWeek || showWeek
56-
? (date: DateType) => {
57-
// >>> Additional check for disabled
58-
const disabled = disabledDate?.(date, { type: 'week' });
59-
60-
return (
61-
<td
62-
key="week"
63-
className={classNames(cellPrefixCls, `${cellPrefixCls}-week`, {
64-
[`${cellPrefixCls}-disabled`]: disabled,
65-
})}
66-
// Operation: Same as code in PanelBody
67-
onClick={() => {
68-
if (!disabled) {
69-
onSelect(date);
70-
}
71-
}}
72-
onMouseEnter={() => {
73-
if (!disabled) {
74-
onHover?.(date);
75-
}
76-
}}
77-
onMouseLeave={() => {
78-
if (!disabled) {
79-
onHover?.(null);
80-
}
81-
}}
82-
>
83-
<div className={`${cellPrefixCls}-inner`}>
84-
{generateConfig.locale.getWeek(locale.locale, date)}
85-
</div>
86-
</td>
87-
);
88-
}
89-
: null;
54+
const showPrefixColumn = showWeek === undefined ? isWeek : showWeek;
55+
const prefixColumn = showPrefixColumn
56+
? (date: DateType) => {
57+
// >>> Additional check for disabled
58+
const disabled = disabledDate?.(date, { type: 'week' });
59+
60+
return (
61+
<td
62+
key="week"
63+
className={classNames(cellPrefixCls, `${cellPrefixCls}-week`, {
64+
[`${cellPrefixCls}-disabled`]: disabled,
65+
})}
66+
// Operation: Same as code in PanelBody
67+
onClick={() => {
68+
if (!disabled) {
69+
onSelect(date);
70+
}
71+
}}
72+
onMouseEnter={() => {
73+
if (!disabled) {
74+
onHover?.(date);
75+
}
76+
}}
77+
onMouseLeave={() => {
78+
if (!disabled) {
79+
onHover?.(null);
80+
}
81+
}}
82+
>
83+
<div className={`${cellPrefixCls}-inner`}>
84+
{generateConfig.locale.getWeek(locale.locale, date)}
85+
</div>
86+
</td>
87+
);
88+
}
89+
: null;
9090

9191
// ========================= Cells ==========================
9292
// >>> Header Cells

0 commit comments

Comments
 (0)