@nativescript/canvas 2.0.0-alpha.31 → 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.abi.json

@@ -6095,203 +6095,203 @@
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 8495,
+      "offset": 8560,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 10126,
+      "offset": 10191,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 10247,
+      "offset": 10312,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 10620,
+      "offset": 10685,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 10741,
+      "offset": 10806,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 10900,
+      "offset": 10965,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 11512,
+      "offset": 11577,
       "length": 5,
       "value": "false"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 11573,
+      "offset": 11638,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 11750,
+      "offset": 11815,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 11753,
+      "offset": 11818,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12136,
+      "offset": 12201,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12163,
+      "offset": 12228,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 12195,
+      "offset": 12260,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12299,
+      "offset": 12364,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12327,
+      "offset": 12392,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "BooleanLiteral",
-      "offset": 12447,
+      "offset": 12512,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12558,
+      "offset": 12623,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12691,
+      "offset": 12756,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12781,
+      "offset": 12846,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12816,
+      "offset": 12881,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 12889,
+      "offset": 12954,
       "length": 1,
       "value": "0"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 13727,
+      "offset": 13792,
       "length": 1,
       "value": "1"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 13784,
+      "offset": 13849,
       "length": 1,
       "value": "2"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 13842,
+      "offset": 13907,
       "length": 1,
       "value": "3"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 13891,
+      "offset": 13956,
       "length": 1,
       "value": "4"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 13944,
+      "offset": 14009,
       "length": 1,
       "value": "5"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 13998,
+      "offset": 14063,
       "length": 1,
       "value": "6"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 14047,
+      "offset": 14112,
       "length": 1,
       "value": "7"
     },
     {
       "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/CanvasNative\/Source\/NSCCanvas.swift",
       "kind": "IntegerLiteral",
-      "offset": 14209,
+      "offset": 14274,
       "length": 1,
       "value": "0"
     },

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

@@ -18,7 +18,7 @@
 		</data>
 		<key>Headers/canvas_native.h</key>
 		<data>
-		IGuEROm9kdptZf3262S3gVStmBg=
+		NxfB7FhSGtuOu9Ck2Y6OAxEspDk=
 		</data>
 		<key>Info.plist</key>
 		<data>
@@ -26,15 +26,15 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		HCnnpXSRLMEZUawVYP7bjIrykvY=
+		MINThIl7ndWVb8bIShypUSh/3go=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		NBQwCzT566EVuifc3CGTABJArIg=
+		9Z9FjgTKHinlXDE6k355GJQ+hDk=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		ZMfwT5PJatFgh1+CMyoU3Wv8PIw=
+		a05xfoh8i4smP+ATcF26KP9w8IY=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -54,7 +54,7 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		ZMfwT5PJatFgh1+CMyoU3Wv8PIw=
+		a05xfoh8i4smP+ATcF26KP9w8IY=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -108,28 +108,28 @@
 		<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=
+			++sX4p8tBMeuVFks8jongrvmbBm+PZ6z4HxEPAbLomw=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			WiDcXU4QuScyp6Lnic8gkcbMnIznccTZHGi35c1pR+g=
+			rGTM5TkLTVTN8jNFgTOABzilyBCnblKehhohqojojIQ=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			E/7n06UUQIxz7Bkm2stxRet0YW5fO/ZBPTzdDtTgKrQ=
+			ivLUd4vcB85bDIQrO24DZdQEiDa/wuC/s4UqLJoeDAs=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -164,7 +164,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			E/7n06UUQIxz7Bkm2stxRet0YW5fO/ZBPTzdDtTgKrQ=
+			ivLUd4vcB85bDIQrO24DZdQEiDa/wuC/s4UqLJoeDAs=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</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();
     }
 }