Skip to content

Commit 4a97ccb

Browse files
authored
Merge branch 'main' into feat/textfield-word-wrap
2 parents 8522566 + 8979ad8 commit 4a97ccb

File tree

3 files changed

+17
-63
lines changed

3 files changed

+17
-63
lines changed

.github/workflows/npm_release_core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444
env:
4545
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
4646
run: |
47-
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ../../.npmrc
47+
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
4848
echo "Publishing @nativescript/core@$NPM_VERSION to NPM with tag $NPM_TAG..."
49-
npm publish --tag $NPM_TAG
49+
npm publish --tag $NPM_TAG --access public

packages/core/project.json

Lines changed: 11 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,9 @@
44
"sourceRoot": "packages/core",
55
"projectType": "library",
66
"generators": {},
7-
"namedInputs": {
8-
"default": ["{projectRoot}/**/*"],
9-
"production": ["!{projectRoot}/**/*.spec.ts"]
10-
},
7+
"namedInputs": { "default": ["{projectRoot}/**/*"], "production": ["!{projectRoot}/**/*.spec.ts"] },
118
"targets": {
12-
"lint": {
13-
"executor": "@nx/eslint:lint",
14-
"options": {
15-
"lintFilePatterns": ["packages/core/**/*.ts", "packages/core/references.d.ts", "packages/core/**/*.spec.ts", "packages/core/**/*.spec.tsx", "packages/core/**/*.spec.js", "packages/core/**/*.spec.jsx", "packages/core/**/*.d.ts"]
16-
}
17-
},
9+
"lint": { "executor": "@nx/eslint:lint", "options": { "lintFilePatterns": ["packages/core/**/*.ts", "packages/core/references.d.ts", "packages/core/**/*.spec.ts", "packages/core/**/*.spec.tsx", "packages/core/**/*.spec.js", "packages/core/**/*.spec.jsx", "packages/core/**/*.d.ts"] } },
1810
"build": {
1911
"executor": "@nx/js:tsc",
2012
"inputs": ["default", "^production"],
@@ -28,59 +20,18 @@
2820
"{workspaceRoot}/LICENSE",
2921
"{projectRoot}/README.md",
3022
"{projectRoot}/global-types.d.ts",
31-
{
32-
"glob": "**/*",
33-
"input": "{projectRoot}/js-libs/",
34-
"output": "./js-libs/"
35-
},
36-
{
37-
"glob": "**/*",
38-
"input": "{projectRoot}/cli-hooks/",
39-
"output": "./cli-hooks/"
40-
},
41-
{
42-
"glob": "**/*",
43-
"input": "{projectRoot}/fetch/",
44-
"output": "./fetch/"
45-
},
46-
{
47-
"glob": "**/*",
48-
"input": "{projectRoot}/css/",
49-
"output": "./css/"
50-
},
51-
{
52-
"glob": "**/*",
53-
"input": "{projectRoot}/css-value/",
54-
"output": "./css-value/"
55-
},
56-
{
57-
"glob": "**/*",
58-
"input": "{projectRoot}/platforms/",
59-
"output": "./platforms/"
60-
}
23+
{ "glob": "**/*", "input": "{projectRoot}/js-libs/", "output": "./js-libs/" },
24+
{ "glob": "**/*", "input": "{projectRoot}/cli-hooks/", "output": "./cli-hooks/" },
25+
{ "glob": "**/*", "input": "{projectRoot}/fetch/", "output": "./fetch/" },
26+
{ "glob": "**/*", "input": "{projectRoot}/css/", "output": "./css/" },
27+
{ "glob": "**/*", "input": "{projectRoot}/css-value/", "output": "./css-value/" },
28+
{ "glob": "**/*", "input": "{projectRoot}/platforms/", "output": "./platforms/" },
29+
{ "glob": "**/*.d.ts", "input": "{projectRoot}/", "output": "./" }
6130
]
6231
},
6332
"dependsOn": ["^build"]
6433
},
65-
"build.npm": {
66-
"executor": "nx:run-commands",
67-
"options": {
68-
"commands": ["node tools/scripts/build-finish.ts core"],
69-
"parallel": false
70-
},
71-
"outputs": ["{workspaceRoot}/dist/packages/core"],
72-
"dependsOn": [
73-
{
74-
"target": "build"
75-
}
76-
]
77-
},
78-
"test": {
79-
"executor": "@nx/vite:test",
80-
"outputs": ["{options.reportsDirectory}"],
81-
"options": {
82-
"reportsDirectory": "../../coverage/packages/core"
83-
}
84-
}
34+
"build.npm": { "executor": "nx:run-commands", "options": { "commands": ["node tools/scripts/build-finish.ts core"], "parallel": false }, "outputs": ["{workspaceRoot}/dist/packages/core"], "dependsOn": [{ "target": "build" }] },
35+
"test": { "executor": "@nx/vite:test", "outputs": ["{options.reportsDirectory}"], "options": { "reportsDirectory": "../../coverage/packages/core" } }
8536
}
8637
}

packages/core/ui/list-view/index.ios.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,12 @@ export class ListView extends ListViewBase {
392392
}
393393

394394
public measure(widthMeasureSpec: number, heightMeasureSpec: number): void {
395+
const changed: boolean = this._currentWidthMeasureSpec !== widthMeasureSpec || this._currentHeightMeasureSpec !== heightMeasureSpec;
396+
395397
this.widthMeasureSpec = widthMeasureSpec;
396-
const changed = this._setCurrentMeasureSpecs(widthMeasureSpec, heightMeasureSpec);
397398
super.measure(widthMeasureSpec, heightMeasureSpec);
399+
400+
// Reload native view cells only in the case of size change
398401
if (changed) {
399402
this.nativeViewProtected.reloadData();
400403
}

0 commit comments

Comments
 (0)