Skip to content

fix: disabled Date enable selected #637

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

fix: disabled Date enable selected #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb95cac
fix: disabled Date enable selected
coderbaozi May 21, 2023
a9cabc2
fix: fix some error
coderbaozi May 22, 2023
139279d
chore: update test case
coderbaozi May 23, 2023
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
9 changes: 7 additions & 2 deletions src/RangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function canValueTrigger<DateType>(
return true;
}

if (disabled[(index + 1) % 2]) {
if (disabled[(index+1) % 2]) {
return true;
}

Expand Down Expand Up @@ -394,6 +394,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
}

function triggerChange(newValue: RangeValue<DateType>, sourceIndex: 0 | 1) {
if(mergedDisabled[sourceIndex])
return
let values = newValue;
let startValue = getValue(values, 0);
let endValue = getValue(values, 1);
Expand Down Expand Up @@ -447,7 +449,6 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
const canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);

const canTrigger = values === null || (canStartValueTrigger && canEndValueTrigger);

if (canTrigger) {
// Trigger onChange only when value is validate
setInnerValue(values);
Expand Down Expand Up @@ -539,6 +540,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
});

const onDateMouseEnter = (date: DateType) => {
if(mergedDisabled[mergedActivePickerIndex])
return
setHoverRangedValue(updateValues(selectedValue, date, mergedActivePickerIndex));
if (mergedActivePickerIndex === 0) {
onStartEnter(date);
Expand All @@ -548,6 +551,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
};

const onDateMouseLeave = () => {
if(mergedDisabled[mergedActivePickerIndex])
return
setHoverRangedValue(updateValues(selectedValue, null, mergedActivePickerIndex));
if (mergedActivePickerIndex === 0) {
onStartLeave();
Expand Down
6 changes: 3 additions & 3 deletions tests/__snapshots__/range.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ exports[`Picker.Range panelRender 1`] = `
<div>
<div
class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
>
<div
class="rc-picker-range-wrapper rc-picker-date-range-wrapper"
Expand Down Expand Up @@ -201,7 +201,7 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
<div>
<div
class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
>
<div
class="rc-picker-range-wrapper rc-picker-date-range-wrapper"
Expand Down Expand Up @@ -1161,7 +1161,7 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
<div>
<div
class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
>
<div
class="rc-picker-range-wrapper rc-picker-month-range-wrapper"
Expand Down