diff --git a/packages/core/application/application-interfaces.ts b/packages/core/application/application-interfaces.ts index 895c7c433..a1bc99071 100644 --- a/packages/core/application/application-interfaces.ts +++ b/packages/core/application/application-interfaces.ts @@ -71,8 +71,22 @@ export interface CssChangedEventData extends } export interface AndroidActivityEventData extends ApplicationEventData { - activity: any /* androidx.appcompat.app.AppCompatActivity */; - object: any /* AndroidApplication */; + /** + * The activity. + * androidx.appcompat.app.AppCompatActivity + */ + activity: any; + + /** + * The name of the event. + */ + eventName: string; + + /** + * The instance that has raised the event. + * AndroidApplication + */ + object: T; } export interface AndroidActivityBundleEventData extends AndroidActivityEventData { diff --git a/packages/core/application/index.d.ts b/packages/core/application/index.d.ts index 6deba59fd..31c3eeaff 100644 --- a/packages/core/application/index.d.ts +++ b/packages/core/application/index.d.ts @@ -395,7 +395,7 @@ export let ios: iOSApplication; /** * Data for the Android activity events. */ -export interface AndroidActivityEventData { +export interface AndroidActivityEventData extends ApplicationEventData { /** * The activity. */ diff --git a/packages/core/ui/button/index.d.ts b/packages/core/ui/button/index.d.ts index 9e4a6d0b2..767eb480e 100644 --- a/packages/core/ui/button/index.d.ts +++ b/packages/core/ui/button/index.d.ts @@ -31,10 +31,10 @@ export class Button extends TextBase { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when a tap event occurs. */ - on(event: 'tap', callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'tap', callback: (args: EventData) => void, thisArg?: any): void; } diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts index 42f254dcd..527fe47ad 100644 --- a/packages/core/ui/core/view/index.android.ts +++ b/packages/core/ui/core/view/index.android.ts @@ -335,14 +335,14 @@ export class View extends ViewCommon { } // TODO: Implement unobserve that detach the touchListener. - _observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void { + _observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void { super._observe(type, callback, thisArg); if (this.isLoaded && !this.touchListenerIsSet) { this.setOnTouchListener(); } } - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any) { + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any) { super.on(eventNames, callback, thisArg); const isLayoutEvent = typeof eventNames === 'string' ? eventNames.indexOf(ViewCommon.layoutChangedEvent) !== -1 : false; @@ -351,7 +351,7 @@ export class View extends ViewCommon { } } - off(eventNames: string, callback?: (data: EventData) => void, thisArg?: any) { + off(eventNames: string, callback?: (data: EventData) => void, thisArg?: any) { super.off(eventNames, callback, thisArg); const isLayoutEvent = typeof eventNames === 'string' ? eventNames.indexOf(ViewCommon.layoutChangedEvent) !== -1 : false; diff --git a/packages/core/ui/core/view/index.d.ts b/packages/core/ui/core/view/index.d.ts index 947421bb1..a95087768 100644 --- a/packages/core/ui/core/view/index.d.ts +++ b/packages/core/ui/core/view/index.d.ts @@ -83,7 +83,7 @@ export interface Size { /** * Defines the data for the shownModally event. */ -export interface ShownModallyData extends EventData { +export interface ShownModallyData extends EventData { /** * The context (optional, may be undefined) passed to the view when shown modally. */ @@ -585,7 +585,7 @@ export abstract class View extends ViewCommon { * @param callback An optional parameter pointing to a specific listener. If not defined, all listeners for the event names will be removed. * @param thisArg An optional parameter which when set will be used to refine search of the correct callback which will be removed as event listener. */ - off(eventNames: string | GestureTypes, callback?: (args: EventData) => void, thisArg?: any); + off(eventNames: string | GestureTypes, callback?: (args: EventData) => void, thisArg?: any); /** * A basic method signature to hook an event listener (shortcut alias to the addEventListener method). @@ -593,33 +593,33 @@ export abstract class View extends ViewCommon { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string | GestureTypes, callback: (args: EventData) => void, thisArg?: any); + on(eventNames: string | GestureTypes, callback: (args: EventData) => void, thisArg?: any); /** * Raised when a loaded event occurs. */ - on(event: 'loaded', callback: (args: EventData) => void, thisArg?: any); + on(event: 'loaded', callback: (args: EventData) => void, thisArg?: any); /** * Raised when an unloaded event occurs. */ - on(event: 'unloaded', callback: (args: EventData) => void, thisArg?: any); + on(event: 'unloaded', callback: (args: EventData) => void, thisArg?: any); /** * Raised when a back button is pressed. * This event is raised only for android. */ - on(event: 'androidBackPressed', callback: (args: EventData) => void, thisArg?: any); + on(event: 'androidBackPressed', callback: (args: EventData) => void, thisArg?: any); /** * Raised before the view is shown as a modal dialog. */ - on(event: 'showingModally', callback: (args: ShownModallyData) => void, thisArg?: any): void; + on(event: 'showingModally', callback: (args: ShownModallyData) => void, thisArg?: any): void; /** * Raised after the view is shown as a modal dialog. */ - on(event: 'shownModally', callback: (args: ShownModallyData) => void, thisArg?: any); + on(event: 'shownModally', callback: (args: ShownModallyData) => void, thisArg?: any); /** * Returns the current modal view that this page is showing (is parent of), if any. diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts index 6464b9b32..d54282d55 100644 --- a/packages/core/ui/core/view/view-common.ts +++ b/packages/core/ui/core/view/view-common.ts @@ -253,7 +253,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition { } } - _observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void { + _observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void { if (!this._gestureObservers[type]) { this._gestureObservers[type] = []; } @@ -265,7 +265,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition { return this._gestureObservers[type]; } - public addEventListener(arg: string | GestureTypes, callback: (data: EventData) => void, thisArg?: any) { + public addEventListener(arg: string | GestureTypes, callback: (data: EventData) => void, thisArg?: any) { if (typeof arg === 'string') { arg = getEventOrGestureName(arg); @@ -293,7 +293,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition { } } - public removeEventListener(arg: string | GestureTypes, callback?: (data: EventData) => void, thisArg?: any) { + public removeEventListener(arg: string | GestureTypes, callback?: (data: EventData) => void, thisArg?: any) { if (typeof arg === 'string') { const gesture = gestureFromString(arg); if (gesture && !this._isEvent(arg)) { diff --git a/packages/core/ui/frame/index.d.ts b/packages/core/ui/frame/index.d.ts index 2fd89be4f..41da5ac52 100644 --- a/packages/core/ui/frame/index.d.ts +++ b/packages/core/ui/frame/index.d.ts @@ -6,7 +6,7 @@ import { Transition } from '../transition'; export * from './frame-interfaces'; -export interface NavigationData extends EventData { +export interface NavigationData extends EventData { entry?: NavigationEntry; fromEntry?: NavigationEntry; isBack?: boolean; @@ -221,17 +221,17 @@ export class Frame extends FrameBase { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; /** * Raised when navigation to the page has started. */ - public on(event: 'navigatingTo', callback: (args: NavigationData) => void, thisArg?: any): void; + public on(event: 'navigatingTo', callback: (args: NavigationData) => void, thisArg?: any): void; /** * Raised when navigation to the page has finished. */ - public on(event: 'navigatedTo', callback: (args: NavigationData) => void, thisArg?: any): void; + public on(event: 'navigatedTo', callback: (args: NavigationData) => void, thisArg?: any): void; } /** diff --git a/packages/core/ui/gestures/index.d.ts b/packages/core/ui/gestures/index.d.ts index b1a34e6fb..759d2931e 100644 --- a/packages/core/ui/gestures/index.d.ts +++ b/packages/core/ui/gestures/index.d.ts @@ -132,7 +132,7 @@ export namespace TouchAction { /** * Provides gesture event data. */ -export interface GestureEventData extends EventData { +export interface GestureEventData extends EventData { /** * Gets the type of the gesture. */ @@ -154,7 +154,7 @@ export interface GestureEventData extends Eve /** * Provides gesture event data. */ -export interface TapGestureEventData extends GestureEventData { +export interface TapGestureEventData extends GestureEventData { /** * Gets the number of pointers in the event. */ @@ -172,7 +172,7 @@ export interface TapGestureEventData extends /** * Provides gesture event data. */ -export interface TouchGestureEventData extends TapGestureEventData { +export interface TouchGestureEventData extends TapGestureEventData { /** * Gets action of the touch. Possible values: 'up', 'move', 'down', 'cancel' */ @@ -241,14 +241,14 @@ export interface Pointer { /** * Provides gesture event data. */ -export interface GestureEventDataWithState extends GestureEventData { +export interface GestureEventDataWithState extends GestureEventData { state: number; } /** * Provides gesture event data for pinch gesture. */ -export interface PinchGestureEventData extends GestureEventDataWithState { +export interface PinchGestureEventData extends GestureEventDataWithState { scale: number; getFocusX(): number; @@ -258,14 +258,14 @@ export interface PinchGestureEventData extend /** * Provides gesture event data for swipe gesture. */ -export interface SwipeGestureEventData extends GestureEventData { +export interface SwipeGestureEventData extends GestureEventData { direction: SwipeDirection; } /** * Provides gesture event data for pan gesture. */ -export interface PanGestureEventData extends GestureEventDataWithState { +export interface PanGestureEventData extends GestureEventDataWithState { deltaX: number; deltaY: number; } @@ -273,14 +273,14 @@ export interface PanGestureEventData extends /** * Provides gesture event data for rotation gesture. */ -export interface RotationGestureEventData extends GestureEventDataWithState { +export interface RotationGestureEventData extends GestureEventDataWithState { rotation: number; } /** * Provides options for the GesturesObserver. */ -export class GesturesObserver { +export class GesturesObserver { /** * Creates an instance of GesturesObserver class. * @param target - The view for which the observer is created. @@ -328,7 +328,7 @@ export class GesturesObserver { * @param callback - A function that will be executed when a gesture is received. * @param context - this argument for the callback. */ -export function observe(target: View, type: GestureTypes, callback: (args: GestureEventData) => void, context?: any): GesturesObserver; +export function observe(target: View, type: GestureTypes, callback: (args: GestureEventData) => void, context?: any): GesturesObserver; /** * Returns a string representation of a gesture type. diff --git a/packages/core/ui/gestures/index.ios.ts b/packages/core/ui/gestures/index.ios.ts index bcf959662..28ba4ecbb 100644 --- a/packages/core/ui/gestures/index.ios.ts +++ b/packages/core/ui/gestures/index.ios.ts @@ -53,7 +53,7 @@ class UIGestureRecognizerImpl extends NSObject { private _callback: Function; private _context: any; - public static initWithOwnerTypeCallback(owner: WeakRef, type: any, callback?: (args: GestureEventData) => void, thisArg?: any): UIGestureRecognizerImpl { + public static initWithOwnerTypeCallback(owner: WeakRef, type: any, callback?: (args: GestureEventData) => void, thisArg?: any): UIGestureRecognizerImpl { const handler = UIGestureRecognizerImpl.new(); handler._owner = owner; handler._type = type; @@ -320,7 +320,7 @@ export class GesturesObserver extends GesturesObserverBase { } } -function _createUIGestureRecognizerTarget(owner: GesturesObserver, type: GestureTypes, callback?: (args: GestureEventData) => void, context?: any): any { +function _createUIGestureRecognizerTarget(owner: GesturesObserver, type: GestureTypes, callback?: (args: GestureEventData) => void, context?: any): any { return UIGestureRecognizerImpl.initWithOwnerTypeCallback(new WeakRef(owner), type, callback, context); } diff --git a/packages/core/ui/image-cache/image-cache-common.ts b/packages/core/ui/image-cache/image-cache-common.ts index 402ff774a..6abab86c1 100644 --- a/packages/core/ui/image-cache/image-cache-common.ts +++ b/packages/core/ui/image-cache/image-cache-common.ts @@ -215,7 +215,7 @@ export class Cache extends Observable implements definition.Cache { } } export interface Cache { - on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; - on(event: 'downloaded', callback: (args: definition.DownloadedData) => void, thisArg?: any): void; - on(event: 'downloadError', callback: (args: definition.DownloadError) => void, thisArg?: any): void; + on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'downloaded', callback: (args: definition.DownloadedData) => void, thisArg?: any): void; + on(event: 'downloadError', callback: (args: definition.DownloadError) => void, thisArg?: any): void; } diff --git a/packages/core/ui/image-cache/index.d.ts b/packages/core/ui/image-cache/index.d.ts index d94c1c604..468567fa7 100644 --- a/packages/core/ui/image-cache/index.d.ts +++ b/packages/core/ui/image-cache/index.d.ts @@ -85,17 +85,17 @@ export class Cache extends Observable { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; /** * Raised when the image has been downloaded. */ - on(event: 'downloaded', callback: (args: DownloadedData) => void, thisArg?: any): void; + on(event: 'downloaded', callback: (args: DownloadedData) => void, thisArg?: any): void; /** * Raised if the image download errors. */ - on(event: 'downloadError', callback: (args: DownloadError) => void, thisArg?: any): void; + on(event: 'downloadError', callback: (args: DownloadError) => void, thisArg?: any): void; //@private /** diff --git a/packages/core/ui/list-view/index.d.ts b/packages/core/ui/list-view/index.d.ts index f230c8d75..525967be6 100644 --- a/packages/core/ui/list-view/index.d.ts +++ b/packages/core/ui/list-view/index.d.ts @@ -108,7 +108,7 @@ export class ListView extends View { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when a View for the data at the specified index should be created. @@ -116,23 +116,23 @@ export class ListView extends View { * Note, that the view property of the event data can be pre-initialized with * an old instance of a view, so that it can be reused. */ - on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void; + on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void; /** * Raised when an item inside the ListView is tapped. */ - on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any): void; + on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any): void; /** * Raised when the ListView is scrolled so that its last item is visible. */ - on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any): void; } /** * Event data containing information for the index and the view associated to a list view item. */ -export interface ItemEventData extends EventData { +export interface ItemEventData extends EventData { /** * The index of the item, for which the event is raised. */ @@ -164,8 +164,8 @@ export interface TemplatedItemsView { itemTemplate: string | Template; itemTemplates?: string | Array; refresh(): void; - on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void; - off(event: 'itemLoading', callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void; + off(event: 'itemLoading', callback: (args: EventData) => void, thisArg?: any): void; } /** diff --git a/packages/core/ui/list-view/list-view-common.ts b/packages/core/ui/list-view/list-view-common.ts index 3566d83ad..a1c2a3f48 100644 --- a/packages/core/ui/list-view/list-view-common.ts +++ b/packages/core/ui/list-view/list-view-common.ts @@ -154,10 +154,10 @@ export abstract class ListViewBase extends ContainerView implements ListViewDefi ListViewBase.prototype.recycleNativeView = 'auto'; export interface ListViewBase { - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; - on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void; - on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any): void; - on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void; + on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any): void; + on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any): void; } /** diff --git a/packages/core/ui/page/index.d.ts b/packages/core/ui/page/index.d.ts index db0ca49c2..7e98ff40e 100644 --- a/packages/core/ui/page/index.d.ts +++ b/packages/core/ui/page/index.d.ts @@ -12,7 +12,7 @@ export * from './page-common'; /** * Defines the data for the page navigation events. */ -export interface NavigatedData extends EventData { +export interface NavigatedData extends EventData { /** * The navigation context (optional, may be undefined) passed to the page navigation events method. */ @@ -116,27 +116,27 @@ export declare class Page extends PageBase { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - public on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + public on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when navigation to the page has started. */ - public on(event: 'navigatingTo', callback: (args: NavigatedData) => void, thisArg?: any): void; + public on(event: 'navigatingTo', callback: (args: NavigatedData) => void, thisArg?: any): void; /** * Raised when navigation to the page has finished. */ - public on(event: 'navigatedTo', callback: (args: NavigatedData) => void, thisArg?: any): void; + public on(event: 'navigatedTo', callback: (args: NavigatedData) => void, thisArg?: any): void; /** * Raised when navigation from the page has started. */ - public on(event: 'navigatingFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; + public on(event: 'navigatingFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; /** * Raised when navigation from the page has finished. */ - public on(event: 'navigatedFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; + public on(event: 'navigatedFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; //@private /** diff --git a/packages/core/ui/page/page-common.ts b/packages/core/ui/page/page-common.ts index 3cff9cb3e..07d9b7bd2 100644 --- a/packages/core/ui/page/page-common.ts +++ b/packages/core/ui/page/page-common.ts @@ -12,7 +12,7 @@ import { ActionBar } from '../action-bar'; import { KeyframeAnimationInfo } from '../animation/keyframe-animation'; import { profile } from '../../profiling'; -interface NavigatedData extends EventData { +interface NavigatedData extends EventData { context: any; isBackNavigation: boolean; } @@ -166,13 +166,13 @@ export class PageBase extends ContentView { PageBase.prototype.recycleNativeView = 'never'; export interface PageBase { - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; - on(event: 'navigatingTo', callback: (args: NavigatedData) => void, thisArg?: any): void; - on(event: 'navigatedTo', callback: (args: NavigatedData) => void, thisArg?: any): void; - on(event: 'navigatingFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; - on(event: 'navigatedFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; - on(event: 'showingModally', callback: (args: ShownModallyData) => void, thisArg?: any): void; - on(event: 'shownModally', callback: (args: ShownModallyData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(event: 'navigatingTo', callback: (args: NavigatedData) => void, thisArg?: any): void; + on(event: 'navigatedTo', callback: (args: NavigatedData) => void, thisArg?: any): void; + on(event: 'navigatingFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; + on(event: 'navigatedFrom', callback: (args: NavigatedData) => void, thisArg?: any): void; + on(event: 'showingModally', callback: (args: ShownModallyData) => void, thisArg?: any): void; + on(event: 'shownModally', callback: (args: ShownModallyData) => void, thisArg?: any): void; } /** diff --git a/packages/core/ui/placeholder/index.android.ts b/packages/core/ui/placeholder/index.android.ts index 35fea8807..52c03a25d 100644 --- a/packages/core/ui/placeholder/index.android.ts +++ b/packages/core/ui/placeholder/index.android.ts @@ -21,6 +21,6 @@ export class Placeholder extends View { } } export interface Placeholder { - on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; - on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void; } diff --git a/packages/core/ui/placeholder/index.d.ts b/packages/core/ui/placeholder/index.d.ts index 56bc17580..dba9860ff 100644 --- a/packages/core/ui/placeholder/index.d.ts +++ b/packages/core/ui/placeholder/index.d.ts @@ -18,18 +18,18 @@ export class Placeholder extends View { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; /** * Raised when a creatingView event occurs. */ - on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void; + on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void; } /** * Event data containing information for creating a native view that will be added to the visual tree. */ -export interface CreateViewEventData extends EventData { +export interface CreateViewEventData extends EventData { /** * The native view that should be added to the visual tree. */ diff --git a/packages/core/ui/placeholder/index.ts b/packages/core/ui/placeholder/index.ts index b95b054ea..c32d4bb71 100644 --- a/packages/core/ui/placeholder/index.ts +++ b/packages/core/ui/placeholder/index.ts @@ -20,6 +20,6 @@ export class Placeholder extends View { } } export interface Placeholder { - on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; - on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void; } diff --git a/packages/core/ui/scroll-view/index.d.ts b/packages/core/ui/scroll-view/index.d.ts index 530ac716d..b6596f544 100644 --- a/packages/core/ui/scroll-view/index.d.ts +++ b/packages/core/ui/scroll-view/index.d.ts @@ -67,17 +67,17 @@ export class ScrollView extends ContentView { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when a scroll event occurs. */ - on(event: 'scroll', callback: (args: ScrollEventData) => void, thisArg?: any): void; + on(event: 'scroll', callback: (args: ScrollEventData) => void, thisArg?: any): void; _onOrientationChanged(): void; } -export interface ScrollEventData extends EventData { +export interface ScrollEventData extends EventData { scrollX: number; scrollY: number; } diff --git a/packages/core/ui/scroll-view/scroll-view-common.ts b/packages/core/ui/scroll-view/scroll-view-common.ts index f3bb10b29..ac1529620 100644 --- a/packages/core/ui/scroll-view/scroll-view-common.ts +++ b/packages/core/ui/scroll-view/scroll-view-common.ts @@ -87,8 +87,8 @@ export abstract class ScrollViewBase extends ContentView implements ScrollViewDe public abstract _onOrientationChanged(); } export interface ScrollViewBase { - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; - on(event: 'scroll', callback: (args: ScrollEventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(event: 'scroll', callback: (args: ScrollEventData) => void, thisArg?: any): void; } const converter = makeParser(makeValidator(CoreTypes.Orientation.horizontal, CoreTypes.Orientation.vertical)); diff --git a/packages/core/ui/search-bar/index.d.ts b/packages/core/ui/search-bar/index.d.ts index a1de48f76..aeec43410 100644 --- a/packages/core/ui/search-bar/index.d.ts +++ b/packages/core/ui/search-bar/index.d.ts @@ -53,17 +53,17 @@ export class SearchBar extends View { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when a search bar search is submitted. */ - on(event: 'submit', callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'submit', callback: (args: EventData) => void, thisArg?: any): void; /** * Raised when a search bar search is closed. */ - on(event: 'close', callback: (args: EventData) => void, thisArg?: any): void; + on(event: 'close', callback: (args: EventData) => void, thisArg?: any): void; /** * Hides the soft input method, usually a soft keyboard. diff --git a/packages/core/ui/segmented-bar/index.d.ts b/packages/core/ui/segmented-bar/index.d.ts index 8553fa305..5b9205732 100644 --- a/packages/core/ui/segmented-bar/index.d.ts +++ b/packages/core/ui/segmented-bar/index.d.ts @@ -18,7 +18,7 @@ export class SegmentedBarItem extends ViewBase { /** * Defines the data for the SegmentedBar.selectedIndexChanged event. */ -export interface SelectedIndexChangedEventData extends EventData { +export interface SelectedIndexChangedEventData extends EventData { /** * The old selected index. */ @@ -60,12 +60,12 @@ export class SegmentedBar extends View implements AddChildFromBuilder, AddArrayF * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when the selected index changes. */ - on(event: 'selectedIndexChanged', callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any): void; + on(event: 'selectedIndexChanged', callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any): void; /** * Called for every child element declared in xml. diff --git a/packages/core/ui/slider/index.d.ts b/packages/core/ui/slider/index.d.ts index b99822c23..65cecd75a 100644 --- a/packages/core/ui/slider/index.d.ts +++ b/packages/core/ui/slider/index.d.ts @@ -61,12 +61,12 @@ export const maxValueProperty: CoercibleProperty; */ export const accessibilityStepProperty: Property; -interface AccessibilityIncrementEventData extends EventData { +interface AccessibilityIncrementEventData extends EventData { object: Slider; value?: number; } -interface AccessibilityDecrementEventData extends EventData { +interface AccessibilityDecrementEventData extends EventData { object: Slider; value?: number; } diff --git a/packages/core/ui/tab-view/index.d.ts b/packages/core/ui/tab-view/index.d.ts index d57989ee4..56918da23 100644 --- a/packages/core/ui/tab-view/index.d.ts +++ b/packages/core/ui/tab-view/index.d.ts @@ -42,7 +42,7 @@ export class TabViewItem extends ViewBase { /** * Defines the data for the TabView.selectedIndexChanged event. */ -export interface SelectedIndexChangedEventData extends EventData { +export interface SelectedIndexChangedEventData extends EventData { /** * The old selected index. */ @@ -150,12 +150,12 @@ export class TabView extends View { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when the selected index changes. */ - on(event: 'selectedIndexChanged', callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any): void; + on(event: 'selectedIndexChanged', callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any): void; } export const itemsProperty: Property; diff --git a/packages/core/ui/tab-view/tab-view-common.ts b/packages/core/ui/tab-view/tab-view-common.ts index d07c4b8db..969f85f80 100644 --- a/packages/core/ui/tab-view/tab-view-common.ts +++ b/packages/core/ui/tab-view/tab-view-common.ts @@ -205,8 +205,8 @@ export class TabViewBase extends View implements TabViewDefinition, AddChildFrom } export interface TabViewBase { - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; - on(event: 'selectedIndexChanged', callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(event: 'selectedIndexChanged', callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any): void; } export function traceMissingIcon(icon: string) { diff --git a/packages/core/ui/text-base/span.ts b/packages/core/ui/text-base/span.ts index 9cf29d1c8..843855960 100644 --- a/packages/core/ui/text-base/span.ts +++ b/packages/core/ui/text-base/span.ts @@ -81,12 +81,12 @@ export class Span extends ViewBase implements SpanDefinition { return this._tappable; } - addEventListener(arg: string, callback: (data: EventData) => void, thisArg?: any): void { + addEventListener(arg: string, callback: (data: EventData) => void, thisArg?: any): void { super.addEventListener(arg, callback, thisArg); this._setTappable(this.hasListeners(Span.linkTapEvent)); } - removeEventListener(arg: string, callback?: (data: EventData) => void, thisArg?: any): void { + removeEventListener(arg: string, callback?: (data: EventData) => void, thisArg?: any): void { super.removeEventListener(arg, callback, thisArg); this._setTappable(this.hasListeners(Span.linkTapEvent)); } diff --git a/packages/core/ui/web-view/index.d.ts b/packages/core/ui/web-view/index.d.ts index 9f2160ad3..1a8097ead 100644 --- a/packages/core/ui/web-view/index.d.ts +++ b/packages/core/ui/web-view/index.d.ts @@ -92,23 +92,23 @@ export class WebView extends View { * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; /** * Raised when a loadFinished event occurs. */ - on(event: 'loadFinished', callback: (args: LoadEventData) => void, thisArg?: any): void; + on(event: 'loadFinished', callback: (args: LoadEventData) => void, thisArg?: any): void; /** * Raised when a loadStarted event occurs. */ - on(event: 'loadStarted', callback: (args: LoadEventData) => void, thisArg?: any): void; + on(event: 'loadStarted', callback: (args: LoadEventData) => void, thisArg?: any): void; } /** * Event data containing information for the loading events of a WebView. */ -export interface LoadEventData extends EventData { +export interface LoadEventData extends EventData { /** * Gets the url of the web-view. */ diff --git a/packages/core/ui/web-view/web-view-common.ts b/packages/core/ui/web-view/web-view-common.ts index 1cf67287d..6c276f5dd 100644 --- a/packages/core/ui/web-view/web-view-common.ts +++ b/packages/core/ui/web-view/web-view-common.ts @@ -29,7 +29,7 @@ export abstract class WebViewBase extends ContainerView { error: error, }; - this.notify(args); + this.notify(args); } public _onLoadStarted(url: string, navigationType: WebViewNavigationType) { @@ -41,7 +41,7 @@ export abstract class WebViewBase extends ContainerView { error: undefined, }; - this.notify(args); + this.notify(args); } abstract _loadUrl(src: string): void; @@ -101,9 +101,9 @@ export abstract class WebViewBase extends ContainerView { // HACK: We declare all these 'on' statements, so that they can appear in the API reference // HACK: Do we need this? Is it useful? There are static fields to the WebViewBase class for the event names. export interface WebViewBase { - on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; - on(event: 'loadFinished', callback: (args: LoadEventData) => void, thisArg?: any): void; - on(event: 'loadStarted', callback: (args: LoadEventData) => void, thisArg?: any): void; + on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void; + on(event: 'loadFinished', callback: (args: LoadEventData) => void, thisArg?: any): void; + on(event: 'loadStarted', callback: (args: LoadEventData) => void, thisArg?: any): void; } srcProperty.register(WebViewBase); diff --git a/packages/core/ui/web-view/web-view-interfaces.ts b/packages/core/ui/web-view/web-view-interfaces.ts index 8b43a5800..3d14164b6 100644 --- a/packages/core/ui/web-view/web-view-interfaces.ts +++ b/packages/core/ui/web-view/web-view-interfaces.ts @@ -1,9 +1,10 @@ -import { WebView } from '.'; +import { WebViewBase } from './web-view-common'; +import { WebView } from '.'; import { EventData, Observable } from '../../data/observable'; export type WebViewNavigationType = 'linkClicked' | 'formSubmitted' | 'backForward' | 'reload' | 'formResubmitted' | 'other' | undefined; -export interface LoadEventData extends EventData { +export interface LoadEventData extends EventData { url: string; navigationType: WebViewNavigationType; error: string;