diff --git a/packages/canvas-babylon/package.json b/packages/canvas-babylon/package.json index 8d340cdbf..9bd5a9a36 100644 --- a/packages/canvas-babylon/package.json +++ b/packages/canvas-babylon/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-babylon", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas-chartjs/package.json b/packages/canvas-chartjs/package.json index 217a428f9..8aced31ed 100644 --- a/packages/canvas-chartjs/package.json +++ b/packages/canvas-chartjs/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-chartjs", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "ChartJS", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas-media/package.json b/packages/canvas-media/package.json index 8839076bd..182cc9fb6 100644 --- a/packages/canvas-media/package.json +++ b/packages/canvas-media/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-media", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "Canvas media", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas-phaser-ce/package.json b/packages/canvas-phaser-ce/package.json index 8b276f6f7..17d65c5f0 100644 --- a/packages/canvas-phaser-ce/package.json +++ b/packages/canvas-phaser-ce/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-phaser-ce", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "Tools for using Phaser-ce to build native 2D games in NativeScript 👾", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas-phaser/package.json b/packages/canvas-phaser/package.json index bb454deb4..e77c7ec72 100644 --- a/packages/canvas-phaser/package.json +++ b/packages/canvas-phaser/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-phaser", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "Build awesome 2D games with Phaser.js and NativeScript", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas-pixi/package.json b/packages/canvas-pixi/package.json index 94fb67dd4..acda096b7 100644 --- a/packages/canvas-pixi/package.json +++ b/packages/canvas-pixi/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-pixi", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "Plugin for using pixi.js in NativeScript", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas-polyfill/package.json b/packages/canvas-polyfill/package.json index 25f0a3a84..3f6d9d6c0 100644 --- a/packages/canvas-polyfill/package.json +++ b/packages/canvas-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-polyfill", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "Polyfill for making NativeScript compatible with web libs like pixi.js, three.js, phaser.js, babylon.js, etc....", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas-three/package.json b/packages/canvas-three/package.json index 264348b10..6adf6c62f 100644 --- a/packages/canvas-three/package.json +++ b/packages/canvas-three/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas-three", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "Utilities for using THREE.js on NativeScript", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas/Canvas/common.ts b/packages/canvas/Canvas/common.ts index e0f4197ce..fc4139ecd 100644 --- a/packages/canvas/Canvas/common.ts +++ b/packages/canvas/Canvas/common.ts @@ -518,7 +518,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { } } - private _moveCallback(pointers: { ptrId: number; x: number; y: number }[]) { + private _moveCallback(pointers: { ptrId: number; x: number; y: number; isPrimary: boolean }[]) { const hasPointerCallbacks = this._pointerMoveCallbacks.length > 0; const hasMouseCallbacks = this._mouseMoveCallbacks.length > 0; if (hasPointerCallbacks || hasMouseCallbacks) { @@ -537,7 +537,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { pageY: pointer.y, movementX: pointer.x - previousEvent.x, movementY: pointer.y - previousEvent.y, - isPrimary: pointerId === 0, + isPrimary: pointer.isPrimary, button: -1, }); @@ -600,7 +600,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { } } - private _upCallback(ptrId, x, y) { + private _upCallback(ptrId, x, y, isPrimary) { const hasPointerCallbacks = this._pointerUpCallbacks.length > 0; const hasMouseCallbacks = this._mouseUpCallbacks.length > 0; @@ -614,7 +614,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { clientY: y, screenX: x, screenY: y, - isPrimary: pointerId === 0, + isPrimary, pageX: x, pageY: y, }); @@ -678,7 +678,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { } } - private _downCallback(ptrId, x, y) { + private _downCallback(ptrId, x, y, isPrimary = false) { const hasPointerCallbacks = this._pointerDownCallbacks.length > 0; const hasMouseCallbacks = this._mouseDownCallbacks.length > 0; @@ -692,7 +692,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { clientY: y, screenX: x, screenY: y, - isPrimary: pointerId === 0, + isPrimary, pageX: x, pageY: y, }); @@ -747,7 +747,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { } } - private _cancelCallback(ptrid, x, y) { + private _cancelCallback(ptrid, x, y, isPrimary = false) { const hasPointerCallbacks = this._pointerCancelCallbacks.length > 0; const hasMouseCallbacks = this._mouseCancelCallbacks.length > 0; if (hasPointerCallbacks || hasMouseCallbacks) { @@ -762,6 +762,7 @@ export abstract class CanvasBase extends View implements ICanvasBase { screenY: y, pageX: x, pageY: y, + isPrimary, }); for (const callback of this._pointerCancelCallbacks) { @@ -911,58 +912,24 @@ export abstract class CanvasBase extends View implements ICanvasBase { } } - /* - switched on second move - - { - "event": "down", - "ptrId": 0, - "x": 970.5, - "y": 688.5 - } - { - "event": "down", - "ptrId": 1, - "x": 395.5, - "y": 187.5 - } - { - "event": "move", - "pointers": [ - { - "ptrId": 0, - "x": 396, - "y": 187.5 - }, - { - "ptrId": 1, - "x": 971, - "y": 688.5 - } - ] - } - - - */ - _handleEvents(event) { try { const data = JSON.parse(event); switch (data.event) { case 'down': - this._downCallback(data.ptrId, data.x, data.y); + this._downCallback(data.ptrId, data.x, data.y, data.isPrimary); break; case 'move': this._moveCallback(data.pointers); break; case 'up': - this._upCallback(data.ptrId, data.x, data.y); + this._upCallback(data.ptrId, data.x, data.y, data.isPrimary); break; case 'scale': this._pinchCallback(data); break; case 'cancel': - this._cancelCallback(data.ptrId, data.x, data.y); + this._cancelCallback(data.ptrId, data.x, data.y, data.isPrimary); break; default: break; diff --git a/packages/canvas/package.json b/packages/canvas/package.json index 3cd3a3710..82e30b227 100644 --- a/packages/canvas/package.json +++ b/packages/canvas/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/canvas", - "version": "2.0.0-alpha.38", + "version": "2.0.0-alpha.39", "description": "DOM Canvas API for NativeScript", "main": "index", "typings": "index.d.ts", diff --git a/packages/canvas/platforms/android/canvas-release.aar b/packages/canvas/platforms/android/canvas-release.aar index a4058ca85..9531427be 100644 Binary files a/packages/canvas/platforms/android/canvas-release.aar and b/packages/canvas/platforms/android/canvas-release.aar differ diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative index 80dc89ba0..0c5d9b235 100755 Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative differ diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo index 9b46c200a..854ea6d04 100644 Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo differ diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json index 862a4473c..44d8bd40e 100644 --- a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json +++ b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json @@ -7090,820 +7090,575 @@ }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 815, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 878, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 960, + "kind": "Array", + "offset": 383, "length": 2, - "value": "10" + "value": "[]" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3651, + "offset": 421, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3673, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 3677, - "length": 1, - "value": "0" + "offset": 979, + "length": 2, + "value": "10" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3927, + "offset": 1855, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5548, + "offset": 7203, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5567, + "offset": 7222, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5576, - "length": 7, - "value": "\"scale\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5608, - "length": 8, - "value": "\"deltaX\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5646, - "length": 8, - "value": "\"deltaY\"" + "offset": 7231, + "length": 6, + "value": "\"down\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5712, - "length": 8, - "value": "\"deltaZ\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5722, - "length": 1, - "value": "0" + "offset": 7259, + "length": 7, + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5745, + "offset": 7295, "length": 11, - "value": "\"deltaMode\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5758, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5781, - "length": 14, - "value": "\"isInProgress\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5852, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5872, - "length": 17, - "value": "\"\"pointers\": [\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5908, - "length": 1, - "value": "0" + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5969, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5992, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6127, + "offset": 7364, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6171, + "offset": 7392, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 6196, + "offset": 7405, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6252, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6300, + "offset": 7426, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6342, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6369, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6599, + "offset": 7651, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6618, + "offset": 7670, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6627, - "length": 6, - "value": "\"down\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6655, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6691, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6719, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 6732, + "offset": 7679, "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6753, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6978, - "length": 3, - "value": "\"{\"" + "value": "\"up\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6997, + "offset": 7705, "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 7006, - "length": 4, - "value": "\"up\"" + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7032, - "length": 7, - "value": "\"ptrId\"" + "offset": 7741, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7068, + "offset": 7810, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7096, + "offset": 7838, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7109, + "offset": 7851, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7130, + "offset": 7872, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7349, + "offset": 8091, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7368, + "offset": 8110, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7377, + "offset": 8119, "length": 8, "value": "\"cancel\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7407, + "offset": 8149, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7443, + "offset": 8185, + "length": 11, + "value": "\"isPrimary\"" + }, + { + "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", + "kind": "StringLiteral", + "offset": 8254, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7471, + "offset": 8282, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7484, + "offset": 8295, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7504, + "offset": 8315, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8129, + "offset": 8940, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8156, + "offset": 8967, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8165, + "offset": 8976, "length": 6, "value": "\"move\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 8223, + "offset": 9039, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8251, + "offset": 9067, "length": 17, "value": "\"\"pointers\": [\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8592, + "offset": 9337, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8623, + "offset": 9368, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8672, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8721, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 8743, - "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8820, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8884, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9005, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9048, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9300, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9323, - "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9332, - "length": 6, - "value": "\"move\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 9384, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9408, - "length": 17, - "value": "\"\"pointers\": [\"" + "offset": 9420, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 9448, + "offset": 9442, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9517, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9544, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9687, + "offset": 9477, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9735, + "offset": 9526, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 9760, + "offset": 9548, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9824, + "offset": 9624, "length": 4, "value": "\"},\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9880, + "offset": 9688, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9934, + "offset": 9809, "length": 3, "value": "\"]\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9969, + "offset": 9852, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10142, + "offset": 10963, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10165, + "offset": 10986, "length": 46, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10174, + "offset": 10995, "length": 1, "value": "\"\": \"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10188, + "offset": 11009, "length": 1, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10201, + "offset": 11022, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10206, + "offset": 11027, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10210, + "offset": 11031, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10309, + "offset": 11130, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10332, + "offset": 11153, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10341, + "offset": 11162, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10353, + "offset": 11174, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10365, + "offset": 11186, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10370, + "offset": 11191, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10375, + "offset": 11196, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10478, + "offset": 11299, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10501, + "offset": 11322, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10510, + "offset": 11331, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10522, + "offset": 11343, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10534, + "offset": 11355, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10539, + "offset": 11360, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10544, + "offset": 11365, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10649, + "offset": 11470, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10672, + "offset": 11493, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10681, + "offset": 11502, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10693, + "offset": 11514, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10705, + "offset": 11526, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10710, + "offset": 11531, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10715, + "offset": 11536, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10819, + "offset": 11640, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10842, + "offset": 11663, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10851, + "offset": 11672, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10863, + "offset": 11684, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10875, + "offset": 11696, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10880, + "offset": 11701, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10885, + "offset": 11706, "length": 1, "value": "\"\"" }, diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative index fffe3ecd6..e2633592f 100644 Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative index aa1559946..6a62b902a 100755 Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative differ diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo index 1e2e354b3..f42571346 100644 Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo differ diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo index 33c5548bc..05ced7897 100644 Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo differ diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json index 862a4473c..44d8bd40e 100644 --- a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json +++ b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json @@ -7090,820 +7090,575 @@ }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 815, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 878, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 960, + "kind": "Array", + "offset": 383, "length": 2, - "value": "10" + "value": "[]" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3651, + "offset": 421, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3673, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 3677, - "length": 1, - "value": "0" + "offset": 979, + "length": 2, + "value": "10" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3927, + "offset": 1855, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5548, + "offset": 7203, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5567, + "offset": 7222, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5576, - "length": 7, - "value": "\"scale\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5608, - "length": 8, - "value": "\"deltaX\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5646, - "length": 8, - "value": "\"deltaY\"" + "offset": 7231, + "length": 6, + "value": "\"down\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5712, - "length": 8, - "value": "\"deltaZ\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5722, - "length": 1, - "value": "0" + "offset": 7259, + "length": 7, + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5745, + "offset": 7295, "length": 11, - "value": "\"deltaMode\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5758, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5781, - "length": 14, - "value": "\"isInProgress\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5852, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5872, - "length": 17, - "value": "\"\"pointers\": [\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5908, - "length": 1, - "value": "0" + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5969, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5992, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6127, + "offset": 7364, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6171, + "offset": 7392, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 6196, + "offset": 7405, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6252, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6300, + "offset": 7426, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6342, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6369, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6599, + "offset": 7651, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6618, + "offset": 7670, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6627, - "length": 6, - "value": "\"down\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6655, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6691, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6719, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 6732, + "offset": 7679, "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6753, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6978, - "length": 3, - "value": "\"{\"" + "value": "\"up\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6997, + "offset": 7705, "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 7006, - "length": 4, - "value": "\"up\"" + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7032, - "length": 7, - "value": "\"ptrId\"" + "offset": 7741, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7068, + "offset": 7810, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7096, + "offset": 7838, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7109, + "offset": 7851, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7130, + "offset": 7872, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7349, + "offset": 8091, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7368, + "offset": 8110, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7377, + "offset": 8119, "length": 8, "value": "\"cancel\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7407, + "offset": 8149, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7443, + "offset": 8185, + "length": 11, + "value": "\"isPrimary\"" + }, + { + "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", + "kind": "StringLiteral", + "offset": 8254, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7471, + "offset": 8282, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7484, + "offset": 8295, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7504, + "offset": 8315, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8129, + "offset": 8940, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8156, + "offset": 8967, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8165, + "offset": 8976, "length": 6, "value": "\"move\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 8223, + "offset": 9039, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8251, + "offset": 9067, "length": 17, "value": "\"\"pointers\": [\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8592, + "offset": 9337, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8623, + "offset": 9368, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8672, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8721, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 8743, - "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8820, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8884, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9005, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9048, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9300, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9323, - "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9332, - "length": 6, - "value": "\"move\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 9384, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9408, - "length": 17, - "value": "\"\"pointers\": [\"" + "offset": 9420, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 9448, + "offset": 9442, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9517, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9544, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9687, + "offset": 9477, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9735, + "offset": 9526, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 9760, + "offset": 9548, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9824, + "offset": 9624, "length": 4, "value": "\"},\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9880, + "offset": 9688, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9934, + "offset": 9809, "length": 3, "value": "\"]\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9969, + "offset": 9852, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10142, + "offset": 10963, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10165, + "offset": 10986, "length": 46, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10174, + "offset": 10995, "length": 1, "value": "\"\": \"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10188, + "offset": 11009, "length": 1, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10201, + "offset": 11022, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10206, + "offset": 11027, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10210, + "offset": 11031, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10309, + "offset": 11130, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10332, + "offset": 11153, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10341, + "offset": 11162, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10353, + "offset": 11174, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10365, + "offset": 11186, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10370, + "offset": 11191, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10375, + "offset": 11196, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10478, + "offset": 11299, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10501, + "offset": 11322, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10510, + "offset": 11331, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10522, + "offset": 11343, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10534, + "offset": 11355, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10539, + "offset": 11360, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10544, + "offset": 11365, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10649, + "offset": 11470, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10672, + "offset": 11493, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10681, + "offset": 11502, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10693, + "offset": 11514, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10705, + "offset": 11526, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10710, + "offset": 11531, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10715, + "offset": 11536, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10819, + "offset": 11640, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10842, + "offset": 11663, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10851, + "offset": 11672, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10863, + "offset": 11684, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10875, + "offset": 11696, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10880, + "offset": 11701, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10885, + "offset": 11706, "length": 1, "value": "\"\"" }, diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json index 862a4473c..44d8bd40e 100644 --- a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json +++ b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json @@ -7090,820 +7090,575 @@ }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 815, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 878, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 960, + "kind": "Array", + "offset": 383, "length": 2, - "value": "10" + "value": "[]" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3651, + "offset": 421, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3673, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 3677, - "length": 1, - "value": "0" + "offset": 979, + "length": 2, + "value": "10" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3927, + "offset": 1855, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5548, + "offset": 7203, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5567, + "offset": 7222, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5576, - "length": 7, - "value": "\"scale\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5608, - "length": 8, - "value": "\"deltaX\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5646, - "length": 8, - "value": "\"deltaY\"" + "offset": 7231, + "length": 6, + "value": "\"down\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5712, - "length": 8, - "value": "\"deltaZ\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5722, - "length": 1, - "value": "0" + "offset": 7259, + "length": 7, + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5745, + "offset": 7295, "length": 11, - "value": "\"deltaMode\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5758, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5781, - "length": 14, - "value": "\"isInProgress\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5852, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5872, - "length": 17, - "value": "\"\"pointers\": [\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5908, - "length": 1, - "value": "0" + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5969, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5992, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6127, + "offset": 7364, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6171, + "offset": 7392, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 6196, + "offset": 7405, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6252, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6300, + "offset": 7426, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6342, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6369, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6599, + "offset": 7651, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6618, + "offset": 7670, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6627, - "length": 6, - "value": "\"down\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6655, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6691, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6719, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 6732, + "offset": 7679, "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6753, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6978, - "length": 3, - "value": "\"{\"" + "value": "\"up\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6997, + "offset": 7705, "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 7006, - "length": 4, - "value": "\"up\"" + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7032, - "length": 7, - "value": "\"ptrId\"" + "offset": 7741, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7068, + "offset": 7810, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7096, + "offset": 7838, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7109, + "offset": 7851, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7130, + "offset": 7872, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7349, + "offset": 8091, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7368, + "offset": 8110, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7377, + "offset": 8119, "length": 8, "value": "\"cancel\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7407, + "offset": 8149, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7443, + "offset": 8185, + "length": 11, + "value": "\"isPrimary\"" + }, + { + "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", + "kind": "StringLiteral", + "offset": 8254, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7471, + "offset": 8282, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7484, + "offset": 8295, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7504, + "offset": 8315, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8129, + "offset": 8940, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8156, + "offset": 8967, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8165, + "offset": 8976, "length": 6, "value": "\"move\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 8223, + "offset": 9039, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8251, + "offset": 9067, "length": 17, "value": "\"\"pointers\": [\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8592, + "offset": 9337, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8623, + "offset": 9368, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8672, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8721, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 8743, - "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8820, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8884, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9005, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9048, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9300, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9323, - "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9332, - "length": 6, - "value": "\"move\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 9384, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9408, - "length": 17, - "value": "\"\"pointers\": [\"" + "offset": 9420, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 9448, + "offset": 9442, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9517, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9544, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9687, + "offset": 9477, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9735, + "offset": 9526, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 9760, + "offset": 9548, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9824, + "offset": 9624, "length": 4, "value": "\"},\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9880, + "offset": 9688, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9934, + "offset": 9809, "length": 3, "value": "\"]\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9969, + "offset": 9852, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10142, + "offset": 10963, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10165, + "offset": 10986, "length": 46, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10174, + "offset": 10995, "length": 1, "value": "\"\": \"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10188, + "offset": 11009, "length": 1, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10201, + "offset": 11022, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10206, + "offset": 11027, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10210, + "offset": 11031, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10309, + "offset": 11130, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10332, + "offset": 11153, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10341, + "offset": 11162, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10353, + "offset": 11174, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10365, + "offset": 11186, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10370, + "offset": 11191, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10375, + "offset": 11196, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10478, + "offset": 11299, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10501, + "offset": 11322, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10510, + "offset": 11331, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10522, + "offset": 11343, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10534, + "offset": 11355, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10539, + "offset": 11360, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10544, + "offset": 11365, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10649, + "offset": 11470, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10672, + "offset": 11493, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10681, + "offset": 11502, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10693, + "offset": 11514, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10705, + "offset": 11526, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10710, + "offset": 11531, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10715, + "offset": 11536, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10819, + "offset": 11640, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10842, + "offset": 11663, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10851, + "offset": 11672, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10863, + "offset": 11684, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10875, + "offset": 11696, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10880, + "offset": 11701, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10885, + "offset": 11706, "length": 1, "value": "\"\"" }, diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources index 702692229..2a04cdfe6 100644 --- a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources +++ b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources @@ -26,15 +26,15 @@ Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo - 3PGfu+DpWs74e2/jectBCkoPFkE= + PouMhqyl/EqN64gr/2kBAdO3V0s= Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo - AB2ULkbsV/tnfqLTj8xebAByTMg= + pmdiLAl1gUGZ1AqlwOgsMEer/Bo= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json - rFeSh8JKQPfJKcbUjik683Pavbk= + zpKrXn88jSp9fjjHPOl1tefuutg= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface @@ -50,11 +50,11 @@ Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule - B2YAI7Jk/GkcR0hx/P4EyZK13MM= + X0r4KzG5NUUt5bKmLEq0HwLZVsc= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json - rFeSh8JKQPfJKcbUjik683Pavbk= + zpKrXn88jSp9fjjHPOl1tefuutg= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface @@ -70,7 +70,7 @@ Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - Pr1Krr/11x7o2pc+XAGhTm0ZJj8= + iLqn3MAqm/2M+2/n/+4DcQQBp4w= Modules/module.modulemap @@ -115,21 +115,21 @@ hash2 - I2vQ77pc0KsbHL/IZ12xyWXLUnLqPKPtP6ovn8ocz5M= + EfRDNolIeXxZWF6MKwbUOZrDKuRLcN8a7ooG0tOuKR4= Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo hash2 - 8oN/iiMOEWKZyn+VYAy5OchsZ1wNXjfzjIQ6OgBPhFY= + IYpoI+jHJlnH6sFj4ir7EvqtXcHOh1KIN9EDdP3WX3U= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json hash2 - s7wRxIkfcWnQw1jCFrtr8hXFiK7atp9hr7ZiFk+ScDs= + sTe9JvG86F1Qo1k+xV/NtZYwK/+SDeeAfuWgMhLyi4E= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface @@ -157,14 +157,14 @@ hash2 - lTwunV/yvYWKFiAhLqSymZsSWJwe/e/LsF6bFfisqFw= + ZYoPz3CPeMm6dE1ZAZhnHUsY6BbdTKzDwdf1i8y7wCo= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json hash2 - s7wRxIkfcWnQw1jCFrtr8hXFiK7atp9hr7ZiFk+ScDs= + sTe9JvG86F1Qo1k+xV/NtZYwK/+SDeeAfuWgMhLyi4E= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface @@ -192,7 +192,7 @@ hash2 - EYv30S7uOq5oYA+vgzHwfGa8rS7Tgcd/7MZClAyVz+4= + E9X0eUSjrB/yDqLQ58GL2wqqjAvTcHyi3rggPTK0wrs= Modules/module.modulemap diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative index 717e15c29..0071a1190 100644 Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ diff --git a/packages/canvas/src-native/canvas-android/.idea/deploymentTargetDropDown.xml b/packages/canvas/src-native/canvas-android/.idea/deploymentTargetDropDown.xml index 39c5e2d58..0c0c33838 100644 --- a/packages/canvas/src-native/canvas-android/.idea/deploymentTargetDropDown.xml +++ b/packages/canvas/src-native/canvas-android/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,10 @@ - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/packages/canvas/src-native/canvas-android/canvas/CMakeLists.txt b/packages/canvas/src-native/canvas-android/canvas/CMakeLists.txt index 83d8daff8..8e2bcf967 100644 --- a/packages/canvas/src-native/canvas-android/canvas/CMakeLists.txt +++ b/packages/canvas/src-native/canvas-android/canvas/CMakeLists.txt @@ -50,7 +50,7 @@ else () endif () -set(CANVAS_ANDROID_LIB ${CANVAS_ANDROID_LIB}/${CMAKE_STATIC_LIBRARY_PREFIX}canvasandroid${CMAKE_SHARED_LIBRARY_SUFFIX}) +set(CANVAS_ANDROID_LIB ${CANVAS_ANDROID_LIB}/${CMAKE_STATIC_LIBRARY_PREFIX}canvasnative${CMAKE_SHARED_LIBRARY_SUFFIX}) if ("${ANDROID_ABI}" MATCHES "arm64-v8a$" OR "${ANDROID_ABI}" MATCHES "x86_64$") # Enable pointer compression on 64 bit platforms @@ -157,15 +157,15 @@ add_library( ) -add_custom_command( - TARGET canvasnativev8 - #COMMAND cargo +nightly build -Z build-std='std,panic_abort' -Z build-std-features='panic_immediate_abort' --manifest-path ${CARGO_MANIFEST} --target ${RUST_BUILD_TARGET} ${RUST_BUILD_TYPE} -p canvas-android - COMMAND cargo +nightly build -Z build-std='std,panic_abort' --manifest-path ${CARGO_MANIFEST} --target ${RUST_BUILD_TARGET} ${RUST_BUILD_TYPE} -p canvas-android - # COMMAND cargo build --manifest-path ${CARGO_MANIFEST} --target ${RUST_BUILD_TARGET} ${RUST_BUILD_TYPE} -p canvas-android - # DEPENDS ${CANVAS_ANDROID_SOURCE_FILE} - DEPENDS ${CANVAS_ANDROID_LIB} - #USES_TERMINAL -) +#add_custom_command( +# TARGET canvasnativev8 +# #COMMAND RUSTFLAGS='-Cpanic=abort -C target-cpu=native -C target-feature=-outline-atomics' cargo +nightly build -Z build-std='std,panic_abort' -Z build-std-features='panic_immediate_abort' --manifest-path ${CARGO_MANIFEST} --target ${RUST_BUILD_TARGET} ${RUST_BUILD_TYPE} -p canvas-android +# COMMAND cargo +nightly build -Z build-std='std,panic_abort' --manifest-path ${CARGO_MANIFEST} --target ${RUST_BUILD_TARGET} ${RUST_BUILD_TYPE} -p canvas-android +# # COMMAND cargo build --manifest-path ${CARGO_MANIFEST} --target ${RUST_BUILD_TARGET} ${RUST_BUILD_TYPE} -p canvas-android +# # DEPENDS ${CANVAS_ANDROID_SOURCE_FILE} +# DEPENDS ${CANVAS_ANDROID_LIB} +# #USES_TERMINAL +#) #add_custom_command( @@ -222,6 +222,6 @@ add_custom_command(TARGET canvasnativev8 POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CANVAS_ANDROID_LIB} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libcanvasandroid.so + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libcanvasnative.so ) diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate b/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate index cc160fb74..188aac3c1 100644 Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate and b/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative index 80dc89ba0..0c5d9b235 100755 Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative differ diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo index 9b46c200a..854ea6d04 100644 Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo differ diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json index 862a4473c..44d8bd40e 100644 --- a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json +++ b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json @@ -7090,820 +7090,575 @@ }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 815, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 878, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 960, + "kind": "Array", + "offset": 383, "length": 2, - "value": "10" + "value": "[]" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3651, + "offset": 421, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3673, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 3677, - "length": 1, - "value": "0" + "offset": 979, + "length": 2, + "value": "10" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3927, + "offset": 1855, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5548, + "offset": 7203, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5567, + "offset": 7222, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5576, - "length": 7, - "value": "\"scale\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5608, - "length": 8, - "value": "\"deltaX\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5646, - "length": 8, - "value": "\"deltaY\"" + "offset": 7231, + "length": 6, + "value": "\"down\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5712, - "length": 8, - "value": "\"deltaZ\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5722, - "length": 1, - "value": "0" + "offset": 7259, + "length": 7, + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5745, + "offset": 7295, "length": 11, - "value": "\"deltaMode\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5758, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5781, - "length": 14, - "value": "\"isInProgress\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5852, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5872, - "length": 17, - "value": "\"\"pointers\": [\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5908, - "length": 1, - "value": "0" + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5969, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5992, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6127, + "offset": 7364, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6171, + "offset": 7392, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 6196, + "offset": 7405, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6252, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6300, + "offset": 7426, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6342, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6369, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6599, + "offset": 7651, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6618, + "offset": 7670, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6627, - "length": 6, - "value": "\"down\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6655, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6691, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6719, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 6732, + "offset": 7679, "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6753, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6978, - "length": 3, - "value": "\"{\"" + "value": "\"up\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6997, + "offset": 7705, "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 7006, - "length": 4, - "value": "\"up\"" + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7032, - "length": 7, - "value": "\"ptrId\"" + "offset": 7741, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7068, + "offset": 7810, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7096, + "offset": 7838, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7109, + "offset": 7851, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7130, + "offset": 7872, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7349, + "offset": 8091, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7368, + "offset": 8110, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7377, + "offset": 8119, "length": 8, "value": "\"cancel\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7407, + "offset": 8149, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7443, + "offset": 8185, + "length": 11, + "value": "\"isPrimary\"" + }, + { + "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", + "kind": "StringLiteral", + "offset": 8254, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7471, + "offset": 8282, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7484, + "offset": 8295, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7504, + "offset": 8315, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8129, + "offset": 8940, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8156, + "offset": 8967, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8165, + "offset": 8976, "length": 6, "value": "\"move\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 8223, + "offset": 9039, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8251, + "offset": 9067, "length": 17, "value": "\"\"pointers\": [\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8592, + "offset": 9337, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8623, + "offset": 9368, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8672, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8721, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 8743, - "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8820, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8884, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9005, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9048, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9300, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9323, - "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9332, - "length": 6, - "value": "\"move\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 9384, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9408, - "length": 17, - "value": "\"\"pointers\": [\"" + "offset": 9420, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 9448, + "offset": 9442, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9517, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9544, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9687, + "offset": 9477, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9735, + "offset": 9526, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 9760, + "offset": 9548, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9824, + "offset": 9624, "length": 4, "value": "\"},\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9880, + "offset": 9688, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9934, + "offset": 9809, "length": 3, "value": "\"]\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9969, + "offset": 9852, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10142, + "offset": 10963, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10165, + "offset": 10986, "length": 46, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10174, + "offset": 10995, "length": 1, "value": "\"\": \"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10188, + "offset": 11009, "length": 1, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10201, + "offset": 11022, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10206, + "offset": 11027, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10210, + "offset": 11031, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10309, + "offset": 11130, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10332, + "offset": 11153, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10341, + "offset": 11162, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10353, + "offset": 11174, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10365, + "offset": 11186, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10370, + "offset": 11191, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10375, + "offset": 11196, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10478, + "offset": 11299, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10501, + "offset": 11322, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10510, + "offset": 11331, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10522, + "offset": 11343, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10534, + "offset": 11355, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10539, + "offset": 11360, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10544, + "offset": 11365, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10649, + "offset": 11470, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10672, + "offset": 11493, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10681, + "offset": 11502, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10693, + "offset": 11514, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10705, + "offset": 11526, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10710, + "offset": 11531, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10715, + "offset": 11536, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10819, + "offset": 11640, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10842, + "offset": 11663, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10851, + "offset": 11672, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10863, + "offset": 11684, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10875, + "offset": 11696, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10880, + "offset": 11701, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10885, + "offset": 11706, "length": 1, "value": "\"\"" }, diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative index fffe3ecd6..e2633592f 100644 Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative index aa1559946..6a62b902a 100755 Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative differ diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo index 1e2e354b3..f42571346 100644 Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo differ diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo index 33c5548bc..05ced7897 100644 Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo differ diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json index 862a4473c..44d8bd40e 100644 --- a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json +++ b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json @@ -7090,820 +7090,575 @@ }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 815, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 878, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 960, + "kind": "Array", + "offset": 383, "length": 2, - "value": "10" + "value": "[]" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3651, + "offset": 421, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3673, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 3677, - "length": 1, - "value": "0" + "offset": 979, + "length": 2, + "value": "10" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3927, + "offset": 1855, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5548, + "offset": 7203, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5567, + "offset": 7222, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5576, - "length": 7, - "value": "\"scale\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5608, - "length": 8, - "value": "\"deltaX\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5646, - "length": 8, - "value": "\"deltaY\"" + "offset": 7231, + "length": 6, + "value": "\"down\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5712, - "length": 8, - "value": "\"deltaZ\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5722, - "length": 1, - "value": "0" + "offset": 7259, + "length": 7, + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5745, + "offset": 7295, "length": 11, - "value": "\"deltaMode\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5758, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5781, - "length": 14, - "value": "\"isInProgress\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5852, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5872, - "length": 17, - "value": "\"\"pointers\": [\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5908, - "length": 1, - "value": "0" + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5969, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5992, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6127, + "offset": 7364, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6171, + "offset": 7392, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 6196, + "offset": 7405, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6252, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6300, + "offset": 7426, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6342, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6369, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6599, + "offset": 7651, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6618, + "offset": 7670, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6627, - "length": 6, - "value": "\"down\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6655, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6691, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6719, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 6732, + "offset": 7679, "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6753, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6978, - "length": 3, - "value": "\"{\"" + "value": "\"up\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6997, + "offset": 7705, "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 7006, - "length": 4, - "value": "\"up\"" + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7032, - "length": 7, - "value": "\"ptrId\"" + "offset": 7741, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7068, + "offset": 7810, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7096, + "offset": 7838, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7109, + "offset": 7851, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7130, + "offset": 7872, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7349, + "offset": 8091, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7368, + "offset": 8110, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7377, + "offset": 8119, "length": 8, "value": "\"cancel\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7407, + "offset": 8149, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7443, + "offset": 8185, + "length": 11, + "value": "\"isPrimary\"" + }, + { + "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", + "kind": "StringLiteral", + "offset": 8254, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7471, + "offset": 8282, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7484, + "offset": 8295, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7504, + "offset": 8315, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8129, + "offset": 8940, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8156, + "offset": 8967, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8165, + "offset": 8976, "length": 6, "value": "\"move\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 8223, + "offset": 9039, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8251, + "offset": 9067, "length": 17, "value": "\"\"pointers\": [\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8592, + "offset": 9337, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8623, + "offset": 9368, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8672, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8721, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 8743, - "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8820, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8884, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9005, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9048, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9300, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9323, - "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9332, - "length": 6, - "value": "\"move\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 9384, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9408, - "length": 17, - "value": "\"\"pointers\": [\"" + "offset": 9420, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 9448, + "offset": 9442, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9517, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9544, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9687, + "offset": 9477, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9735, + "offset": 9526, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 9760, + "offset": 9548, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9824, + "offset": 9624, "length": 4, "value": "\"},\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9880, + "offset": 9688, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9934, + "offset": 9809, "length": 3, "value": "\"]\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9969, + "offset": 9852, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10142, + "offset": 10963, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10165, + "offset": 10986, "length": 46, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10174, + "offset": 10995, "length": 1, "value": "\"\": \"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10188, + "offset": 11009, "length": 1, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10201, + "offset": 11022, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10206, + "offset": 11027, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10210, + "offset": 11031, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10309, + "offset": 11130, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10332, + "offset": 11153, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10341, + "offset": 11162, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10353, + "offset": 11174, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10365, + "offset": 11186, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10370, + "offset": 11191, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10375, + "offset": 11196, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10478, + "offset": 11299, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10501, + "offset": 11322, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10510, + "offset": 11331, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10522, + "offset": 11343, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10534, + "offset": 11355, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10539, + "offset": 11360, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10544, + "offset": 11365, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10649, + "offset": 11470, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10672, + "offset": 11493, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10681, + "offset": 11502, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10693, + "offset": 11514, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10705, + "offset": 11526, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10710, + "offset": 11531, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10715, + "offset": 11536, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10819, + "offset": 11640, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10842, + "offset": 11663, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10851, + "offset": 11672, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10863, + "offset": 11684, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10875, + "offset": 11696, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10880, + "offset": 11701, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10885, + "offset": 11706, "length": 1, "value": "\"\"" }, diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json index 862a4473c..44d8bd40e 100644 --- a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json +++ b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json @@ -7090,820 +7090,575 @@ }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 815, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 878, - "length": 2, - "value": "10" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 960, + "kind": "Array", + "offset": 383, "length": 2, - "value": "10" + "value": "[]" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3651, + "offset": 421, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3673, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 3677, - "length": 1, - "value": "0" + "offset": 979, + "length": 2, + "value": "10" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 3927, + "offset": 1855, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5548, + "offset": 7203, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5567, + "offset": 7222, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5576, - "length": 7, - "value": "\"scale\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5608, - "length": 8, - "value": "\"deltaX\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5646, - "length": 8, - "value": "\"deltaY\"" + "offset": 7231, + "length": 6, + "value": "\"down\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5712, - "length": 8, - "value": "\"deltaZ\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5722, - "length": 1, - "value": "0" + "offset": 7259, + "length": 7, + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5745, + "offset": 7295, "length": 11, - "value": "\"deltaMode\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5758, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5781, - "length": 14, - "value": "\"isInProgress\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5852, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5872, - "length": 17, - "value": "\"\"pointers\": [\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 5908, - "length": 1, - "value": "0" + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 5969, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 5992, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6127, + "offset": 7364, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6171, + "offset": 7392, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 6196, + "offset": 7405, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6252, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6300, + "offset": 7426, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6342, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6369, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6599, + "offset": 7651, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6618, + "offset": 7670, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6627, - "length": 6, - "value": "\"down\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6655, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6691, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6719, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 6732, + "offset": 7679, "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6753, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 6978, - "length": 3, - "value": "\"{\"" + "value": "\"up\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 6997, + "offset": 7705, "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 7006, - "length": 4, - "value": "\"up\"" + "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7032, - "length": 7, - "value": "\"ptrId\"" + "offset": 7741, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7068, + "offset": 7810, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7096, + "offset": 7838, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7109, + "offset": 7851, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7130, + "offset": 7872, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7349, + "offset": 8091, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7368, + "offset": 8110, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7377, + "offset": 8119, "length": 8, "value": "\"cancel\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7407, + "offset": 8149, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7443, + "offset": 8185, + "length": 11, + "value": "\"isPrimary\"" + }, + { + "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", + "kind": "StringLiteral", + "offset": 8254, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7471, + "offset": 8282, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 7484, + "offset": 8295, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 7504, + "offset": 8315, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8129, + "offset": 8940, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8156, + "offset": 8967, "length": 7, "value": "\"event\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8165, + "offset": 8976, "length": 6, "value": "\"move\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 8223, + "offset": 9039, "length": 1, "value": "1" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8251, + "offset": 9067, "length": 17, "value": "\"\"pointers\": [\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8592, + "offset": 9337, "length": 3, "value": "\"{\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8623, + "offset": 9368, "length": 7, "value": "\"ptrId\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 8672, - "length": 3, - "value": "\"x\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8721, - "length": 3, - "value": "\"y\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "BooleanLiteral", - "offset": 8743, - "length": 4, - "value": "true" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8820, - "length": 4, - "value": "\"},\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 8884, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9005, - "length": 3, - "value": "\"]\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9048, - "length": 3, - "value": "\"}\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9300, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9323, - "length": 7, - "value": "\"event\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9332, - "length": 6, - "value": "\"move\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "IntegerLiteral", - "offset": 9384, - "length": 1, - "value": "1" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9408, - "length": 17, - "value": "\"\"pointers\": [\"" + "offset": 9420, + "length": 11, + "value": "\"isPrimary\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "IntegerLiteral", - "offset": 9448, + "offset": 9442, "length": 1, "value": "0" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9517, - "length": 3, - "value": "\"{\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9544, - "length": 7, - "value": "\"ptrId\"" - }, - { - "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", - "kind": "StringLiteral", - "offset": 9687, + "offset": 9477, "length": 3, "value": "\"x\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9735, + "offset": 9526, "length": 3, "value": "\"y\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 9760, + "offset": 9548, "length": 4, "value": "true" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9824, + "offset": 9624, "length": 4, "value": "\"},\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9880, + "offset": 9688, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9934, + "offset": 9809, "length": 3, "value": "\"]\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 9969, + "offset": 9852, "length": 3, "value": "\"}\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10142, + "offset": 10963, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10165, + "offset": 10986, "length": 46, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10174, + "offset": 10995, "length": 1, "value": "\"\": \"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10188, + "offset": 11009, "length": 1, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10201, + "offset": 11022, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10206, + "offset": 11027, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10210, + "offset": 11031, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10309, + "offset": 11130, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10332, + "offset": 11153, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10341, + "offset": 11162, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10353, + "offset": 11174, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10365, + "offset": 11186, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10370, + "offset": 11191, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10375, + "offset": 11196, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10478, + "offset": 11299, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10501, + "offset": 11322, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10510, + "offset": 11331, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10522, + "offset": 11343, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10534, + "offset": 11355, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10539, + "offset": 11360, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10544, + "offset": 11365, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10649, + "offset": 11470, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10672, + "offset": 11493, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10681, + "offset": 11502, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10693, + "offset": 11514, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10705, + "offset": 11526, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10710, + "offset": 11531, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10715, + "offset": 11536, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "BooleanLiteral", - "offset": 10819, + "offset": 11640, "length": 5, "value": "false" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10842, + "offset": 11663, "length": 44, "value": "\"\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10851, + "offset": 11672, "length": 1, "value": "\"\": \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10863, + "offset": 11684, "length": 1, "value": "\" \"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10875, + "offset": 11696, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10880, + "offset": 11701, "length": 3, "value": "\",\"" }, { "filePath": "\/Users\/triniwiz\/Documents\/GitHub\/canvas\/packages\/canvas\/src-native\/canvas-ios\/NSCTouchHandler.swift", "kind": "StringLiteral", - "offset": 10885, + "offset": 11706, "length": 1, "value": "\"\"" }, diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources index 702692229..2a04cdfe6 100644 --- a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources +++ b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources @@ -26,15 +26,15 @@ Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo - 3PGfu+DpWs74e2/jectBCkoPFkE= + PouMhqyl/EqN64gr/2kBAdO3V0s= Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo - AB2ULkbsV/tnfqLTj8xebAByTMg= + pmdiLAl1gUGZ1AqlwOgsMEer/Bo= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json - rFeSh8JKQPfJKcbUjik683Pavbk= + zpKrXn88jSp9fjjHPOl1tefuutg= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface @@ -50,11 +50,11 @@ Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule - B2YAI7Jk/GkcR0hx/P4EyZK13MM= + X0r4KzG5NUUt5bKmLEq0HwLZVsc= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json - rFeSh8JKQPfJKcbUjik683Pavbk= + zpKrXn88jSp9fjjHPOl1tefuutg= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface @@ -70,7 +70,7 @@ Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - Pr1Krr/11x7o2pc+XAGhTm0ZJj8= + iLqn3MAqm/2M+2/n/+4DcQQBp4w= Modules/module.modulemap @@ -115,21 +115,21 @@ hash2 - I2vQ77pc0KsbHL/IZ12xyWXLUnLqPKPtP6ovn8ocz5M= + EfRDNolIeXxZWF6MKwbUOZrDKuRLcN8a7ooG0tOuKR4= Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo hash2 - 8oN/iiMOEWKZyn+VYAy5OchsZ1wNXjfzjIQ6OgBPhFY= + IYpoI+jHJlnH6sFj4ir7EvqtXcHOh1KIN9EDdP3WX3U= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json hash2 - s7wRxIkfcWnQw1jCFrtr8hXFiK7atp9hr7ZiFk+ScDs= + sTe9JvG86F1Qo1k+xV/NtZYwK/+SDeeAfuWgMhLyi4E= Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface @@ -157,14 +157,14 @@ hash2 - lTwunV/yvYWKFiAhLqSymZsSWJwe/e/LsF6bFfisqFw= + ZYoPz3CPeMm6dE1ZAZhnHUsY6BbdTKzDwdf1i8y7wCo= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json hash2 - s7wRxIkfcWnQw1jCFrtr8hXFiK7atp9hr7ZiFk+ScDs= + sTe9JvG86F1Qo1k+xV/NtZYwK/+SDeeAfuWgMhLyi4E= Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface @@ -192,7 +192,7 @@ hash2 - EYv30S7uOq5oYA+vgzHwfGa8rS7Tgcd/7MZClAyVz+4= + E9X0eUSjrB/yDqLQ58GL2wqqjAvTcHyi3rggPTK0wrs= Modules/module.modulemap diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative index 717e15c29..0071a1190 100644 Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ diff --git a/packages/canvas/src-native/canvas-native/canvas-c/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-c/Cargo.toml index 9e118b884..6ea909df7 100644 --- a/packages/canvas/src-native/canvas-native/canvas-c/Cargo.toml +++ b/packages/canvas/src-native/canvas-native/canvas-c/Cargo.toml @@ -27,7 +27,7 @@ display-link = "0.2.0" #[target.'cfg(target_os="macos")'.dependencies] #display-link = "0.2.0" -#[target.'cfg(target_os="android")'.dependencies] -#ndk = { version = "0.7.0", features = ["bitmap"] } -#once_cell = "1.14.0" +[target.'cfg(target_os="android")'.dependencies] +ndk = { version = "0.7.0", features = ["bitmap"] } +once_cell = "1.14.0" #ada-url = {git = "https://github.com/triniwiz/ada-url-rust" , rev = "bc35ae9"} \ No newline at end of file diff --git a/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml index 83171d91d..469626188 100644 --- a/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml +++ b/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml @@ -20,11 +20,11 @@ log = "0.4.17" icrate = { version = "0.0.4", features = ["objc2", "Foundation", "Foundation_NSData"] } core-foundation = "0.9.3" -#[target.'cfg(target_os = "android")'.dependencies] -#egl = "0.2.7" -#glutin = "0.31.1" +[target.'cfg(target_os = "android")'.dependencies] +egl = "0.2.7" +glutin = "0.31.1" #glutin = { git = "https://github.com/triniwiz/glutin", rev = "1b2cbbe" } -#android_log = "0.1.3" +android_log = "0.1.3" [target.'cfg(target_os = "macos")'.dependencies] winit = "0.29.4" diff --git a/tools/demo/canvas-three/index.ts b/tools/demo/canvas-three/index.ts index 78b039723..01dbee403 100644 --- a/tools/demo/canvas-three/index.ts +++ b/tools/demo/canvas-three/index.ts @@ -69,7 +69,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase { //init(this.canvas); - this.topDown(this.canvas); + //this.topDown(this.canvas); // (canvas as any).scaleX = -1; //this.group(this.canvas); @@ -96,7 +96,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase { // console.log(NSString.alloc().initWithDataEncoding(base, NSUTF8StringEncoding)); // }, 10000); //this.threeCube(this.canvas); - //this.threeCar(this.canvas); + this.threeCar(this.canvas); //this.threeKeyframes(this.canvas); //tiny_poly_world(this.canvas); //this.webGLHelpers(this.canvas);