@nativescript/canvas 2.0.0-alpha.31 → 2.0.0-alpha.33

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface

@@ -1,12 +1,14 @@
 // swift-interface-format-version: 1.0
 // swift-compiler-version: Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
-// swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name CanvasNative
+// swift-module-flags: -target x86_64-apple-ios12.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name CanvasNative
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import AVFoundation
 @_exported import CanvasNative
 import CoreVideo
+import OpenGLES.EAGLIOSurface
 import Foundation
 import GLKit
+import IOSurface
 import OpenGLES
 import Swift
 import UIKit
@@ -44,8 +46,7 @@ import _StringProcessing
   @objc override dynamic public init()
   @objc deinit
 }
-@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(NSCCanvas) @_Concurrency.MainActor(unsafe) public class NSCCanvas : UIKit.UIView, GLKit.GLKViewDelegate {
-  @_Concurrency.MainActor(unsafe) @objc public func glkView(_ view: GLKit.GLKView, drawIn rect: CoreFoundation.CGRect)
+@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(NSCCanvas) @_Concurrency.MainActor(unsafe) public class NSCCanvas : UIKit.UIView {
   @objc @_Concurrency.MainActor(unsafe) public static let store: Foundation.NSMutableDictionary
   @objc @_Concurrency.MainActor(unsafe) public static func getViews() -> Foundation.NSMapTable<Foundation.NSString, CanvasNative.NSCCanvas>
   @objc @_Concurrency.MainActor(unsafe) public func getViewPtr() -> Swift.UnsafeMutableRawPointer
@@ -83,8 +84,9 @@ import _StringProcessing
   @objc deinit
   @objc @_Concurrency.MainActor(unsafe) public static func getBoundingClientRect(_ canvas: CanvasNative.NSCCanvas, _ buffer: Swift.UnsafeMutableRawPointer)
 }
-@_inheritsConvenienceInitializers @objcMembers @objc(TNSRender) public class NSCRender : ObjectiveC.NSObject {
+@_inheritsConvenienceInitializers @objcMembers @objc(NSCRender) public class NSCRender : ObjectiveC.NSObject {
   @objc override dynamic public init()
+  @objc public func texImage2D(_ target: Swift.Int32, _ level: Swift.Int32, _ internalFormat: Swift.Int32, _ format: Swift.Int32, _ type: Swift.Int32, _ source: CanvasNative.NSCCanvas, _ dest: CanvasNative.NSCCanvas, _ flipYWebGL: Swift.Bool)
   @objc public func createSurface()
   @objc deinit
 }
@@ -135,6 +137,8 @@ import _StringProcessing
   @_Concurrency.MainActor(unsafe) @objc override dynamic public init(frame: CoreFoundation.CGRect)
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func setNeedsDisplay()
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func setNeedsDisplay(_ rect: CoreFoundation.CGRect)
+  @_Concurrency.MainActor(unsafe) @objc override dynamic public func bindDrawable()
+  @_Concurrency.MainActor(unsafe) @objc override dynamic public func deleteDrawable()
   @objc deinit
 }
 extension GLKit.GLKView {

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface

@@ -1,12 +1,14 @@
 // swift-interface-format-version: 1.0
 // swift-compiler-version: Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
-// swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name CanvasNative
+// swift-module-flags: -target x86_64-apple-ios12.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name CanvasNative
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 import AVFoundation
 @_exported import CanvasNative
 import CoreVideo
+import OpenGLES.EAGLIOSurface
 import Foundation
 import GLKit
+import IOSurface
 import OpenGLES
 import Swift
 import UIKit
@@ -44,8 +46,7 @@ import _StringProcessing
   @objc override dynamic public init()
   @objc deinit
 }
-@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(NSCCanvas) @_Concurrency.MainActor(unsafe) public class NSCCanvas : UIKit.UIView, GLKit.GLKViewDelegate {
-  @_Concurrency.MainActor(unsafe) @objc public func glkView(_ view: GLKit.GLKView, drawIn rect: CoreFoundation.CGRect)
+@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(NSCCanvas) @_Concurrency.MainActor(unsafe) public class NSCCanvas : UIKit.UIView {
   @objc @_Concurrency.MainActor(unsafe) public static let store: Foundation.NSMutableDictionary
   @objc @_Concurrency.MainActor(unsafe) public static func getViews() -> Foundation.NSMapTable<Foundation.NSString, CanvasNative.NSCCanvas>
   @objc @_Concurrency.MainActor(unsafe) public func getViewPtr() -> Swift.UnsafeMutableRawPointer
@@ -83,8 +84,9 @@ import _StringProcessing
   @objc deinit
   @objc @_Concurrency.MainActor(unsafe) public static func getBoundingClientRect(_ canvas: CanvasNative.NSCCanvas, _ buffer: Swift.UnsafeMutableRawPointer)
 }
-@_inheritsConvenienceInitializers @objcMembers @objc(TNSRender) public class NSCRender : ObjectiveC.NSObject {
+@_inheritsConvenienceInitializers @objcMembers @objc(NSCRender) public class NSCRender : ObjectiveC.NSObject {
   @objc override dynamic public init()
+  @objc public func texImage2D(_ target: Swift.Int32, _ level: Swift.Int32, _ internalFormat: Swift.Int32, _ format: Swift.Int32, _ type: Swift.Int32, _ source: CanvasNative.NSCCanvas, _ dest: CanvasNative.NSCCanvas, _ flipYWebGL: Swift.Bool)
   @objc public func createSurface()
   @objc deinit
 }
@@ -135,6 +137,8 @@ import _StringProcessing
   @_Concurrency.MainActor(unsafe) @objc override dynamic public init(frame: CoreFoundation.CGRect)
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func setNeedsDisplay()
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func setNeedsDisplay(_ rect: CoreFoundation.CGRect)
+  @_Concurrency.MainActor(unsafe) @objc override dynamic public func bindDrawable()
+  @_Concurrency.MainActor(unsafe) @objc override dynamic public func deleteDrawable()
   @objc deinit
 }
 extension GLKit.GLKView {

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/CanvasNative-Swift.h</key>
 		<data>
-		+VCFMd8HrKLciD+OwsTVcdS0fAA=
+		hkAiS/OaLARvaFQb0DHwxYCAHNo=
 		</data>
 		<key>Headers/CanvasNative.h</key>
 		<data>
@@ -14,63 +14,63 @@
 		</data>
 		<key>Headers/canvas_ios.h</key>
 		<data>
-		KTxEWGEXbMkpqkl1jFw9IrlUXNk=
+		LPanBXKcbVunr8F1KyVxJgAshlg=
 		</data>
 		<key>Headers/canvas_native.h</key>
 		<data>
-		IGuEROm9kdptZf3262S3gVStmBg=
+		NxfB7FhSGtuOu9Ck2Y6OAxEspDk=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		U1i9btMZtOpHf9qhXwKYLDvVNdo=
+		EM/hl4VHfqrUWG5WhwjIgBQydpw=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		HCnnpXSRLMEZUawVYP7bjIrykvY=
+		mjBdXtl149aezdRYyhnkMsfNCso=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		NBQwCzT566EVuifc3CGTABJArIg=
+		jr4oFCEOrsgiMSqWW89kvpQaDVM=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		ZMfwT5PJatFgh1+CMyoU3Wv8PIw=
+		+mYFJvWCBB76R2eas9FSQg2VKhY=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		8Srz3VbLpqZAT9Vj0TTcMmNnFpo=
+		fY/HArWFvvmGSpE3+5PfP3//Y5g=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		CMMmee6VmdZfdJ0Wkbazb7dDXdQ=
+		3k4ihv2rEGRfxk2bofe8XCNgmOU=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		8Srz3VbLpqZAT9Vj0TTcMmNnFpo=
+		fY/HArWFvvmGSpE3+5PfP3//Y5g=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		xwUL0+sPWQOnLRbmCRAaufNhlQg=
+		70zSLB/L8EjqubKbY1ub2GUcWYc=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		ZMfwT5PJatFgh1+CMyoU3Wv8PIw=
+		+mYFJvWCBB76R2eas9FSQg2VKhY=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		oGaFzJw2skR8h7F5PnUt0p1T0do=
+		dgft4XLXJepSsHdsqwdPYPLY33w=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		qIf+V6LPokPDapYCnIkzGPNTQBQ=
+		LhXFUgL45ajNWjn9PjgN0RRMMRI=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		oGaFzJw2skR8h7F5PnUt0p1T0do=
+		dgft4XLXJepSsHdsqwdPYPLY33w=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		a6dK/jYfYD3OMc+7AAdKioPdSzM=
+		kqHhXWrHrCCozrDoh/ogcFMwF5Q=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -87,7 +87,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			fXm+b+Qm+nCs5qVchcJ5cPoIgOfKloO3YiRF6o4KNRg=
+			NgdeIBmztWUdD5mFMZ3+6AuGJtG14SrQYJD64J/vSpg=
 			</data>
 		</dict>
 		<key>Headers/CanvasNative.h</key>
@@ -101,98 +101,98 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			TiO6d1r0FpNodOiAuX3VSvZMqWAXTOTOJOr7ntjAfW0=
+			D4WQBTe9g4ZWCu0OZfSbjUBcaqYn7WDpfEaYGK/aMqQ=
 			</data>
 		</dict>
 		<key>Headers/canvas_native.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			0L3I06bMeoK4UNoafHEw7AGoDeCi4B1w6G3Ms6CT26A=
+			ORK71+iLrkjjzu3hwV2vt58kg+ICPAC0ZSPhcqy7oTI=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			47O+ZoX5+8n5GWFdbt4LCXjSURv2AO1i+hSh7J7xyB0=
+			2powB9/NAZB+c/ibkyy8L7y7ykMk0laWSx4FNH93VQU=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			WiDcXU4QuScyp6Lnic8gkcbMnIznccTZHGi35c1pR+g=
+			OLLsfUpvgjnrs/OlIPpbjrtK6fEgpr2yUvQU/+Rnic4=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			E/7n06UUQIxz7Bkm2stxRet0YW5fO/ZBPTzdDtTgKrQ=
+			S8CrfbHJGL4tgH88fSvyWBnMTU7UlLG1mllA6da1bRs=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			NYLgbQSiXcqEGePfly2vWkVlmvpletiSTJhSSvYELy0=
+			LRcG5nNY1WV/dtLwqrWTBBTalKyc+OU86LF04q2QJmQ=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			XEwqbBhZEdrykIJcHcrifRLpaclowS2e/807PqxiO3c=
+			hfByW1Q/oKQfs+YO18TpacW07cK0OcnuziqQqzi0jjg=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			NYLgbQSiXcqEGePfly2vWkVlmvpletiSTJhSSvYELy0=
+			LRcG5nNY1WV/dtLwqrWTBBTalKyc+OU86LF04q2QJmQ=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			pTosagdcfbOSk+kqEUxvwO8uiO0kDuxEPJAEzFGZvNw=
+			PsYyhtHA6HJvG/DeyKaiSSg5Cn2cjHk6GppD9wKRtzU=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			E/7n06UUQIxz7Bkm2stxRet0YW5fO/ZBPTzdDtTgKrQ=
+			S8CrfbHJGL4tgH88fSvyWBnMTU7UlLG1mllA6da1bRs=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			1OljxijU01/Dy6xtdgZ9TjaT8i0/oF9cLMQx2FhpL8w=
+			zrtt+lROTZEFj42lP0OGAqujMpwQCfoehUWJATK0dy0=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			4Vrv9xfds4FwI/1nDrreY1HfYl1r31bJkIMvsfoEf54=
+			0DLlMsH/LfZQEHFMASjz0T2DkSd63Uboie1M0O5WBmc=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			1OljxijU01/Dy6xtdgZ9TjaT8i0/oF9cLMQx2FhpL8w=
+			zrtt+lROTZEFj42lP0OGAqujMpwQCfoehUWJATK0dy0=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			RzFPk/lsBdJedrAgG+Vzkgv6bq2WCg3BdPLGfDgwZtM=
+			MFQc4PLEY/IAe1zn3A7HKjWoluwwYwg1eTdir1/1w9w=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

package/platforms/ios/src/cpp/CanvasJSIModule.cpp

@@ -34,7 +34,7 @@ void CanvasJSIModule::install(v8::Isolate *isolate) {
         CanvasPattern::Init(canvasMod, isolate);
         MatrixImpl::Init(canvasMod, isolate);
         TextMetricsImpl::Init(canvasMod, isolate);
-                URLImpl::Init(canvasMod, isolate);
+        URLImpl::Init(canvasMod, isolate);
         v8Global->Set(context, ConvertToV8String(isolate, "CanvasModule"), canvasMod);
         canvasMod->Set(context, ConvertToV8String(isolate, "create2DContext"),
                        v8::FunctionTemplate::New(isolate, &Create2DContext)->GetFunction(
@@ -57,6 +57,11 @@ void CanvasJSIModule::install(v8::Isolate *isolate) {
                        v8::FunctionTemplate::New(isolate, &CreateWebGL2Context)->GetFunction(
                                context).ToLocalChecked());
 
+
+        canvasMod->Set(context, ConvertToV8String(isolate, "__addFontFamily"),
+                       v8::FunctionTemplate::New(isolate, &AddFontFamily)->GetFunction(
+                               context).ToLocalChecked());
+
         global->Set(context,
                     ConvertToV8String(isolate, "CanvasModule"), canvasMod);
 
@@ -64,6 +69,37 @@ void CanvasJSIModule::install(v8::Isolate *isolate) {
 }
 
 
+void CanvasJSIModule::AddFontFamily(const v8::FunctionCallbackInfo<v8::Value> &args) {
+    auto isolate = args.GetIsolate();
+    auto context = isolate->GetCurrentContext();
+    auto aliasValue = args[0];
+    auto familyValue = args[1];
+
+    // todo improve
+    if (familyValue->IsArray()) {
+        auto family = familyValue.As<v8::Array>();
+        auto len = family->Length();
+        std::vector<std::string> buf;
+        std::vector<const char *> buffer;
+        buf.reserve(len);
+
+        for (uint32_t i = 0; i < len; i++) {
+            buf.emplace_back(
+                    ConvertFromV8String(isolate, family->Get(context, i).ToLocalChecked()));
+            buffer.emplace_back(buf[0].c_str());
+        }
+
+        if (aliasValue->IsString()) {
+            auto alias = ConvertFromV8String(isolate, aliasValue);
+            canvas_native_font_add_family(alias.c_str(), buffer.data(), buffer.size());
+        } else {
+            canvas_native_font_add_family(nullptr, buffer.data(), buffer.size());
+        }
+
+    }
+
+}
+
 void CanvasJSIModule::Create2DContext(const v8::FunctionCallbackInfo<v8::Value> &args) {
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();

package/platforms/ios/src/cpp/CanvasJSIModule.h

@@ -23,12 +23,20 @@
 
 class CanvasJSIModule {
 public:
-    static void install(v8::Isolate * isolate);
+    static void install(v8::Isolate *isolate);
+
     static void CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     static void Create2DContext(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     static void Create2DContextWithPointer(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     static void ReadFile(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     static void CreateWebGLContext(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     static void CreateWebGL2Context(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void AddFontFamily(const v8::FunctionCallbackInfo<v8::Value> &args);
 };
 

package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.cpp

@@ -1700,13 +1700,18 @@ CanvasRenderingContext2DImpl::FillText(const v8::FunctionCallbackInfo<v8::Value>
 
     auto x = static_cast<float>(args[1]->NumberValue(context).ToChecked());
     auto y = static_cast<float>(args[2]->NumberValue(context).ToChecked());
-    float width = -1;
+
     if (args[3]->IsNumber()) {
-        width = static_cast<float>(args[3]->NumberValue(context).ToChecked());
-    }
-    canvas_native_context_fill_text(
-            ptr->GetContext(), text.c_str(), x,
-            y, width);
+        float width = static_cast<float>(args[3]->NumberValue(context).ToChecked());
+        canvas_native_context_fill_text_width(
+                ptr->GetContext(), text.c_str(), x,
+                y, width);
+    }else {
+        canvas_native_context_fill_text(
+                ptr->GetContext(), text.c_str(), x,
+                y);
+    }
+    
     ptr->UpdateInvalidateState();
 
 }
@@ -2270,15 +2275,18 @@ CanvasRenderingContext2DImpl::StrokeText(const v8::FunctionCallbackInfo<v8::Valu
         auto text = ConvertFromV8String(isolate, args[0]);
         auto x = static_cast<float>(args[1]->NumberValue(context).ToChecked());
         auto y = static_cast<float>(args[2]->NumberValue(context).ToChecked());
-        float maxWidth = -1;
-
         if (count > 3) {
-            maxWidth = static_cast<float>(args[3]->NumberValue(context).ToChecked());
+            float maxWidth = static_cast<float>(args[3]->NumberValue(context).ToChecked());
+            canvas_native_context_stroke_text_width(
+                    ptr->GetContext(), text.c_str(),
+                    x, y,maxWidth);
+        }else {
+            canvas_native_context_stroke_text(
+                    ptr->GetContext(), text.c_str(),
+                    x, y);
         }
 
-        canvas_native_context_stroke_text(
-                ptr->GetContext(), text.c_str(),
-                x, y, maxWidth);
+        
         ptr->UpdateInvalidateState();
     }
 }