Skip to content

Commit 5fe2742

Browse files
CatchABusCatchABus
authored
feat(android): FlexboxLayout support for isPassThroughParentEnabled (NativeScript#8798)
1 parent 39547b3 commit 5fe2742

File tree

31 files changed

+333
-302
lines changed

31 files changed

+333
-302
lines changed

‎.eslintrc.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@
88
},
99
"ignorePatterns": ["**/*"],
1010
"plugins": ["prettier", "@typescript-eslint", "@nrwl/nx"],
11-
"extends": [
12-
"eslint:recommended",
13-
"plugin:@typescript-eslint/recommended",
14-
"prettier/@typescript-eslint",
15-
"plugin:prettier/recommended"
16-
],
11+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier/@typescript-eslint", "plugin:prettier/recommended"],
1712
"rules": {
1813
"prettier/prettier": "warn",
1914
"@typescript-eslint/explicit-member-accessibility": "off",

‎apps/ui/src/flexbox/flexbox-ispassthroughparent-page.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export function onStackLayoutTapped(args) {
2+
console.log('The StackLayout is tapped (called method: onStackLayoutTapped)');
3+
// Some visual action to execute when the tap is triggered
4+
args.object.backgroundColor = !args.object.backgroundColor || args.object.backgroundColor.toString() !== '#FFFF00' ? '#FFFF00' : '#FFFFFF';
5+
}
6+
7+
export function onFlexLayoutTap(args) {
8+
console.log('The FlexboxLayout is tapped (called method: onFlexLayoutTap)');
9+
// Some visual action to execute when the tap is triggered
10+
args.object.backgroundColor = !args.object.backgroundColor || args.object.backgroundColor.toString() !== '#FFFF00' ? '#FFFF00' : '#FFFFFF';
11+
}

‎apps/ui/src/flexbox/flexbox-ispassthroughparent-page.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
<StackLayout tap="onStackLayoutTapped" backgroundColor="#fff">
3+
4+
<Label text="With 'isPassThroughParentEnabled'" textWrap="true" textAlignment="center" color="#000" fontSize="20"/>
5+
<FlexboxLayout tap="onFlexLayoutTap" isPassThroughParentEnabled="true" alignItems="center" justifyContent="center" height="150" backgroundColor="#fff">
6+
<Label text="Tap Here to trigger the parent tap! (StackLayout)" textWrap="true" fontSize="24"/>
7+
</FlexboxLayout>
8+
9+
<Label text="Without 'isPassThroughParentEnabled'" textWrap="true" textAlignment="center" color="#000" fontSize="20"/>
10+
<FlexboxLayout tap="onFlexLayoutTap" alignItems="center" justifyContent="center" height="150" backgroundColor="#fff">
11+
<Label text="Tap Here to trigger both!" textWrap="true" fontSize="24"/>
12+
</FlexboxLayout>
13+
</StackLayout>
14+
</Page>

‎apps/ui/src/flexbox/flexbox-main-page.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export function loadExamples() {
1818
examples.set('flex-perf', 'flexbox/flexbox-perf-comparison-page');
1919
examples.set('flexbox-4143', 'flexbox/flexbox-4143-page');
2020
examples.set('flexbox-4834', 'flexbox/flexbox-4834-page');
21+
examples.set("flexbox-ispassthroughparent", "flexbox/flexbox-ispassthroughparent-page");
2122

2223
return examples;
2324
}

‎migrations.json‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,109 @@
11
{
2-
"migrations": [
3-
{
4-
"version": "10.1.0-beta.0",
5-
"description": "Migrate .eslintrc files to use tsconfig with a wildcard",
6-
"factory": "./src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard",
7-
"package": "@nrwl/workspace",
8-
"name": "migrate-eslintrc-tsconfig-wildcard"
9-
},
10-
{
11-
"version": "10.3.0-beta.0",
12-
"description": "Add @nrwl/cli as dependency",
13-
"factory": "./src/migrations/update-10-3-0/add-cli-dependency",
14-
"package": "@nrwl/workspace",
15-
"name": "add-cli-dependency"
16-
},
17-
{
18-
"version": "10.3.0-beta.0",
19-
"description": "Update typescript to v4",
20-
"factory": "./src/migrations/update-10-3-0/update-typescript",
21-
"package": "@nrwl/workspace",
22-
"name": "update-10-3-0"
23-
},
24-
{
25-
"version": "10.3.0-beta.1",
26-
"description": "Adds .vscode/extensions.json to a workspace",
27-
"factory": "./src/migrations/update-10-3-0/add-vscode-extensions",
28-
"package": "@nrwl/workspace",
29-
"name": "add-vscode-extensions"
30-
},
31-
{
32-
"version": "10.3.0-beta.0",
33-
"description": "Adds `buildableProjectDepsInPackageJsonType` for web and angular package builders",
34-
"factory": "./src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type",
35-
"package": "@nrwl/workspace",
36-
"name": "add-buildable-project-deps-in-package-json-type"
37-
},
38-
{
39-
"version": "10.1.0-beta.4",
40-
"description": "Update jest to v26",
41-
"factory": "./src/migrations/update-10-1-0/update-10-1-0",
42-
"package": "@nrwl/jest",
43-
"name": "update-10.1.0"
44-
},
45-
{
46-
"version": "10.2.0",
47-
"description": "Remove deprecated jest builder options",
48-
"factory": "./src/migrations/update-10-2-0/update-10-2-0",
49-
"package": "@nrwl/jest",
50-
"name": "update-10.2.0"
51-
},
52-
{
53-
"version": "10.3.0-beta.1",
54-
"description": "Adds all jest projects into the root jest config",
55-
"factory": "./src/migrations/update-10-3-0/update-projects-property",
56-
"package": "@nrwl/jest",
57-
"name": "update-projects-property"
58-
},
59-
{
60-
"version": "10.3.0-beta.1",
61-
"description": "Update ts-jest to v26.4",
62-
"factory": "./src/migrations/update-10-3-0/update-ts-jest",
63-
"package": "@nrwl/jest",
64-
"name": "update-ts-jest"
65-
},
66-
{
67-
"version": "10.3.0-beta.1",
68-
"description": "Adds a jest extension to the recommended extensions for vscode",
69-
"factory": "./src/migrations/update-10-3-0/add-jest-extension",
70-
"package": "@nrwl/jest",
71-
"name": "add-jest-extension"
72-
},
73-
{
74-
"version": "10.3.0-beta.1",
75-
"description": "Update @typescript-eslint to v4.3",
76-
"factory": "./src/migrations/update-10-3-0/update-10-3-0",
77-
"package": "@nrwl/linter",
78-
"name": "update-10.3.0"
79-
},
80-
{
81-
"version": "10.3.0-beta.0",
82-
"description": "Migrate to the new ESLint builder and ESLint config style",
83-
"factory": "./src/migrations/update-10-3-0/update-eslint-builder-and-config",
84-
"package": "@nrwl/linter",
85-
"name": "update-eslint-builder-and-config"
86-
},
87-
{
88-
"version": "10.3.0-beta.2",
89-
"description": "Add explicit .json file extension to .eslintrc files, not using an extension is deprecated",
90-
"factory": "./src/migrations/update-10-3-0/add-json-ext-to-eslintrc",
91-
"package": "@nrwl/linter",
92-
"name": "add-json-ext-to-eslintrc"
93-
},
94-
{
95-
"version": "10.3.0-beta.3",
96-
"description": "Update implicitDependencies within nx.json to include root .eslintrc.json",
97-
"factory": "./src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps",
98-
"package": "@nrwl/linter",
99-
"name": "add-root-eslintrc-json-to-workspace-implicit-deps"
100-
},
101-
{
102-
"version": "10.1.0-beta.1",
103-
"description": "Removes rootDir from node libs' tsconfig",
104-
"factory": "./src/migrations/update-10-1-0/remove-root-dir",
105-
"package": "@nrwl/node",
106-
"name": "remove-root-dir"
107-
}
108-
]
109-
}
2+
"migrations": [
3+
{
4+
"version": "10.1.0-beta.0",
5+
"description": "Migrate .eslintrc files to use tsconfig with a wildcard",
6+
"factory": "./src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard",
7+
"package": "@nrwl/workspace",
8+
"name": "migrate-eslintrc-tsconfig-wildcard"
9+
},
10+
{
11+
"version": "10.3.0-beta.0",
12+
"description": "Add @nrwl/cli as dependency",
13+
"factory": "./src/migrations/update-10-3-0/add-cli-dependency",
14+
"package": "@nrwl/workspace",
15+
"name": "add-cli-dependency"
16+
},
17+
{
18+
"version": "10.3.0-beta.0",
19+
"description": "Update typescript to v4",
20+
"factory": "./src/migrations/update-10-3-0/update-typescript",
21+
"package": "@nrwl/workspace",
22+
"name": "update-10-3-0"
23+
},
24+
{
25+
"version": "10.3.0-beta.1",
26+
"description": "Adds .vscode/extensions.json to a workspace",
27+
"factory": "./src/migrations/update-10-3-0/add-vscode-extensions",
28+
"package": "@nrwl/workspace",
29+
"name": "add-vscode-extensions"
30+
},
31+
{
32+
"version": "10.3.0-beta.0",
33+
"description": "Adds `buildableProjectDepsInPackageJsonType` for web and angular package builders",
34+
"factory": "./src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type",
35+
"package": "@nrwl/workspace",
36+
"name": "add-buildable-project-deps-in-package-json-type"
37+
},
38+
{
39+
"version": "10.1.0-beta.4",
40+
"description": "Update jest to v26",
41+
"factory": "./src/migrations/update-10-1-0/update-10-1-0",
42+
"package": "@nrwl/jest",
43+
"name": "update-10.1.0"
44+
},
45+
{
46+
"version": "10.2.0",
47+
"description": "Remove deprecated jest builder options",
48+
"factory": "./src/migrations/update-10-2-0/update-10-2-0",
49+
"package": "@nrwl/jest",
50+
"name": "update-10.2.0"
51+
},
52+
{
53+
"version": "10.3.0-beta.1",
54+
"description": "Adds all jest projects into the root jest config",
55+
"factory": "./src/migrations/update-10-3-0/update-projects-property",
56+
"package": "@nrwl/jest",
57+
"name": "update-projects-property"
58+
},
59+
{
60+
"version": "10.3.0-beta.1",
61+
"description": "Update ts-jest to v26.4",
62+
"factory": "./src/migrations/update-10-3-0/update-ts-jest",
63+
"package": "@nrwl/jest",
64+
"name": "update-ts-jest"
65+
},
66+
{
67+
"version": "10.3.0-beta.1",
68+
"description": "Adds a jest extension to the recommended extensions for vscode",
69+
"factory": "./src/migrations/update-10-3-0/add-jest-extension",
70+
"package": "@nrwl/jest",
71+
"name": "add-jest-extension"
72+
},
73+
{
74+
"version": "10.3.0-beta.1",
75+
"description": "Update @typescript-eslint to v4.3",
76+
"factory": "./src/migrations/update-10-3-0/update-10-3-0",
77+
"package": "@nrwl/linter",
78+
"name": "update-10.3.0"
79+
},
80+
{
81+
"version": "10.3.0-beta.0",
82+
"description": "Migrate to the new ESLint builder and ESLint config style",
83+
"factory": "./src/migrations/update-10-3-0/update-eslint-builder-and-config",
84+
"package": "@nrwl/linter",
85+
"name": "update-eslint-builder-and-config"
86+
},
87+
{
88+
"version": "10.3.0-beta.2",
89+
"description": "Add explicit .json file extension to .eslintrc files, not using an extension is deprecated",
90+
"factory": "./src/migrations/update-10-3-0/add-json-ext-to-eslintrc",
91+
"package": "@nrwl/linter",
92+
"name": "add-json-ext-to-eslintrc"
93+
},
94+
{
95+
"version": "10.3.0-beta.3",
96+
"description": "Update implicitDependencies within nx.json to include root .eslintrc.json",
97+
"factory": "./src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps",
98+
"package": "@nrwl/linter",
99+
"name": "add-root-eslintrc-json-to-workspace-implicit-deps"
100+
},
101+
{
102+
"version": "10.1.0-beta.1",
103+
"description": "Removes rootDir from node libs' tsconfig",
104+
"factory": "./src/migrations/update-10-1-0/remove-root-dir",
105+
"package": "@nrwl/node",
106+
"name": "remove-root-dir"
107+
}
108+
]
109+
}

0 commit comments

Comments
 (0)