From 1accd24342cebacc29263df699e9c7af5bd471a3 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 11 Dec 2018 09:43:51 -0800 Subject: [PATCH 1/7] Revert "Revert "fix(radio): host element unable to receive focus events" (#14468)" This reverts commit 4aa47c72aef256da625a831e1ceef61b820670a6. From ce9df7bcc3bc51c8f5bcccb0b7229dc605610f39 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 11 Dec 2018 09:43:51 -0800 Subject: [PATCH 2/7] Revert "Revert "fix(a11y): activeItem out of date if active index is removed from ListKeyManager" (#14467)" This reverts commit 8f790f52c713d1b0ae6e4a711b1600f27039361b. From ab58d0b7f42805c7d20cfbfb65ae4ff0c2263ae3 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 11 Dec 2018 09:43:51 -0800 Subject: [PATCH 3/7] Revert "build: update sauce connect (#14422)" This reverts commit bc563b713adb8bc704b5822b872755a29246b4c1. From 2e34f86e1fe392be4cb8b8c91261119bf18b5a34 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 11 Dec 2018 09:43:51 -0800 Subject: [PATCH 4/7] Revert "build: changelog script not filtering duplicate entries (#14421)" This reverts commit fe4629024ffb5034df8cc931f7119a22497241eb. From cc79994f8d1fe620165322543856cf32a236b964 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 11 Dec 2018 09:43:51 -0800 Subject: [PATCH 5/7] Revert "build: update to angular 7.1.2 (#14418)" This reverts commit e1487dfac4ec7ec0802715f16c2b866f1cf52be5. From 456cc7646f8ba32caeb26379bf64253c5f4bc1e4 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 11 Dec 2018 09:43:51 -0800 Subject: [PATCH 6/7] Revert "refactor(drag-drop): move logic out of directives (#14350)" This reverts commit 19f9bca6fb8b022f34317a1c66a451eb453cf282. From 9a5d408e82e9808e2aec5009388520bf5f450a81 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 11 Dec 2018 09:43:51 -0800 Subject: [PATCH 7/7] Revert "fix(checkbox): redirect focus to underlying input element (#13959)" This reverts commit e0eb3dfb649380e320b1e08ba6f47862b8aec7e5. --- src/lib/checkbox/checkbox.scss | 1 - src/lib/checkbox/checkbox.spec.ts | 11 +---------- src/lib/checkbox/checkbox.ts | 3 +-- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/lib/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss index a367499b6481..15e625cf80de 100644 --- a/src/lib/checkbox/checkbox.scss +++ b/src/lib/checkbox/checkbox.scss @@ -182,7 +182,6 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default; cursor: pointer; -webkit-tap-highlight-color: transparent; - outline: 0; .mat-ripple-element:not(.mat-checkbox-persistent-ripple) { opacity: 0.16; diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts index bc043d4bcea9..f5838aaf7144 100644 --- a/src/lib/checkbox/checkbox.spec.ts +++ b/src/lib/checkbox/checkbox.spec.ts @@ -370,15 +370,6 @@ describe('MatCheckbox', () => { expect(document.activeElement).toBe(inputElement); }); - it('should focus on underlying input element when the host is focused', () => { - expect(document.activeElement).not.toBe(inputElement); - - checkboxNativeElement.focus(); - fixture.detectChanges(); - - expect(document.activeElement).toBe(inputElement); - }); - it('should forward the value to input element', () => { testComponent.checkboxValue = 'basic_checkbox'; fixture.detectChanges(); @@ -799,7 +790,7 @@ describe('MatCheckbox', () => { fixture.detectChanges(); const checkbox = fixture.debugElement.query(By.directive(MatCheckbox)).nativeElement; - expect(checkbox.getAttribute('tabindex')).toBe('-1'); + expect(checkbox.getAttribute('tabindex')).toBeFalsy(); }); }); diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts index 67f8a0687340..c30bc5a6ab79 100644 --- a/src/lib/checkbox/checkbox.ts +++ b/src/lib/checkbox/checkbox.ts @@ -119,13 +119,12 @@ export const _MatCheckboxMixinBase: host: { 'class': 'mat-checkbox', '[id]': 'id', - '[attr.tabindex]': '-1', // Reset back to -1 so that the `focus` event still works. + '[attr.tabindex]': 'null', '[class.mat-checkbox-indeterminate]': 'indeterminate', '[class.mat-checkbox-checked]': 'checked', '[class.mat-checkbox-disabled]': 'disabled', '[class.mat-checkbox-label-before]': 'labelPosition == "before"', '[class._mat-animation-noopable]': `_animationMode === 'NoopAnimations'`, - '(focus)': '_inputElement.nativeElement.focus()', }, providers: [MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR], inputs: ['disableRipple', 'color', 'tabIndex'],