diff --git a/packages/core/application/application-interfaces.ts b/packages/core/application/application-interfaces.ts index 0ff3b1a4c9..01aeb3755a 100644 --- a/packages/core/application/application-interfaces.ts +++ b/packages/core/application/application-interfaces.ts @@ -48,7 +48,7 @@ export interface ApplicationEventData { /** * Event data containing information for launch event. */ -export interface LaunchEventData extends EventData { +export interface LaunchEventData extends EventData { /** * The root view for this Window on iOS or Activity for Android. * If not set a new Frame will be created as a root view in order to maintain backwards compatibility. diff --git a/packages/core/data/observable-array/index.ts b/packages/core/data/observable-array/index.ts index 03a5d7e18a..51fd9c12a6 100644 --- a/packages/core/data/observable-array/index.ts +++ b/packages/core/data/observable-array/index.ts @@ -13,7 +13,7 @@ export class ChangeType { /** * Event args for "changed" event. */ -export interface ChangedData extends EventData { +export interface ChangedData extends EventData { /** * Change type. */ diff --git a/packages/core/data/observable/index.ts b/packages/core/data/observable/index.ts index 60e6c81da3..cbc95f0be1 100644 --- a/packages/core/data/observable/index.ts +++ b/packages/core/data/observable/index.ts @@ -3,7 +3,7 @@ import { Optional } from '../../utils/typescript-utils'; /** * Base event data. */ -export interface EventData { +export interface EventData { /** * The name of the event. */ @@ -11,17 +11,17 @@ export interface EventData { /** * The Observable instance that has raised the event. */ - object: Observable; + object: T; } -export interface EventDataValue extends EventData { +export interface EventDataValue extends EventData { value?: boolean; } /** * Data for the "propertyChange" event. */ -export interface PropertyChangeData extends EventData { +export interface PropertyChangeData extends EventData { /** * The name of the property that has changed. */ @@ -36,8 +36,8 @@ export interface PropertyChangeData extends EventData { oldValue?: any; } -interface ListenerEntry { - callback: (data: EventData) => void; +interface ListenerEntry { + callback: (data: EventData) => void; thisArg: any; once?: true; } @@ -106,7 +106,7 @@ export class Observable { */ public _isViewBase: boolean; - private readonly _observers: { [eventName: string]: ListenerEntry[] } = {}; + private readonly _observers: { [eventName: string]: ListenerEntry[] } = {}; /** * Gets the value of the specified property. @@ -465,7 +465,7 @@ export class Observable { return list; } - private static _indexOfListener(list: Array, callback: (data: EventData) => void, thisArg?: any): number { + private static _indexOfListener(list: Array>, callback: (data: EventData) => void, thisArg?: any): number { for (let i = 0; i < list.length; i++) { const entry = list[i]; if (thisArg) { diff --git a/packages/core/data/virtual-array/index.ts b/packages/core/data/virtual-array/index.ts index bf16e47287..c151d93c3d 100644 --- a/packages/core/data/virtual-array/index.ts +++ b/packages/core/data/virtual-array/index.ts @@ -4,7 +4,7 @@ import { ChangedData, ChangeType } from '../observable-array'; /** * Event args for "itemsLoading" event. */ -export interface ItemsLoading extends EventData { +export interface ItemsLoading extends EventData { /** * Start index. */ diff --git a/packages/core/ui/gestures/gestures-common.ts b/packages/core/ui/gestures/gestures-common.ts index 434b80bd57..01feac817e 100644 --- a/packages/core/ui/gestures/gestures-common.ts +++ b/packages/core/ui/gestures/gestures-common.ts @@ -1,6 +1,6 @@ import type { GesturesObserver as GesturesObserverDefinition } from '.'; import type { View } from '../core/view'; -import type { EventData } from '../../data/observable'; +import type { EventData, Observable } from '../../data/observable'; export * from './touch-manager'; @@ -133,7 +133,7 @@ export enum TouchAction { /** * Provides gesture event data. */ -export interface GestureEventData extends EventData { +export interface GestureEventData extends EventData { /** * Gets the type of the gesture. */ diff --git a/packages/core/ui/page/page-common.ts b/packages/core/ui/page/page-common.ts index b238419f41..b6559a54df 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; } diff --git a/packages/core/ui/placeholder/placeholder-common.ts b/packages/core/ui/placeholder/placeholder-common.ts index b94f5b91c3..b152e6ad8e 100644 --- a/packages/core/ui/placeholder/placeholder-common.ts +++ b/packages/core/ui/placeholder/placeholder-common.ts @@ -1,6 +1,7 @@ +import type { Placeholder } from '.'; import { EventData } from '../../data/observable'; -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/web-view/web-view-interfaces.ts b/packages/core/ui/web-view/web-view-interfaces.ts index 44e4262fe7..fef7b32ee0 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 { EventData } from '../../data/observable'; +import { EventData, Observable } from '../../data/observable'; +import type { WebViewBase } from './web-view-common'; 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;