@nativescript/canvas 1.0.0 → 1.1.0-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Canvas/common.d.ts +1 -0
- package/Canvas/common.js +65 -31
- package/Canvas/common.js.map +1 -1
- package/Canvas2D/CanvasRenderingContext2D/index.android.d.ts +3 -0
- package/Canvas2D/CanvasRenderingContext2D/index.android.js +47 -35
- package/Canvas2D/CanvasRenderingContext2D/index.android.js.map +1 -1
- package/Canvas2D/CanvasRenderingContext2D/index.d.ts +6 -0
- package/Canvas2D/CanvasRenderingContext2D/index.ios.d.ts +4 -1
- package/Canvas2D/CanvasRenderingContext2D/index.ios.js +117 -113
- package/Canvas2D/CanvasRenderingContext2D/index.ios.js.map +1 -1
- package/ImageBitmap/index.ios.js +9 -9
- package/ImageBitmap/index.ios.js.map +1 -1
- package/SVG/SVG.js.map +1 -1
- package/angular/esm2020/index.mjs +17 -0
- package/angular/esm2020/nativescript-canvas-angular.mjs +5 -0
- package/angular/fesm2015/nativescript-canvas-angular.mjs +24 -0
- package/angular/fesm2015/nativescript-canvas-angular.mjs.map +1 -0
- package/angular/fesm2020/nativescript-canvas-angular.mjs +24 -0
- package/angular/fesm2020/nativescript-canvas-angular.mjs.map +1 -0
- package/angular/index.d.ts +4 -0
- package/angular/package.json +20 -8
- package/package.json +2 -2
- package/platforms/android/include.gradle +1 -1
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative-Swift.h +67 -3
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_native.h +56 -32
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Info.plist +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json +74840 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/{arm64.swiftinterface → arm64-apple-ios.private.swiftinterface} +26 -13
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftdoc +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftinterface +26 -13
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/module.modulemap +2 -2
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/CanvasNative-Swift.h +124 -6
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_native.h +56 -32
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Info.plist +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json +74840 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/{arm64.swiftinterface → arm64-apple-ios-simulator.private.swiftinterface} +26 -13
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface +26 -13
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json +74840 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/{x86_64.swiftinterface → x86_64-apple-ios-simulator.private.swiftinterface} +26 -13
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +26 -13
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/module.modulemap +2 -2
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources +41 -85
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
- package/typings/objc!CanvasNative.d.ts +2018 -0
- package/typings/objc!CanvasNative.js +1 -0
- package/typings/objc!CanvasNative.js.map +1 -0
- package/angular/bundles/nativescript-canvas-angular.umd.js +0 -29
- package/angular/bundles/nativescript-canvas-angular.umd.js.map +0 -1
- package/angular/esm2015/index.js +0 -12
- package/angular/esm2015/nativescript-canvas-angular.js +0 -5
- package/angular/fesm2015/nativescript-canvas-angular.js +0 -19
- package/angular/fesm2015/nativescript-canvas-angular.js.map +0 -1
- package/angular/nativescript-canvas-angular.d.ts +0 -4
- package/angular/nativescript-canvas-angular.metadata.json +0 -1
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64.swiftdoc +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64.swiftdoc +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64.swiftdoc +0 -0
package/Canvas/common.d.ts
CHANGED
package/Canvas/common.js
CHANGED
|
@@ -12,7 +12,7 @@ export class TouchEvent {
|
|
|
12
12
|
constructor(name, init) {
|
|
13
13
|
this.type = name;
|
|
14
14
|
if (init && typeof init === 'object') {
|
|
15
|
-
Object.keys(init).forEach(key => {
|
|
15
|
+
Object.keys(init).forEach((key) => {
|
|
16
16
|
this[key] = init[key];
|
|
17
17
|
});
|
|
18
18
|
}
|
|
@@ -24,7 +24,7 @@ export class PointerEvent {
|
|
|
24
24
|
constructor(name, init) {
|
|
25
25
|
this.type = name;
|
|
26
26
|
if (init && typeof init === 'object') {
|
|
27
|
-
Object.keys(init).forEach(key => {
|
|
27
|
+
Object.keys(init).forEach((key) => {
|
|
28
28
|
this[key] = init[key];
|
|
29
29
|
});
|
|
30
30
|
}
|
|
@@ -32,11 +32,11 @@ export class PointerEvent {
|
|
|
32
32
|
preventDefault() { }
|
|
33
33
|
stopPropagation() { }
|
|
34
34
|
}
|
|
35
|
-
const WEB_GESTURE_EVENTS = ['touchmove', 'touchstart', 'touchcancel', 'touchend', 'change', 'pointerup', 'pointerdown', 'pointermove', 'pointercancel'];
|
|
35
|
+
const WEB_GESTURE_EVENTS = ['touchmove', 'touchstart', 'touchcancel', 'touchend', 'change', 'pointerup', 'pointerdown', 'pointermove', 'pointercancel', 'mousedown', 'mousemove'];
|
|
36
36
|
export const ignorePixelScalingProperty = new Property({
|
|
37
37
|
name: 'ignorePixelScaling',
|
|
38
38
|
defaultValue: false,
|
|
39
|
-
valueConverter: booleanConverter
|
|
39
|
+
valueConverter: booleanConverter,
|
|
40
40
|
});
|
|
41
41
|
let pointerId = 0;
|
|
42
42
|
let CanvasBase = class CanvasBase extends View {
|
|
@@ -62,7 +62,7 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
62
62
|
super.removeEventListener(arg, callback, thisArg);
|
|
63
63
|
if (WEB_GESTURE_EVENTS.indexOf(arg) !== -1) {
|
|
64
64
|
// if we dont have any other web gestures we can unregister gestures
|
|
65
|
-
if (!WEB_GESTURE_EVENTS.some(e => this.hasListeners(e))) {
|
|
65
|
+
if (!WEB_GESTURE_EVENTS.some((e) => this.hasListeners(e))) {
|
|
66
66
|
this.__unregisterGestures();
|
|
67
67
|
}
|
|
68
68
|
}
|
|
@@ -257,10 +257,13 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
257
257
|
let extraData;
|
|
258
258
|
let hasPointerDown = false;
|
|
259
259
|
let hasTouchStart = false;
|
|
260
|
+
let hasMouseDown = false;
|
|
260
261
|
let hasPointerMove = false;
|
|
261
262
|
let hasTouchMove = false;
|
|
263
|
+
let hasMouseMove = false;
|
|
262
264
|
let hasPointerUp = false;
|
|
263
265
|
let hasTouchEnd = false;
|
|
266
|
+
let hasMouseUp = false;
|
|
264
267
|
let hasPointerCancel = false;
|
|
265
268
|
let hasTouchCancel = false;
|
|
266
269
|
if (event.eventName === 'touch') {
|
|
@@ -268,7 +271,8 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
268
271
|
case 'down':
|
|
269
272
|
hasPointerDown = this.hasListeners('pointerdown');
|
|
270
273
|
hasTouchStart = this.hasListeners('touchstart');
|
|
271
|
-
|
|
274
|
+
hasMouseDown = this.hasListeners('mousedown');
|
|
275
|
+
if (hasPointerDown || hasTouchStart || hasMouseDown) {
|
|
272
276
|
const numberOfPointers = event.getPointerCount();
|
|
273
277
|
const positions = this._positionsFromEvent(event);
|
|
274
278
|
const x = event.getX();
|
|
@@ -277,20 +281,25 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
277
281
|
numberOfPointers,
|
|
278
282
|
positions,
|
|
279
283
|
x,
|
|
280
|
-
y
|
|
284
|
+
y,
|
|
281
285
|
};
|
|
282
286
|
}
|
|
283
|
-
if (hasPointerDown && this._previousPointerCount !== extraData.numberOfPointers) {
|
|
287
|
+
if ((hasPointerDown || hasMouseDown) && this._previousPointerCount !== extraData.numberOfPointers) {
|
|
284
288
|
this._previousPointerCount = extraData.numberOfPointers;
|
|
285
289
|
pointerId++;
|
|
286
290
|
this._pointers[this._previousPointerCount - 1] = {
|
|
287
291
|
id: pointerId,
|
|
288
292
|
coords: {
|
|
289
293
|
x: extraData.x,
|
|
290
|
-
y: extraData.y
|
|
291
|
-
}
|
|
294
|
+
y: extraData.y,
|
|
295
|
+
},
|
|
292
296
|
};
|
|
293
|
-
|
|
297
|
+
if (hasPointerDown) {
|
|
298
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointerdown', extraData)), { pointerId: pointerId }));
|
|
299
|
+
}
|
|
300
|
+
if (hasMouseDown) {
|
|
301
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousedown', extraData)), { pointerId: pointerId }));
|
|
302
|
+
}
|
|
294
303
|
}
|
|
295
304
|
if (hasTouchStart) {
|
|
296
305
|
this.notify(this._createTouchEvent('touchstart', extraData));
|
|
@@ -299,7 +308,8 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
299
308
|
case 'up':
|
|
300
309
|
hasPointerUp = this.hasListeners('pointerup');
|
|
301
310
|
hasTouchEnd = this.hasListeners('touchend');
|
|
302
|
-
|
|
311
|
+
hasMouseUp = this.hasListeners('mouseup');
|
|
312
|
+
if (hasPointerUp || hasTouchEnd || hasMouseUp) {
|
|
303
313
|
const numberOfPointers = event.getPointerCount();
|
|
304
314
|
const positions = this._positionsFromEvent(event);
|
|
305
315
|
const x = event.getX();
|
|
@@ -308,15 +318,20 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
308
318
|
numberOfPointers,
|
|
309
319
|
positions,
|
|
310
320
|
x,
|
|
311
|
-
y
|
|
321
|
+
y,
|
|
312
322
|
};
|
|
313
323
|
}
|
|
314
|
-
if (hasPointerUp) {
|
|
324
|
+
if (hasPointerUp || hasMouseUp) {
|
|
315
325
|
this._previousPointerCount -= extraData.numberOfPointers;
|
|
316
326
|
for (let i = 0; i < extraData.numberOfPointers; i++) {
|
|
317
327
|
const x = extraData.positions[i];
|
|
318
328
|
const y = extraData.positions[i + 1];
|
|
319
|
-
|
|
329
|
+
if (hasPointerUp) {
|
|
330
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointerup', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
|
|
331
|
+
}
|
|
332
|
+
if (hasMouseUp) {
|
|
333
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mouseup', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
|
|
334
|
+
}
|
|
320
335
|
}
|
|
321
336
|
}
|
|
322
337
|
if (hasTouchEnd) {
|
|
@@ -335,7 +350,7 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
335
350
|
numberOfPointers,
|
|
336
351
|
positions,
|
|
337
352
|
x,
|
|
338
|
-
y
|
|
353
|
+
y,
|
|
339
354
|
};
|
|
340
355
|
}
|
|
341
356
|
if (hasPointerCancel) {
|
|
@@ -360,14 +375,15 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
360
375
|
const numberOfPointers = this._pointerCountFromEvent(event);
|
|
361
376
|
hasPointerMove = this.hasListeners('pointermove');
|
|
362
377
|
hasTouchMove = this.hasListeners('touchmove');
|
|
378
|
+
hasMouseMove = this.hasListeners('mousemove');
|
|
363
379
|
let data = {};
|
|
364
|
-
if (hasPointerMove || hasTouchMove) {
|
|
380
|
+
if (hasPointerMove || hasTouchMove || hasMouseMove) {
|
|
365
381
|
const positions = this._positionsFromEvent(event);
|
|
366
382
|
extraData = {
|
|
367
383
|
numberOfPointers,
|
|
368
384
|
positions,
|
|
369
385
|
x: positions[0],
|
|
370
|
-
y: positions[1]
|
|
386
|
+
y: positions[1],
|
|
371
387
|
};
|
|
372
388
|
const dx = extraData.positions[2] - extraData.positions[0];
|
|
373
389
|
const dy = extraData.positions[3] - extraData.positions[1];
|
|
@@ -391,13 +407,18 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
391
407
|
deltaZ: 0,
|
|
392
408
|
};
|
|
393
409
|
}
|
|
394
|
-
if (hasPointerMove) {
|
|
410
|
+
if (hasPointerMove || hasMouseMove) {
|
|
395
411
|
const count = extraData.numberOfPointers;
|
|
396
412
|
const positions = extraData.positions;
|
|
397
413
|
for (let i = 0; i < count; i++) {
|
|
398
414
|
let x = positions[i] - extraData.x;
|
|
399
415
|
let y = positions[i + 1] - extraData.y;
|
|
400
|
-
|
|
416
|
+
if (hasPointerMove) {
|
|
417
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
|
|
418
|
+
}
|
|
419
|
+
if (hasMouseMove) {
|
|
420
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousemove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
|
|
421
|
+
}
|
|
401
422
|
}
|
|
402
423
|
}
|
|
403
424
|
if (hasTouchMove) {
|
|
@@ -411,7 +432,7 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
411
432
|
}
|
|
412
433
|
else if (event.eventName === 'pinch') {
|
|
413
434
|
if (global.isAndroid) {
|
|
414
|
-
if (
|
|
435
|
+
if (event.state === GestureStateTypes.began || event.state === GestureStateTypes.changed) {
|
|
415
436
|
this._isPinching = true;
|
|
416
437
|
this._previousPinchDistance = 0;
|
|
417
438
|
}
|
|
@@ -432,15 +453,16 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
432
453
|
if (global.isIOS) {
|
|
433
454
|
hasPointerMove = this.hasListeners('pointermove');
|
|
434
455
|
hasTouchMove = this.hasListeners('touchmove');
|
|
456
|
+
hasMouseMove = this.hasListeners('mousemove');
|
|
435
457
|
let data = {};
|
|
436
458
|
let delta = 0;
|
|
437
|
-
if (hasPointerMove || hasTouchMove) {
|
|
459
|
+
if (hasPointerMove || hasTouchMove || hasMouseMove) {
|
|
438
460
|
const positions = this._positionsFromEvent(event);
|
|
439
461
|
extraData = {
|
|
440
462
|
numberOfPointers,
|
|
441
463
|
positions,
|
|
442
464
|
x: positions[0],
|
|
443
|
-
y: positions[1]
|
|
465
|
+
y: positions[1],
|
|
444
466
|
};
|
|
445
467
|
const dx = extraData.positions[2] - extraData.positions[0];
|
|
446
468
|
const dy = extraData.positions[3] - extraData.positions[1];
|
|
@@ -463,13 +485,18 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
463
485
|
deltaZ: 0,
|
|
464
486
|
};
|
|
465
487
|
}
|
|
466
|
-
if (hasPointerMove) {
|
|
488
|
+
if (hasPointerMove || hasMouseMove) {
|
|
467
489
|
const count = extraData.numberOfPointers;
|
|
468
490
|
const positions = extraData.positions;
|
|
469
491
|
for (let i = 0; i < count; i++) {
|
|
470
492
|
let x = positions[i] - extraData.x;
|
|
471
493
|
let y = positions[i + 1] - extraData.y;
|
|
472
|
-
|
|
494
|
+
if (hasPointerMove) {
|
|
495
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
|
|
496
|
+
}
|
|
497
|
+
if (hasMouseMove) {
|
|
498
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousemove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
|
|
499
|
+
}
|
|
473
500
|
}
|
|
474
501
|
}
|
|
475
502
|
if (hasTouchMove) {
|
|
@@ -486,7 +513,8 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
486
513
|
if (event.state === GestureStateTypes.began || event.state === GestureStateTypes.changed) {
|
|
487
514
|
hasPointerMove = this.hasListeners('pointermove');
|
|
488
515
|
hasTouchMove = this.hasListeners('touchmove');
|
|
489
|
-
|
|
516
|
+
hasMouseMove = this.hasListeners('mousemove');
|
|
517
|
+
if (hasPointerMove || hasTouchMove || hasMouseMove) {
|
|
490
518
|
const numberOfPointers = this._pointerCountFromEvent(event);
|
|
491
519
|
const positions = this._positionsFromEvent(event);
|
|
492
520
|
const x = positions[0];
|
|
@@ -495,15 +523,20 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
495
523
|
numberOfPointers,
|
|
496
524
|
positions,
|
|
497
525
|
x,
|
|
498
|
-
y
|
|
526
|
+
y,
|
|
499
527
|
};
|
|
500
528
|
}
|
|
501
|
-
if (hasPointerMove) {
|
|
529
|
+
if (hasPointerMove || hasMouseMove) {
|
|
502
530
|
const positions = extraData.positions;
|
|
503
531
|
for (let i = 0; i < extraData.numberOfPointers; i++) {
|
|
504
532
|
const x = positions[i];
|
|
505
533
|
const y = positions[i + 1];
|
|
506
|
-
|
|
534
|
+
if (hasPointerMove) {
|
|
535
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', { numberOfPointers: extraData.numberOfPointers, positions, x, y })), { pointerId: this._pointers[i].id }));
|
|
536
|
+
}
|
|
537
|
+
if (hasMouseMove) {
|
|
538
|
+
this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousemove', { numberOfPointers: extraData.numberOfPointers, positions, x, y })), { pointerId: this._pointers[i].id }));
|
|
539
|
+
}
|
|
507
540
|
}
|
|
508
541
|
}
|
|
509
542
|
if (hasTouchMove) {
|
|
@@ -575,10 +608,11 @@ let CanvasBase = class CanvasBase extends View {
|
|
|
575
608
|
y,
|
|
576
609
|
width: 23.4375,
|
|
577
610
|
height: 23.4375,
|
|
578
|
-
isPrimary: true
|
|
611
|
+
isPrimary: true,
|
|
579
612
|
};
|
|
580
|
-
return Object.assign(new PointerEvent(name), Object.assign({ eventName: name, defaultPrevented: false, cancelable: false, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, target: this }, activePointer));
|
|
613
|
+
return Object.assign(new PointerEvent(name), Object.assign(Object.assign({ eventName: name, defaultPrevented: false, cancelable: false, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, target: this }, activePointer), { preventDefault: () => { } }));
|
|
581
614
|
}
|
|
615
|
+
preventDefault() { }
|
|
582
616
|
};
|
|
583
617
|
CanvasBase.readyEvent = 'ready';
|
|
584
618
|
CanvasBase = __decorate([
|
package/Canvas/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/common.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,7 @@ export declare class CanvasRenderingContext2D extends CanvasRenderingContext2DBa
|
|
|
66
66
|
createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
|
|
67
67
|
createPattern(image: any, repetition: string): CanvasPattern | null;
|
|
68
68
|
createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient;
|
|
69
|
+
createConicGradient(startAngle: number, x: number, y: number): CanvasGradient;
|
|
69
70
|
drawFocusIfNeeded(element: any): void;
|
|
70
71
|
drawFocusIfNeeded(path: any, element: any): void;
|
|
71
72
|
drawImage(image: any, dx: number, dy: number): void;
|
|
@@ -91,6 +92,8 @@ export declare class CanvasRenderingContext2D extends CanvasRenderingContext2DBa
|
|
|
91
92
|
putImageData(imageData: ImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number): void;
|
|
92
93
|
quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
|
|
93
94
|
rect(x: number, y: number, width: number, height: number): void;
|
|
95
|
+
roundRect(x: number, y: number, width: number, height: number, radii: number): void;
|
|
96
|
+
roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
|
|
94
97
|
removeHitRegion(id: string): void;
|
|
95
98
|
resetTransform(): void;
|
|
96
99
|
restore(): void;
|
|
@@ -7,7 +7,7 @@ import { ImageSource } from '@nativescript/core';
|
|
|
7
7
|
import { ImageAsset } from '../../ImageAsset';
|
|
8
8
|
import { CanvasPattern } from '../CanvasPattern';
|
|
9
9
|
import { Canvas } from '../../Canvas';
|
|
10
|
-
import lazy from '@nativescript/
|
|
10
|
+
import lazy from '@nativescript/core/utils/lazy';
|
|
11
11
|
const FillRule = {
|
|
12
12
|
EvenOdd: lazy(() => org.nativescript.canvas.TNSFillRule.EvenOdd),
|
|
13
13
|
NonZero: lazy(() => org.nativescript.canvas.TNSFillRule.NonZero),
|
|
@@ -70,7 +70,7 @@ const PatternRepetition = {
|
|
|
70
70
|
NoRepeat: lazy(() => org.nativescript.canvas.TNSPatternRepetition.NoRepeat),
|
|
71
71
|
Repeat: lazy(() => org.nativescript.canvas.TNSPatternRepetition.Repeat),
|
|
72
72
|
RepeatX: lazy(() => org.nativescript.canvas.TNSPatternRepetition.RepeatX),
|
|
73
|
-
RepeatY: lazy(() => org.nativescript.canvas.TNSPatternRepetition.RepeatY)
|
|
73
|
+
RepeatY: lazy(() => org.nativescript.canvas.TNSPatternRepetition.RepeatY),
|
|
74
74
|
};
|
|
75
75
|
export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
76
76
|
constructor(context) {
|
|
@@ -115,13 +115,13 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
115
115
|
}
|
|
116
116
|
get direction() {
|
|
117
117
|
this.log('direction');
|
|
118
|
-
return this.context.getDirection() === TextDirection.Ltr() ?
|
|
118
|
+
return this.context.getDirection() === TextDirection.Ltr() ? 'ltr' : 'rtl';
|
|
119
119
|
}
|
|
120
120
|
set direction(value) {
|
|
121
121
|
this.log('direction value:', value);
|
|
122
122
|
this._ensureLayoutBeforeDraw();
|
|
123
123
|
if (this.context) {
|
|
124
|
-
this.context.setDirection(value ===
|
|
124
|
+
this.context.setDirection(value === 'rtl' ? TextDirection.Rtl() : TextDirection.Ltr());
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
get globalAlpha() {
|
|
@@ -385,14 +385,15 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
385
385
|
get fillStyle() {
|
|
386
386
|
this.log('fillStyle');
|
|
387
387
|
if (this.context) {
|
|
388
|
-
|
|
388
|
+
const style = this.context.getFillStyle();
|
|
389
|
+
switch (style.getStyleType()) {
|
|
389
390
|
case org.nativescript.canvas.TNSColorStyleType.Color:
|
|
390
|
-
const color =
|
|
391
|
+
const color = style;
|
|
391
392
|
return color.getColor();
|
|
392
393
|
case org.nativescript.canvas.TNSColorStyleType.Gradient:
|
|
393
|
-
return CanvasGradient.fromNative(
|
|
394
|
+
return CanvasGradient.fromNative(style);
|
|
394
395
|
case org.nativescript.canvas.TNSColorStyleType.Pattern:
|
|
395
|
-
return new CanvasPattern(
|
|
396
|
+
return new CanvasPattern(style);
|
|
396
397
|
}
|
|
397
398
|
}
|
|
398
399
|
return 'black';
|
|
@@ -404,7 +405,7 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
404
405
|
}
|
|
405
406
|
this._ensureLayoutBeforeDraw();
|
|
406
407
|
if (typeof color === 'string') {
|
|
407
|
-
this.context.
|
|
408
|
+
this.context.setFillStyleWithString(color);
|
|
408
409
|
}
|
|
409
410
|
else if (color instanceof CanvasGradient) {
|
|
410
411
|
this.context.setFillStyle(color.native);
|
|
@@ -425,14 +426,15 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
425
426
|
}
|
|
426
427
|
get strokeStyle() {
|
|
427
428
|
this.log('strokeStyle');
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
429
|
+
const style = this.context.getStrokeStyle();
|
|
430
|
+
switch (style.getStyleType()) {
|
|
431
|
+
case 0 /* CanvasColorStyleType.Color */:
|
|
432
|
+
const color = style;
|
|
431
433
|
return color.getColor();
|
|
432
|
-
case 1 /* Gradient */:
|
|
433
|
-
return CanvasGradient.fromNative(
|
|
434
|
-
case 2 /* Pattern */:
|
|
435
|
-
return new CanvasPattern(
|
|
434
|
+
case 1 /* CanvasColorStyleType.Gradient */:
|
|
435
|
+
return CanvasGradient.fromNative(style);
|
|
436
|
+
case 2 /* CanvasColorStyleType.Pattern */:
|
|
437
|
+
return new CanvasPattern(style);
|
|
436
438
|
}
|
|
437
439
|
}
|
|
438
440
|
set strokeStyle(color) {
|
|
@@ -442,7 +444,7 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
442
444
|
}
|
|
443
445
|
this._ensureLayoutBeforeDraw();
|
|
444
446
|
if (typeof color === 'string') {
|
|
445
|
-
this.context.
|
|
447
|
+
this.context.setStrokeStyleWithString(color);
|
|
446
448
|
}
|
|
447
449
|
else if (color instanceof CanvasGradient) {
|
|
448
450
|
this.context.setStrokeStyle(color.native);
|
|
@@ -462,8 +464,7 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
462
464
|
this.context.setLineWidth(width);
|
|
463
465
|
}
|
|
464
466
|
}
|
|
465
|
-
addHitRegion(region) {
|
|
466
|
-
}
|
|
467
|
+
addHitRegion(region) { }
|
|
467
468
|
arc(x, y, radius, startAngle, endAngle, anticlockwise = false) {
|
|
468
469
|
this.log('arc value:', x, y, radius, startAngle, endAngle, anticlockwise);
|
|
469
470
|
this._ensureLayoutBeforeDraw();
|
|
@@ -484,8 +485,7 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
484
485
|
this._ensureLayoutBeforeDraw();
|
|
485
486
|
this.context.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
|
|
486
487
|
}
|
|
487
|
-
clearHitRegions() {
|
|
488
|
-
}
|
|
488
|
+
clearHitRegions() { }
|
|
489
489
|
clearRect(x, y, width, height) {
|
|
490
490
|
this.log('clearRect value:', x, y, width, height);
|
|
491
491
|
this._ensureLayoutBeforeDraw();
|
|
@@ -563,9 +563,7 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
563
563
|
img = ImageSource.fromFileSync(image.src).android;
|
|
564
564
|
}
|
|
565
565
|
}
|
|
566
|
-
else if (image &&
|
|
567
|
-
typeof image.tagName === 'string' &&
|
|
568
|
-
image.tagName === 'CANVAS' && image._canvas instanceof Canvas) {
|
|
566
|
+
else if (image && typeof image.tagName === 'string' && image.tagName === 'CANVAS' && image._canvas instanceof Canvas) {
|
|
569
567
|
img = image._canvas.android;
|
|
570
568
|
}
|
|
571
569
|
else if (image instanceof ImageBitmap || (image === null || image === void 0 ? void 0 : image.nativeInstance) instanceof org.nativescript.canvas.TNSImageBitmap) {
|
|
@@ -596,8 +594,12 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
596
594
|
this._ensureLayoutBeforeDraw();
|
|
597
595
|
return CanvasGradient.fromNative(this.context.createRadialGradient(x0, y0, r0, x1, y1, r1));
|
|
598
596
|
}
|
|
599
|
-
|
|
597
|
+
createConicGradient(startAngle, x, y) {
|
|
598
|
+
this.log('createConicGradient value:', startAngle, x, y);
|
|
599
|
+
this._ensureLayoutBeforeDraw();
|
|
600
|
+
return CanvasGradient.fromNative(this.context.createConicGradient(startAngle, x, y));
|
|
600
601
|
}
|
|
602
|
+
drawFocusIfNeeded(...args) { }
|
|
601
603
|
drawImage(...args) {
|
|
602
604
|
this.log('drawImage value:', ...args);
|
|
603
605
|
this._ensureLayoutBeforeDraw();
|
|
@@ -628,9 +630,7 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
628
630
|
image = ImageSource.fromFileSync(image.src).android;
|
|
629
631
|
}
|
|
630
632
|
}
|
|
631
|
-
else if (image &&
|
|
632
|
-
typeof image.tagName === 'string' &&
|
|
633
|
-
image.tagName === 'CANVAS' && image._canvas instanceof Canvas) {
|
|
633
|
+
else if (image && typeof image.tagName === 'string' && image.tagName === 'CANVAS' && image._canvas instanceof Canvas) {
|
|
634
634
|
image = image._canvas.android;
|
|
635
635
|
}
|
|
636
636
|
else if (image instanceof ImageBitmap || (image === null || image === void 0 ? void 0 : image.nativeInstance) instanceof org.nativescript.canvas.TNSImageBitmap) {
|
|
@@ -654,6 +654,10 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
654
654
|
fill(...args) {
|
|
655
655
|
this.log('fill value:', ...args);
|
|
656
656
|
this._ensureLayoutBeforeDraw();
|
|
657
|
+
if (arguments.length === 0) {
|
|
658
|
+
this.context.fill();
|
|
659
|
+
return;
|
|
660
|
+
}
|
|
657
661
|
if (typeof args[0] === 'string') {
|
|
658
662
|
const rule = this._fillRuleFromString(args[0]);
|
|
659
663
|
this.context.fill(rule);
|
|
@@ -678,10 +682,10 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
678
682
|
this.log('fillText value:', text, x, y, maxWidth);
|
|
679
683
|
this._ensureLayoutBeforeDraw();
|
|
680
684
|
if (typeof maxWidth === 'number') {
|
|
681
|
-
this.context.fillText(text, x, y, maxWidth);
|
|
685
|
+
this.context.fillText(text + '', x, y, maxWidth);
|
|
682
686
|
}
|
|
683
687
|
else {
|
|
684
|
-
this.context.fillText(text, x, y);
|
|
688
|
+
this.context.fillText(text + '', x, y);
|
|
685
689
|
}
|
|
686
690
|
}
|
|
687
691
|
getImageData(sx, sy, sw, sh) {
|
|
@@ -758,8 +762,17 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
758
762
|
this._ensureLayoutBeforeDraw();
|
|
759
763
|
this.context.rect(x, y, width, height);
|
|
760
764
|
}
|
|
761
|
-
|
|
765
|
+
roundRect(x, y, width, height, radii) {
|
|
766
|
+
this.log('roundRect value:', x, y, width, height, radii);
|
|
767
|
+
this._ensureLayoutBeforeDraw();
|
|
768
|
+
if (Array.isArray(radii)) {
|
|
769
|
+
this.context.roundRect(x, y, width, height, radii);
|
|
770
|
+
}
|
|
771
|
+
else if (typeof radii === 'number') {
|
|
772
|
+
this.context.roundRect(x, y, width, height, radii);
|
|
773
|
+
}
|
|
762
774
|
}
|
|
775
|
+
removeHitRegion(id) { }
|
|
763
776
|
resetTransform() {
|
|
764
777
|
this.log('resetTransform value:');
|
|
765
778
|
this._ensureLayoutBeforeDraw();
|
|
@@ -785,8 +798,7 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
785
798
|
this._ensureLayoutBeforeDraw();
|
|
786
799
|
this.context.scale(x, y);
|
|
787
800
|
}
|
|
788
|
-
scrollPathIntoView(path) {
|
|
789
|
-
}
|
|
801
|
+
scrollPathIntoView(path) { }
|
|
790
802
|
setLineDash(segments) {
|
|
791
803
|
this.log('setLineDash value:', segments);
|
|
792
804
|
this._ensureLayoutBeforeDraw();
|
|
@@ -816,10 +828,10 @@ export class CanvasRenderingContext2D extends CanvasRenderingContext2DBase {
|
|
|
816
828
|
this.log('strokeText value:', text, x, y, maxWidth);
|
|
817
829
|
this._ensureLayoutBeforeDraw();
|
|
818
830
|
if (typeof maxWidth === 'number') {
|
|
819
|
-
this.context.strokeText(text, x, y, maxWidth);
|
|
831
|
+
this.context.strokeText(text + '', x, y, maxWidth);
|
|
820
832
|
}
|
|
821
833
|
else {
|
|
822
|
-
this.context.strokeText(text, x, y);
|
|
834
|
+
this.context.strokeText(text + '', x, y);
|
|
823
835
|
}
|
|
824
836
|
}
|
|
825
837
|
transform(a, b, c, d, e, f) {
|