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

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

@@ -5,10 +5,8 @@
 import AVFoundation
 @_exported import CanvasNative
 import CoreVideo
-import OpenGLES.EAGLIOSurface
 import Foundation
 import GLKit
-import IOSurface
 import OpenGLES
 import Swift
 import UIKit

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

@@ -5,10 +5,8 @@
 import AVFoundation
 @_exported import CanvasNative
 import CoreVideo
-import OpenGLES.EAGLIOSurface
 import Foundation
 import GLKit
-import IOSurface
 import OpenGLES
 import Swift
 import UIKit

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>
-		NxfB7FhSGtuOu9Ck2Y6OAxEspDk=
+		pRAw58hbawyHmNg47MpPInfGUXE=
 		</data>
 		<key>Info.plist</key>
 		<data>
@@ -26,19 +26,19 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		mjBdXtl149aezdRYyhnkMsfNCso=
+		trMxXoNOVvJWXOLBxxfNpfL/Scg=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		jr4oFCEOrsgiMSqWW89kvpQaDVM=
+		CEdlyzzOwLQs8TyhmEQsXMs5A2o=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		+mYFJvWCBB76R2eas9FSQg2VKhY=
+		3ma5PFjT4Xml5NbJXZjkfgMpG78=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		fY/HArWFvvmGSpE3+5PfP3//Y5g=
+		YpF33cjos22C+odi1kiW+HRnnoU=
 		</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>
-		fY/HArWFvvmGSpE3+5PfP3//Y5g=
+		YpF33cjos22C+odi1kiW+HRnnoU=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		70zSLB/L8EjqubKbY1ub2GUcWYc=
+		UpJt2D+h+ShsN0V+y+W18QnA9tg=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		+mYFJvWCBB76R2eas9FSQg2VKhY=
+		3ma5PFjT4Xml5NbJXZjkfgMpG78=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		dgft4XLXJepSsHdsqwdPYPLY33w=
+		8hFN6uPR9aaO4y9GFtU7MZcgCrE=
 		</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>
-		dgft4XLXJepSsHdsqwdPYPLY33w=
+		8hFN6uPR9aaO4y9GFtU7MZcgCrE=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		kqHhXWrHrCCozrDoh/ogcFMwF5Q=
+		wI0PbZtS1/3Pm9r9kWuErAGg9kU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -108,35 +108,35 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			ORK71+iLrkjjzu3hwV2vt58kg+ICPAC0ZSPhcqy7oTI=
+			+uJrcducrhwiNwtZ6wBUM2xpn2cfp1O2gq8/4NtuBVU=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			2powB9/NAZB+c/ibkyy8L7y7ykMk0laWSx4FNH93VQU=
+			Ly5lZzwdCbZocMUzKN+m2VAw4xmauWAhFhWdbent3E4=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			OLLsfUpvgjnrs/OlIPpbjrtK6fEgpr2yUvQU/+Rnic4=
+			1uqo2zHJZxR9Yqg1JEqiTcXfFG9hZVhL7idxeJbxlV4=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			S8CrfbHJGL4tgH88fSvyWBnMTU7UlLG1mllA6da1bRs=
+			dDfZkjfDIcMopkv5WI7npxyqsoipcLCHuCH/QnjtRxk=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			LRcG5nNY1WV/dtLwqrWTBBTalKyc+OU86LF04q2QJmQ=
+			NEs1Zh63V5aQ0+USgEGvZ4Ctov1DaYnPcRxwpRr5qOA=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
@@ -150,28 +150,28 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			LRcG5nNY1WV/dtLwqrWTBBTalKyc+OU86LF04q2QJmQ=
+			NEs1Zh63V5aQ0+USgEGvZ4Ctov1DaYnPcRxwpRr5qOA=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			PsYyhtHA6HJvG/DeyKaiSSg5Cn2cjHk6GppD9wKRtzU=
+			aUFrye0zvIFzyfbvh5wNZOi/RVQUbd/KabDp5br2/pE=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			S8CrfbHJGL4tgH88fSvyWBnMTU7UlLG1mllA6da1bRs=
+			dDfZkjfDIcMopkv5WI7npxyqsoipcLCHuCH/QnjtRxk=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			zrtt+lROTZEFj42lP0OGAqujMpwQCfoehUWJATK0dy0=
+			gdGxXuI8iVdBPQUlh1VmeE2VK9UKbNjrWRIjfGJrmoo=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
@@ -185,14 +185,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			zrtt+lROTZEFj42lP0OGAqujMpwQCfoehUWJATK0dy0=
+			gdGxXuI8iVdBPQUlh1VmeE2VK9UKbNjrWRIjfGJrmoo=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			MFQc4PLEY/IAe1zn3A7HKjWoluwwYwg1eTdir1/1w9w=
+			fOmzW/5hBfpa/UTW25wHCTCstHz1Dhj2Lckmeybd8nA=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

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

@@ -76,6 +76,11 @@ v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolat
 
     tmpl->SetAccessor(ConvertToV8String(isolate, "filter"), GetFilter, SetFilter);
     tmpl->SetAccessor(ConvertToV8String(isolate, "font"), GetFont, SetFont);
+    tmpl->SetAccessor(ConvertToV8String(isolate, "letterSpacing"), GetLetterSpacing,
+                      SetLetterSpacing);
+    tmpl->SetAccessor(ConvertToV8String(isolate, "wordSpacing"), GetWordSpacing, SetWordSpacing);
+
+
     tmpl->SetAccessor(ConvertToV8String(isolate, "globalAlpha"), GetGlobalAlpha, SetGlobalAlpha);
     tmpl->SetAccessor(ConvertToV8String(isolate, "imageSmoothingEnabled"), GetImageSmoothingEnabled,
                       SetImageSmoothingEnabled);
@@ -93,6 +98,8 @@ v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolat
     tmpl->SetAccessor(ConvertToV8String(isolate, "shadowOffsetY"), GetShadowOffsetY,
                       SetShadowOffsetY);
     tmpl->SetAccessor(ConvertToV8String(isolate, "textAlign"), GetTextAlign, SetTextAlign);
+    tmpl->SetAccessor(ConvertToV8String(isolate, "textBaseline"), GetTextBaseline,
+                      SetTextBaseline);
     tmpl->SetAccessor(ConvertToV8String(isolate, "globalCompositeOperation"),
                       GetGlobalCompositeOperation, SetGlobalCompositeOperation);
     tmpl->SetAccessor(ConvertToV8String(isolate, "fillStyle"), GetFillStyle, SetFillStyle);
@@ -381,6 +388,61 @@ void CanvasRenderingContext2DImpl::SetFont(v8::Local<v8::String> property,
     canvas_native_context_set_font(ptr->GetContext(), val.c_str());
 }
 
+
+void CanvasRenderingContext2DImpl::GetLetterSpacing(v8::Local<v8::String> property,
+                                                    const v8::PropertyCallbackInfo<v8::Value> &info) {
+    CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    auto isolate = info.GetIsolate();
+    auto font = canvas_native_context_get_letter_spacing(ptr->GetContext());
+    info.GetReturnValue().Set(ConvertToV8String(isolate, font));
+
+    canvas_native_string_destroy((char *) font);
+}
+
+void CanvasRenderingContext2DImpl::SetLetterSpacing(v8::Local<v8::String> property,
+                                                    v8::Local<v8::Value> value,
+                                                    const v8::PropertyCallbackInfo<void> &info) {
+    CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        return;
+    }
+    auto isolate = info.GetIsolate();
+    auto val = ConvertFromV8String(isolate, value);
+    canvas_native_context_set_letter_spacing(ptr->GetContext(), val.c_str());
+}
+
+
+void CanvasRenderingContext2DImpl::GetWordSpacing(v8::Local<v8::String> property,
+                                                  const v8::PropertyCallbackInfo<v8::Value> &info) {
+    CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    auto isolate = info.GetIsolate();
+    auto font = canvas_native_context_get_word_spacing(ptr->GetContext());
+    info.GetReturnValue().Set(ConvertToV8String(isolate, font));
+
+    canvas_native_string_destroy((char *) font);
+}
+
+void CanvasRenderingContext2DImpl::SetWordSpacing(v8::Local<v8::String> property,
+                                                  v8::Local<v8::Value> value,
+                                                  const v8::PropertyCallbackInfo<void> &info) {
+    CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        return;
+    }
+    auto isolate = info.GetIsolate();
+    auto val = ConvertFromV8String(isolate, value);
+    canvas_native_context_set_word_spacing(ptr->GetContext(), val.c_str());
+}
+
+
 void CanvasRenderingContext2DImpl::GetGlobalAlpha(v8::Local<v8::String> property,
                                                   const v8::PropertyCallbackInfo<v8::Value> &info) {
     CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
@@ -685,6 +747,33 @@ void CanvasRenderingContext2DImpl::SetTextAlign(v8::Local<v8::String> property,
     canvas_native_context_set_text_align(ptr->GetContext(), alignment.c_str());
 }
 
+void CanvasRenderingContext2DImpl::GetTextBaseline(v8::Local<v8::String> property,
+                                                   const v8::PropertyCallbackInfo<v8::Value> &info) {
+    CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
+    auto isolate = info.GetIsolate();
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+    auto baseline = canvas_native_context_get_text_baseline(ptr->GetContext());
+    info.GetReturnValue().Set(
+            ConvertToV8String(isolate, baseline));
+    canvas_native_string_destroy((char *) baseline);
+}
+
+void CanvasRenderingContext2DImpl::SetTextBaseline(v8::Local<v8::String> property,
+                                                   v8::Local<v8::Value> value,
+                                                   const v8::PropertyCallbackInfo<void> &info) {
+    CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+
+        return;
+    }
+    auto isolate = info.GetIsolate();
+    auto baseline = ConvertFromV8String(isolate, value);
+    canvas_native_context_set_text_baseline(ptr->GetContext(), baseline.c_str());
+}
+
 
 void CanvasRenderingContext2DImpl::GetGlobalCompositeOperation(v8::Local<v8::String> property,
                                                                const v8::PropertyCallbackInfo<v8::Value> &info) {
@@ -1706,12 +1795,12 @@ CanvasRenderingContext2DImpl::FillText(const v8::FunctionCallbackInfo<v8::Value>
         canvas_native_context_fill_text_width(
                 ptr->GetContext(), text.c_str(), x,
                 y, width);
-    }else {
+    } else {
         canvas_native_context_fill_text(
                 ptr->GetContext(), text.c_str(), x,
                 y);
     }
-    
+
     ptr->UpdateInvalidateState();
 
 }
@@ -2279,14 +2368,14 @@ CanvasRenderingContext2DImpl::StrokeText(const v8::FunctionCallbackInfo<v8::Valu
             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 {
+                    x, y, maxWidth);
+        } else {
             canvas_native_context_stroke_text(
                     ptr->GetContext(), text.c_str(),
                     x, y);
         }
 
-        
+
         ptr->UpdateInvalidateState();
     }
 }

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

@@ -72,6 +72,21 @@ public:
                         v8::Local<v8::Value> value,
                         const v8::PropertyCallbackInfo<void> &info);
 
+
+    static void GetLetterSpacing(v8::Local<v8::String> property,
+                        const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void SetLetterSpacing(v8::Local<v8::String> property,
+                        v8::Local<v8::Value> value,
+                        const v8::PropertyCallbackInfo<void> &info);
+
+    static void GetWordSpacing(v8::Local<v8::String> property,
+                                 const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void SetWordSpacing(v8::Local<v8::String> property,
+                                 v8::Local<v8::Value> value,
+                                 const v8::PropertyCallbackInfo<void> &info);
+
     static void SetGlobalAlpha(v8::Local<v8::String> property,
                                v8::Local<v8::Value> value,
                                const v8::PropertyCallbackInfo<void> &info);
@@ -151,11 +166,18 @@ public:
                                  const v8::PropertyCallbackInfo<void> &info);
 
     static void GetTextAlign(v8::Local<v8::String> property,
-                             const v8::PropertyCallbackInfo<v8::Value> &info);
+                                 const v8::PropertyCallbackInfo<v8::Value> &info);
 
     static void SetTextAlign(v8::Local<v8::String> property,
-                             v8::Local<v8::Value> value,
-                             const v8::PropertyCallbackInfo<void> &info);
+                                 v8::Local<v8::Value> value,
+                                 const v8::PropertyCallbackInfo<void> &info);
+    
+    static void GetTextBaseline(v8::Local<v8::String> property,
+                                 const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void SetTextBaseline(v8::Local<v8::String> property,
+                                 v8::Local<v8::Value> value,
+                                 const v8::PropertyCallbackInfo<void> &info);
 
     static void GetGlobalCompositeOperation(v8::Local<v8::String> property,
                                             const v8::PropertyCallbackInfo<v8::Value> &info);