From a2d06a9efeecc4fbd8f900560eb638863002bb86 Mon Sep 17 00:00:00 2001
From: Martin Guillon <martin.guillon@akylas.fr>
Date: Thu, 18 Mar 2021 14:00:36 +0100
Subject: [PATCH] fix(button): ios let the gesture observer handles tap events

in some weird cases like i some UICollectionView layouts the UIControlEvents.TouchUpInside is failing
---
 apps/automated/src/pages/page11.ts            |  2 +-
 apps/automated/src/pages/page7.ts             |  2 +-
 apps/automated/src/pages/page8.ts             |  4 +-
 apps/automated/src/pages/property-bindings.ts |  2 +-
 .../bottom-navigation-navigation-tests.ts     |  4 +-
 apps/automated/src/ui/button/button-tests.ts  |  3 +-
 .../src/ui/root-view/mymodule/MyControl.ts    |  2 +-
 .../ui/tab-view/tab-view-navigation-tests.ts  |  4 +-
 .../src/xml-declaration/mymodule/MyControl.ts |  3 +-
 apps/ui/src/bindings/basics-page.ts           |  6 +-
 apps/ui/src/bindings/xmlbasics-page.ts        |  2 +-
 apps/ui/src/events/i73-page.ts                |  2 +-
 apps/ui/src/test-page-main-view-model.ts      |  4 +-
 .../core/ui/action-bar/action-bar-common.ts   |  2 +
 packages/core/ui/button/button-common.ts      |  4 +-
 packages/core/ui/button/index.android.ts      |  7 ++-
 packages/core/ui/button/index.d.ts            | 10 ++--
 packages/core/ui/button/index.ios.ts          | 56 ++++++++-----------
 .../tab-strip-item/index.ts                   |  2 +
 19 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/apps/automated/src/pages/page11.ts b/apps/automated/src/pages/page11.ts
index 624b57a26..63eeb754e 100644
--- a/apps/automated/src/pages/page11.ts
+++ b/apps/automated/src/pages/page11.ts
@@ -51,7 +51,7 @@ export function createPage() {
 	//page.content = GridLayout;
 	page.content = StackLayout;
 	var x = 1;
-	btn1.on(button.Button.tapEvent, function () {
+	btn1.on(button.tapEvent, function () {
 		x++;
 		var gravity;
 		//btn1.android.setLayoutParams(new android.view.ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.FILL_PARENT));
diff --git a/apps/automated/src/pages/page7.ts b/apps/automated/src/pages/page7.ts
index 6b6a4c9d5..858a63c8b 100644
--- a/apps/automated/src/pages/page7.ts
+++ b/apps/automated/src/pages/page7.ts
@@ -13,7 +13,7 @@ export function createPage() {
 	var vAligns: VerticalAlignment[] = ['stretch', 'top', 'middle', 'bottom'];
 	//var hAligns = ["stretch", "left", "center", "right"];
 	var count = 0;
-	btn.on(buttons.Button.tapEvent, function () {
+	btn.on(buttons.tapEvent, function () {
 		//page.css = "button { vertical-align:" + vAligns[(count++) % 4] + " }";
 		btn.verticalAlignment = vAligns[count++ % 4];
 	});
diff --git a/apps/automated/src/pages/page8.ts b/apps/automated/src/pages/page8.ts
index 8d8687d82..94cce4df3 100644
--- a/apps/automated/src/pages/page8.ts
+++ b/apps/automated/src/pages/page8.ts
@@ -41,7 +41,7 @@ export function createPage() {
 	var counter = 0;
 	var btn = new btns.Button();
 	btn.text = 'tap';
-	btn.on(btns.Button.tapEvent, function () {
+	btn.on(btns.tapEvent, function () {
 		btn.text = 'hi: ' + counter++;
 	});
 	btn.isEnabled = false;
@@ -52,7 +52,7 @@ export function createPage() {
 	var info = new btns.Button();
 	info.text = 'info';
 	info.className = 'info';
-	info.on(btns.Button.tapEvent, function () {
+	info.on(btns.tapEvent, function () {
 		info.text = 'hi: ' + counter++;
 		btn.isEnabled = true;
 	});
diff --git a/apps/automated/src/pages/property-bindings.ts b/apps/automated/src/pages/property-bindings.ts
index 12a9ec9fc..e57e6defc 100644
--- a/apps/automated/src/pages/property-bindings.ts
+++ b/apps/automated/src/pages/property-bindings.ts
@@ -41,7 +41,7 @@ export function createPage() {
 	var count = 0;
 	var control = new btns.Button();
 	control.text = 'test control';
-	control.on(btns.Button.tapEvent, (data) => {
+	control.on(btns.tapEvent, (data) => {
 		control.text = 'count: ' + count++;
 	});
 	grid.addChild(control);
diff --git a/apps/automated/src/ui/bottom-navigation/bottom-navigation-navigation-tests.ts b/apps/automated/src/ui/bottom-navigation/bottom-navigation-navigation-tests.ts
index 01789168d..3350bb038 100644
--- a/apps/automated/src/ui/bottom-navigation/bottom-navigation-navigation-tests.ts
+++ b/apps/automated/src/ui/bottom-navigation/bottom-navigation-navigation-tests.ts
@@ -6,7 +6,7 @@ import { Frame } from '@nativescript/core/ui/frame';
 import { Page } from '@nativescript/core/ui/page';
 import { ListView, ItemEventData } from '@nativescript/core/ui/list-view';
 import { BottomNavigation, TabContentItem, TabStrip, TabStripItem } from '@nativescript/core';
-import { Button } from '@nativescript/core/ui/button';
+import { Button , tapEvent} from '@nativescript/core/ui/button';
 
 var ASYNC = 2;
 
@@ -55,7 +55,7 @@ function _createListView(): ListView {
 		var button = <Button>args.view;
 		if (!button) {
 			button = new Button();
-			button.on(Button.tapEvent, _clickHandlerFactory(args.index));
+			button.on(tapEvent, _clickHandlerFactory(args.index));
 			args.view = button;
 		}
 
diff --git a/apps/automated/src/ui/button/button-tests.ts b/apps/automated/src/ui/button/button-tests.ts
index 5e6d3bab2..ff3f9461d 100644
--- a/apps/automated/src/ui/button/button-tests.ts
+++ b/apps/automated/src/ui/button/button-tests.ts
@@ -3,6 +3,7 @@ import * as helper from '../../ui-helper';
 import { View, EventData, Button, Observable, Color, Page, FormattedString } from '@nativescript/core';
 import * as buttonTestsNative from './button-tests-native';
 import * as spanModule from '@nativescript/core/text/span';
+import { tapEvent} from '@nativescript/core/ui/button';
 
 // >> button-require-others
 import { BindingOptions } from '@nativescript/core/ui/core/bindable';
@@ -100,7 +101,7 @@ var _testOnClick = function (views: Array<View>) {
 
 	var actualValue = false;
 	// >> button-tap
-	button.on(Button.tapEvent, function (args: EventData) {
+	button.on(tapEvent, function (args: EventData) {
 		// Do something
 		// >> (hide)
 		actualValue = true;
diff --git a/apps/automated/src/ui/root-view/mymodule/MyControl.ts b/apps/automated/src/ui/root-view/mymodule/MyControl.ts
index dd0382909..36df8b069 100644
--- a/apps/automated/src/ui/root-view/mymodule/MyControl.ts
+++ b/apps/automated/src/ui/root-view/mymodule/MyControl.ts
@@ -13,7 +13,7 @@ export class MyControl extends stackLayoutModule.StackLayout {
 		lbl.id = 'my-test-label';
 		var btn = new button.Button();
 		btn.text = 'Tap me!';
-		btn.on(button.Button.tapEvent, (args: EventData) => {
+		btn.on(button.tapEvent, (args: EventData) => {
 			lbl.text = 'Tap ' + counter++;
 		});
 
diff --git a/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts b/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
index 225dac289..3bbae7622 100644
--- a/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
+++ b/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
@@ -7,7 +7,7 @@ import { Frame } from '@nativescript/core/ui/frame';
 import { Page } from '@nativescript/core/ui/page';
 import { ListView, ItemEventData } from '@nativescript/core/ui/list-view';
 import { TabView, TabViewItem } from '@nativescript/core/ui/tab-view';
-import { Button } from '@nativescript/core/ui/button';
+import { Button, tapEvent} from '@nativescript/core/ui/button';
 
 var ASYNC = 2;
 
@@ -44,7 +44,7 @@ function _createListView(): ListView {
 		var button = <Button>args.view;
 		if (!button) {
 			button = new Button();
-			button.on(Button.tapEvent, _clickHandlerFactory(args.index));
+			button.on(tapEvent, _clickHandlerFactory(args.index));
 			args.view = button;
 		}
 
diff --git a/apps/automated/src/xml-declaration/mymodule/MyControl.ts b/apps/automated/src/xml-declaration/mymodule/MyControl.ts
index d74126e04..3e7d6cf05 100644
--- a/apps/automated/src/xml-declaration/mymodule/MyControl.ts
+++ b/apps/automated/src/xml-declaration/mymodule/MyControl.ts
@@ -1,4 +1,5 @@
 import { StackLayout, Label, Button, EventData } from '@nativescript/core';
+import { tapEvent } from '@nativescript/core/ui/button';
 
 export class MyControl extends StackLayout {
 	constructor() {
@@ -9,7 +10,7 @@ export class MyControl extends StackLayout {
 		var lbl = new Label();
 		var btn = new Button();
 		btn.text = 'Tap me!';
-		btn.on(Button.tapEvent, (args: EventData) => {
+		btn.on(tapEvent, (args: EventData) => {
 			lbl.text = 'Tap ' + counter++;
 		});
 
diff --git a/apps/ui/src/bindings/basics-page.ts b/apps/ui/src/bindings/basics-page.ts
index dff4e4497..ac19c6e89 100644
--- a/apps/ui/src/bindings/basics-page.ts
+++ b/apps/ui/src/bindings/basics-page.ts
@@ -28,7 +28,7 @@ export function createPage() {
 	//buttonTwoWay.automationText = "buttonTwoWay";
 
 	buttonSetText.text = 'SetText';
-	buttonSetText.on(buttonModule.Button.tapEvent, function () {
+	buttonSetText.on(buttonModule.tapEvent, function () {
 		targetOneWay.text = 'Test';
 		targetTwoWay.text = 'Test';
 	});
@@ -47,7 +47,7 @@ export function createPage() {
 	buttonOneWay.on(buttonModule.Button.loadedEvent, function () {
 		buttonOneWay.text = sourceOneWay.get('textSource');
 	});
-	buttonOneWay.on(buttonModule.Button.tapEvent, function () {
+	buttonOneWay.on(buttonModule.tapEvent, function () {
 		buttonOneWay.text = sourceOneWay.get('textSource');
 	});
 
@@ -67,7 +67,7 @@ export function createPage() {
 	buttonTwoWay.on(buttonModule.Button.loadedEvent, function () {
 		buttonTwoWay.text = sourceTwoWay.get('textSource');
 	});
-	buttonTwoWay.on(buttonModule.Button.tapEvent, function () {
+	buttonTwoWay.on(buttonModule.tapEvent, function () {
 		buttonTwoWay.text = sourceTwoWay.get('textSource');
 	});
 
diff --git a/apps/ui/src/bindings/xmlbasics-page.ts b/apps/ui/src/bindings/xmlbasics-page.ts
index c6952afba..00199b90d 100644
--- a/apps/ui/src/bindings/xmlbasics-page.ts
+++ b/apps/ui/src/bindings/xmlbasics-page.ts
@@ -16,7 +16,7 @@ export function stack0Loaded(args: observable.EventData) {
 	target.bind(bindingOptions, source);
 	source.set('textSource', 'Text');
 
-	button.on(buttonModule.Button.tapEvent, function () {
+	button.on(buttonModule.tapEvent, function () {
 		button.text = source.get('textSource');
 	});
 }
diff --git a/apps/ui/src/events/i73-page.ts b/apps/ui/src/events/i73-page.ts
index f9f31560a..d19c865ab 100644
--- a/apps/ui/src/events/i73-page.ts
+++ b/apps/ui/src/events/i73-page.ts
@@ -7,7 +7,7 @@ export function createPage() {
 
 	var btn = new button.Button();
 	btn.text = 'Alert';
-	btn.on(button.Button.tapEvent, function () {
+	btn.on(button.tapEvent, function () {
 		alert('Alert is global');
 	});
 
diff --git a/apps/ui/src/test-page-main-view-model.ts b/apps/ui/src/test-page-main-view-model.ts
index 7c59d7a4a..ec552962b 100644
--- a/apps/ui/src/test-page-main-view-model.ts
+++ b/apps/ui/src/test-page-main-view-model.ts
@@ -1,5 +1,5 @@
 import { Observable } from '@nativescript/core/data/observable';
-import { Button } from '@nativescript/core/ui/button';
+import { Button, tapEvent } from '@nativescript/core/ui/button';
 import { Color } from '@nativescript/core/color';
 import { WrapLayout } from '@nativescript/core/ui/layouts/wrap-layout';
 import { alert } from '@nativescript/core/ui/dialogs';
@@ -65,7 +65,7 @@ export class TestPageMainViewModel extends Observable {
 			btn.style.backgroundColor = new Color(this._colors[count++ % 3]);
 			btn.style.borderRadius = 5;
 			btn.on(
-				Button.tapEvent,
+				tapEvent,
 				function (eventData) {
 					let text = btn.text;
 					this.loadExample(text);
diff --git a/packages/core/ui/action-bar/action-bar-common.ts b/packages/core/ui/action-bar/action-bar-common.ts
index 84fb55753..c82000e2f 100644
--- a/packages/core/ui/action-bar/action-bar-common.ts
+++ b/packages/core/ui/action-bar/action-bar-common.ts
@@ -259,6 +259,8 @@ export class ActionItems implements ActionItemsDefinition {
 }
 
 export class ActionItemBase extends ViewBase implements ActionItemDefinition {
+	// defining this here means tap event wont be handled
+	// by the gesture observers
 	public static tapEvent = 'tap';
 
 	private _actionBar: ActionBarDefinition;
diff --git a/packages/core/ui/button/button-common.ts b/packages/core/ui/button/button-common.ts
index 7c59348ff..a09ffba93 100644
--- a/packages/core/ui/button/button-common.ts
+++ b/packages/core/ui/button/button-common.ts
@@ -3,9 +3,11 @@ import { TextBase } from '../text-base';
 import { CSSType } from '../core/view';
 import { booleanConverter } from '../core/view-base';
 
+
+export const tapEvent = 'tap';
+
 @CSSType('Button')
 export abstract class ButtonBase extends TextBase implements ButtonDefinition {
-	public static tapEvent = 'tap';
 
 	get textWrap(): boolean {
 		return this.style.whiteSpace === 'normal';
diff --git a/packages/core/ui/button/index.android.ts b/packages/core/ui/button/index.android.ts
index 9b9092a09..97a1cdd90 100644
--- a/packages/core/ui/button/index.android.ts
+++ b/packages/core/ui/button/index.android.ts
@@ -1,4 +1,4 @@
-import { ButtonBase } from './button-common';
+import { ButtonBase, tapEvent } from './button-common';
 import { PseudoClassHandler } from '../core/view';
 import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length, zIndexProperty, minWidthProperty, minHeightProperty } from '../styling/style-properties';
 import { textAlignmentProperty } from '../text-base';
@@ -38,7 +38,7 @@ function initializeClickListener(): void {
 		public onClick(v: android.view.View): void {
 			const owner = this.owner;
 			if (owner) {
-				owner._emit(ButtonBase.tapEvent);
+				owner._emit(tapEvent);
 			}
 		}
 	}
@@ -47,6 +47,9 @@ function initializeClickListener(): void {
 }
 
 export class Button extends ButtonBase {
+	// defining this here means tap event wont be handled
+	// by the gesture observers
+	public static tapEvent = tapEvent;
 	nativeViewProtected: android.widget.Button;
 
 	constructor() {
diff --git a/packages/core/ui/button/index.d.ts b/packages/core/ui/button/index.d.ts
index 8560e1b68..4d98be890 100644
--- a/packages/core/ui/button/index.d.ts
+++ b/packages/core/ui/button/index.d.ts
@@ -1,14 +1,16 @@
 import { TextBase } from '../text-base';
 import { EventData } from '../../data/observable';
 
+/**
+ * String value used when hooking to tap event.
+ */
+export const tapEvent: string;
+
 /**
  * Represents a standard Button widget.
  */
 export class Button extends TextBase {
-	/**
-	 * String value used when hooking to tap event.
-	 */
-	public static tapEvent: string;
+
 
 	/**
 	 * Gets the native [android widget](http://developer.android.com/reference/android/widget/Button.html) that represents the user interface for this component. Valid only when running on Android OS.
diff --git a/packages/core/ui/button/index.ios.ts b/packages/core/ui/button/index.ios.ts
index 0ffaa3485..32be9dd2a 100644
--- a/packages/core/ui/button/index.ios.ts
+++ b/packages/core/ui/button/index.ios.ts
@@ -12,6 +12,8 @@ import { layout } from '../../utils';
 export * from './button-common';
 
 export class Button extends ButtonBase {
+	// we dont defile tapEvent to let the gesture obserers handle it
+	// in some weird case with UICollectionView UIControlEvents.TouchUpInside is not working
 	public nativeViewProtected: UIButton;
 
 	private _tapHandler: NSObject;
@@ -21,18 +23,6 @@ export class Button extends ButtonBase {
 		return UIButton.buttonWithType(UIButtonType.System);
 	}
 
-	public initNativeView(): void {
-		super.initNativeView();
-		const nativeView = this.nativeViewProtected;
-		this._tapHandler = TapHandlerImpl.initWithOwner(new WeakRef(this));
-		nativeView.addTargetActionForControlEvents(this._tapHandler, 'tap', UIControlEvents.TouchUpInside);
-	}
-
-	public disposeNativeView(): void {
-		this._tapHandler = null;
-		super.disposeNativeView();
-	}
-
 	// @ts-ignore
 	get ios() {
 		return this.nativeViewProtected;
@@ -266,27 +256,27 @@ export class Button extends ButtonBase {
 	}
 }
 
-@NativeClass
-class TapHandlerImpl extends NSObject {
-	private _owner: WeakRef<Button>;
+// @NativeClass
+// class TapHandlerImpl extends NSObject {
+// 	private _owner: WeakRef<Button>;
 
-	public static initWithOwner(owner: WeakRef<Button>): TapHandlerImpl {
-		const handler = <TapHandlerImpl>TapHandlerImpl.new();
-		handler._owner = owner;
-		return handler;
-	}
+// 	public static initWithOwner(owner: WeakRef<Button>): TapHandlerImpl {
+// 		const handler = <TapHandlerImpl>TapHandlerImpl.new();
+// 		handler._owner = owner;
+// 		return handler;
+// 	}
 
-	public tap(args) {
-		// _owner is a {N} view which could get destroyed when a tap initiates (protect!)
-		if (this._owner) {
-			const owner = this._owner.get();
-			if (owner) {
-				owner._emit(ButtonBase.tapEvent);
-			}
-		}
-	}
+// 	public tap(args) {
+// 		// _owner is a {N} view which could get destroyed when a tap initiates (protect!)
+// 		if (this._owner) {
+// 			const owner = this._owner.get();
+// 			if (owner) {
+// 				owner._emit(ButtonBase.tapEvent);
+// 			}
+// 		}
+// 	}
 
-	public static ObjCExposedMethods = {
-		tap: { returns: interop.types.void, params: [interop.types.id] },
-	};
-}
+// 	public static ObjCExposedMethods = {
+// 		tap: { returns: interop.types.void, params: [interop.types.id] },
+// 	};
+// }
diff --git a/packages/core/ui/tab-navigation-base/tab-strip-item/index.ts b/packages/core/ui/tab-navigation-base/tab-strip-item/index.ts
index 54b1b727a..08d31260c 100644
--- a/packages/core/ui/tab-navigation-base/tab-strip-item/index.ts
+++ b/packages/core/ui/tab-navigation-base/tab-strip-item/index.ts
@@ -16,6 +16,8 @@ import { textTransformProperty, TextTransform } from '../../text-base';
 
 @CSSType('TabStripItem')
 export class TabStripItem extends View implements TabStripItemDefinition, AddChildFromBuilder {
+	// defining this here means tap event wont be handled
+	// by the gesture observers
 	public static tapEvent = 'tap';
 	public static selectEvent = 'select';
 	public static unselectEvent = 'unselect';