@nativescript/canvas-svg 2.0.0-beta.19 → 2.0.0-beta.21

package/index.android.d.ts

@@ -1,14 +1,16 @@
 import { SVGBase } from './common';
 import { SVGItem } from './Elements/SVGItem';
+export * from './Elements';
 export declare class Svg extends SVGBase {
     _svg: any;
     constructor();
     createNativeView(): any;
     get native(): any;
-    onLayout(left: number, top: number, right: number, bottom: number): void;
     __redraw(): void;
     onLoaded(): void;
     onUnloaded(): void;
     addChild(view: SVGItem): void;
     removeChild(view: SVGItem): void;
+    static fromSrcSync(value: string): Svg | null;
+    static fromSrc(value: string): Promise<Svg>;
 }

package/index.android.js

@@ -1,11 +1,60 @@
 import { initialSVG, SVGBase, srcProperty, syncProperty } from './common';
-import { Application, Http, knownFolders, path, Utils } from '@nativescript/core';
+import { Application, Http, knownFolders, path, Screen, Utils } from '@nativescript/core';
+export * from './Elements';
+function parseSVGDimensions(svgString) {
+    const svgRegex = /<svg([^>]*)>/i;
+    const match = svgString.match(svgRegex);
+    if (!match) {
+        return { width: 0, height: 0 };
+    }
+    const svgAttributes = match[1];
+    const regex = /\b(?:width|height|viewBox)\s*=\s*"([^"]*(?:"[^"]*")*[^"]*)"/g;
+    const matches = svgAttributes.match(regex);
+    let width, height, viewBox;
+    if (matches) {
+        matches.forEach((match) => {
+            const parts = match.split('=');
+            const attributeName = parts[0].trim();
+            const attributeValue = parts[1].trim().replace(/"/g, '');
+            if (attributeName === 'width') {
+                if (width === undefined) {
+                    width = parseFloat(attributeValue) ?? 0;
+                }
+            }
+            else if (attributeName === 'height') {
+                if (height === undefined) {
+                    height = parseFloat(attributeValue) ?? 0;
+                }
+            }
+            else if (attributeName === 'viewBox') {
+                if (viewBox === undefined) {
+                    viewBox = attributeValue.split(' ').map(parseFloat).splice(0, 4);
+                }
+            }
+        });
+    }
+    if (!width && viewBox && viewBox.length === 4) {
+        const viewBoxWidth = viewBox[2];
+        const viewBoxHeight = viewBox[3];
+        const aspectRatio = viewBoxWidth / viewBoxHeight;
+        width = (height ?? Screen.mainScreen.widthDIPs) * aspectRatio;
+    }
+    if (!height && viewBox && viewBox.length === 4) {
+        const viewBoxWidth = viewBox[2];
+        const viewBoxHeight = viewBox[3];
+        const aspectRatio = viewBoxWidth / viewBoxHeight;
+        height = (width ?? Screen.mainScreen.heightDIPs) / aspectRatio;
+    }
+    return { width: width ?? 0, height: height ?? 0 };
+}
 export class Svg extends SVGBase {
     constructor() {
         super();
         const context = Application.android.foregroundActivity || Application.android.startActivity || Utils.android.getApplicationContext();
         this._svg = new org.nativescript.canvas.svg.NSCSVG(context);
-        this._svg.setSync(true);
+        this.on('layoutChanged', (args) => {
+            this.__redraw();
+        });
     }
     createNativeView() {
         return this._svg;
@@ -40,23 +89,22 @@ export class Svg extends SVGBase {
     [syncProperty.setNative](value) {
         this._svg.setSync(value);
     }
-    onLayout(left, top, right, bottom) {
-        super.onLayout(left, top, right, bottom);
-        this.__redraw();
-    }
-    // this.__internalElement._dom.documentElement.setAttribute('id', value);
     __redraw() {
         if (this._attachedToDom) {
-            const domCopy = this._dom.valueOf();
-            const serialized = this._serializer.serializeToString(domCopy);
-            const width = domCopy.documentElement.getAttribute('width');
-            const height = domCopy.documentElement.getAttribute('height');
-            if (width === 'auto') {
-                domCopy.documentElement.setAttribute('width', `${this.getMeasuredWidth()}px`);
-            }
-            if (height === 'auto') {
-                domCopy.documentElement.setAttribute('height', `${this.getMeasuredHeight()}px`);
+            const domCopy = this.__domElement.valueOf();
+            // const width = domCopy.documentElement.getAttribute('width');
+            // const height = domCopy.documentElement.getAttribute('height');
+            const viewBox = domCopy.getAttribute('viewBox');
+            // if (!width) {
+            // 	domCopy.documentElement.setAttribute('width', `${this.getMeasuredWidth()}`);
+            // }
+            // if (!height) {
+            // 	domCopy.documentElement.setAttribute('height', `${this.getMeasuredHeight()}`);
+            // }
+            if (!viewBox) {
+                domCopy.setAttribute('viewBox', '0 0 0 0');
             }
+            const serialized = this._serializer.serializeToString(domCopy);
             if (serialized !== initialSVG) {
                 this.src = serialized;
             }
@@ -82,5 +130,97 @@ export class Svg extends SVGBase {
             this.__children = this.__children.filter((item) => item !== view);
         }
     }
+    static fromSrcSync(value) {
+        if (typeof value === 'string') {
+            const context = Utils.android.getApplicationContext();
+            if (value.indexOf('<svg') > -1) {
+                const { width, height } = parseSVGDimensions(value);
+                if (width > 0 && height > 0) {
+                    const svg = org.nativescript.canvas.svg.NSCSVG.fromStringSync(context, width * Screen.mainScreen.scale, height * Screen.mainScreen.scale, value);
+                    const view = new Svg();
+                    view._svg = svg;
+                    view.width = width;
+                    view.height = height;
+                    return view;
+                }
+            }
+            else {
+                let nativeSvg;
+                try {
+                    if (value.startsWith('~')) {
+                        nativeSvg = org.nativescript.canvas.svg.NSCSVG.fromPathSync(context, path.join(knownFolders.currentApp().path, value.replace('~', '')));
+                    }
+                    else if (value.startsWith('/')) {
+                        nativeSvg = org.nativescript.canvas.svg.NSCSVG.fromPathSync(context, value);
+                    }
+                    else if (value.startsWith('http')) {
+                        nativeSvg = org.nativescript.canvas.svg.NSCSVG.fromRemoteSync(context, value);
+                    }
+                }
+                catch (error) { }
+                if (nativeSvg) {
+                    const view = new Svg();
+                    view._svg = nativeSvg;
+                    const lp = nativeSvg.getLayoutParams();
+                    view.width = lp.width / Screen.mainScreen.scale;
+                    view.height = lp.height / Screen.mainScreen.scale;
+                    return view;
+                }
+            }
+        }
+        return null;
+    }
+    static fromSrc(value) {
+        return new Promise((resolve, reject) => {
+            if (typeof value === 'string') {
+                const context = Utils.android.getApplicationContext();
+                if (value.indexOf('<svg') > -1) {
+                    const { width, height } = parseSVGDimensions(value);
+                    if (width > 0 && height > 0) {
+                        org.nativescript.canvas.svg.NSCSVG.fromString(context, width * Screen.mainScreen.scale, height * Screen.mainScreen.scale, value, new org.nativescript.canvas.svg.NSCSVG.Callback({
+                            onSuccess(svg) {
+                                const view = new Svg();
+                                view._svg = svg;
+                                view.width = width;
+                                view.height = height;
+                                resolve(view);
+                            },
+                        }));
+                        return;
+                    }
+                }
+                else {
+                    const cb = new org.nativescript.canvas.svg.NSCSVG.Callback({
+                        onSuccess(nativeSvg) {
+                            if (nativeSvg) {
+                                const view = new Svg();
+                                const lp = nativeSvg.getLayoutParams();
+                                view._svg = nativeSvg;
+                                view.width = lp.width / Screen.mainScreen.scale;
+                                view.height = lp.height / Screen.mainScreen.scale;
+                                resolve(view);
+                            }
+                            else {
+                                reject(new Error('Failed to parse SVG'));
+                            }
+                        },
+                    });
+                    if (value.startsWith('~')) {
+                        org.nativescript.canvas.svg.NSCSVG.fromPath(context, path.join(knownFolders.currentApp().path, value.replace('~', '')), cb);
+                        return;
+                    }
+                    else if (value.startsWith('/')) {
+                        org.nativescript.canvas.svg.NSCSVG.fromPath(context, value, cb);
+                        return;
+                    }
+                    else if (value.startsWith('http')) {
+                        org.nativescript.canvas.svg.NSCSVG.fromRemote(context, value, cb);
+                        return;
+                    }
+                }
+            }
+            reject(new Error('Source is not valid'));
+        });
+    }
 }
 //# sourceMappingURL=index.android.js.map

package/index.android.js.map

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

package/index.d.ts

@@ -2,4 +2,6 @@ export * from './Elements';
 import { SVGBase } from './common';
 
 export class Svg extends SVGBase {
+	static fromSrcSync(value: string): Svg | null;
+	static fromSrc(value: string): Promise<Svg>;
 }

package/index.ios.d.ts

@@ -13,4 +13,6 @@ export declare class Svg extends SVGBase {
     onUnloaded(): void;
     addChild(view: SVGItem): void;
     removeChild(view: SVGItem): void;
+    static fromSrcSync(value: string): Svg | null;
+    static fromSrc(value: string): Promise<Svg>;
 }

package/index.ios.js

@@ -1,10 +1,56 @@
 import { SVGBase, srcProperty, syncProperty, initialSVG } from './common';
-import { Http, knownFolders, path, Utils } from '@nativescript/core';
+import { Http, knownFolders, path, Screen, Utils } from '@nativescript/core';
 export * from './Elements';
+function parseSVGDimensions(svgString) {
+    const svgRegex = /<svg([^>]*)>/i;
+    const match = svgString.match(svgRegex);
+    if (!match) {
+        return { width: 0, height: 0 };
+    }
+    const svgAttributes = match[1];
+    const regex = /\b(?:width|height|viewBox)\s*=\s*"([^"]*(?:"[^"]*")*[^"]*)"/g;
+    const matches = svgAttributes.match(regex);
+    let width, height, viewBox;
+    if (matches) {
+        matches.forEach((match) => {
+            const parts = match.split('=');
+            const attributeName = parts[0].trim();
+            const attributeValue = parts[1].trim().replace(/"/g, '');
+            if (attributeName === 'width') {
+                if (width === undefined) {
+                    width = parseFloat(attributeValue) ?? 0;
+                }
+            }
+            else if (attributeName === 'height') {
+                if (height === undefined) {
+                    height = parseFloat(attributeValue) ?? 0;
+                }
+            }
+            else if (attributeName === 'viewBox') {
+                if (viewBox === undefined) {
+                    viewBox = attributeValue.split(' ').map(parseFloat).splice(0, 4);
+                }
+            }
+        });
+    }
+    if (!width && viewBox && viewBox.length === 4) {
+        const viewBoxWidth = viewBox[2];
+        const viewBoxHeight = viewBox[3];
+        const aspectRatio = viewBoxWidth / viewBoxHeight;
+        width = (height ?? Screen.mainScreen.widthDIPs) * aspectRatio;
+    }
+    if (!height && viewBox && viewBox.length === 4) {
+        const viewBoxWidth = viewBox[2];
+        const viewBoxHeight = viewBox[3];
+        const aspectRatio = viewBoxWidth / viewBoxHeight;
+        height = (width ?? Screen.mainScreen.heightDIPs) / aspectRatio;
+    }
+    return { width: width ?? 0, height: height ?? 0 };
+}
 export class Svg extends SVGBase {
     constructor() {
         super();
-        this._svg = TNSSVG.alloc().initWithFrame(CGRectZero);
+        this._svg = NSCSVG.alloc().initWithFrame(CGRectZero);
         this._svg.backgroundColor = UIColor.clearColor;
     }
     createNativeView() {
@@ -31,7 +77,7 @@ export class Svg extends SVGBase {
                         this._svg.srcPath = res.path;
                     })
                         .catch((e) => {
-                        console.log(e);
+                        console.error(e);
                     });
                 }
             }
@@ -54,16 +100,20 @@ export class Svg extends SVGBase {
     }
     __redraw() {
         if (this._attachedToDom) {
-            const domCopy = this._dom.valueOf();
-            const serialized = this._serializer.serializeToString(domCopy);
-            const width = domCopy.documentElement.getAttribute('width');
-            const height = domCopy.documentElement.getAttribute('height');
-            if (width === 'auto') {
-                domCopy.documentElement.setAttribute('width', `${this.getMeasuredWidth()}px`);
+            const domCopy = this.__domElement.valueOf();
+            const width = domCopy.getAttribute('width');
+            const height = domCopy.getAttribute('height');
+            const viewBox = domCopy.getAttribute('viewBox');
+            if (!width) {
+                domCopy.setAttribute('width', `${this.getMeasuredWidth() / Screen.mainScreen.scale}`);
+            }
+            if (!height) {
+                domCopy.setAttribute('height', `${this.getMeasuredHeight() / Screen.mainScreen.scale}`);
             }
-            if (height === 'auto') {
-                domCopy.documentElement.setAttribute('height', `${this.getMeasuredHeight()}px`);
+            if (!viewBox) {
+                domCopy.setAttribute('viewBox', '0 0 100 100');
             }
+            const serialized = this._serializer.serializeToString(domCopy);
             if (serialized !== initialSVG) {
                 this.src = serialized;
             }
@@ -89,5 +139,92 @@ export class Svg extends SVGBase {
             this.__children = this.__children.filter((item) => item !== view);
         }
     }
+    static fromSrcSync(value) {
+        if (typeof value === 'string') {
+            if (value.indexOf('<svg') > -1) {
+                const { width, height } = parseSVGDimensions(value);
+                if (width > 0 && height > 0) {
+                    const svg = NSCSVG.fromStringSync(value);
+                    svg.backgroundColor = UIColor.redColor;
+                    const view = new Svg();
+                    view._svg = svg;
+                    view.width = svg.frame.size.width;
+                    view.height = svg.frame.size.height;
+                    return view;
+                }
+            }
+            else {
+                let nativeSvg;
+                try {
+                    if (value.startsWith('~')) {
+                        nativeSvg = NSCSVG.fromPathSync(path.join(knownFolders.currentApp().path, value.replace('~', '')));
+                    }
+                    else if (value.startsWith('/')) {
+                        nativeSvg = NSCSVG.fromPathSync(value);
+                    }
+                    else if (value.startsWith('http')) {
+                        nativeSvg = NSCSVG.fromRemoteSync(value);
+                    }
+                }
+                catch (error) { }
+                if (nativeSvg) {
+                    const view = new Svg();
+                    view._svg = nativeSvg;
+                    const frame = nativeSvg.frame.size;
+                    view.width = frame.width;
+                    view.height = frame.height;
+                    return view;
+                }
+            }
+        }
+        return null;
+    }
+    static fromSrc(value) {
+        return new Promise((resolve, reject) => {
+            if (typeof value === 'string') {
+                if (value.indexOf('<svg') > -1) {
+                    const { width, height } = parseSVGDimensions(value);
+                    if (width > 0 && height > 0) {
+                        NSCSVG.fromString(value, (svg) => {
+                            const view = new Svg();
+                            view._svg = svg;
+                            view.width = width;
+                            view.height = height;
+                            resolve(view);
+                        });
+                        return;
+                    }
+                }
+                else {
+                    const cb = (nativeSvg) => {
+                        if (nativeSvg) {
+                            const view = new Svg();
+                            const lp = nativeSvg.frame.size;
+                            view._svg = nativeSvg;
+                            view.width = lp.width;
+                            view.height = lp.height;
+                            resolve(view);
+                        }
+                        else {
+                            reject(new Error('Failed to parse SVG'));
+                        }
+                    };
+                    if (value.startsWith('~')) {
+                        NSCSVG.fromPath(path.join(knownFolders.currentApp().path, value.replace('~', '')), cb);
+                        return;
+                    }
+                    else if (value.startsWith('/')) {
+                        NSCSVG.fromPath(value, cb);
+                        return;
+                    }
+                    else if (value.startsWith('http')) {
+                        NSCSVG.fromRemote(value, cb);
+                        return;
+                    }
+                }
+            }
+            reject(new Error('Source is not valid'));
+        });
+    }
 }
 //# sourceMappingURL=index.ios.js.map

package/index.ios.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-svg",
-  "version": "2.0.0-beta.19",
+  "version": "2.0.0-beta.21",
   "description": "Add a plugin description",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/ios/CanvasSVG.xcframework/Info.plist

@@ -10,18 +10,15 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>CanvasSVG.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -29,15 +26,18 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>CanvasSVG.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>