Skip to content

fix(tooltip): opening after click on android #12250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2018
Merged

fix(tooltip): opening after click on android #12250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions src/lib/tooltip/tooltip.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {Direction, Directionality} from '@angular/cdk/bidi';
import {OverlayContainer, OverlayModule, CdkScrollable} from '@angular/cdk/overlay';
import {Platform} from '@angular/cdk/platform';
import {dispatchFakeEvent, dispatchKeyboardEvent, patchElementFocus} from '@angular/cdk/testing';
import {
dispatchFakeEvent,
dispatchKeyboardEvent,
patchElementFocus,
dispatchMouseEvent,
} from '@angular/cdk/testing';
import {ESCAPE} from '@angular/cdk/keycodes';
import {FocusMonitor} from '@angular/cdk/a11y';
import {
Expand All @@ -40,12 +45,12 @@ describe('MatTooltip', () => {
let overlayContainer: OverlayContainer;
let overlayContainerElement: HTMLElement;
let dir: {value: Direction};
let platform: {IOS: boolean, isBrowser: boolean};
let platform: {IOS: boolean, isBrowser: boolean, ANDROID: boolean};
let focusMonitor: FocusMonitor;

beforeEach(async(() => {
// Set the default Platform override that can be updated before component creation.
platform = {IOS: false, isBrowser: true};
platform = {IOS: false, isBrowser: true, ANDROID: false};

TestBed.configureTestingModule({
imports: [MatTooltipModule, OverlayModule, NoopAnimationsModule],
Expand Down Expand Up @@ -805,6 +810,30 @@ describe('MatTooltip', () => {
expect(fixture.componentInstance.button.nativeElement.style.webkitUserDrag).toBeFalsy();
});

it('should not open on `mouseenter` on iOS', () => {
platform.IOS = true;

const fixture = TestBed.createComponent(BasicTooltipDemo);

fixture.detectChanges();
dispatchMouseEvent(fixture.componentInstance.button.nativeElement, 'mouseenter');
fixture.detectChanges();

assertTooltipInstance(fixture.componentInstance.tooltip, false);
});

it('should not open on `mouseenter` on Android', () => {
platform.ANDROID = true;

const fixture = TestBed.createComponent(BasicTooltipDemo);

fixture.detectChanges();
dispatchMouseEvent(fixture.componentInstance.button.nativeElement, 'mouseenter');
fixture.detectChanges();

assertTooltipInstance(fixture.componentInstance.tooltip, false);
});

});

});
Expand Down
17 changes: 8 additions & 9 deletions src/lib/tooltip/tooltip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export class MatTooltip implements OnDestroy {
}
}

private _manualListeners = new Map<string, Function>();
private _manualListeners = new Map<string, EventListenerOrEventListenerObject>();

/** Emits when the component is destroyed. */
private readonly _destroyed = new Subject<void>();
Expand All @@ -206,15 +206,14 @@ export class MatTooltip implements OnDestroy {

const element: HTMLElement = _elementRef.nativeElement;

// The mouse events shouldn't be bound on iOS devices, because
// they can prevent the first tap from firing its click event.
if (!_platform.IOS) {
this._manualListeners.set('mouseenter', () => this.show());
this._manualListeners.set('mouseleave', () => this.hide());

// The mouse events shouldn't be bound on mobile devices, because they can prevent the
// first tap from firing its click event or can cause the tooltip to open for clicks.
if (!_platform.IOS && !_platform.ANDROID) {
this._manualListeners
.forEach((listener, event) => _elementRef.nativeElement.addEventListener(event, listener));
} else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
.set('mouseenter', () => this.show())
.set('mouseleave', () => this.hide())
.forEach((listener, event) => element.addEventListener(event, listener));
} else if (_platform.IOS && (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA')) {
// When we bind a gesture event on an element (in this case `longpress`), HammerJS
// will add some inline styles by default, including `user-select: none`. This is
// problematic on iOS, because it will prevent users from typing in inputs. If
Expand Down