fix(module:date-picker): get input width before panel open (#5357)

NG-ZORRO · Jun 5, 2020 · 39a6c28 · 39a6c28
1 parent 896f283
commit 39a6c28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/components/date-picker/picker.component.ts b/components/date-picker/picker.component.ts
@@ -252,7 +252,6 @@ export class NzPickerComponent implements OnInit, AfterViewInit, OnChanges, OnDe
     }
 
     if (this.isRange) {
-      this.resetInputWidthAndArrowLeft();
       fromEvent(window, 'resize')
         .pipe(takeUntil(this.destroy$))
         .subscribe(() => {
@@ -291,7 +290,7 @@ export class NzPickerComponent implements OnInit, AfterViewInit, OnChanges, OnDe
   }
 
   resetInputWidthAndArrowLeft(): void {
-    this.inputWidth = this.rangePickerInputs?.first.nativeElement.offsetWidth || 0;
+    this.inputWidth = this.rangePickerInputs?.first?.nativeElement.offsetWidth || 0;
     this.arrowLeft = this.inputWidth + this.separatorElement?.nativeElement.offsetWidth || 0;
   }
 
@@ -321,6 +320,7 @@ export class NzPickerComponent implements OnInit, AfterViewInit, OnChanges, OnDe
   // Show overlay content
   showOverlay(): void {
     if (!this.realOpenState) {
+      this.resetInputWidthAndArrowLeft();
       this.overlayOpen = true;
       this.animationStart();
       this.focus();

diff --git a/components/date-picker/range-picker.component.spec.ts b/components/date-picker/range-picker.component.spec.ts
@@ -938,7 +938,7 @@ class NzTestRangePickerComponent {
   nzSize!: string;
   nzStyle!: NgStyleInterface;
   nzOnOpenChange(): void {}
-  modelValue!: Array<Date | null>;
+  modelValue: Array<Date | null> = [];
   modelValueChange(): void {}
   nzDefaultPickerValue!: Array<Date | null>;
   nzSeparator!: string;