@nativescript/canvas 2.0.0-webgpu.1 → 2.0.0-webgpu.3

package/Canvas/index.ios.js

@@ -67,6 +67,10 @@ export class Canvas extends CanvasBase {
                 }
                 this.native.__stopRaf();
             };
+            // default canvas size
+            this._canvas.surfaceWidth = 300;
+            this._canvas.surfaceHeight = 150;
+            global.__canvasLoaded = true;
             this._canvas.becomeActiveListener = () => {
                 if (!this.native) {
                     return;
@@ -77,7 +81,6 @@ export class Canvas extends CanvasBase {
                 this._handleEvents(event);
             };
         }
-        this._canvas.autoScale = false;
     }
     [ignoreTouchEventsProperty.setNative](value) {
         this._canvas.ignoreTouchEvents = value;
@@ -87,32 +90,54 @@ export class Canvas extends CanvasBase {
         return this._canvas;
     }
     get clientWidth() {
-        return this.width;
+        return this.getMeasuredWidth() / Screen.mainScreen.scale;
     }
     get clientHeight() {
-        return this.height;
+        return this.getMeasuredHeight() / Screen.mainScreen.scale;
     }
-    //@ts-ignore
+    get drawingBufferHeight() {
+        if (this._canvas === undefined || this._canvas === null) {
+            return 0;
+        }
+        return this._canvas.drawingBufferHeight;
+    }
+    get drawingBufferWidth() {
+        if (this._canvas === undefined || this._canvas === null) {
+            return 0;
+        }
+        return this._canvas.drawingBufferWidth;
+    }
+    // @ts-ignore
     get width() {
-        return this._logicalSize.width;
+        if (this._canvas === undefined || this._canvas === null) {
+            return 0;
+        }
+        return this._canvas.surfaceWidth;
     }
     set width(value) {
-        if (value !== null || value !== undefined) {
-            this.style.width = value;
-            this._didLayout = false;
-            this._layoutNative(true);
+        if (this._canvas === undefined || this._canvas === null) {
+            return;
         }
+        if (typeof value !== 'number') {
+            return;
+        }
+        this._canvas.surfaceWidth = value;
     }
-    //@ts-ignore
+    // @ts-ignore
     get height() {
-        return this._logicalSize.height;
+        if (this._canvas === undefined || this._canvas === null) {
+            return 0;
+        }
+        return this._canvas.surfaceHeight;
     }
     set height(value) {
-        if (value !== null || value !== undefined) {
-            this.style.height = value;
-            this._didLayout = false;
-            this._layoutNative(true);
+        if (this._canvas === undefined || this._canvas === null) {
+            return;
+        }
+        if (typeof value !== 'number') {
+            return;
         }
+        this._canvas.surfaceHeight = value;
     }
     //@ts-ignore
     get iosOverflowSafeArea() {
@@ -131,12 +156,9 @@ export class Canvas extends CanvasBase {
     }
     static createCustomView() {
         const canvas = new Canvas();
-        canvas._isBatch = true;
         canvas._isCustom = true;
         canvas.style.width = 300;
         canvas.style.height = 150;
-        canvas._isBatch = false;
-        canvas._layoutNative();
         return canvas;
     }
     onLayout(left, top, right, bottom) {
@@ -214,34 +236,57 @@ export class Canvas extends CanvasBase {
         this._canvas = undefined;
         super.disposeNativeView();
     }
-    _layoutNative(force = false) {
-        if (this._isBatch) {
-            return;
-        }
-        if (!this._isCustom && !force) {
-            return;
-        }
-        if (this._didLayout && !force) {
-            return;
-        }
-        if (!this.parent || force) {
-            if (!force || (typeof this.style.width === 'string' && this.style.width.indexOf('%')) || (typeof this.style.height === 'string' && this.style.height.indexOf('%'))) {
-                return;
+    _setNativeViewFrame(nativeView, frame) {
+        const styleWidth = this.style.width;
+        const styleHeight = this.style.height;
+        if (typeof styleWidth === 'object' && typeof styleHeight === 'object') {
+            if (styleWidth?.unit === '%' && styleWidth.value >= 1 && styleHeight?.unit === '%' && styleHeight.value >= 1) {
+                // const width = Math.floor(this._canvas.surfaceWidth / Screen.mainScreen.scale);
+                //const height = Math.floor(this._canvas.surfaceHeight / Screen.mainScreen.scale);
+                nativeView.fit = 1;
+                // nativeView.frame = frame;
             }
-            if (this._canvas === undefined || this._canvas === null) {
-                return;
+            else if ((styleWidth?.unit === 'px' || styleWidth?.unit === 'dip') && (styleHeight?.unit === 'px' || styleHeight?.unit === 'dip')) {
+                const width = Math.floor(this._canvas.surfaceWidth / Screen.mainScreen.scale);
+                const height = Math.floor(this._canvas.surfaceHeight / Screen.mainScreen.scale);
+                if (frame.size.width > width || frame.size.height > height) {
+                    nativeView.fit = 4;
+                }
+                else {
+                    nativeView.fit = 1;
+                }
+                // nativeView.frame = frame;
             }
-            const size = this._logicalSize;
-            this._canvas.forceLayout(size.width, size.height);
-            if (this._is2D) {
-                this._2dContext?.native?.__resize?.(size.width, size.height);
+            else {
+                nativeView.fit = 1;
+                //	nativeView.frame = frame;
             }
-            this._didLayout = true;
         }
-    }
-    _setNativeViewFrame(nativeView, frame) {
-        nativeView.frame = frame;
-        this._canvas.forceLayout(frame.size.width, frame.size.height);
+        else if (typeof styleWidth === 'object' && styleHeight === 'auto') {
+            if (styleWidth?.unit === 'px' || styleWidth?.unit === 'dip') {
+                nativeView.fit = 2;
+                //	nativeView.frame = frame;
+            }
+        }
+        else if (styleWidth === 'auto' && typeof styleHeight === 'object') {
+            if (styleHeight?.unit === 'px' || styleHeight?.unit === 'dip') {
+                nativeView.fit = 3;
+                //	nativeView.frame = frame;
+            }
+        }
+        else if (styleWidth === 'auto' && styleHeight === 'auto') {
+            // when auto/auto is set force the frame size to be the same as the canvas
+            const width = Math.floor(this._canvas.surfaceWidth / Screen.mainScreen.scale);
+            const height = Math.floor(this._canvas.surfaceHeight / Screen.mainScreen.scale);
+            const newFrame = CGRectMake(frame.origin.x, frame.origin.y, width, height);
+            nativeView.fit = 0;
+            //nativeView.frame = newFrame;
+            frame = newFrame;
+        }
+        else {
+            //	nativeView.frame = frame;
+        }
+        super._setNativeViewFrame(nativeView, frame);
     }
     getContext(type, options) {
         if (!this._canvas) {
@@ -253,7 +298,6 @@ export class Canvas extends CanvasBase {
                     return null;
                 }
                 if (!this._2dContext) {
-                    //this._layoutNative(true);
                     const opts = { ...defaultOpts, ...this._handleContextOptions(type, options), fontColor: this.parent?.style?.color?.android || -16777216 };
                     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);
                     this._2dContext = new CanvasRenderingContext2D(ctx);
@@ -271,7 +315,6 @@ export class Canvas extends CanvasBase {
                     return null;
                 }
                 if (!this._webglContext) {
-                    this._layoutNative(true);
                     const opts = { version: 1, ...defaultOpts, ...this._handleContextOptions(type, options) };
                     this._canvas.initContext(type, opts.alpha, false, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible);
                     this._webglContext = new WebGLRenderingContext(this._canvas, opts);
@@ -286,7 +329,6 @@ export class Canvas extends CanvasBase {
                     return null;
                 }
                 if (!this._webgl2Context) {
-                    this._layoutNative(true);
                     const opts = { version: 2, ...defaultOpts, ...this._handleContextOptions(type, options) };
                     this._canvas.initContext(type, opts.alpha, false, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible);
                     this._webgl2Context = new WebGL2RenderingContext(this._canvas, opts);
@@ -301,7 +343,6 @@ export class Canvas extends CanvasBase {
                     return null;
                 }
                 if (!this._gpuContext) {
-                    this._layoutNative(true);
                     const ptr = navigator.gpu.native.__getPointer();
                     const number = NSNumber.numberWithLong(Number(ptr));
                     this._canvas.initWebGPUContext(number);

package/Canvas/index.ios.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.ios.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.ios.ts"],"names":[],"mappings":"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"}

package/Canvas2D/CanvasRenderingContext2D/index.js

@@ -112,6 +112,37 @@ function toBlendMode(value) {
             null;
     }
 }
+function drawNativeImage(args, image, context) {
+    let dirty = false;
+    const ptr = context.context.__getPointer();
+    if (args.length === 3) {
+        if (__ANDROID__) {
+            dirty = org.nativescript.canvas.NSCCanvasRenderingContext2D.drawImage(long(ptr), image, args[1], args[2]);
+        }
+        if (__IOS__) {
+            dirty = NSCCanvasRenderingContext2D.drawImage(ptr, image, args[1], args[2]);
+        }
+    }
+    else if (args.length === 5) {
+        if (__ANDROID__) {
+            dirty = org.nativescript.canvas.NSCCanvasRenderingContext2D.drawImage(long(ptr), image, args[1], args[2], args[3], args[4]);
+        }
+        if (__IOS__) {
+            dirty = NSCCanvasRenderingContext2D.drawImage(ptr, image, args[1], args[2], args[3], args[4]);
+        }
+    }
+    else if (args.length === 9) {
+        if (__ANDROID__) {
+            dirty = org.nativescript.canvas.NSCCanvasRenderingContext2D.drawImage(long(ptr), image, args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        }
+        if (__IOS__) {
+            dirty = NSCCanvasRenderingContext2D.drawImage(ptr, image, args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        }
+    }
+    if (dirty) {
+        context.context.__makeDirty();
+    }
+}
 export class CanvasRenderingContext2D {
     constructor(context, contextOptions) {
         this.contextPtr = context;
@@ -333,26 +364,26 @@ export class CanvasRenderingContext2D {
         else if (image instanceof ImageSource) {
             //const ptr = this.context.__getPointer; //this._getMethod('__getPointer');
             //const createPattern = this.context.__createPatternWithNative; //this._getMethod('__createPatternWithNative');
-            if (global.isAndroid) {
+            if (__ANDROID__) {
                 img = image.android;
                 const pattern = org.nativescript.canvas.NSCCanvasRenderingContext2D.createPattern(long(this.context.__getPointer()), img, repetition);
                 return new CanvasPattern(this.context.__createPatternWithNative(pattern));
             }
-            if (global.isIOS) {
+            if (__IOS__) {
                 img = image.ios;
                 const pattern = NSCCanvasRenderingContext2D.createPattern(this.context.__getPointer(), img, repetition);
                 return new CanvasPattern(this.context.__createPatternWithNative(pattern));
             }
             return null;
         }
-        else if (global.isAndroid && image instanceof android.graphics.Bitmap) {
+        else if (__ANDROID__ && image instanceof android.graphics.Bitmap) {
             //const ptr = this.context.__getPointer; //this._getMethod('__getPointer');
             const createPattern = this.context.__createPatternWithNative; //this._getMethod('__createPatternWithNative');
-            if (global.isAndroid) {
+            if (__ANDROID__) {
                 const pattern = org.nativescript.canvas.NSCCanvasRenderingContext2D.createPattern(long(this.context.__getPointer()), image, repetition);
                 return new CanvasPattern(this.context.__createPatternWithNative(pattern));
             }
-            if (global.isIOS) {
+            if (__IOS__) {
                 const pattern = NSCCanvasRenderingContext2D.createPattern(this.context.__getPointer(), image, repetition);
                 return new CanvasPattern(this.context.__createPatternWithNative(pattern));
             }
@@ -365,7 +396,7 @@ export class CanvasRenderingContext2D {
             img = image.native;
         }
         else if (image && typeof image.tagName === 'string' && (image.tagName === 'IMG' || image.tagName === 'IMAGE')) {
-            if (global.isAndroid && image._image instanceof android.graphics.Bitmap) {
+            if (__ANDROID__ && image._image instanceof android.graphics.Bitmap) {
                 //todo ios
                 img = image._image;
             }
@@ -375,12 +406,12 @@ export class CanvasRenderingContext2D {
             else if (typeof image.src === 'string') {
                 //const ptr = this.context.__getPointer; //this._getMethod('__getPointer');
                 //const createPattern = this.context.__createPatternWithNative; //this._getMethod('__createPatternWithNative');
-                if (global.isAndroid) {
+                if (__ANDROID__) {
                     img = ImageSource.fromFileSync(image.src).android;
                     const pattern = org.nativescript.canvas.NSCCanvasRenderingContext2D.createPattern(long(this.context.__getPointer()), img, repetition);
                     return new CanvasPattern(this.context.__createPatternWithNative(pattern));
                 }
-                if (global.isiOS) {
+                if (__IOS__) {
                     img = ImageSource.fromFileSync(image.src).android;
                     const pattern = NSCCanvasRenderingContext2D.createPattern(this.context.__getPointer(), img, repetition);
                     return new CanvasPattern(this.context.__createPatternWithNative(pattern));
@@ -429,38 +460,6 @@ export class CanvasRenderingContext2D {
     drawFocusIfNeeded(...args) { }
     drawImage(...args) {
         //const drawImage = this.context.drawImage; //this._getMethod('drawImage');
-        const drawNativeImage = (args, image) => {
-            //const ptr = this.context.__getPointer; //this._getMethod('__getPointer');
-            //const makeDirty = this.context.__makeDirty; //this._getMethod('__makeDirty');
-            let dirty = false;
-            if (args.length === 3) {
-                if (global.isAndroid) {
-                    dirty = org.nativescript.canvas.NSCCanvasRenderingContext2D.drawImage(long(this.context.__getPointer()), image, args[1], args[2]);
-                }
-                if (global.isIOS) {
-                    dirty = NSCCanvasRenderingContext2D.drawImage(this.context.__getPointer(), image, args[1], args[2]);
-                }
-            }
-            else if (args.length === 5) {
-                if (global.isAndroid) {
-                    dirty = org.nativescript.canvas.NSCCanvasRenderingContext2D.drawImage(long(this.context.__getPointer()), image, args[1], args[2], args[3], args[4]);
-                }
-                if (global.isIOS) {
-                    dirty = NSCCanvasRenderingContext2D.drawImage(this.context.__getPointer(), image, args[1], args[2], args[3], args[4]);
-                }
-            }
-            else if (args.length === 9) {
-                if (global.Android) {
-                    dirty = org.nativescript.canvas.NSCCanvasRenderingContext2D.drawImage(long(this.context.__getPointer()), image, args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
-                }
-                if (global.isIOS) {
-                    dirty = NSCCanvasRenderingContext2D.drawImage(this.context.__getPointer(), image, args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
-                }
-            }
-            if (dirty) {
-                this.context.__makeDirty();
-            }
-        };
         let image = args[0];
         if (image?._type === '2d' || image?._type?.indexOf('webgl') > -1) {
             image = image.native;
@@ -469,20 +468,20 @@ export class CanvasRenderingContext2D {
             image = image.native;
         }
         else if (image instanceof ImageSource) {
-            if (global.isAndroid) {
-                drawNativeImage(args, image.android);
+            if (__ANDROID__) {
+                drawNativeImage(args, image.android, this);
             }
-            if (global.isIOS) {
-                drawNativeImage(args, image.ios);
+            if (__IOS__) {
+                drawNativeImage(args, image.ios, this);
             }
             return;
         }
-        else if (global.isAndroid && image instanceof android.graphics.Bitmap) {
-            drawNativeImage(args, image);
+        else if (__ANDROID__ && image instanceof android.graphics.Bitmap) {
+            drawNativeImage(args, image, this);
             return;
         }
-        else if (global.isIOS && image instanceof UIImage) {
-            drawNativeImage(args, image);
+        else if (__IOS__ && image instanceof UIImage) {
+            drawNativeImage(args, image, this);
             return;
         }
         else if (image instanceof Canvas) {
@@ -490,27 +489,27 @@ export class CanvasRenderingContext2D {
         }
         else if (image && typeof image.tagName === 'string' && (image.tagName === 'IMG' || image.tagName === 'IMAGE')) {
             if (image._imageSource instanceof ImageSource) {
-                if (global.isAndroid) {
-                    drawNativeImage(args, image._imageSource.android);
+                if (__ANDROID__) {
+                    drawNativeImage(args, image._imageSource.android, this);
                 }
-                if (global.isIOS) {
-                    drawNativeImage(args, image._imageSource.ios);
+                if (__IOS__) {
+                    drawNativeImage(args, image._imageSource.ios, this);
                 }
                 return;
             }
-            else if (global.isAndroid && image._image instanceof android.graphics.Bitmap) {
-                drawNativeImage(args, image._image);
+            else if (__ANDROID__ && image._image instanceof android.graphics.Bitmap) {
+                drawNativeImage(args, image._image, this);
                 return;
             }
-            else if (global.isAndroid && image._svg) {
+            else if (__ANDROID__ && image._svg) {
                 const bitmap = image._svg?._svg?.getBitmap?.();
                 if (bitmap) {
-                    drawNativeImage(args, bitmap);
+                    drawNativeImage(args, bitmap, this);
                 }
                 return;
             }
-            else if (global.isIOS && image._image instanceof UIImage) {
-                drawNativeImage(args, image._image);
+            else if (__IOS__ && image._image instanceof UIImage) {
+                drawNativeImage(args, image._image, this);
                 return;
             }
             else if (image._asset instanceof ImageAsset) {
@@ -518,11 +517,11 @@ export class CanvasRenderingContext2D {
             }
             else if (typeof image.src === 'string') {
                 image = ImageSource.fromFileSync(image.src).android;
-                if (global.isAndroid) {
-                    drawNativeImage(args, image.android);
+                if (__ANDROID__) {
+                    drawNativeImage(args, image.android, this);
                 }
-                if (global.isIOS) {
-                    drawNativeImage(args, image.ios);
+                if (__IOS__) {
+                    drawNativeImage(args, image.ios, this);
                 }
                 return;
             }
@@ -552,19 +551,19 @@ export class CanvasRenderingContext2D {
             image = image.native;
         }
         else if (image instanceof ImageSource) {
-            if (global.isAndroid) {
+            if (__ANDROID__) {
                 isNativeSource = true;
                 image = image.android;
             }
-            if (global.isIOS) {
+            if (__IOS__) {
                 isNativeSource = true;
                 image = image.ios;
             }
         }
-        else if (global.isAndroid && image instanceof android.graphics.Bitmap) {
+        else if (__ANDROID__ && image instanceof android.graphics.Bitmap) {
             isNativeSource = true;
         }
-        else if (global.isIOS && image instanceof UIImage) {
+        else if (__IOS__ && image instanceof UIImage) {
             isNativeSource = true;
         }
         else if (image instanceof Canvas) {
@@ -572,21 +571,21 @@ export class CanvasRenderingContext2D {
         }
         else if (image && typeof image.tagName === 'string' && (image.tagName === 'IMG' || image.tagName === 'IMAGE')) {
             if (image._imageSource instanceof ImageSource) {
-                if (global.isAndroid) {
+                if (__ANDROID__) {
                     isNativeSource = true;
                     image = image._imageSource.android;
                 }
-                if (global.isIOS) {
+                if (__IOS__) {
                     isNativeSource = true;
                     image = image._imageSource.ios;
                 }
                 return;
             }
-            else if (global.isAndroid && image._image instanceof android.graphics.Bitmap) {
+            else if (__ANDROID__ && image._image instanceof android.graphics.Bitmap) {
                 image = image._image;
                 isNativeSource = true;
             }
-            else if (global.isIOS && image._image instanceof UIImage) {
+            else if (__IOS__ && image._image instanceof UIImage) {
                 image = image._image;
                 isNativeSource = true;
             }
@@ -605,10 +604,10 @@ export class CanvasRenderingContext2D {
             image = image.native;
         }
         if (isNativeSource) {
-            if (global.isIOS) {
+            if (__IOS__) {
                 return;
             }
-            if (global.isAndroid) {
+            if (__ANDROID__) {
                 const x = Array.create('float', xform.length * 4);
                 let next = 0;
                 for (let i = 0; i < xform.length; i++) {