From fa54ed4ad31b5fa8faf8f9dcd11e23b8cb17d8b5 Mon Sep 17 00:00:00 2001
From: Alfie Johnson <alfiej@gmail.com>
Date: Fri, 20 Jul 2018 18:59:15 -0600
Subject: [PATCH] I believe IDatepickerPopupConfig has everything in
 IDatepickerConfig, plus additional things, so it should extend
 IDatepickerConfig. (#27452)

---
 .../angular-ui-bootstrap-tests.ts             | 22 +++++++++++++++++++
 types/angular-ui-bootstrap/index.d.ts         |  6 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts b/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
index 9dbbf8e002..f21ee43ab3 100644
--- a/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
+++ b/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
@@ -57,6 +57,28 @@ testApp.config((
     /**
      * $datepickerPopupConfig tests
      */
+    $datepickerPopupConfig.datepickerMode = 'month';
+    $datepickerPopupConfig.formatDay = 'd';
+    $datepickerPopupConfig.formatDayHeader = 'E';
+    $datepickerPopupConfig.formatDayTitle = 'dd-MM-yyyy';
+    $datepickerPopupConfig.formatMonth = 'M';
+    $datepickerPopupConfig.formatMonthTitle = 'yy';
+    $datepickerPopupConfig.formatYear = 'y';
+    $datepickerPopupConfig.initDate = '1389586124979';
+    $datepickerPopupConfig.maxDate = '1389586124979';
+    $datepickerPopupConfig.maxMode = 'month';
+    $datepickerPopupConfig.minDate = '1389586124979';
+    $datepickerPopupConfig.minMode = 'month';
+    $datepickerPopupConfig.shortcutPropagation = true;
+    $datepickerPopupConfig.showWeeks = false;
+    $datepickerPopupConfig.startingDay = 1;
+    $datepickerPopupConfig.yearRange = 10;
+    $datepickerPopupConfig.monthColumns = 3;
+    $datepickerPopupConfig.yearColumns = 9;
+    $datepickerPopupConfig.yearRows = 6;
+    $datepickerPopupConfig.ngModelOptions.allowInvalid = false;
+    $datepickerPopupConfig.ngModelOptions.timezone = "EST";
+    $datepickerPopupConfig.ngModelOptions.updateOn = "click";
     $datepickerPopupConfig.altInputFormats = ["mm/dd/YYYY", "mm-dd-YY"];
     $datepickerPopupConfig.appendToBody = true;
     $datepickerPopupConfig.currentText = 'Select Today';
diff --git a/types/angular-ui-bootstrap/index.d.ts b/types/angular-ui-bootstrap/index.d.ts
index 0c41fcc15c..db08aae252 100644
--- a/types/angular-ui-bootstrap/index.d.ts
+++ b/types/angular-ui-bootstrap/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for Angular UI Bootstrap 0.13.3
 // Project: https://github.com/angular-ui/bootstrap
-// Definitions by: Brian Surowiec <https://github.com/xt0rted>, Ryan Southgate <https://github.com/ry8806>
+// Definitions by:  Brian Surowiec <https://github.com/xt0rted>,
+//                  Ryan Southgate <https://github.com/ry8806>
+//                  Alfie Johnson <https://github.com/alfiej>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -227,7 +229,7 @@ declare module 'angular' {
             customClass?: DatepickerCallback<string>;
         }
 
-        interface IDatepickerPopupConfig {
+        interface IDatepickerPopupConfig extends IDatepickerConfig {
 
             /**
              * A list of alternate formats acceptable for manual entry.