fix(canvas): flipY handling

Author: triniwiz

CanvasNative.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
     s.name         = "CanvasNative"
 
-    s.version      = "0.9.18"
+    s.version      = "0.9.19"
 
     s.summary      = "A Canvas library"
 

packages/canvas/Canvas/common.ts

@@ -143,8 +143,8 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 			let x = 0;
 			let y = 0;
 			if (global.isIOS) {
-				x = event.deltaX + this.__touchStart?.getX() ?? 0;
-				y = event.deltaY + this.__touchStart?.getY() ?? 0;
+				x = event.deltaX + this.__touchStart?.getX?.() ?? 0;
+				y = event.deltaY + this.__touchStart?.getY?.() ?? 0;
 			} else {
 				const initial: android.view.MotionEvent = event.android.initial;
 				const current: android.view.MotionEvent = event.android.current;
@@ -194,6 +194,9 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 			this._previousY = event.deltaY;
 		} else if (name === 'touchmove:pinch') {
 			name = 'touchmove';
+			if (!this.__touchStart) {
+				return null;
+			}
 			const x = event.getFocusX();
 			const y = event.getFocusY();
 			const scale = event.scale;
@@ -213,17 +216,17 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 			};
 
 			pointers.push({
-				clientX: this.__touchStart?.getX() ?? 0,
-				clientY: this.__touchStart?.getY() ?? 0,
+				clientX: this.__touchStart?.getX?.() ?? 0,
+				clientY: this.__touchStart?.getY?.() ?? 0,
 				force: 0.0,
 				identifier: 0,
-				pageX: this.__touchStart?.getX() ?? 0,
-				pageY: this.__touchStart?.getY() ?? 0,
+				pageX: this.__touchStart?.getX?.() ?? 0,
+				pageY: this.__touchStart?.getY?.() ?? 0,
 				radiusX: 0,
 				radiusY: 0,
 				rotationAngle: 0,
-				screenX: this.__touchStart?.getX() ?? 0,
-				screenY: this.__touchStart?.getY() ?? 0,
+				screenX: this.__touchStart?.getX?.() ?? 0,
+				screenY: this.__touchStart?.getY?.() ?? 0,
 				target,
 			});
 
@@ -246,7 +249,9 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 		} else {
 			const count = event.getAllPointers().length;
 			const point = event.getActivePointers()[0];
-
+			if (!point) {
+				return null;
+			}
 			// mouse event
 			activePointer = {
 				clientX: point.getX() * scale,
@@ -303,7 +308,10 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 	}
 
 	_emitEvent(name, event) {
-		this.notify(this._getTouchEvent(name, event, this));
+		const data = this._getTouchEvent(name, event, this);
+		if (data) {
+			this.notify(data);
+		}
 	}
 
 	_readyEvent() {

packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
+// Generated by Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
 #ifndef CANVASNATIVE_SWIFT_H
 #define CANVASNATIVE_SWIFT_H
 #pragma clang diagnostic push
@@ -256,6 +256,8 @@ SWIFT_PROTOCOL("_TtP12CanvasNative17ICanvasColorStyle_")
 - (enum CanvasColorStyleType)getStyleType SWIFT_WARN_UNUSED_RESULT;
 @end
 
+@class NSNumber;
+@class NSString;
 
 SWIFT_CLASS_NAMED("TNSAnimationFrame")
 @interface TNSAnimationFrame : NSObject
@@ -264,7 +266,6 @@ SWIFT_CLASS_NAMED("TNSAnimationFrame")
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
-@class NSString;
 @class TNSDOMMatrix;
 @protocol TNSCanvasListener;
 @class TNSCanvasRenderingContext;

packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.framework.dSYM.zip

@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
+// swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name CanvasNative
 import AVFoundation
 @_exported import CanvasNative
@@ -140,8 +140,8 @@ import UIKit
 @_inheritsConvenienceInitializers @objcMembers @objc(TNSAnimationFrame) public class TNSAnimationFrame : ObjectiveC.NSObject {
   @objc public static func requestAnimationFrame(toLoop: @escaping (Swift.Float) -> Swift.Void)
   @objc public static func cancelAnimationFrame(id: Swift.String)
-  @objc deinit
   @objc override dynamic public init()
+  @objc deinit
 }
 @objc(TNSFillRule) public enum TNSFillRule : Swift.Int, Swift.RawRepresentable {
   case NonZero
@@ -216,8 +216,8 @@ import UIKit
   @objc public func drawArraysInstancedANGLE(mode: Swift.Int32, first: Swift.Int32, count: Swift.Int32, primcount: Swift.Int32)
   @objc public func drawElementsInstancedANGLE(mode: Swift.Int32, count: Swift.Int32, type: Swift.Int32, offset: Swift.Int32, primcount: Swift.Int32)
   @objc public func vertexAttribDivisorANGLE(index: Swift.Int32, divisor: Swift.Int32)
-  @objc deinit
   @objc override dynamic public init()
+  @objc deinit
 }
 @_inheritsConvenienceInitializers @objcMembers @objc(TNS_EXT_blend_minmax) public class TNS_EXT_blend_minmax : ObjectiveC.NSObject {
   @objc override dynamic public init()
@@ -2527,8 +2527,8 @@ extension RangeReplaceableCollection {
   @objc public static func createImage(_ texturecache: CoreVideo.CVOpenGLESTextureCache, _ buffer: CoreVideo.CVImageBuffer, _ textureAttributes: CoreFoundation.CFDictionary?, _ target: OpenGLES.GLenum, _ internalFormat: OpenGLES.GLint, _ width: OpenGLES.GLsizei, _ height: OpenGLES.GLsizei, _ format: OpenGLES.GLenum, _ type: OpenGLES.GLenum, _ planeIndex: Swift.Int) -> CoreVideo.CVOpenGLESTexture?
   @objc public static func setupRender() -> CanvasNative.TNSRender
   @objc public static func drawFrame(_ player: AVFoundation.AVPlayer, _ output: AVFoundation.AVPlayerItemVideoOutput, _ videoSize: CoreGraphics.CGSize, _ render: CanvasNative.TNSRender, _ internalFormat: Swift.Int32, _ format: Swift.Int32, _ flipYWebGL: Swift.Bool)
-  @objc deinit
   @objc override dynamic public init()
+  @objc deinit
 }
 @objcMembers @objc(TNSWebGLShaderPrecisionFormat) public class TNSWebGLShaderPrecisionFormat : ObjectiveC.NSObject {
   @objc public var rangeMin: Swift.Int32 {
@@ -2780,8 +2780,8 @@ extension RangeReplaceableCollection {
   @objc override dynamic public init(frame: CoreGraphics.CGRect)
   @objc override dynamic public func setNeedsDisplay()
   @objc override dynamic public func setNeedsDisplay(_ rect: CoreGraphics.CGRect)
-  @objc deinit
   @objc override dynamic public init(frame: CoreGraphics.CGRect, context: OpenGLES.EAGLContext)
+  @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(CanvasCPUView) public class CanvasCPUView : UIKit.UIView {
   @objc dynamic public init()
@@ -2796,8 +2796,8 @@ public enum ContextType : Swift.Int, Swift.RawRepresentable {
   case none
   case webGL
   case twoD
-  public typealias RawValue = Swift.Int
   public init?(rawValue: Swift.Int)
+  public typealias RawValue = Swift.Int
   public var rawValue: Swift.Int {
     get
   }
@@ -3130,8 +3130,8 @@ public enum ContextType : Swift.Int, Swift.RawRepresentable {
     @objc public func getStyleType() -> CanvasNative.CanvasColorStyleType
     @objc override dynamic public init()
   }
-  @objc deinit
   @objc override dynamic public init()
+  @objc deinit
 }
 @_hasMissingDesignatedInitializers @objcMembers @objc(TNSTextMetrics) public class TNSTextMetrics : ObjectiveC.NSObject {
   @objc deinit