Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9a07b1b

Browse files
committed
fix: defaults for most EventData
1 parent8840fef commit9a07b1b

29 files changed

+119
-104
lines changed

‎packages/core/application/application-interfaces.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,22 @@ export interface CssChangedEventData<T extends Observable = Observable> extends
7171
}
7272

7373
exportinterfaceAndroidActivityEventData<TextendsObservable=Observable>extendsApplicationEventData<T>{
74-
activity:any/* androidx.appcompat.app.AppCompatActivity */;
75-
object:any/* AndroidApplication */;
74+
/**
75+
* The activity.
76+
* androidx.appcompat.app.AppCompatActivity
77+
*/
78+
activity:any;
79+
80+
/**
81+
* The name of the event.
82+
*/
83+
eventName:string;
84+
85+
/**
86+
* The instance that has raised the event.
87+
* AndroidApplication
88+
*/
89+
object:T;
7690
}
7791

7892
exportinterfaceAndroidActivityBundleEventData<TextendsObservable=Observable>extendsAndroidActivityEventData<T>{

‎packages/core/application/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ export let ios: iOSApplication;
395395
/**
396396
* Data for the Android activity events.
397397
*/
398-
exportinterfaceAndroidActivityEventData{
398+
exportinterfaceAndroidActivityEventData<TextendsObservable=Observable>extendsApplicationEventData<T>{
399399
/**
400400
* The activity.
401401
*/

‎packages/core/ui/button/index.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ export class Button extends TextBase {
3131
*@param callback - Callback function which will be executed when event is raised.
3232
*@param thisArg - An optional parameter which will be used as `this` context for callback execution.
3333
*/
34-
on<TextendsObservable=Observable>(eventNames:string,callback:(data:EventData<T>)=>void,thisArg?:any):void;
34+
on<TextendsObservable=Button>(eventNames:string,callback:(data:EventData<T>)=>void,thisArg?:any):void;
3535

3636
/**
3737
* Raised when a tap event occurs.
3838
*/
39-
on<TextendsObservable=Observable>(event:'tap',callback:(args:EventData<T>)=>void,thisArg?:any):void;
39+
on<TextendsObservable=Button>(event:'tap',callback:(args:EventData<T>)=>void,thisArg?:any):void;
4040
}

‎packages/core/ui/core/view/index.android.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,14 +335,14 @@ export class View extends ViewCommon {
335335
}
336336

337337
// TODO: Implement unobserve that detach the touchListener.
338-
_observe<TextendsObservable=Observable>(type:GestureTypes,callback:(args:GestureEventData<T>)=>void,thisArg?:any):void{
338+
_observe<TextendsObservable=View>(type:GestureTypes,callback:(args:GestureEventData<T>)=>void,thisArg?:any):void{
339339
super._observe(type,callback,thisArg);
340340
if(this.isLoaded&&!this.touchListenerIsSet){
341341
this.setOnTouchListener();
342342
}
343343
}
344344

345-
on<TextendsObservable=Observable>(eventNames:string,callback:(data:EventData<T>)=>void,thisArg?:any){
345+
on<TextendsObservable=View>(eventNames:string,callback:(data:EventData<T>)=>void,thisArg?:any){
346346
super.on(eventNames,callback,thisArg);
347347
constisLayoutEvent=typeofeventNames==='string' ?eventNames.indexOf(ViewCommon.layoutChangedEvent)!==-1 :false;
348348

@@ -351,7 +351,7 @@ export class View extends ViewCommon {
351351
}
352352
}
353353

354-
off<TextendsObservable=Observable>(eventNames:string,callback?:(data:EventData<T>)=>void,thisArg?:any){
354+
off<TextendsObservable=View>(eventNames:string,callback?:(data:EventData<T>)=>void,thisArg?:any){
355355
super.off(eventNames,callback,thisArg);
356356
constisLayoutEvent=typeofeventNames==='string' ?eventNames.indexOf(ViewCommon.layoutChangedEvent)!==-1 :false;
357357

‎packages/core/ui/core/view/index.d.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export interface Size {
8383
/**
8484
* Defines the data for the shownModally event.
8585
*/
86-
exportinterfaceShownModallyData<TextendsObservable=Observable>extendsEventData<T>{
86+
exportinterfaceShownModallyData<TextendsObservable=ViewCommon>extendsEventData<T>{
8787
/**
8888
* The context (optional, may be undefined) passed to the view when shown modally.
8989
*/
@@ -585,41 +585,41 @@ export abstract class View extends ViewCommon {
585585
*@param callback An optional parameter pointing to a specific listener. If not defined, all listeners for the event names will be removed.
586586
*@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.
587587
*/
588-
off<TextendsObservable=Observable>(eventNames:string|GestureTypes,callback?:(args:EventData<T>)=>void,thisArg?:any);
588+
off<TextendsObservable=View>(eventNames:string|GestureTypes,callback?:(args:EventData<T>)=>void,thisArg?:any);
589589

590590
/**
591591
* A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
592592
*@param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change") or you can use gesture types.
593593
*@param callback - Callback function which will be executed when event is raised.
594594
*@param thisArg - An optional parameter which will be used as `this` context for callback execution.
595595
*/
596-
on<TextendsObservable=Observable>(eventNames:string|GestureTypes,callback:(args:EventData<T>)=>void,thisArg?:any);
596+
on<TextendsObservable=View>(eventNames:string|GestureTypes,callback:(args:EventData<T>)=>void,thisArg?:any);
597597

598598
/**
599599
* Raised when a loaded event occurs.
600600
*/
601-
on<TextendsObservable=Observable>(event:'loaded',callback:(args:EventData<T>)=>void,thisArg?:any);
601+
on<TextendsObservable=View>(event:'loaded',callback:(args:EventData<T>)=>void,thisArg?:any);
602602

603603
/**
604604
* Raised when an unloaded event occurs.
605605
*/
606-
on<TextendsObservable=Observable>(event:'unloaded',callback:(args:EventData<T>)=>void,thisArg?:any);
606+
on<TextendsObservable=View>(event:'unloaded',callback:(args:EventData<T>)=>void,thisArg?:any);
607607

608608
/**
609609
* Raised when a back button is pressed.
610610
* This event is raised only for android.
611611
*/
612-
on<TextendsObservable=Observable>(event:'androidBackPressed',callback:(args:EventData<T>)=>void,thisArg?:any);
612+
on<TextendsObservable=View>(event:'androidBackPressed',callback:(args:EventData<T>)=>void,thisArg?:any);
613613

614614
/**
615615
* Raised before the view is shown as a modal dialog.
616616
*/
617-
on<TextendsObservable=Observable>(event:'showingModally',callback:(args:ShownModallyData<T>)=>void,thisArg?:any):void;
617+
on<TextendsObservable=View>(event:'showingModally',callback:(args:ShownModallyData<T>)=>void,thisArg?:any):void;
618618

619619
/**
620620
* Raised after the view is shown as a modal dialog.
621621
*/
622-
on<TextendsObservable=Observable>(event:'shownModally',callback:(args:ShownModallyData<T>)=>void,thisArg?:any);
622+
on<TextendsObservable=View>(event:'shownModally',callback:(args:ShownModallyData<T>)=>void,thisArg?:any);
623623

624624
/**
625625
* Returns the current modal view that this page is showing (is parent of), if any.

‎packages/core/ui/core/view/view-common.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
253253
}
254254
}
255255

256-
_observe<TextendsObservable=Observable>(type:GestureTypes,callback:(args:GestureEventData<T>)=>void,thisArg?:any):void{
256+
_observe<TextendsObservable=ViewCommon>(type:GestureTypes,callback:(args:GestureEventData<T>)=>void,thisArg?:any):void{
257257
if(!this._gestureObservers[type]){
258258
this._gestureObservers[type]=[];
259259
}
@@ -265,7 +265,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
265265
returnthis._gestureObservers[type];
266266
}
267267

268-
publicaddEventListener<TextendsObservable=Observable>(arg:string|GestureTypes,callback:(data:EventData<T>)=>void,thisArg?:any){
268+
publicaddEventListener<TextendsObservable=ViewCommon>(arg:string|GestureTypes,callback:(data:EventData<T>)=>void,thisArg?:any){
269269
if(typeofarg==='string'){
270270
arg=getEventOrGestureName(arg);
271271

@@ -293,7 +293,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
293293
}
294294
}
295295

296-
publicremoveEventListener<TextendsObservable=Observable>(arg:string|GestureTypes,callback?:(data:EventData<T>)=>void,thisArg?:any){
296+
publicremoveEventListener<TextendsObservable=ViewCommon>(arg:string|GestureTypes,callback?:(data:EventData<T>)=>void,thisArg?:any){
297297
if(typeofarg==='string'){
298298
constgesture=gestureFromString(arg);
299299
if(gesture&&!this._isEvent(arg)){

‎packages/core/ui/frame/index.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Transition } from '../transition';
66

77
export*from'./frame-interfaces';
88

9-
exportinterfaceNavigationData<TextendsObservable=Observable>extendsEventData<T>{
9+
exportinterfaceNavigationData<TextendsObservable=Frame>extendsEventData<T>{
1010
entry?:NavigationEntry;
1111
fromEntry?:NavigationEntry;
1212
isBack?:boolean;
@@ -221,17 +221,17 @@ export class Frame extends FrameBase {
221221
*@param callback - Callback function which will be executed when event is raised.
222222
*@param thisArg - An optional parameter which will be used as `this` context for callback execution.
223223
*/
224-
on<TextendsObservable=Observable>(eventNames:string,callback:(args:EventData<T>)=>void,thisArg?:any):void;
224+
on<TextendsObservable=Frame>(eventNames:string,callback:(args:EventData<T>)=>void,thisArg?:any):void;
225225

226226
/**
227227
* Raised when navigation to the page has started.
228228
*/
229-
publicon<TextendsObservable=Observable>(event:'navigatingTo',callback:(args:NavigationData<T>)=>void,thisArg?:any):void;
229+
publicon<TextendsObservable=Frame>(event:'navigatingTo',callback:(args:NavigationData<T>)=>void,thisArg?:any):void;
230230

231231
/**
232232
* Raised when navigation to the page has finished.
233233
*/
234-
publicon<TextendsObservable=Observable>(event:'navigatedTo',callback:(args:NavigationData<T>)=>void,thisArg?:any):void;
234+
publicon<TextendsObservable=Frame>(event:'navigatedTo',callback:(args:NavigationData<T>)=>void,thisArg?:any):void;
235235
}
236236

237237
/**

‎packages/core/ui/gestures/index.d.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export namespace TouchAction {
132132
/**
133133
* Provides gesture event data.
134134
*/
135-
exportinterfaceGestureEventData<TextendsObservable=Observable>extendsEventData<T>{
135+
exportinterfaceGestureEventData<TextendsObservable=View>extendsEventData<T>{
136136
/**
137137
* Gets the type of the gesture.
138138
*/
@@ -154,7 +154,7 @@ export interface GestureEventData<T extends Observable = Observable> extends Eve
154154
/**
155155
* Provides gesture event data.
156156
*/
157-
exportinterfaceTapGestureEventData<TextendsObservable=Observable>extendsGestureEventData<T>{
157+
exportinterfaceTapGestureEventData<TextendsObservable=View>extendsGestureEventData<T>{
158158
/**
159159
* Gets the number of pointers in the event.
160160
*/
@@ -172,7 +172,7 @@ export interface TapGestureEventData<T extends Observable = Observable> extends
172172
/**
173173
* Provides gesture event data.
174174
*/
175-
exportinterfaceTouchGestureEventData<TextendsObservable=Observable>extendsTapGestureEventData<T>{
175+
exportinterfaceTouchGestureEventData<TextendsObservable=View>extendsTapGestureEventData<T>{
176176
/**
177177
* Gets action of the touch. Possible values: 'up', 'move', 'down', 'cancel'
178178
*/
@@ -241,14 +241,14 @@ export interface Pointer {
241241
/**
242242
* Provides gesture event data.
243243
*/
244-
exportinterfaceGestureEventDataWithState<TextendsObservable=Observable>extendsGestureEventData<T>{
244+
exportinterfaceGestureEventDataWithState<TextendsObservable=View>extendsGestureEventData<T>{
245245
state:number;
246246
}
247247

248248
/**
249249
* Provides gesture event data for pinch gesture.
250250
*/
251-
exportinterfacePinchGestureEventData<TextendsObservable=Observable>extendsGestureEventDataWithState<T>{
251+
exportinterfacePinchGestureEventData<TextendsObservable=View>extendsGestureEventDataWithState<T>{
252252
scale:number;
253253

254254
getFocusX():number;
@@ -258,29 +258,29 @@ export interface PinchGestureEventData<T extends Observable = Observable> extend
258258
/**
259259
* Provides gesture event data for swipe gesture.
260260
*/
261-
exportinterfaceSwipeGestureEventData<TextendsObservable=Observable>extendsGestureEventData<T>{
261+
exportinterfaceSwipeGestureEventData<TextendsObservable=View>extendsGestureEventData<T>{
262262
direction:SwipeDirection;
263263
}
264264

265265
/**
266266
* Provides gesture event data for pan gesture.
267267
*/
268-
exportinterfacePanGestureEventData<TextendsObservable=Observable>extendsGestureEventDataWithState<T>{
268+
exportinterfacePanGestureEventData<TextendsObservable=View>extendsGestureEventDataWithState<T>{
269269
deltaX:number;
270270
deltaY:number;
271271
}
272272

273273
/**
274274
* Provides gesture event data for rotation gesture.
275275
*/
276-
exportinterfaceRotationGestureEventData<TextendsObservable=Observable>extendsGestureEventDataWithState<T>{
276+
exportinterfaceRotationGestureEventData<TextendsObservable=View>extendsGestureEventDataWithState<T>{
277277
rotation:number;
278278
}
279279

280280
/**
281281
* Provides options for the GesturesObserver.
282282
*/
283-
exportclassGesturesObserver<TextendsObservable=Observable>{
283+
exportclassGesturesObserver<TextendsObservable=View>{
284284
/**
285285
* Creates an instance of GesturesObserver class.
286286
*@param target - The view for which the observer is created.
@@ -328,7 +328,7 @@ export class GesturesObserver<T extends Observable = Observable> {
328328
*@param callback - A function that will be executed when a gesture is received.
329329
*@param context - this argument for the callback.
330330
*/
331-
exportfunctionobserve<TextendsObservable=Observable>(target:View,type:GestureTypes,callback:(args:GestureEventData<T>)=>void,context?:any):GesturesObserver<T>;
331+
exportfunctionobserve<TextendsObservable=View>(target:View,type:GestureTypes,callback:(args:GestureEventData<T>)=>void,context?:any):GesturesObserver<T>;
332332

333333
/**
334334
* Returns a string representation of a gesture type.

‎packages/core/ui/gestures/index.ios.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class UIGestureRecognizerImpl extends NSObject {
5353
private_callback:Function;
5454
private_context:any;
5555

56-
publicstaticinitWithOwnerTypeCallback<TextendsObservable=Observable>(owner:WeakRef<GesturesObserver>,type:any,callback?:(args:GestureEventData<T>)=>void,thisArg?:any):UIGestureRecognizerImpl{
56+
publicstaticinitWithOwnerTypeCallback<TextendsObservable=View>(owner:WeakRef<GesturesObserver>,type:any,callback?:(args:GestureEventData<T>)=>void,thisArg?:any):UIGestureRecognizerImpl{
5757
consthandler=<UIGestureRecognizerImpl>UIGestureRecognizerImpl.new();
5858
handler._owner=owner;
5959
handler._type=type;
@@ -320,7 +320,7 @@ export class GesturesObserver extends GesturesObserverBase {
320320
}
321321
}
322322

323-
function_createUIGestureRecognizerTarget<TextendsObservable=Observable>(owner:GesturesObserver,type:GestureTypes,callback?:(args:GestureEventData<T>)=>void,context?:any):any{
323+
function_createUIGestureRecognizerTarget<TextendsObservable=View>(owner:GesturesObserver,type:GestureTypes,callback?:(args:GestureEventData<T>)=>void,context?:any):any{
324324
returnUIGestureRecognizerImpl.initWithOwnerTypeCallback(newWeakRef(owner),type,callback,context);
325325
}
326326

‎packages/core/ui/image-cache/image-cache-common.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export class Cache extends Observable implements definition.Cache {
215215
}
216216
}
217217
exportinterfaceCache{
218-
on<TextendsObservable=Observable>(eventNames:string,callback:(args:EventData<T>)=>void,thisArg?:any):void;
219-
on<TextendsObservable=Observable>(event:'downloaded',callback:(args:definition.DownloadedData<T>)=>void,thisArg?:any):void;
220-
on<TextendsObservable=Observable>(event:'downloadError',callback:(args:definition.DownloadError<T>)=>void,thisArg?:any):void;
218+
on<TextendsObservable=Cache>(eventNames:string,callback:(args:EventData<T>)=>void,thisArg?:any):void;
219+
on<TextendsObservable=Cache>(event:'downloaded',callback:(args:definition.DownloadedData<T>)=>void,thisArg?:any):void;
220+
on<TextendsObservable=Cache>(event:'downloadError',callback:(args:definition.DownloadError<T>)=>void,thisArg?:any):void;
221221
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp