Skip to content
Draft
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
11 changes: 11 additions & 0 deletions assets/index/YearPanel.less
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,17 @@

.@{prefixClass}-year-panel-cell {
text-align: center;

&-disabled {
.@{prefixClass}-year-panel-year {
color: #bfbfbf;

&:hover {
background: white;
cursor: not-allowed;
}
}
}
}

.@{prefixClass}-year-panel-year {
Expand Down
1 change: 1 addition & 0 deletions src/Calendar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ class Calendar extends React.Component {
renderFooter={renderFooter}
showTimePicker={showTimePicker}
prefixCls={prefixCls}
disabledDate={disabledDate}
/>
{timePicker && showTimePicker ?
(<div className={`${prefixCls}-time-picker`}>
Expand Down
2 changes: 1 addition & 1 deletion src/MonthCalendar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class MonthCalendar extends React.Component {
mode={mode}
value={value}
locale={props.locale}
disabledMonth={props.disabledDate}
disabledDate={props.disabledDate}
monthCellRender={props.monthCellRender}
monthCellContentRender={props.monthCellContentRender}
onMonthSelect={this.onSelect}
Expand Down
6 changes: 3 additions & 3 deletions src/calendar/CalendarHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default class CalendarHeader extends React.Component {
locale: PropTypes.object,
enablePrev: PropTypes.any,
enableNext: PropTypes.any,
disabledMonth: PropTypes.func,
disabledDate: PropTypes.func,
renderFooter: PropTypes.func,
onMonthSelect: PropTypes.func,
}
Expand Down Expand Up @@ -144,7 +144,7 @@ export default class CalendarHeader extends React.Component {
showTimePicker,
enableNext,
enablePrev,
disabledMonth,
disabledDate,
renderFooter,
} = props;

Expand All @@ -157,7 +157,7 @@ export default class CalendarHeader extends React.Component {
rootPrefixCls={prefixCls}
onSelect={this.onMonthSelect}
onYearPanelShow={() => this.showYearPanel('month')}
disabledDate={disabledMonth}
disabledDate={disabledDate}
cellRender={props.monthCellRender}
contentRender={props.monthCellContentRender}
renderFooter={renderFooter}
Expand Down
9 changes: 8 additions & 1 deletion src/year/YearPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,15 @@ export default class YearPanel extends React.Component {

const yeasEls = years.map((row, index) => {
const tds = row.map(yearData => {
let disabled = false;
if (props.disabledDate) {
const testValue = value.clone();
testValue.year(yearData.year);
disabled = props.disabledDate(testValue);
}
const classNameMap = {
[`${prefixCls}-cell`]: 1,
[`${prefixCls}-cell-disabled`]: disabled,
[`${prefixCls}-selected-cell`]: yearData.year === currentYear,
[`${prefixCls}-last-decade-cell`]: yearData.year < startYear,
[`${prefixCls}-next-decade-cell`]: yearData.year > endYear,
Expand All @@ -83,7 +90,7 @@ export default class YearPanel extends React.Component {
role="gridcell"
title={yearData.title}
key={yearData.content}
onClick={clickHandler}
onClick={disabled ? null : clickHandler}
className={classnames(classNameMap)}
>
<a
Expand Down