Skip to content

feat: years and months are disabled based on disabledDate #610

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 3 commits into
base: master
Choose a base branch
from
Open
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
10 changes: 10 additions & 0 deletions assets/index/YearPanel.less
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@

.@{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
13 changes: 13 additions & 0 deletions examples/start-end-range.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ class Demo extends React.Component {
return endValue.diff(startValue, 'days') < 0;
}

disabledDate = (current) => {
if (!current) {
// allow empty select
return false;
}
const date = moment();
date.hour(0);
date.minute(0);
date.second(0);
return current.valueOf() < date.valueOf(); // can not select days before today
}

render() {
const state = this.state;
return (
Expand All @@ -132,6 +144,7 @@ class Demo extends React.Component {
open={this.state.startOpen}
value={[state.startValue, state.endValue]}
onChange={this.onStartChange}
disabledDate={ this.disabledDate}
/>
</p>

Expand Down
1 change: 1 addition & 0 deletions src/Calendar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,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: 5 additions & 1 deletion src/calendar/CalendarHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default class CalendarHeader extends React.Component {
locale: PropTypes.object,
enablePrev: PropTypes.any,
enableNext: PropTypes.any,
disabledDate: PropTypes.func,
disabledMonth: PropTypes.func,
renderFooter: PropTypes.func,
onMonthSelect: PropTypes.func,
Expand Down Expand Up @@ -152,6 +153,7 @@ export default class CalendarHeader extends React.Component {
showTimePicker,
enableNext,
enablePrev,
disabledDate,
disabledMonth,
renderFooter,
} = props;
Expand All @@ -165,7 +167,8 @@ export default class CalendarHeader extends React.Component {
rootPrefixCls={prefixCls}
onSelect={this.onMonthSelect}
onYearPanelShow={() => this.showYearPanel('month')}
disabledDate={disabledMonth}
disabledDate={disabledDate}
disabledMonth={disabledMonth}
cellRender={props.monthCellRender}
contentRender={props.monthCellContentRender}
renderFooter={renderFooter}
Expand All @@ -182,6 +185,7 @@ export default class CalendarHeader extends React.Component {
onSelect={this.onYearSelect}
onDecadePanelShow={this.showDecadePanel}
renderFooter={renderFooter}
disabledDate={disabledDate}
/>
);
}
Expand Down
22 changes: 17 additions & 5 deletions src/date/DateTBody.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export default class DateTBody extends React.Component {
contentRender: PropTypes.func,
dateRender: PropTypes.func,
disabledDate: PropTypes.func,
disabledMonth: PropTypes.func,
prefixCls: PropTypes.string,
selectedValue: PropTypes.oneOfType([PropTypes.object, PropTypes.arrayOf(PropTypes.object)]),
value: PropTypes.object,
Expand All @@ -48,7 +49,7 @@ export default class DateTBody extends React.Component {
const props = this.props;
const {
contentRender, prefixCls, selectedValue, value,
showWeekNumber, dateRender, disabledDate,
showWeekNumber, dateRender, disabledDate, disabledMonth,
hoverValue,
} = props;
let iIndex;
Expand Down Expand Up @@ -183,15 +184,26 @@ export default class DateTBody extends React.Component {
cls += ` ${lastDayOfMonthClass}`;
}

if (disabledDate) {
if (disabledDate(current, value)) {
if (disabledDate || disabledMonth) {
if (
(disabledDate && disabledDate(current, value))
|| (disabledMonth && disabledMonth(value))
) {
disabled = true;

if (!last || !disabledDate(last, value)) {
if (
!last
|| (disabledDate && !disabledDate(last, value))
|| (disabledMonth && disabledMonth(last))
) {
cls += ` ${firstDisableClass}`;
}

if (!next || !disabledDate(next, value)) {
if (
!next
|| (disabledDate && !disabledDate(next, value))
|| (disabledMonth && disabledMonth(next))
) {
cls += ` ${lastDisableClass}`;
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/month/MonthPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class MonthPanel extends React.Component {
static propTypes = {
onChange: PropTypes.func,
disabledDate: PropTypes.func,
disabledMonth: PropTypes.func,
onSelect: PropTypes.func,
renderFooter: PropTypes.func,
rootPrefixCls: PropTypes.string,
Expand Down Expand Up @@ -105,6 +106,7 @@ class MonthPanel extends React.Component {
<div className={`${prefixCls}-body`}>
<MonthTable
disabledDate={props.disabledDate}
disabledMonth={props.disabledMonth}
onSelect={this.setAndSelectValue}
locale={locale}
value={value}
Expand Down
13 changes: 11 additions & 2 deletions src/month/MonthTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,20 @@ class MonthTable extends Component {
const monthsEls = months.map((month, index) => {
const tds = month.map(monthData => {
let disabled = false;
if (props.disabledDate) {

if (props.disabledDate || props.disabledMonth) {
const testValue = value.clone();
testValue.month(monthData.value);
disabled = props.disabledDate(testValue);

if (props.disabledDate) {
disabled = props.disabledDate(testValue);
}

if (props.disabledMonth) {
disabled = props.disabledMonth(testValue);
}
}

const classNameMap = {
[`${prefixCls}-cell`]: 1,
[`${prefixCls}-cell-disabled`]: disabled,
Expand Down
7 changes: 5 additions & 2 deletions src/range-calendar/CalendarPart.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default class CalendarPart extends React.Component {
format: PropTypes.any,
placeholder: PropTypes.any,
disabledDate: PropTypes.any,
disabledMonth: PropTypes.any,
timePicker: PropTypes.any,
disabledTime: PropTypes.any,
onInputChange: PropTypes.func,
Expand All @@ -40,7 +41,7 @@ export default class CalendarPart extends React.Component {
mode,
direction,
locale, format, placeholder,
disabledDate, timePicker, disabledTime,
disabledDate, timePicker, disabledTime, disabledMonth,
timePickerDisabledTime, showTimePicker,
onInputChange, onInputSelect, enablePrev, enableNext,
clearIcon,
Expand Down Expand Up @@ -102,7 +103,8 @@ export default class CalendarPart extends React.Component {
enablePrev={enablePrev}
onValueChange={props.onValueChange}
onPanelChange={props.onPanelChange}
disabledMonth={props.disabledMonth}
disabledMonth={disabledMonth}
disabledDate={disabledDate}
/>
{showTimePicker ? <div className={`${prefixCls}-time-picker`}>
<div className={`${prefixCls}-time-picker-panel`}>
Expand All @@ -118,6 +120,7 @@ export default class CalendarPart extends React.Component {
onSelect={props.onSelect}
onDayHover={props.onDayHover}
disabledDate={disabledDate}
disabledMonth={disabledMonth}
showWeekNumber={props.showWeekNumber}
/>
</div>
Expand Down
11 changes: 10 additions & 1 deletion src/year/YearPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,17 @@ 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 @@ -86,7 +95,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