Skip to content

Commit 6deba03

Browse files
triniwiztriniwiz
authored
Merge pull request #64 from NativeScript/fix/gestures-patches
fix: gestures
2 parents 36a27c8 + 37d0916 commit 6deba03

File tree

206 files changed

+15091
-4899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+15091
-4899
lines changed

‎CanvasNative.podspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = "CanvasNative"
44

5-
s.version = "1.0.0-alpha.3"
5+
s.version = "1.0.0-alpha.11"
66

77
s.summary = "A Canvas library"
88

@@ -18,11 +18,11 @@ Pod::Spec.new do |s|
1818
s.source = { :git => "https://github.com/nativescript/canvas.git", :tag => "#{s.version}" }
1919

2020
s.pod_target_xcconfig = {
21-
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/CanvasNative/Dist"',
21+
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/dist"',
2222
'ENABLE_BITCODE' => 'YES',
2323
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '"arm64"',
2424
}
2525
s.swift_versions = ['4.0','4.2', '5.0']
26-
s.vendored_frameworks = 'packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework'
27-
s.preserve_paths = 'packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework'
26+
s.vendored_frameworks = 'packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework'
27+
s.preserve_paths = 'packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework'
2828
end

‎apps/demo/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"zen-3d": "file:../../node_modules/zen-3d"
2929
},
3030
"devDependencies": {
31-
"@nativescript/android": "8.2.0-alpha.2",
32-
"@nativescript/ios": "8.0.0"
31+
"@nativescript/android": "8.1.1",
32+
"@nativescript/ios": "8.1.0"
3333
}
3434
}

‎apps/demo/src/app.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
require('@nativescript/canvas-polyfill');
12
import { Application } from '@nativescript/core';
23
Application.run({ moduleName: 'app-root' });

‎apps/demo/src/plugin-demos/canvas.ts‎

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,57 @@
1-
import {EventData, Page} from '@nativescript/core';
2-
import {DemoSharedCanvas} from '@demo/shared';
1+
import { EventData, Page, WebView } from '@nativescript/core';
2+
import { DemoSharedCanvas } from '@demo/shared';
33

44
export function navigatingTo(args: EventData) {
55
const page = <Page>args.object;
66
page.bindingContext = new DemoModel();
77
}
88

9+
export function loaded(args) {
10+
const view = <WebView>args.object;
11+
view.src = `
12+
<script>
13+
14+
document.addEventListener('DOMContentLoaded', ()=>{
15+
const canvas = document.createElement('canvas');
16+
canvas.style = "width:100%;height:100%;background-color:red;";
17+
document.body.appendChild(canvas);
18+
canvas.addEventListener('touchstart', e =>{
19+
console.log('touchstart',e);
20+
});
21+
canvas.addEventListener('pointerdown', e =>{
22+
console.log('pointerdown',e);
23+
});
24+
canvas.addEventListener('pointermove', e =>{
25+
console.log('pointermove',e);
26+
});
27+
canvas.addEventListener('touchmove', e =>{
28+
console.log('touchmove',e);
29+
});
30+
canvas.addEventListener('pointerup', e =>{
31+
console.log('pointerup',e);
32+
});
33+
canvas.addEventListener('touchend', e =>{
34+
console.log('touchend',e);
35+
});
36+
canvas.addEventListener('pointercancel', e =>{
37+
console.log('pointercancel',e);
38+
});
39+
canvas.addEventListener('touchcancel', e =>{
40+
console.log('touchcancel',e);
41+
});
42+
canvas.addEventListener('wheel', e =>{
43+
console.log('wheel',e);
44+
});
45+
}, false);
46+
47+
</script>
48+
<!DOCTYPE html>
49+
<html>
50+
<body>
51+
</body>
52+
</html>
53+
`;
54+
}
55+
956
export class DemoModel extends DemoSharedCanvas {
1057
}

‎apps/demo/src/plugin-demos/canvas.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
</ActionBar>
55
</Page.actionBar>
66
<GridLayout loaded="{{ gridLoaded }}" rows="*,*" columns="*,*" iosOverflowSafeArea="false" width="100%" height="100%">
7-
<canvas:Canvas rowSpan="2" colSpan="2" width="100%" height="100%" ready="{{ canvasLoaded }}"
8-
layoutChanged="{{ onLayout }}"/>
7+
<WebView rowSpan="2" colSpan="2" height="100%" width="100%" loaded="loaded"/>
8+
<!-- <canvas:Canvas rowSpan="2" colSpan="2" width="100%" height="100%" ready="{{ canvasLoaded }}"
9+
layoutChanged="{{ onLayout }}"/> -->
910
<!-- <canvas:Svg id="1" width="100%" height="100%" src="{{src1}}" loaded="{{svgViewLoaded}}"/>
1011
<canvas:Svg id="2" col="1" width="100%" height="100%" src="{{src2}}" loaded="{{svgViewLoaded}}"/>
1112
<canvas:Svg id="3" row="1" width="100%" height="100%" src="{{src3}}" loaded="{{svgViewLoaded}}"/>

‎package.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
"sync-packages-with-demos": "nx g @nativescript/plugin-tools:sync-packages-with-demos",
1313
"postinstall": "husky install && npx ts-patch install",
1414
"remove-package": "nx g @nativescript/plugin-tools:remove-package",
15-
"add-demo": "nx g @nativescript/plugin-tools:add-demo"
15+
"add-demo": "nx g @nativescript/plugin-tools:add-demo",
16+
"build.canvas.android.release": "nx run canvas:build.native.android.release",
17+
"build.canvas.android.debug": "nx run canvas:build.native.android.debug",
18+
"build.canvas.ios.release": "nx run canvas:build.native.ios.release",
19+
"build.canvas.ios.debug": "nx run canvas:build.native.ios.debug",
20+
"build.canvas.ios.framework.release": "nx run canvas:build.native.ios.framework.release",
21+
"build.canvas.ios.framework.debug": "nx run canvas:build.native.ios.framework.debug"
1622
},
1723
"private": true,
1824
"devDependencies": {
@@ -25,7 +31,6 @@
2531
"@angular/platform-browser": "^12.0.0",
2632
"@angular/platform-browser-dynamic": "^12.0.0",
2733
"@angular/router": "^12.0.0",
28-
"@nativescript-community/gesturehandler": "^0.1.45",
2934
"@nativescript/angular": "^12.0.0",
3035
"@nativescript/core": "~8.1.0",
3136
"@nativescript/plugin-tools": "2.1.0",
@@ -56,7 +61,7 @@
5661
"rimraf": "^3.0.2",
5762
"rxjs": "~6.6.0",
5863
"svelte-native": "^0.9.3",
59-
"three": "^0.123.0",
64+
"three": "^0.133.1",
6065
"typescript": "~4.3.0",
6166
"vexflow": "^3.0.9",
6267
"xmldom": "~0.6.0",

‎packages/canvas-babylon/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-babylon",
3-
"version": "1.0.0-beta.1",
3+
"version": "1.0.0-beta.5",
44
"description": "",
55
"main": "index",
66
"typings": "index.d.ts",
@@ -32,8 +32,10 @@
3232
"homepage": "https://github.com/NativeScript/canvas",
3333
"readmeFilename": "README.md",
3434
"bootstrapper": "@nativescript/plugin-seed",
35+
"dependencies": {
36+
"@nativescript/canvas-polyfill": "beta"
37+
},
3538
"peerDependencies": {
36-
"@nativescript/canvas": "alpha",
3739
"babylonjs": "^4.1.0"
3840
}
3941
}

‎packages/canvas-media/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-media",
3-
"version": "0.12.0",
3+
"version": "0.13.2",
44
"description": "Canvas media",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/canvas-phaser-ce/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-phaser-ce",
3-
"version": "1.0.0-beta.1",
3+
"version": "1.0.0-beta.5",
44
"description": "Tools for using Phaser-ce to build native 2D games in NativeScript 👾",
55
"main": "index",
66
"typings": "index.d.ts",
@@ -32,8 +32,10 @@
3232
"homepage": "https://github.com/NativeScript/canvas",
3333
"readmeFilename": "README.md",
3434
"bootstrapper": "@nativescript/plugin-seed",
35+
"dependencies": {
36+
"@nativescript/canvas-polyfill": "beta"
37+
},
3538
"peerDependencies": {
36-
"@nativescript/canvas": "alpha",
3739
"phaser-ce": "2.15.0"
3840
}
3941
}

‎packages/canvas-phaser/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-phaser",
3-
"version": "1.0.0-beta.1",
3+
"version": "1.0.0-beta.5",
44
"description": "Build awesome 2D games with Phaser.js and NativeScript",
55
"main": "index",
66
"typings": "index.d.ts",
@@ -32,8 +32,10 @@
3232
"homepage": "https://github.com/NativeScript/canvas",
3333
"readmeFilename": "README.md",
3434
"bootstrapper": "@nativescript/plugin-seed",
35+
"dependencies": {
36+
"@nativescript/canvas-polyfill": "beta"
37+
},
3538
"peerDependencies": {
36-
"@nativescript/canvas": "alpha",
3739
"phaser": "^3.24.1"
3840
}
3941
}

0 commit comments

Comments
 (0)