Skip to content
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

Jump to bottom

fix(module:date-picker): click date cell not work when changing month or year #4876

Merged
merged 2 commits into from
Apr 2, 2020
Merged

fix(module:date-picker): click date cell not work when changing month or year #4876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4efc7a0
fix(module:date-picker): click date not work when changing month
wenqi73 Apr 1, 2020
52aa224
chore: change name
wenqi73 Apr 2, 2020
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
1 change: 0 additions & 1 deletion components/date-picker/calendar-footer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ export class CalendarFooterComponent implements OnChanges {
@Input() hasTimePicker: boolean = false;
@Input() isRange: boolean = false;

@Input() timePickerDisabled: boolean = false;
@Input() okDisabled: boolean = false;
@Input() disabledDate: (d: Date) => boolean;
@Input() extraFooter: TemplateRef<void> | string;
Expand Down
1 change: 0 additions & 1 deletion components/date-picker/date-picker.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
[open]="nzOpen"
[separator]="nzSeparator"
[disabled]="nzDisabled"
[disabledDate]="nzDisabledDate"
[format]="nzFormat"
[allowClear]="nzAllowClear"
[autoFocus]="nzAutoFocus"
Expand Down
78 changes: 56 additions & 22 deletions components/date-picker/date-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,29 @@ describe('NzDatePickerComponent', () => {
describe('panel switch and move forward/afterward', () => {
beforeEach(() => (fixtureInstance.useSuite = 1));

it('should support date panel changes on click month', fakeAsync(() => {
fixtureInstance.nzValue = new Date('2018-11-11');
fixture.detectChanges();
flush();
fixture.detectChanges();
openPickerByClickTrigger();
// Click month
dispatchMouseEvent(queryFromOverlay('.ant-picker-header-month-btn'), 'click');
fixture.detectChanges();
tick(500);
fixture.detectChanges();
dispatchMouseEvent(getFirstCell(), 'click');
fixture.detectChanges();
tick(500);
fixture.detectChanges();
// click 2018-01-01
dispatchMouseEvent(getFirstCell(), 'click');
fixture.detectChanges();
tick(500);
fixture.detectChanges();
expect(getPickerInput(fixture.debugElement).value).toBe('2018-01-01');
}));

it('should support date panel changes', fakeAsync(() => {
fixtureInstance.nzValue = new Date('2018-11-11');
fixture.detectChanges();
Expand Down Expand Up @@ -585,10 +608,10 @@ describe('NzDatePickerComponent', () => {

it('should support nzShowTime', fakeAsync(() => {
fixtureInstance.nzValue = new Date('2018-11-11 11:22:33');
fixtureInstance.nzShowTime = true;
// tslint:disable-next-line:no-any
fixtureInstance.nzShowTime = '' as any;
fixture.detectChanges();
openPickerByClickTrigger();
// Why need one more detectChange ?
flush();
fixture.detectChanges();
expect(queryFromOverlay('.ant-picker-ok')).toBeDefined();
Expand Down Expand Up @@ -627,10 +650,10 @@ describe('NzDatePickerComponent', () => {
fixtureInstance.nzValue = new Date('2019-08-02 13:03:33');
fixtureInstance.nzShowTime = true;
fixture.detectChanges();
flush();
fixture.detectChanges();
openPickerByClickTrigger();

dispatchMouseEvent(getFirstCell(), 'click');

fixture.detectChanges();
flush();
fixture.detectChanges();
Expand Down Expand Up @@ -678,6 +701,35 @@ describe('NzDatePickerComponent', () => {
expect(+queryFromOverlay('.ant-picker-time-panel-column:nth-child(3) li:first-child').textContent!.trim()).toBe(1);
}));

it('should nzDisabledTime invalid input not emit', fakeAsync(() => {
fixtureInstance.nzShowTime = true;
fixtureInstance.nzDisabledTime = () => {
return {
nzDisabledHours: () => [0, 1, 2],
nzDisabledMinutes: () => [0, 1],
nzDisabledSeconds: () => [0]
};
};
fixture.detectChanges();
openPickerByClickTrigger();

// input disabled value
const input = getPickerInput(fixture.debugElement);
typeInElement('2020-03-14 00:00:00', input);
fixture.detectChanges();
input.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
fixture.detectChanges();
tick(500);
fixture.detectChanges();
expect(getPickerContainer()).not.toBeNull();

dispatchMouseEvent(queryFromOverlay('.cdk-overlay-backdrop'), 'click');
fixture.detectChanges();
tick(500);
fixture.detectChanges();
expect(getPickerInput(fixture.debugElement).value).toBe('');
}));

it('should support nzRenderExtraFooter', fakeAsync(() => {
fixtureInstance.nzRenderExtraFooter = () => fixtureInstance.tplExtraFooter;
fixture.detectChanges();
Expand Down Expand Up @@ -807,24 +859,6 @@ describe('NzDatePickerComponent', () => {
}));
});

// describe('AbstractPicker', () => {
// beforeEach(() => {
// const fakeCdr = { markForCheck: () => void 0 };
// componentInstance = new (AbstractPickerComponent as any)(i18n, fakeCdr); // tslint:disable-line:no-any
// });
//
// it('should cover untouched branches', () => {
// // onOpenChange
// const emit = spyOn(componentInstance.nzOnOpenChange, 'emit');
// componentInstance.onOpenChange(true);
// expect(emit).toHaveBeenCalled();
//
// // setDisabledState
// componentInstance.setDisabledState(true);
// expect(componentInstance.nzDisabled).toBeTruthy();
// });
// }); // /AbstractPicker

////////////

function getPickerContainer(): HTMLElement {
Expand Down
13 changes: 10 additions & 3 deletions components/date-picker/date-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { warnDeprecation } from 'ng-zorro-antd/core/logger';
import { NzNoAnimationDirective } from 'ng-zorro-antd/core/no-animation';
import { CandyDate, cloneDate, CompatibleValue } from 'ng-zorro-antd/core/time';
import { FunctionProp, OnChangeType, OnTouchedType } from 'ng-zorro-antd/core/types';
import { InputBoolean, valueFunctionProp } from 'ng-zorro-antd/core/util';
import { InputBoolean, toBoolean, valueFunctionProp } from 'ng-zorro-antd/core/util';
import { DateHelperService, NzDatePickerI18nInterface, NzI18nService } from 'ng-zorro-antd/i18n';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
Expand Down Expand Up @@ -70,6 +70,7 @@ export class NzDatePickerComponent implements OnInit, OnChanges, OnDestroy, Cont

protected destroyed$: Subject<void> = new Subject();
protected isCustomPlaceHolder: boolean = false;
private showTime: SupportTimeOptions | boolean;

// --- Common API
@Input() @InputBoolean() nzAllowClear: boolean = true;
Expand Down Expand Up @@ -98,7 +99,6 @@ export class NzDatePickerComponent implements OnInit, OnChanges, OnDestroy, Cont
@Input() nzMode: PanelMode | PanelMode[] = 'date';
@Input() nzRanges: PresetRanges;
@Input() nzDefaultPickerValue: CompatibleDate | null = null;
@Input() nzShowTime: SupportTimeOptions | boolean = false;
@Input() nzSeparator: string = '~';

@Output() readonly nzOnPanelChange = new EventEmitter<PanelMode | PanelMode[]>();
Expand All @@ -108,6 +108,14 @@ export class NzDatePickerComponent implements OnInit, OnChanges, OnDestroy, Cont

@ViewChild(NzPickerComponent, { static: true }) protected picker: NzPickerComponent;

@Input() get nzShowTime(): SupportTimeOptions | boolean {
return this.showTime;
}

set nzShowTime(value: SupportTimeOptions | boolean) {
this.showTime = typeof value === 'object' ? value : toBoolean(value);
}

get realOpenState(): boolean {
return this.picker.animationOpenState;
} // Use picker's real open state to let re-render the picker's content when shown up
Expand Down Expand Up @@ -143,7 +151,6 @@ export class NzDatePickerComponent implements OnInit, OnChanges, OnDestroy, Cont
this.datePickerService.emitValue$.pipe(takeUntil(this.destroyed$)).subscribe(_ => {
const value = this.datePickerService.value;
this.datePickerService.initialValue = cloneDate(value);
// this.datePickerService.activeDate = cloneDate(value);
if (this.isRange) {
const vAsRange = value as CandyDate[];
if (vAsRange.length) {
Expand Down
2 changes: 1 addition & 1 deletion components/date-picker/date-picker.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class DatePickerService {
}
}

makeValue(value: CompatibleDate): CompatibleValue {
makeValue(value: CompatibleDate | null): CompatibleValue {
if (this.isRange) {
return value ? (value as Date[]).map(val => new CandyDate(val)) : [];
} else {
Expand Down
Loading