@nativescript/canvas 1.1.0-alpha.9 → 2.0.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 -5
- package/Canvas/common.js +31 -69
- package/Canvas/common.js.map +1 -1
- package/Canvas/index.android.d.ts +4 -4
- package/Canvas/index.android.js +62 -55
- package/Canvas/index.android.js.map +1 -1
- package/Canvas/index.d.ts +0 -4
- package/Canvas/index.ios.d.ts +0 -2
- package/Canvas/index.ios.js +24 -43
- package/Canvas/index.ios.js.map +1 -1
- package/Canvas2D/CanvasGradient/CanvasGradient.android.d.ts +2 -0
- package/Canvas2D/CanvasGradient/CanvasGradient.android.js +10 -1
- package/Canvas2D/CanvasGradient/CanvasGradient.android.js.map +1 -1
- package/Canvas2D/CanvasPattern/CanvasPattern.android.d.ts +2 -0
- package/Canvas2D/CanvasPattern/CanvasPattern.android.js +10 -1
- package/Canvas2D/CanvasPattern/CanvasPattern.android.js.map +1 -1
- package/Canvas2D/CanvasPattern/CanvasPattern.ios.d.ts +0 -1
- package/Canvas2D/CanvasPattern/CanvasPattern.ios.js +0 -3
- package/Canvas2D/CanvasPattern/CanvasPattern.ios.js.map +1 -1
- package/Canvas2D/CanvasRenderingContext2D/common.d.ts +1 -3
- package/Canvas2D/CanvasRenderingContext2D/common.js.map +1 -1
- package/Canvas2D/CanvasRenderingContext2D/index.android.d.ts +5 -6
- package/Canvas2D/CanvasRenderingContext2D/index.android.js +188 -394
- package/Canvas2D/CanvasRenderingContext2D/index.android.js.map +1 -1
- package/Canvas2D/CanvasRenderingContext2D/index.d.ts +0 -6
- package/Canvas2D/CanvasRenderingContext2D/index.ios.d.ts +0 -3
- package/Canvas2D/CanvasRenderingContext2D/index.ios.js +90 -107
- package/Canvas2D/CanvasRenderingContext2D/index.ios.js.map +1 -1
- package/Canvas2D/DOMMatrix/DOMMatrix.android.d.ts +24 -0
- package/Canvas2D/DOMMatrix/DOMMatrix.android.js +81 -46
- package/Canvas2D/DOMMatrix/DOMMatrix.android.js.map +1 -1
- package/Canvas2D/DOMMatrix/DOMMatrix.d.ts +3 -2
- package/Canvas2D/DOMMatrix/common.d.ts +0 -2
- package/Canvas2D/DOMMatrix/common.js +0 -7
- package/Canvas2D/DOMMatrix/common.js.map +1 -1
- package/Canvas2D/ImageData/ImageData.android.d.ts +4 -5
- package/Canvas2D/ImageData/ImageData.android.js +48 -29
- package/Canvas2D/ImageData/ImageData.android.js.map +1 -1
- package/Canvas2D/ImageData/ImageData.d.ts +4 -2
- package/Canvas2D/ImageData/common.d.ts +0 -1
- package/Canvas2D/ImageData/common.js +0 -3
- package/Canvas2D/ImageData/common.js.map +1 -1
- package/Canvas2D/Path2D/Path2D.android.d.ts +3 -2
- package/Canvas2D/Path2D/Path2D.android.js +45 -25
- package/Canvas2D/Path2D/Path2D.android.js.map +1 -1
- package/Canvas2D/Path2D/Path2D.d.ts +0 -4
- package/Canvas2D/Path2D/Path2D.ios.d.ts +0 -2
- package/Canvas2D/Path2D/Path2D.ios.js +1 -9
- package/Canvas2D/Path2D/Path2D.ios.js.map +1 -1
- package/Canvas2D/Path2D/common.d.ts +1 -4
- package/Canvas2D/Path2D/common.js +2 -6
- package/Canvas2D/Path2D/common.js.map +1 -1
- package/Canvas2D/TextMetrics/TextMetrics.android.js +12 -12
- package/Canvas2D/TextMetrics/TextMetrics.android.js.map +1 -1
- package/Canvas2D/TextMetrics/common.d.ts +0 -1
- package/Canvas2D/TextMetrics/common.js +0 -3
- package/Canvas2D/TextMetrics/common.js.map +1 -1
- package/ImageAsset/ImageAsset.android.d.ts +11 -12
- package/ImageAsset/ImageAsset.android.js +92 -127
- package/ImageAsset/ImageAsset.android.js.map +1 -1
- package/ImageAsset/ImageAsset.d.ts +8 -12
- package/ImageAsset/ImageAsset.ios.js +3 -3
- package/ImageAsset/ImageAsset.ios.js.map +1 -1
- package/ImageAsset/common.d.ts +0 -1
- package/ImageAsset/common.js +0 -3
- package/ImageAsset/common.js.map +1 -1
- package/ImageBitmap/common.d.ts +0 -2
- package/ImageBitmap/common.js +0 -7
- package/ImageBitmap/common.js.map +1 -1
- package/ImageBitmap/index.android.d.ts +2 -2
- package/ImageBitmap/index.android.js +55 -294
- package/ImageBitmap/index.android.js.map +1 -1
- package/ImageBitmap/index.ios.d.ts +1 -2
- package/ImageBitmap/index.ios.js +34 -23
- package/ImageBitmap/index.ios.js.map +1 -1
- package/TextDecoder/TextDecoder.android.d.ts +2 -1
- package/TextDecoder/TextDecoder.android.js +19 -38
- package/TextDecoder/TextDecoder.android.js.map +1 -1
- package/TextDecoder/common.d.ts +0 -1
- package/TextDecoder/common.js +0 -3
- package/TextDecoder/common.js.map +1 -1
- package/TextEncoder/TextEncoder.android.d.ts +2 -0
- package/TextEncoder/TextEncoder.android.js +19 -5
- package/TextEncoder/TextEncoder.android.js.map +1 -1
- package/TextEncoder/common.d.ts +0 -2
- package/TextEncoder/common.js +0 -7
- package/TextEncoder/common.js.map +1 -1
- package/WebGL/WebGLActiveInfo.d.ts +5 -8
- package/WebGL/WebGLActiveInfo.js +8 -24
- package/WebGL/WebGLActiveInfo.js.map +1 -1
- package/WebGL/WebGLExtensions/index.android.d.ts +9 -0
- package/WebGL/WebGLExtensions/index.android.js +94 -57
- package/WebGL/WebGLExtensions/index.android.js.map +1 -1
- package/WebGL/WebGLProgram.d.ts +1 -0
- package/WebGL/WebGLProgram.js +3 -0
- package/WebGL/WebGLProgram.js.map +1 -1
- package/WebGL/WebGLRenderingContext/index.android.d.ts +10 -13
- package/WebGL/WebGLRenderingContext/index.android.js +449 -952
- package/WebGL/WebGLRenderingContext/index.android.js.map +1 -1
- package/WebGL/WebGLRenderingContext/index.ios.js +4 -3
- package/WebGL/WebGLRenderingContext/index.ios.js.map +1 -1
- package/WebGL/WebGLShaderPrecisionFormat.d.ts +5 -4
- package/WebGL/WebGLShaderPrecisionFormat.js +11 -4
- package/WebGL/WebGLShaderPrecisionFormat.js.map +1 -1
- package/WebGL2/WebGL2RenderingContext/common.d.ts +1 -1
- package/WebGL2/WebGL2RenderingContext/common.js +199 -199
- package/WebGL2/WebGL2RenderingContext/common.js.map +1 -1
- package/WebGL2/WebGL2RenderingContext/index.android.d.ts +8 -7
- package/WebGL2/WebGL2RenderingContext/index.android.js +290 -328
- package/WebGL2/WebGL2RenderingContext/index.android.js.map +1 -1
- package/WebGL2/WebGL2RenderingContext/index.ios.js +1 -1
- package/WebGL2/WebGL2RenderingContext/index.ios.js.map +1 -1
- package/angular/esm2020/index.mjs +4 -4
- package/angular/fesm2015/nativescript-canvas-angular.mjs +4 -4
- package/angular/fesm2020/nativescript-canvas-angular.mjs +4 -4
- package/angular/nativescript-canvas-angular.d.ts +5 -0
- package/angular/package.json +2 -2
- package/helpers.d.ts +5 -0
- package/helpers.js +18 -0
- package/helpers.js.map +1 -0
- package/index.js +6 -0
- package/index.js.map +1 -1
- package/package.json +1 -1
- package/platforms/android/canvas-release.aar +0 -0
- package/platforms/android/include.gradle +5 -6
- 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 +33 -89
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative.h +1 -1
- 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/Project/arm64.swiftsourceinfo +0 -0
- 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 +22 -49
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64.swiftdoc +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/{arm64-apple-ios.private.swiftinterface → arm64.swiftinterface} +22 -49
- 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 +66 -168
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/CanvasNative.h +1 -1
- 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/arm64.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/Project/x86_64.swiftsourceinfo +0 -0
- 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 +22 -49
- 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/{arm64-apple-ios-simulator.private.swiftinterface → arm64.swiftinterface} +22 -49
- 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 +22 -49
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64.swiftdoc +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/{x86_64-apple-ios-simulator.private.swiftinterface → x86_64.swiftinterface} +22 -49
- 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 +83 -50
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
- package/utils.d.ts +1 -3
- package/utils.js +20 -7
- package/utils.js.map +1 -1
- package/LICENSE +0 -201
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_native.h +0 -1636
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json +0 -75693
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_native.h +0 -1636
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json +0 -75693
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json +0 -75693
- package/typings/objc!CanvasNative.d.ts +0 -2036
- package/typings/objc!CanvasNative.js +0 -1
- package/typings/objc!CanvasNative.js.map +0 -1
package/Canvas/index.android.js
CHANGED
|
@@ -7,37 +7,40 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { CanvasBase, ignorePixelScalingProperty
|
|
10
|
+
import { CanvasBase, ignorePixelScalingProperty } from './common';
|
|
11
11
|
import { DOMMatrix } from '../Canvas2D';
|
|
12
12
|
import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
|
|
13
13
|
import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
|
|
14
14
|
import { WebGL2RenderingContext } from '../WebGL2/WebGL2RenderingContext';
|
|
15
|
-
import { Application, View, profile
|
|
15
|
+
import { Application, View, profile } from '@nativescript/core';
|
|
16
16
|
export function createSVGMatrix() {
|
|
17
|
-
return new DOMMatrix(
|
|
17
|
+
return new DOMMatrix();
|
|
18
18
|
}
|
|
19
19
|
export * from './common';
|
|
20
|
+
const defaultOpts = {
|
|
21
|
+
alpha: true,
|
|
22
|
+
antialias: true,
|
|
23
|
+
depth: true,
|
|
24
|
+
failIfMajorPerformanceCaveat: false,
|
|
25
|
+
powerPreference: 'default',
|
|
26
|
+
premultipliedAlpha: true,
|
|
27
|
+
preserveDrawingBuffer: false,
|
|
28
|
+
stencil: false,
|
|
29
|
+
desynchronized: false,
|
|
30
|
+
xrCompatible: false,
|
|
31
|
+
};
|
|
20
32
|
export class Canvas extends CanvasBase {
|
|
21
|
-
constructor(
|
|
33
|
+
constructor() {
|
|
22
34
|
super();
|
|
23
35
|
this._ready = false;
|
|
24
36
|
this._didPause = false;
|
|
25
|
-
|
|
26
|
-
if (typeof arguments[0] === 'boolean') {
|
|
27
|
-
useCpu = arguments[0];
|
|
28
|
-
}
|
|
29
|
-
}
|
|
37
|
+
this._didLayout = false;
|
|
30
38
|
const activity = Application.android.foregroundActivity || Application.android.startActivity;
|
|
31
|
-
this._canvas = new org.nativescript.canvas.
|
|
39
|
+
this._canvas = new org.nativescript.canvas.NSCCanvas(activity);
|
|
32
40
|
global.__canvasLoaded = true;
|
|
33
41
|
}
|
|
34
42
|
[ignorePixelScalingProperty.setNative](value) {
|
|
35
|
-
|
|
36
|
-
(_b = (_a = this._canvas) === null || _a === void 0 ? void 0 : _a.setIgnorePixelScaling) === null || _b === void 0 ? void 0 : _b.call(_a, value);
|
|
37
|
-
}
|
|
38
|
-
[scalingProperty.setNative](value) {
|
|
39
|
-
var _a, _b;
|
|
40
|
-
(_b = (_a = this._canvas) === null || _a === void 0 ? void 0 : _a.setScaling) === null || _b === void 0 ? void 0 : _b.call(_a, value);
|
|
43
|
+
this._canvas.setIgnorePixelScaling(value);
|
|
41
44
|
}
|
|
42
45
|
// @ts-ignore
|
|
43
46
|
get android() {
|
|
@@ -65,6 +68,7 @@ export class Canvas extends CanvasBase {
|
|
|
65
68
|
}
|
|
66
69
|
set width(value) {
|
|
67
70
|
this.style.width = value;
|
|
71
|
+
this._didLayout = false;
|
|
68
72
|
if (this._isCustom) {
|
|
69
73
|
this._layoutNative();
|
|
70
74
|
}
|
|
@@ -85,6 +89,7 @@ export class Canvas extends CanvasBase {
|
|
|
85
89
|
}
|
|
86
90
|
set height(value) {
|
|
87
91
|
this.style.height = value;
|
|
92
|
+
this._didLayout = false;
|
|
88
93
|
if (this._isCustom) {
|
|
89
94
|
this._layoutNative();
|
|
90
95
|
}
|
|
@@ -94,6 +99,7 @@ export class Canvas extends CanvasBase {
|
|
|
94
99
|
canvas.width = 300;
|
|
95
100
|
canvas.height = 150;
|
|
96
101
|
canvas._isCustom = true;
|
|
102
|
+
canvas._layoutNative();
|
|
97
103
|
return canvas;
|
|
98
104
|
}
|
|
99
105
|
createNativeView() {
|
|
@@ -104,9 +110,6 @@ export class Canvas extends CanvasBase {
|
|
|
104
110
|
if (this.ignorePixelScaling) {
|
|
105
111
|
this._canvas.setIgnorePixelScaling(this.ignorePixelScaling);
|
|
106
112
|
}
|
|
107
|
-
if (this.scaling) {
|
|
108
|
-
this._canvas.setScaling(this.scaling);
|
|
109
|
-
}
|
|
110
113
|
const ref = new WeakRef(this);
|
|
111
114
|
this.on(View.layoutChangedEvent, (args) => {
|
|
112
115
|
const parent = this.parent;
|
|
@@ -124,7 +127,7 @@ export class Canvas extends CanvasBase {
|
|
|
124
127
|
});
|
|
125
128
|
}
|
|
126
129
|
});
|
|
127
|
-
this._canvas.setListener(new org.nativescript.canvas.
|
|
130
|
+
this._canvas.setListener(new org.nativescript.canvas.NSCCanvas.Listener({
|
|
128
131
|
contextReady() {
|
|
129
132
|
const owner = ref.get();
|
|
130
133
|
if (owner && !owner._ready) {
|
|
@@ -132,6 +135,12 @@ export class Canvas extends CanvasBase {
|
|
|
132
135
|
owner._readyEvent();
|
|
133
136
|
}
|
|
134
137
|
},
|
|
138
|
+
surfaceResize(width, height) {
|
|
139
|
+
//console.log('surfaceResize', width, height);
|
|
140
|
+
// if(this._webglContext || this._webgl2Context){
|
|
141
|
+
// (this._webglContext || this._webgl2Context)?.resize();
|
|
142
|
+
// }
|
|
143
|
+
},
|
|
135
144
|
}));
|
|
136
145
|
}
|
|
137
146
|
onUnloaded() {
|
|
@@ -150,32 +159,20 @@ export class Canvas extends CanvasBase {
|
|
|
150
159
|
// }
|
|
151
160
|
}
|
|
152
161
|
}
|
|
153
|
-
flush() {
|
|
154
|
-
if (this._didPause) {
|
|
155
|
-
return;
|
|
156
|
-
}
|
|
157
|
-
if (this._canvas) {
|
|
158
|
-
this._canvas.flush();
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
162
|
disposeNativeView() {
|
|
162
163
|
this._canvas.setListener(null);
|
|
163
164
|
super.disposeNativeView();
|
|
164
165
|
}
|
|
165
166
|
toDataURL(type = 'png', encoderOptions = 0.92) {
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
snapshot(flip = false) {
|
|
169
|
-
var _a, _b;
|
|
170
|
-
if (this._canvas) {
|
|
171
|
-
const bm = (_b = (_a = this._canvas).getImage) === null || _b === void 0 ? void 0 : _b.call(_a, flip !== null && flip !== void 0 ? flip : false);
|
|
172
|
-
if (bm) {
|
|
173
|
-
return new ImageSource(bm);
|
|
174
|
-
}
|
|
167
|
+
if (this._2dContext) {
|
|
168
|
+
return this._2dContext.__toDataURL(type, encoderOptions);
|
|
175
169
|
}
|
|
176
|
-
return
|
|
170
|
+
return (this._webglContext || this._webgl2Context).__toDataURL(type, encoderOptions);
|
|
177
171
|
}
|
|
178
172
|
_layoutNative() {
|
|
173
|
+
if (this._didLayout) {
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
179
176
|
if (!this.parent) {
|
|
180
177
|
if ((typeof this.width === 'string' && this.width.indexOf('%')) || (typeof this.height === 'string' && this.height.indexOf('%'))) {
|
|
181
178
|
return;
|
|
@@ -184,29 +181,41 @@ export class Canvas extends CanvasBase {
|
|
|
184
181
|
return;
|
|
185
182
|
}
|
|
186
183
|
const size = this._realSize;
|
|
187
|
-
org.nativescript.canvas.
|
|
184
|
+
org.nativescript.canvas.NSCCanvas.layoutView(size.width || 0, size.height || 0, this._canvas);
|
|
185
|
+
if (this._2dContext) {
|
|
186
|
+
this._2dContext.native.__resize(size.width, size.height);
|
|
187
|
+
}
|
|
188
|
+
this._didLayout = true;
|
|
188
189
|
}
|
|
189
190
|
}
|
|
191
|
+
get __native__context() {
|
|
192
|
+
var _a, _b, _c, _d, _e;
|
|
193
|
+
return (_d = (_b = (_a = this._2dContext) === null || _a === void 0 ? void 0 : _a.native) !== null && _b !== void 0 ? _b : (_c = this._webglContext) === null || _c === void 0 ? void 0 : _c.native) !== null && _d !== void 0 ? _d : (_e = this._webgl2Context) === null || _e === void 0 ? void 0 : _e.native;
|
|
194
|
+
}
|
|
195
|
+
get native() {
|
|
196
|
+
return this.__native__context;
|
|
197
|
+
}
|
|
190
198
|
getContext(type, options) {
|
|
199
|
+
var _a, _b, _c;
|
|
191
200
|
if (!this._canvas) {
|
|
192
201
|
return null;
|
|
193
202
|
}
|
|
194
|
-
const getNativeOptions = (options) => {
|
|
195
|
-
return JSON.stringify(this._handleContextOptions(type, options));
|
|
196
|
-
};
|
|
197
203
|
if (typeof type === 'string') {
|
|
198
204
|
if (type === '2d') {
|
|
199
205
|
if (this._webglContext || this._webgl2Context) {
|
|
200
206
|
return null;
|
|
201
207
|
}
|
|
202
208
|
if (!this._2dContext) {
|
|
203
|
-
this.
|
|
204
|
-
|
|
209
|
+
this._layoutNative();
|
|
210
|
+
const opts = Object.assign(defaultOpts, this._handleContextOptions(type, options));
|
|
211
|
+
opts['fontColor'] = ((_c = (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.color) === null || _c === void 0 ? void 0 : _c.android) || -16777216;
|
|
212
|
+
// this._canvas.initContext(type, opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.desynchronized, opts.xrCompatible);
|
|
213
|
+
const ctx = this._canvas.create2DContext(opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible, opts.fontColor);
|
|
214
|
+
this._2dContext = new CanvasRenderingContext2D(ctx);
|
|
215
|
+
//this._2dContext = new (CanvasRenderingContext2D as any)(this._canvas, opts);
|
|
216
|
+
// // @ts-ignore
|
|
205
217
|
this._2dContext._canvas = this;
|
|
206
218
|
}
|
|
207
|
-
else {
|
|
208
|
-
this._canvas.getContext(type, getNativeOptions(options));
|
|
209
|
-
}
|
|
210
219
|
// @ts-ignore
|
|
211
220
|
this._2dContext._type = '2d';
|
|
212
221
|
return this._2dContext;
|
|
@@ -216,12 +225,11 @@ export class Canvas extends CanvasBase {
|
|
|
216
225
|
return null;
|
|
217
226
|
}
|
|
218
227
|
if (!this._webglContext) {
|
|
219
|
-
|
|
228
|
+
const opts = Object.assign({ version: 'v1' }, Object.assign(defaultOpts, this._handleContextOptions(type, options)));
|
|
229
|
+
this._canvas.initContext(type, opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.desynchronized, opts.xrCompatible);
|
|
230
|
+
this._webglContext = new WebGLRenderingContext(this._canvas, opts);
|
|
220
231
|
this._webglContext._canvas = this;
|
|
221
232
|
}
|
|
222
|
-
else {
|
|
223
|
-
this._canvas.getContext('webgl', getNativeOptions(options));
|
|
224
|
-
}
|
|
225
233
|
this._webglContext._type = 'webgl';
|
|
226
234
|
return this._webglContext;
|
|
227
235
|
}
|
|
@@ -230,12 +238,11 @@ export class Canvas extends CanvasBase {
|
|
|
230
238
|
return null;
|
|
231
239
|
}
|
|
232
240
|
if (!this._webgl2Context) {
|
|
233
|
-
|
|
241
|
+
const opts = Object.assign({ version: 'v2' }, Object.assign(defaultOpts, this._handleContextOptions(type, options)));
|
|
242
|
+
this._canvas.initContext(type, opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.desynchronized, opts.xrCompatible);
|
|
243
|
+
this._webgl2Context = new WebGL2RenderingContext(this._canvas, opts);
|
|
234
244
|
this._webgl2Context._canvas = this;
|
|
235
245
|
}
|
|
236
|
-
else {
|
|
237
|
-
this.android.getContext('webgl2', getNativeOptions(options));
|
|
238
|
-
}
|
|
239
246
|
this._webgl2Context._type = 'webgl2';
|
|
240
247
|
return this._webgl2Context;
|
|
241
248
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.android.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.android.ts"],"names":[],"mappings":"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"}
|
package/Canvas/index.d.ts
CHANGED
|
@@ -40,10 +40,6 @@ export declare class Canvas extends CanvasBase {
|
|
|
40
40
|
|
|
41
41
|
toDataURL(type?: string, encoderOptions?: number): any;
|
|
42
42
|
|
|
43
|
-
|
|
44
|
-
getContext(type: '2d', options?: any): CanvasRenderingContext2D | null;
|
|
45
|
-
getContext(type: 'webgl' | 'experimental-webgl', options?: any): WebGLRenderingContext | null;
|
|
46
|
-
getContext(type: 'webgl2', options?: any): WebGL2RenderingContext | null;
|
|
47
43
|
getContext(type: string, options?: any): CanvasRenderingContext2D | WebGLRenderingContext | WebGL2RenderingContext | null;
|
|
48
44
|
|
|
49
45
|
getBoundingClientRect(): {
|
package/Canvas/index.ios.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ import { DOMMatrix } from '../Canvas2D';
|
|
|
3
3
|
import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
|
|
4
4
|
import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
|
|
5
5
|
import { WebGL2RenderingContext } from '../WebGL2/WebGL2RenderingContext';
|
|
6
|
-
import { ImageSource } from '@nativescript/core';
|
|
7
6
|
export * from './common';
|
|
8
7
|
export declare function createSVGMatrix(): DOMMatrix;
|
|
9
8
|
export declare class Canvas extends CanvasBase {
|
|
@@ -36,7 +35,6 @@ export declare class Canvas extends CanvasBase {
|
|
|
36
35
|
_layoutNative(): void;
|
|
37
36
|
getContext(type: string, options?: any): CanvasRenderingContext2D | WebGLRenderingContext | WebGL2RenderingContext | null;
|
|
38
37
|
toDataURL(type?: string, encoderOptions?: number): any;
|
|
39
|
-
snapshot(flip?: boolean): ImageSource | null;
|
|
40
38
|
getBoundingClientRect(): {
|
|
41
39
|
x: number;
|
|
42
40
|
y: number;
|
package/Canvas/index.ios.js
CHANGED
|
@@ -7,12 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { CanvasBase, ignorePixelScalingProperty
|
|
10
|
+
import { CanvasBase, ignorePixelScalingProperty } from './common';
|
|
11
11
|
import { DOMMatrix } from '../Canvas2D';
|
|
12
12
|
import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
|
|
13
13
|
import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
|
|
14
14
|
import { WebGL2RenderingContext } from '../WebGL2/WebGL2RenderingContext';
|
|
15
|
-
import {
|
|
15
|
+
import { profile } from '@nativescript/core';
|
|
16
16
|
export * from './common';
|
|
17
17
|
export function createSVGMatrix() {
|
|
18
18
|
return new DOMMatrix(TNSCanvas.createSVGMatrix());
|
|
@@ -44,9 +44,6 @@ export class Canvas extends CanvasBase {
|
|
|
44
44
|
[ignorePixelScalingProperty.setNative](value) {
|
|
45
45
|
this._canvas.ignorePixelScaling = value;
|
|
46
46
|
}
|
|
47
|
-
[scalingProperty.setNative](value) {
|
|
48
|
-
this._canvas.scaling = value;
|
|
49
|
-
}
|
|
50
47
|
// @ts-ignore
|
|
51
48
|
get ios() {
|
|
52
49
|
return this._canvas;
|
|
@@ -129,9 +126,7 @@ export class Canvas extends CanvasBase {
|
|
|
129
126
|
}
|
|
130
127
|
initNativeView() {
|
|
131
128
|
super.initNativeView();
|
|
132
|
-
|
|
133
|
-
this._canvas.scaling = this.scaling;
|
|
134
|
-
}
|
|
129
|
+
this._canvas.ignorePixelScaling = this.ignorePixelScaling;
|
|
135
130
|
}
|
|
136
131
|
flush() {
|
|
137
132
|
if (this.ios) {
|
|
@@ -157,6 +152,7 @@ export class Canvas extends CanvasBase {
|
|
|
157
152
|
}
|
|
158
153
|
_layoutNative() {
|
|
159
154
|
if (!this.parent) {
|
|
155
|
+
console.time('_layoutNative');
|
|
160
156
|
if ((typeof this.style.width === 'string' && this.style.width.indexOf('%')) || (typeof this.style.height === 'string' && this.style.height.indexOf('%'))) {
|
|
161
157
|
return;
|
|
162
158
|
}
|
|
@@ -164,12 +160,22 @@ export class Canvas extends CanvasBase {
|
|
|
164
160
|
return;
|
|
165
161
|
}
|
|
166
162
|
const size = this._realSize;
|
|
167
|
-
if (!(size.width || 0) && !(size.height || 0)) {
|
|
168
|
-
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
const
|
|
172
|
-
|
|
163
|
+
// if (!(size.width || 0) && !(size.height || 0)) {
|
|
164
|
+
// return;
|
|
165
|
+
// }
|
|
166
|
+
this._canvas.forceLayout(size.width || 0, size.height || 0);
|
|
167
|
+
// const width = Utils.layout.toDeviceIndependentPixels(size.width || 0);
|
|
168
|
+
// const height = Utils.layout.toDeviceIndependentPixels(size.height || 0);
|
|
169
|
+
// let frameSize = this._canvas.frame.size;
|
|
170
|
+
// if (width === frameSize.width && height === frameSize.height) {
|
|
171
|
+
// return;
|
|
172
|
+
// }
|
|
173
|
+
// const frame_origin = this._canvas.frame.origin;
|
|
174
|
+
// const frame = CGRectMake(frame_origin.x, frame_origin.y, width, height);
|
|
175
|
+
// this._canvas.frame = frame;
|
|
176
|
+
// this._canvas.setNeedsLayout();
|
|
177
|
+
// this._canvas.layoutIfNeeded();
|
|
178
|
+
console.timeEnd('_layoutNative');
|
|
173
179
|
}
|
|
174
180
|
}
|
|
175
181
|
getContext(type, options) {
|
|
@@ -181,16 +187,11 @@ export class Canvas extends CanvasBase {
|
|
|
181
187
|
return null;
|
|
182
188
|
}
|
|
183
189
|
if (!this._2dContext) {
|
|
184
|
-
|
|
185
|
-
this._2dContext = new CanvasRenderingContext2D(this._canvas.getContext(type));
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
this._2dContext = new CanvasRenderingContext2D(this._canvas.getContextWithTypeAttributes(type, JSON.stringify(this._handleContextOptions(type, options))));
|
|
189
|
-
}
|
|
190
|
+
this._2dContext = new CanvasRenderingContext2D(this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, options)));
|
|
190
191
|
this._2dContext._canvas = this;
|
|
191
192
|
}
|
|
192
193
|
else {
|
|
193
|
-
this._canvas.getContextContextAttributes(type, this._handleContextOptions(type,
|
|
194
|
+
this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, options));
|
|
194
195
|
}
|
|
195
196
|
this._2dContext._type = '2d';
|
|
196
197
|
return this._2dContext;
|
|
@@ -200,12 +201,7 @@ export class Canvas extends CanvasBase {
|
|
|
200
201
|
return null;
|
|
201
202
|
}
|
|
202
203
|
if (!this._webglContext) {
|
|
203
|
-
|
|
204
|
-
this._webglContext = new WebGLRenderingContext(this._canvas.getContext('webgl'));
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
this._webglContext = new WebGLRenderingContext(this._canvas.getContextContextAttributes('webgl', this._handleContextOptions(type, options)));
|
|
208
|
-
}
|
|
204
|
+
this._webglContext = new WebGLRenderingContext(this._canvas.getContextContextAttributes('webgl', this._handleContextOptions(type, options)));
|
|
209
205
|
this._webglContext._canvas = this;
|
|
210
206
|
}
|
|
211
207
|
else {
|
|
@@ -219,12 +215,7 @@ export class Canvas extends CanvasBase {
|
|
|
219
215
|
return null;
|
|
220
216
|
}
|
|
221
217
|
if (!this._webgl2Context) {
|
|
222
|
-
|
|
223
|
-
this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContext('webgl2'));
|
|
224
|
-
}
|
|
225
|
-
else {
|
|
226
|
-
this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContextContextAttributes('webgl2', this._handleContextOptions(type, options)));
|
|
227
|
-
}
|
|
218
|
+
this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContextContextAttributes('webgl2', this._handleContextOptions(type, options)));
|
|
228
219
|
this._webgl2Context._canvas = this;
|
|
229
220
|
}
|
|
230
221
|
else {
|
|
@@ -238,16 +229,6 @@ export class Canvas extends CanvasBase {
|
|
|
238
229
|
toDataURL(type = 'image/png', encoderOptions = 0.92) {
|
|
239
230
|
return this._canvas.toDataURL(type, encoderOptions);
|
|
240
231
|
}
|
|
241
|
-
snapshot(flip = false) {
|
|
242
|
-
var _a, _b;
|
|
243
|
-
if (this._canvas) {
|
|
244
|
-
const bm = (_b = (_a = this._canvas).getImage) === null || _b === void 0 ? void 0 : _b.call(_a, flip !== null && flip !== void 0 ? flip : false);
|
|
245
|
-
if (bm) {
|
|
246
|
-
return new ImageSource(bm);
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
return null;
|
|
250
|
-
}
|
|
251
232
|
getBoundingClientRect() {
|
|
252
233
|
const view = this;
|
|
253
234
|
const frame = view.ios.frame;
|
package/Canvas/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.ios.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { CanvasGradientBase } from './common';
|
|
2
2
|
export declare class CanvasGradient extends CanvasGradientBase {
|
|
3
3
|
readonly nativeInstance: any;
|
|
4
|
+
_addColorStop: any;
|
|
5
|
+
_getMethod(name: string): any;
|
|
4
6
|
protected constructor(nativeInstance: any);
|
|
5
7
|
get native(): any;
|
|
6
8
|
static fromNative(nativeInstance: any): CanvasGradient;
|
|
@@ -3,6 +3,15 @@ export class CanvasGradient extends CanvasGradientBase {
|
|
|
3
3
|
constructor(nativeInstance) {
|
|
4
4
|
super();
|
|
5
5
|
this.nativeInstance = nativeInstance;
|
|
6
|
+
this._getMethod('addColorStop');
|
|
7
|
+
}
|
|
8
|
+
_getMethod(name) {
|
|
9
|
+
if (this._addColorStop === undefined) {
|
|
10
|
+
const ret = this.native[name];
|
|
11
|
+
this._addColorStop = ret;
|
|
12
|
+
return ret;
|
|
13
|
+
}
|
|
14
|
+
return this._addColorStop;
|
|
6
15
|
}
|
|
7
16
|
get native() {
|
|
8
17
|
return this.nativeInstance;
|
|
@@ -11,7 +20,7 @@ export class CanvasGradient extends CanvasGradientBase {
|
|
|
11
20
|
return new CanvasGradient(nativeInstance);
|
|
12
21
|
}
|
|
13
22
|
addColorStop(offset, color) {
|
|
14
|
-
this.
|
|
23
|
+
this._addColorStop(offset, color);
|
|
15
24
|
}
|
|
16
25
|
}
|
|
17
26
|
//# sourceMappingURL=CanvasGradient.android.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CanvasGradient.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasGradient/CanvasGradient.android.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"CanvasGradient.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasGradient/CanvasGradient.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,MAAM,OAAO,cAAe,SAAQ,kBAAkB;IAerD,YAAsB,cAAmB;QACxC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAdD,UAAU,CAAC,IAAY;QACtB,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC;YACzB,OAAO,GAAG,CAAC;SACX;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAQD,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,cAAc;QAC/B,OAAO,IAAI,cAAc,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC;IAEM,YAAY,CAAC,MAAc,EAAE,KAAU;QAC7C,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;CACD"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { CanvasPatternBase } from './common';
|
|
2
2
|
import { DOMMatrix } from '../DOMMatrix/DOMMatrix';
|
|
3
3
|
export declare class CanvasPattern extends CanvasPatternBase {
|
|
4
|
+
_setTransform: any;
|
|
5
|
+
_getMethod(name: string): any;
|
|
4
6
|
constructor(instance: any);
|
|
5
7
|
setTransform(matrix: DOMMatrix): void;
|
|
6
8
|
}
|
|
@@ -3,9 +3,18 @@ export class CanvasPattern extends CanvasPatternBase {
|
|
|
3
3
|
constructor(instance) {
|
|
4
4
|
super(instance);
|
|
5
5
|
this.nativeInstance = instance;
|
|
6
|
+
this._getMethod('setTransform');
|
|
7
|
+
}
|
|
8
|
+
_getMethod(name) {
|
|
9
|
+
if (this._setTransform === undefined) {
|
|
10
|
+
const ret = this.native[name];
|
|
11
|
+
this._setTransform = ret;
|
|
12
|
+
return ret;
|
|
13
|
+
}
|
|
14
|
+
return this._setTransform;
|
|
6
15
|
}
|
|
7
16
|
setTransform(matrix) {
|
|
8
|
-
this.
|
|
17
|
+
this._setTransform(matrix.native);
|
|
9
18
|
}
|
|
10
19
|
}
|
|
11
20
|
//# sourceMappingURL=CanvasPattern.android.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CanvasPattern.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.android.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"CanvasPattern.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAanD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAdD,UAAU,CAAC,IAAY;QACtB,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC;YACzB,OAAO,GAAG,CAAC;SACX;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAQM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CanvasPattern.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACnD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC;IACM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;
|
|
1
|
+
{"version":3,"file":"CanvasPattern.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACnD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC;IACM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CanvasRenderingContext } from
|
|
1
|
+
import { CanvasRenderingContext } from "../../common";
|
|
2
2
|
import { CanvasGradient } from '../CanvasGradient';
|
|
3
3
|
import { CanvasPattern } from '../CanvasPattern';
|
|
4
4
|
import { Path2D } from '../Path2D';
|
|
@@ -68,8 +68,6 @@ export declare abstract class CanvasRenderingContext2DBase implements CanvasRend
|
|
|
68
68
|
abstract putImageData(imageData: ImageData, dx: number, dy: number, dirtyX: number, dirtyY: number, dirtyWidth: number, dirtyHeight: number): void;
|
|
69
69
|
abstract quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): any;
|
|
70
70
|
abstract rect(x: number, y: number, width: number, height: number): void;
|
|
71
|
-
abstract roundRect(x: number, y: number, width: number, height: number, radii: number): void;
|
|
72
|
-
abstract roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
|
|
73
71
|
abstract removeHitRegion(id: string): void;
|
|
74
72
|
abstract resetTransform(): void;
|
|
75
73
|
abstract restore(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/common.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,4BAA4B;IAAlD;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/common.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,4BAA4B;IAAlD;QA2BC,UAAK,GAAW,MAAM,CAAC;IAyPxB,CAAC;IA7PA,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAGD,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CAsPD"}
|