fix(datepicker): no input focus after close

packages/dev-app/system-config.ts

@@ -10,7 +10,7 @@ System.config({
         'main': 'main.js',
         'tslib': 'node:tslib/tslib.js',
         'moment': 'node:moment/min/moment-with-locales.min.js',
-        'messageformat': 'node:messageformat/messageformat.min.js',
+        'messageformat': 'node:messageformat/messageformat.js',
 
         'rxjs': 'node_modules/rxjs/bundles/rxjs.umd.min.js',
         'rxjs/operators': 'system-rxjs-operators.js',

packages/mosaic/datepicker/datepicker.spec.ts

@@ -95,6 +95,18 @@ describe('McDatepicker', () => {
                 flush();
             }));
 
+            it('should focus input after close', fakeAsync(() => {
+                testComponent.datepicker.open();
+                fixture.detectChanges();
+
+                testComponent.datepicker.close();
+                fixture.detectChanges();
+
+                flush();
+
+                expect(document.activeElement).toBe(testComponent.datepicker.datepickerInput.elementRef.nativeElement);
+            }));
+
             it('open non-touch should open popup', () => {
                 expect(document.querySelector('.cdk-overlay-pane.mc-datepicker__popup')).toBeNull();
 
@@ -1228,12 +1240,6 @@ describe('McDatepicker', () => {
             }));
 
             it('should not reopen if the browser fires the focus event asynchronously', fakeAsync(() => {
-                // Stub out the real focus method so we can call it reliably.
-                spyOn(input, 'focus').and.callFake(() => {
-                    // Dispatch the event handler async to simulate the IE11 behavior.
-                    Promise.resolve().then(() => dispatchFakeEvent(input, 'focus'));
-                });
-
                 // Open initially by focusing.
                 input.focus();
                 fixture.detectChanges();

packages/mosaic/datepicker/datepicker.ts

@@ -383,6 +383,8 @@ export class McDatepicker<D> implements OnDestroy, CanColor {
                 this._opened = false;
                 this.closedStream.emit();
                 this.focusedElementBeforeOpen = null;
+
+                this.datepickerInput.elementRef.nativeElement.focus();
             }
         };
 

tests/karma-system-config.js

@@ -8,7 +8,7 @@ System.config({
         'rxjs': 'node:rxjs',
         'tslib': 'node:tslib/tslib.js',
         'moment': 'node:moment/min/moment-with-locales.min.js',
-        'messageformat': 'node:messageformat/messageformat.min.js',
+        'messageformat': 'node:messageformat/messageformat.js',
 
         // Angular specific mappings.
         '@angular/core': 'node:@angular/core/bundles/core.umd.js',

tests/karma.conf.js

@@ -25,7 +25,7 @@ module.exports = (config) => {
             {pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: false},
             {pattern: 'node_modules/zone.js/dist/fake-async-test.js', included: true, watched: false},
             {pattern: 'node_modules/moment/min/moment-with-locales.min.js', included: false, watched: false},
-            {pattern: 'node_modules/messageformat/messageformat.min.js', included: false, watched: false},
+            {pattern: 'node_modules/messageformat/messageformat.js', included: false, watched: false},
 
             // Include all Angular dependencies
             {pattern: 'node_modules/@angular/**/*', included: false, watched: false},