From fa1648be7a91b35b49de725e2d70119a7ebd0593 Mon Sep 17 00:00:00 2001
From: Giorgos Polychronis <giorgos.polic@gmail.com>
Date: Fri, 13 Mar 2020 10:26:14 +0100
Subject: [PATCH] fix(tooltip): tooltip does not appear when ... (ios) #3630

---
 src/tooltip/tooltip-config.spec.ts |  2 +-
 src/tooltip/tooltip-config.ts      |  2 +-
 src/util/autoclose.ts              | 18 ++----------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/tooltip/tooltip-config.spec.ts b/src/tooltip/tooltip-config.spec.ts
index 08f6c3e75a..0cd2c2dfb4 100644
--- a/src/tooltip/tooltip-config.spec.ts
+++ b/src/tooltip/tooltip-config.spec.ts
@@ -6,7 +6,7 @@ describe('ngb-tooltip-config', () => {
 
     expect(config.autoClose).toBe(true);
     expect(config.placement).toBe('auto');
-    expect(config.triggers).toBe('hover focus');
+    expect(config.triggers).toBe('hover focus pointerdown:dummy');
     expect(config.container).toBeUndefined();
     expect(config.disableTooltip).toBe(false);
     expect(config.tooltipClass).toBeUndefined();
diff --git a/src/tooltip/tooltip-config.ts b/src/tooltip/tooltip-config.ts
index 400e2ed892..3e54bbf8f6 100644
--- a/src/tooltip/tooltip-config.ts
+++ b/src/tooltip/tooltip-config.ts
@@ -11,7 +11,7 @@ import {PlacementArray} from '../util/positioning';
 export class NgbTooltipConfig {
   autoClose: boolean | 'inside' | 'outside' = true;
   placement: PlacementArray = 'auto';
-  triggers = 'hover focus';
+  triggers = 'hover focus pointerdown:dummy';
   container: string;
   disableTooltip = false;
   tooltipClass: string;
diff --git a/src/util/autoclose.ts b/src/util/autoclose.ts
index be766bd372..06e17e9d56 100644
--- a/src/util/autoclose.ts
+++ b/src/util/autoclose.ts
@@ -10,26 +10,12 @@ const isContainedIn = (element: HTMLElement, array?: HTMLElement[]) =>
 const matchesSelectorIfAny = (element: HTMLElement, selector?: string) =>
     !selector || closest(element, selector) != null;
 
-// we have to add a more significant delay to avoid re-opening when handling (click) on a toggling element
-// TODO: use proper Angular platform detection when NgbAutoClose becomes a service and we can inject PLATFORM_ID
-const isMobile = (() => {
-  const isIOS = () => /iPad|iPhone|iPod/.test(navigator.userAgent) ||
-      (/Macintosh/.test(navigator.userAgent) && navigator.maxTouchPoints && navigator.maxTouchPoints > 2);
-  const isAndroid = () => /Android/.test(navigator.userAgent);
-
-  return typeof navigator !== 'undefined' ? !!navigator.userAgent && (isIOS() || isAndroid()) : false;
-})();
-
-// setting 'ngbAutoClose' synchronously on mobile results in immediate popup closing
-// when tapping on the triggering element
-const wrapAsyncForMobile = fn => isMobile ? () => setTimeout(() => fn(), 100) : fn;
-
 export function ngbAutoClose(
     zone: NgZone, document: any, type: boolean | 'inside' | 'outside', close: () => void, closed$: Observable<any>,
     insideElements: HTMLElement[], ignoreElements?: HTMLElement[], insideSelector?: string) {
   // closing on ESC and outside clicks
   if (type) {
-    zone.runOutsideAngular(wrapAsyncForMobile(() => {
+    zone.runOutsideAngular(() => {
 
       const shouldCloseOnClick = (event: MouseEvent) => {
         const element = event.target as HTMLElement;
@@ -64,6 +50,6 @@ export function ngbAutoClose(
 
 
       race<Event>([escapes$, closeableClicks$]).subscribe(() => zone.run(close));
-    }));
+    });
   }
 }