feat(datepicker): use init value for the first initialization (#2897)

* Add-Init-Config for DateRangePicker for the first initialization of the international date display. * feat(datepicker): add setConfig in OnInit
valor-software · Nov 22, 2017 · 7ec97f8 · 7ec97f8
1 parent 0d72cd6
commit 7ec97f8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 18 deletions.
diff --git a/src/datepicker/bs-datepicker.component.ts b/src/datepicker/bs-datepicker.component.ts
@@ -120,6 +120,7 @@ export class BsDatepickerComponent implements OnInit, OnDestroy, OnChanges {
       triggers: this.triggers,
       show: () => this.show()
     });
+    this.setConfig();
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -149,12 +150,7 @@ export class BsDatepickerComponent implements OnInit, OnDestroy, OnChanges {
       return;
     }
 
-    this._config = Object.assign({}, this._config, this.bsConfig, {
-      value: this._bsValue,
-      isDisabled: this.isDisabled,
-      minDate: this.minDate || this._config.minDate,
-      maxDate: this.maxDate || this._config.maxDate
-    });
+    this.setConfig();
 
     this._datepickerRef = this._datepicker
       .provide({provide: BsDatepickerConfig, useValue: this._config})
@@ -204,6 +200,18 @@ export class BsDatepickerComponent implements OnInit, OnDestroy, OnChanges {
     this.show();
   }
 
+  /**
+   * Set config for datepicker
+   */
+  setConfig(): void {
+    this._config = Object.assign({}, this._config, this.bsConfig, {
+      value: this._bsValue,
+      isDisabled: this.isDisabled,
+      minDate: this.minDate || this._config.minDate,
+      maxDate: this.maxDate || this._config.maxDate
+    });
+  }
+
   ngOnDestroy(): any {
     this._datepicker.dispose();
   }

diff --git a/src/datepicker/bs-daterangepicker.component.ts b/src/datepicker/bs-daterangepicker.component.ts
@@ -119,6 +119,7 @@ export class BsDaterangepickerComponent
       triggers: this.triggers,
       show: () => this.show()
     });
+    this.setConfig();
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -148,18 +149,7 @@ export class BsDaterangepickerComponent
       return;
     }
 
-    this._config = Object.assign(
-      {},
-      this._config,
-      {displayMonths: 2},
-      this.bsConfig,
-      {
-        value: this._bsValue,
-        isDisabled: this.isDisabled,
-        minDate: this.minDate || this._config.minDate,
-        maxDate: this.maxDate || this._config.maxDate
-      }
-    );
+    this.setConfig();
 
     this._datepickerRef = this._datepicker
       .provide({provide: BsDatepickerConfig, useValue: this._config})
@@ -186,6 +176,24 @@ export class BsDaterangepickerComponent
     );
   }
 
+  /**
+   * Set config for daterangepicker
+   */
+  setConfig() {
+    this._config = Object.assign(
+      {},
+      this._config,
+      {displayMonths: 2},
+      this.bsConfig,
+      {
+        value: this._bsValue,
+        isDisabled: this.isDisabled,
+        minDate: this.minDate || this._config.minDate,
+        maxDate: this.maxDate || this._config.maxDate
+      }
+    );
+  }
+
   /**
    * Closes an element’s datepicker. This is considered a “manual” triggering of
    * the datepicker.