Skip to content

feat:add a prop to allow range-picker outof [begin,end] #452

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

Open
destiny4 wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −2
Open

feat:add a prop to allow range-picker outof [begin,end] #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions docs/examples/range.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,19 @@ export default () => {
disabledDate={disabledDate}
/>
</div>
<div style={{ margin: '0 8px' }}>
<h3>Allow outof [begin,end]</h3>
<RangePicker<Moment>
{...sharedProps}
value={undefined}
locale={zhCN}
allowClear
limitBeginAndEnd={false}
ref={rangePickerRef}
clearIcon={<span>X</span>}
suffixIcon={<span>O</span>}
/>
</div>
</div>
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions src/PickerPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export type PickerPanelSharedProps<DateType> = {

// Date
disabledDate?: (date: DateType) => boolean;
// disable outof range[begin,end]; default true
limitBeginAndEnd?:boolean

// Render
dateRender?: DateRender<DateType>;
Expand Down
12 changes: 10 additions & 2 deletions src/RangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
open,
defaultOpen,
disabledDate,
limitBeginAndEnd=true,
disabledTime,
dateRender,
panelRender,
Expand Down Expand Up @@ -329,8 +330,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
disabledDate,
generateConfig,
},
openRecordsRef.current[1],
openRecordsRef.current[0],
limitBeginAndEnd&&openRecordsRef.current[1],
limitBeginAndEnd&&openRecordsRef.current[0],
);

// ============================= Open ==============================
Expand Down Expand Up @@ -405,6 +406,13 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
let values = newValue;
let startValue = getValue(values, 0);
let endValue = getValue(values, 1);

// change startValue and endValue ,if start > end
if(startValue && endValue &&!generateConfig.isAfter(endValue,startValue,)){
const tmp=endValue
endValue=startValue
startValue=tmp
}

// >>>>> Format start & end values
if (startValue && endValue && generateConfig.isAfter(startValue, endValue)) {
Expand Down