Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4765dd9
fix-next(android): exit fragment animation (#6421)
manoldonev Oct 26, 2018
e487825
fix-next: handle action bar safe area nesting (#6455)
MartoYankov Oct 26, 2018
745a79f
docs(iOS): update HtmlView documentation link (#6335)
daviditsygin Oct 26, 2018
f5cca13
fix-next: correct raising of layoutChanged event (#6457)
tgpetrov Oct 26, 2018
448936d
fix-next(android): restore fade animation for simulated nav (#6463)
manoldonev Oct 26, 2018
7625d6c
fix-next: handle view controller nesting in ng (#6472)
MartoYankov Oct 29, 2018
95c4ec5
Revert "fix-next(android): restore fade animation for simulated nav (…
manoldonev Oct 29, 2018
58c9d42
fix-next(ios): handle nesting in proxyViewContainer ng (#6475)
MartoYankov Oct 30, 2018
371fc9b
fix(tab-view-android): change androidOffscreenTabLimit to 1 when usin…
ADjenkov Oct 30, 2018
eca938d
chore(apps): add tslib dep and update tsconfig.json file (#6464)
danbockapps Nov 1, 2018
f54f7c3
Revert "chore(apps): add tslib dep and update tsconfig.json file (#64…
vchimev Nov 2, 2018
2933a9a
fix: Resolve incorrect name of listener when unsubscribing (#6487)
VladimirAmiorkov Nov 2, 2018
fac970e
fix(android): back navigation on app suspend/resume (#6489)
manoldonev Nov 2, 2018
c41e3e0
docs: add 5.0.0 changelog (#6485)
vchimev Nov 5, 2018
41ba93d
fix(android): IllegalStateException with tabview&nested frames (#6495)
manoldonev Nov 5, 2018
1485445
test(safe-area): add layoutChanged test (#6462)
tgpetrov Nov 6, 2018
4c08839
test: add test for #6490 (#6517)
manoldonev Nov 6, 2018
7fbdc7a
fix: layoutChanged event in landscape (#6520)
manoldonev Nov 7, 2018
7e7c050
feat: add number and phone input types for prompt dialog (#6365)
shyamseshadri Nov 7, 2018
bf6a6fb
Merge remote-tracking branch 'origin/master' into svetoslavtsenov/mer…
SvetoslavTsenov Nov 8, 2018
6531d7a
Merge pull request #6525 from NativeScript/svetoslavtsenov/merge-release
SvetoslavTsenov Nov 8, 2018
8e83a61
chore: remove flaky test (#6548)
manoldonev Nov 12, 2018
950fdcf
fix(image): uncaught error in promise with image handling (#6453)
NathanWalker Nov 13, 2018
7df8038
fix: nested frames order with tabs & suspend/resume (#6528)
manoldonev Nov 14, 2018
db33cf3
fix: crash on Android Tab-View #6466 (#6467)
DickSmith Nov 14, 2018
5c03abe
chore: update to TypeScript 3 (#6556)
Nov 14, 2018
51a191f
fix(ios): safe area handling in scrollview (#6561)
MartoYankov Nov 15, 2018
efe3318
fix: doc of transitionAndroid property of NavigationEntry interface (…
LeartS Nov 15, 2018
f90995f
fix(ios): scrollview safe area when no scroll (#6568)
MartoYankov Nov 19, 2018
9388a4e
test(ios): add repeater and webview safe area tests (#6578)
MartoYankov Nov 19, 2018
d703f7a
doc: cut the 5.0.3 release
SvetoslavTsenov Nov 20, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
Cross Platform Modules Changelog
==============================
<a name="5.0.3"></a>
## [5.0.3](https://github.com/NativeScript/NativeScript/compare/5.0.2...5.0.3) (2018-11-20)


### Bug Fixes

* crash on Android Tab-View [#6466](https://github.com/NativeScript/NativeScript/issues/6466) ([#6467](https://github.com/NativeScript/NativeScript/issues/6467)) ([db33cf3](https://github.com/NativeScript/NativeScript/commit/db33cf3)), closes [ac04ede#diff-f1459d509d1432b432c29bcd30e462fbL97](https://github.com/ac04ede/issues/diff-f1459d509d1432b432c29bcd30e462fbL97)
* doc of transitionAndroid property of NavigationEntry interface ([#6563](https://github.com/NativeScript/NativeScript/issues/6563)) ([efe3318](https://github.com/NativeScript/NativeScript/commit/efe3318))
* layoutChanged event in landscape ([#6520](https://github.com/NativeScript/NativeScript/issues/6520)) ([7fbdc7a](https://github.com/NativeScript/NativeScript/commit/7fbdc7a))
* nested frames order with tabs & suspend/resume ([#6528](https://github.com/NativeScript/NativeScript/issues/6528)) ([7df8038](https://github.com/NativeScript/NativeScript/commit/7df8038))
* Resolve incorrect name of listener when unsubscribing ([#6487](https://github.com/NativeScript/NativeScript/issues/6487)) ([af5eb73](https://github.com/NativeScript/NativeScript/commit/af5eb73))
* Resolve incorrect name of listener when unsubscribing ([#6487](https://github.com/NativeScript/NativeScript/issues/6487)) ([2933a9a](https://github.com/NativeScript/NativeScript/commit/2933a9a))
* **image:** uncaught error in promise with image handling ([#6453](https://github.com/NativeScript/NativeScript/issues/6453)) ([950fdcf](https://github.com/NativeScript/NativeScript/commit/950fdcf))
* **android:** back navigation on app suspend/resume ([#6489](https://github.com/NativeScript/NativeScript/issues/6489)) ([999e378](https://github.com/NativeScript/NativeScript/commit/999e378))
* **android:** back navigation on app suspend/resume ([#6489](https://github.com/NativeScript/NativeScript/issues/6489)) ([fac970e](https://github.com/NativeScript/NativeScript/commit/fac970e))
* **android:** IllegalStateException with tabview&nested frames ([#6495](https://github.com/NativeScript/NativeScript/issues/6495)) ([7d21b5c](https://github.com/NativeScript/NativeScript/commit/7d21b5c))
* **android:** IllegalStateException with tabview&nested frames ([#6495](https://github.com/NativeScript/NativeScript/issues/6495)) ([41ba93d](https://github.com/NativeScript/NativeScript/commit/41ba93d))
* **ios:** safe area handling in scrollview ([#6561](https://github.com/NativeScript/NativeScript/issues/6561)) ([51a191f](https://github.com/NativeScript/NativeScript/commit/51a191f))
* **ios:** scrollview safe area when no scroll ([#6568](https://github.com/NativeScript/NativeScript/issues/6568)) ([f90995f](https://github.com/NativeScript/NativeScript/commit/f90995f))


### Features

* add number and phone input types for prompt dialog ([#6365](https://github.com/NativeScript/NativeScript/issues/6365)) ([7e7c050](https://github.com/NativeScript/NativeScript/commit/7e7c050))



<a name="5.0.2"></a>
## [5.0.2](https://github.com/NativeScript/NativeScript/compare/5.0.1...5.0.2) (2018-11-07)
Expand Down
4 changes: 3 additions & 1 deletion apps/app/ui-tests-app/dialogs/dialogs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
<Button text="login" tap="{{ loginName }}" />
<Button text="promptText" tap="{{ promptText }}" />
<Button text="promptPass" tap="{{ promptPass }}" />
<Button text="promptEmail" tap="{{ promptEmail }}" />
<Button text="promptEmail" tap="{{ promptEmail }}" />
<Button text="promptNumber" tap="{{ promptNumber }}" />
<Button text="promptPhone" tap="{{ promptPhone }}" />
<Button text="promptCapitalizationNone" tap="{{ promptCapitalizationNone }}" />
<Button text="promptCapitalizationAll" tap="{{ promptCapitalizationAll }}" />
<Button text="promptCapitalizationSentences" tap="{{ promptCapitalizationSentences }}" />
Expand Down
40 changes: 40 additions & 0 deletions apps/app/ui-tests-app/dialogs/view-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,46 @@ export class SettingsViewModel extends observable.Observable {
});
}

public promptNumber(args: observable.EventData) {
dialogs.prompt({
title: "Name",
message: "Enter a number:",
cancelButtonText: "Cancel",
neutralButtonText: "Ignore",
okButtonText: "OK",
defaultText: "1234",
inputType: dialogs.inputType.number
}).then((promptResult) => {
console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
if (promptResult.result) {
this.set("name", promptResult.text);
}
else {
this.set("name", "1234");
}
});
}

public promptPhone(args: observable.EventData) {
dialogs.prompt({
title: "Name",
message: "Enter a phone:",
cancelButtonText: "Cancel",
neutralButtonText: "Ignore",
okButtonText: "OK",
defaultText: "1234",
inputType: dialogs.inputType.phone
}).then((promptResult) => {
console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
if (promptResult.result) {
this.set("name", promptResult.text);
}
else {
this.set("name", "1234");
}
});
}

public promptCapitalizationNone(args: observable.EventData) {
dialogs.prompt({
title: "Name",
Expand Down
8 changes: 8 additions & 0 deletions apps/app/ui-tests-app/issues/issue-6439.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.hr-light {
height: 1;
background-color: gray;
}

.title {
height: 200;
}
38 changes: 38 additions & 0 deletions apps/app/ui-tests-app/issues/issue-6439.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<Page>
<ActionBar title="issue-6439"></ActionBar>

<GridLayout>
<ScrollView>
<StackLayout>
<StackLayout>
<Label text="Play with NativeScript!" textWrap="true" class="title" />
<StackLayout class="hr-light"></StackLayout>
</StackLayout>
<StackLayout>
<Label text="Play with NativeScript!" textWrap="true" class="title" />
<StackLayout class="hr-light"></StackLayout>
</StackLayout>
<StackLayout>
<Label text="Play with NativeScript!" textWrap="true" class="title" />
<StackLayout class="hr-light"></StackLayout>
</StackLayout>
<StackLayout>
<Label text="Play with NativeScript!" textWrap="true" class="title" />
<StackLayout class="hr-light"></StackLayout>
</StackLayout>
<StackLayout>
<Label text="Play with NativeScript!" textWrap="true" class="title" />
<StackLayout class="hr-light"></StackLayout>
</StackLayout>
<StackLayout>
<Label text="Play with NativeScript!" textWrap="true" class="title" />
<StackLayout class="hr-light"></StackLayout>
</StackLayout>
<StackLayout>
<Label text="Play with NativeScript!" textWrap="true" class="title" />
<StackLayout class="hr-light"></StackLayout>
</StackLayout>
</StackLayout>
</ScrollView>
</GridLayout>
</Page>
35 changes: 35 additions & 0 deletions apps/app/ui-tests-app/issues/issue-ng-repo-1599.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.page {
padding: 20;
}

.title {
font-weight: bold;
}

.list-items {
border-radius: 10;
background-repeat: no-repeat;
background-size: cover;
background-position: center top;
background-color: black;
margin-top: 20;
}

.item-title {
color: white;
vertical-align: bottom;
font-size: 30;
padding: 180 20 20;
font-weight: 600;
}

.list-item__row {
padding-left: 20;
}

.list-item {
border-radius: 4;
background-color: white;
margin: 0 10 20 0;
padding: 5 10;
}
109 changes: 109 additions & 0 deletions apps/app/ui-tests-app/issues/issue-ng-repo-1599.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<Page>
<ActionBar title="issue-ng-repo-1599"></ActionBar>

<ScrollView>
<GridLayout rows="auto, *" columns="*" class="page page-content">
<!-- Banner -->
<StackLayout row="0" orientation="vertical">
<StackLayout>
<Label textWrap="true" text="My shopping lists" class="title"></Label>
</StackLayout>
</StackLayout>
<!-- Offer categories -->
<StackLayout row="1">
<!-- Shopping list 1 -->
<StackLayout class="list-items" backgroundImage="~/ui-tests-app/resources/images/woods.jpg">
<Label text="Shopping list 1" class="item-title" textWrap="true"></Label>
<ScrollView orientation="horizontal">
<StackLayout orientation="horizontal" class="list-item__row">
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
</StackLayout>
</ScrollView>
</StackLayout>
<!-- Shopping list 2 -->
<StackLayout class="list-items" backgroundImage="~/ui-tests-app/resources/images/woods.jpg">
<Label text="Shopping list 2" class="item-title" textWrap="true"></Label>
<ScrollView orientation="horizontal">
<StackLayout orientation="horizontal" class="list-item__row">
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
</StackLayout>
</ScrollView>
</StackLayout>
<!-- Shopping list 3 -->
<StackLayout class="list-items" backgroundImage="~/ui-tests-app/resources/images/woods.jpg">
<Label text="Shopping list 3" class="item-title" textWrap="true"></Label>
<ScrollView orientation="horizontal">
<StackLayout orientation="horizontal" class="list-item__row">
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
</StackLayout>
</ScrollView>
</StackLayout>
<!-- Shopping list 4 -->
<StackLayout class="list-items" backgroundImage="~/ui-tests-app/resources/images/woods.jpg">
<Label text="Shopping list 4" class="item-title" textWrap="true"></Label>
<ScrollView orientation="horizontal">
<StackLayout orientation="horizontal" class="list-item__row">
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
<StackLayout class="list-item">
<Label text="Shop Item" textWrap="true" />
</StackLayout>
</StackLayout>
</ScrollView>
</StackLayout>
</StackLayout>
</GridLayout>
</ScrollView>
</Page>
2 changes: 2 additions & 0 deletions apps/app/ui-tests-app/issues/main-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export function loadExamples() {
examples.set("3354-ios", "issues/issue-3354");
examples.set("4450", "issues/issue-4450");
examples.set("5274", "issues/issue-5274");
examples.set("ng-repo-1599", "issues/issue-ng-repo-1599");
examples.set("6439", "issues/issue-6439");

return examples;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</Page.actionBar>

<ScrollView>
<StackLayout>
<StackLayout backgroundColor="teal">
<GridLayout height="30" backgroundColor="red" />
<GridLayout height="30" backgroundColor="yellow" />
<GridLayout height="30" backgroundColor="green" />
Expand Down
4 changes: 2 additions & 2 deletions apps/app/ui-tests-app/scroll-view/safe-area-sub-element.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</Page.actionBar>

<GridLayout>
<ScrollView height="50" verticalAlignment="top">
<StackLayout>
<ScrollView>
<StackLayout backgroundColor="teal">
<GridLayout height="30" backgroundColor="red" />
<GridLayout height="30" backgroundColor="yellow" />
<GridLayout height="30" backgroundColor="green" />
Expand Down
4 changes: 2 additions & 2 deletions apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"babel-types": "6.11.1",
"babylon": "6.8.3",
"lazy": "1.0.11",
"nativescript-dev-typescript": "^0.7.1",
"nativescript-dev-typescript": "next",
"tns-platform-declarations": "*",
"typescript": "^2.7.2"
"typescript": "^3.1.6"
}
}
2 changes: 1 addition & 1 deletion e2e/modal-navigation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"nativescript-dev-typescript": "next",
"nativescript-dev-webpack": "next",
"rimraf": "^2.6.2",
"typescript": "^3.1.1"
"typescript": "^3.1.6"
},
"scripts": {
"e2e": "npm run clean-e2e && tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"tslint": "^5.4.3",
"typedoc": "^0.5.10",
"typedoc-plugin-external-module-name": "git://github.com/PanayotCankov/typedoc-plugin-external-module-name.git#with-js",
"typescript": "^2.6.1"
"typescript": "^3.1.6"
},
"scripts": {
"setup": "npm run dev-link-tns-platform-declarations && npm run dev-link-tns-core-modules && npm run dev-link-tests && npm run dev-link-apps && npm run dev-link-e2e-modal",
Expand Down
4 changes: 4 additions & 0 deletions tests/app/testRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,15 @@ allTests["FLEXBOXLAYOUT"] = flexBoxLayoutTests;
import * as safeAreaLayoutTests from "./ui/layouts/safe-area-tests";
import * as safeAreaListViewtTests from "./ui/list-view/list-view-safe-area-tests";
import * as scrollViewSafeAreaTests from "./ui/scroll-view/scroll-view-safe-area-tests";
import * as repeaterSafeAreaTests from "./ui/repeater/repeater-safe-area-tests";
import * as webViewSafeAreaTests from "./ui/web-view/web-view-safe-area-tests";

if (platform.isIOS && ios.MajorVersion > 10) {
allTests["SAFEAREALAYOUT"] = safeAreaLayoutTests;
allTests["SAFEAREA-LISTVIEW"] = safeAreaListViewtTests;
allTests["SAFEAREA-SCROLL-VIEW"] = scrollViewSafeAreaTests;
allTests["SAFEAREA-REPEATER"] = repeaterSafeAreaTests;
allTests["SAFEAREA-WEBVIEW"] = webViewSafeAreaTests;
}

import * as stylePropertiesTests from "./ui/styling/style-properties-tests";
Expand Down
12 changes: 6 additions & 6 deletions tests/app/ui/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ export function waitUntilNavigatedTo(page: Page, action: Function) {
TKUnit.waitUntilReady(() => completed, 5);
}

export function waitUntilNavigatedFrom(action: Function) {
const currentPage = frame.topmost().currentPage;
export function waitUntilNavigatedFrom(action: Function, topFrame?: frame.Frame) {
const currentPage = topFrame ? topFrame.currentPage : frame.topmost().currentPage;
let completed = false;
function navigatedFrom(args) {
args.object.page.off("navigatedFrom", navigatedFrom);
Expand All @@ -226,19 +226,19 @@ export function waitUntilLayoutReady(view: View): void {
TKUnit.waitUntilReady(() => view.isLayoutValid);
}

export function navigateWithEntry(entry: frame.NavigationEntry): Page {
export function navigateWithEntry(entry: frame.NavigationEntry, topFrame?: frame.Frame): Page {
const page = createViewFromEntry(entry) as Page;
entry.moduleName = null;
entry.create = function () {
return page;
};

waitUntilNavigatedFrom(() => frame.topmost().navigate(entry));
waitUntilNavigatedFrom(() => topFrame ? topFrame.navigate(entry) : frame.topmost().navigate(entry));
return page;
}

export function goBack() {
waitUntilNavigatedFrom(() => frame.topmost().goBack());
export function goBack(topFrame?: frame.Frame) {
waitUntilNavigatedFrom(() => topFrame ? topFrame.goBack() : frame.topmost().goBack());
}

export function assertAreClose(actual: number, expected: number, message: string): void {
Expand Down
Loading