@nativescript/canvas 2.0.0-alpha.30 → 2.0.0-alpha.32

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

@@ -81,6 +81,7 @@ import _StringProcessing
   @objc @_Concurrency.MainActor(unsafe) public func setListener(_ listener: (any CanvasNative.NSCCanvasListener)?)
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func layoutSubviews()
   @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 {
   @objc override dynamic public init()

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

@@ -81,6 +81,7 @@ import _StringProcessing
   @objc @_Concurrency.MainActor(unsafe) public func setListener(_ listener: (any CanvasNative.NSCCanvasListener)?)
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func layoutSubviews()
   @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 {
   @objc override dynamic public init()

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>
-		sJx+D16h1gIfzbfYPRKuXqB1NgE=
+		+VCFMd8HrKLciD+OwsTVcdS0fAA=
 		</data>
 		<key>Headers/CanvasNative.h</key>
 		<data>
@@ -18,7 +18,7 @@
 		</data>
 		<key>Headers/canvas_native.h</key>
 		<data>
-		z51bTEcRfKIDeM3+EAyvWKTpt40=
+		NxfB7FhSGtuOu9Ck2Y6OAxEspDk=
 		</data>
 		<key>Info.plist</key>
 		<data>
@@ -26,19 +26,19 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		eSWvO6kg+mhIJLEj+xj4vAXskuQ=
+		MINThIl7ndWVb8bIShypUSh/3go=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		dcNH2qco5t7qn0NRH3AO0vOkecA=
+		9Z9FjgTKHinlXDE6k355GJQ+hDk=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		3LvGAHj4UsSkh0UPGr+qh+SHrKU=
+		a05xfoh8i4smP+ATcF26KP9w8IY=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		rUssBShz7IWJNX4CSmzc1EHTprc=
+		8Srz3VbLpqZAT9Vj0TTcMmNnFpo=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<data>
@@ -46,19 +46,19 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		rUssBShz7IWJNX4CSmzc1EHTprc=
+		8Srz3VbLpqZAT9Vj0TTcMmNnFpo=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		CjjxdSPby80gKxTrDhQrwKPizLo=
+		xwUL0+sPWQOnLRbmCRAaufNhlQg=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		3LvGAHj4UsSkh0UPGr+qh+SHrKU=
+		a05xfoh8i4smP+ATcF26KP9w8IY=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		Pxu2QUoWj33Ft4+6JDvwUxX6dNA=
+		oGaFzJw2skR8h7F5PnUt0p1T0do=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
@@ -66,11 +66,11 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		Pxu2QUoWj33Ft4+6JDvwUxX6dNA=
+		oGaFzJw2skR8h7F5PnUt0p1T0do=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		6tZGhw/pELdQ6rca8WFCIDa+4I8=
+		a6dK/jYfYD3OMc+7AAdKioPdSzM=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -87,7 +87,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			9bww+fPX3BFEIsBUHvRJpPdYwTxfwLTDFso2WGZs/s0=
+			fXm+b+Qm+nCs5qVchcJ5cPoIgOfKloO3YiRF6o4KNRg=
 			</data>
 		</dict>
 		<key>Headers/CanvasNative.h</key>
@@ -108,35 +108,35 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			S+LxlpeMFZnlf06BBxLXdlVJrObDCyk2+WdyrOHT4Og=
+			ORK71+iLrkjjzu3hwV2vt58kg+ICPAC0ZSPhcqy7oTI=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			xmuMhBW27cWR7axitKkkuEAgx3/0vQGB1XeP3pZ1nxc=
+			++sX4p8tBMeuVFks8jongrvmbBm+PZ6z4HxEPAbLomw=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			9wRmFzgapp1mRLnRo42xMoSAcTPjyRKRK9sBr1mK7Ko=
+			rGTM5TkLTVTN8jNFgTOABzilyBCnblKehhohqojojIQ=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fcYuzkzpPUScaTjEYQlw70HDyhq0GLRHr3Bozr82RdY=
+			ivLUd4vcB85bDIQrO24DZdQEiDa/wuC/s4UqLJoeDAs=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fdKvHFLiqHG6Fp8pYonUVXAwb5bCn2yMtnkoGsbytbM=
+			NYLgbQSiXcqEGePfly2vWkVlmvpletiSTJhSSvYELy0=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
@@ -150,28 +150,28 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			fdKvHFLiqHG6Fp8pYonUVXAwb5bCn2yMtnkoGsbytbM=
+			NYLgbQSiXcqEGePfly2vWkVlmvpletiSTJhSSvYELy0=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			t4EusGFjo37ZRltOZNrXwSStvbtEhC6PU0qSGc8BtEs=
+			pTosagdcfbOSk+kqEUxvwO8uiO0kDuxEPJAEzFGZvNw=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fcYuzkzpPUScaTjEYQlw70HDyhq0GLRHr3Bozr82RdY=
+			ivLUd4vcB85bDIQrO24DZdQEiDa/wuC/s4UqLJoeDAs=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			TsKS6teXKsAKWwfW1GjkiuK6qZdrYXE2cZDEle+dUGs=
+			1OljxijU01/Dy6xtdgZ9TjaT8i0/oF9cLMQx2FhpL8w=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
@@ -185,14 +185,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			TsKS6teXKsAKWwfW1GjkiuK6qZdrYXE2cZDEle+dUGs=
+			1OljxijU01/Dy6xtdgZ9TjaT8i0/oF9cLMQx2FhpL8w=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			x9q1j4AakvNLh8GggtNfapPGs200oGkBppryUMbRuzw=
+			RzFPk/lsBdJedrAgG+Vzkgv6bq2WCg3BdPLGfDgwZtM=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

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

@@ -177,6 +177,10 @@ public:
     std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> WebGLUniformLocationTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
             nullptr);
 
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> URLTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+
 private:
     static std::shared_ptr<ConcurrentMap<v8::Isolate *,
             std::shared_ptr<Caches>>>

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

@@ -34,6 +34,7 @@ void CanvasJSIModule::install(v8::Isolate *isolate) {
         CanvasPattern::Init(canvasMod, isolate);
         MatrixImpl::Init(canvasMod, isolate);
         TextMetricsImpl::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(
@@ -56,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);
 
@@ -63,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

@@ -19,15 +19,24 @@
 #include "webgl/WebGLRenderingContext.h"
 #include "webgl2/WebGL2RenderingContext.h"
 
+#include "URLImpl.h"
 
 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);
 };