Skip to content

feat(TabStrip): add itemTap event #7711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manoldonev merged 4 commits into from
Aug 23, 2019
Merged

feat(TabStrip): add itemTap event #7711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c180598
feat(TabStrip): add itemTap event
vchimev Aug 14, 2019
b82fac6
refactor(tab-strip): rename ItemEventData to TabStripItemEventData
vchimev Aug 22, 2019
0642a0a
Merge branch 'master' into vchimev/item-tap-event
vchimev Aug 23, 2019
05ac5d7
revert: uitestapp to use app._start
manoldonev Aug 23, 2019
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
2 changes: 1 addition & 1 deletion e2e/ui-tests-app/app/app-root.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<Frame defaultPage="main-page" />
<Frame defaultPage="main-page" />
18 changes: 10 additions & 8 deletions e2e/ui-tests-app/app/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ application.on("uncaughtError", args => {
}
});

application.on(application.launchEvent, function(args: application.LaunchEventData) {
application.on(application.launchEvent, function (args: application.LaunchEventData) {
if (args.android) {
// For Android applications, args.android is an android.content.Intent class.
console.log("### Launched application with: " + args.android + ".");
Expand All @@ -34,7 +34,7 @@ application.on(application.launchEvent, function(args: application.LaunchEventDa
}
});

application.on(application.suspendEvent, function(args: application.ApplicationEventData) {
application.on(application.suspendEvent, function (args: application.ApplicationEventData) {
if (args.android) {
// For Android applications, args.android is an android activity class.
console.log("#" + ++countSuspend + "# SuspendEvent Activity: " + args.android);
Expand All @@ -44,7 +44,7 @@ application.on(application.suspendEvent, function(args: application.ApplicationE
}
});

application.on(application.resumeEvent, function(args: application.ApplicationEventData) {
application.on(application.resumeEvent, function (args: application.ApplicationEventData) {
if (args.android) {
// For Android applications, args.android is an android activity class.
console.log("#" + ++countResume + "# ResumeEvent Activity: " + args.android);
Expand All @@ -54,7 +54,7 @@ application.on(application.resumeEvent, function(args: application.ApplicationEv
}
});

application.on(application.exitEvent, function(args: application.ApplicationEventData) {
application.on(application.exitEvent, function (args: application.ApplicationEventData) {
if (args.android) {
// For Android applications, args.android is an android activity class.
console.log("### ExitEvent Activity: " + args.android);
Expand All @@ -64,7 +64,7 @@ application.on(application.exitEvent, function(args: application.ApplicationEven
}
});

application.on(application.lowMemoryEvent, function(args: application.ApplicationEventData) {
application.on(application.lowMemoryEvent, function (args: application.ApplicationEventData) {
if (args.android) {
// For Android applications, args.android is an android activity class.
console.log("### LowMemoryEvent Activity: " + args.android);
Expand All @@ -74,21 +74,23 @@ application.on(application.lowMemoryEvent, function(args: application.Applicatio
}
});

application.on(application.uncaughtErrorEvent, function(args: application.UnhandledErrorEventData) {
application.on(application.uncaughtErrorEvent, function (args: application.UnhandledErrorEventData) {
console.log("### NativeScriptError: " + args.error);
console.log("### nativeException: " + (<any>args.error).nativeException);
console.log("### stackTrace: " + (<any>args.error).stackTrace);
console.log("### stack: " + args.error.stack);
});

application.on(application.discardedErrorEvent, function(args: application.DiscardedErrorEventData) {
application.on(application.discardedErrorEvent, function (args: application.DiscardedErrorEventData) {
console.log("### [Discarded] NativeScriptError: " + args.error);
console.log("### [Discarded] nativeException: " + (<any>args.error).nativeException);
console.log("### [Discarded] stackTrace: " + (<any>args.error).stackTrace);
console.log("### [Discarded] stack: " + args.error.stack);
});

application.setCssFileName("app.css");

application._start({ moduleName: "main-page" });

// TODO: investigate tab-view -> tabviewcss test crash
// TODO: investigate css -> layouts border overlap failure
// application.run({ moduleName: "app-root" });
42 changes: 42 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/events-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { Tabs, SelectedIndexChangedEventData } from "tns-core-modules/ui/tabs";

export function goToFirst(args: EventData) {
console.log("---> goToFirst");
const page = <Page>(<any>args.object).page;
const bottomNav = <Tabs>page.getViewById("bottomNav");
bottomNav.selectedIndex = 0;
}

export function goToSecond(args: EventData) {
console.log("---> goToSecond");
const page = <Page>(<any>args.object).page;
const bottomNav = <Tabs>page.getViewById("bottomNav");
bottomNav.selectedIndex = 1;
}

export function goToThird(args: EventData) {
console.log("---> goToThird");
const page = <Page>(<any>args.object).page;
const bottomNav = <Tabs>page.getViewById("bottomNav");
bottomNav.selectedIndex = 2;
}

export function onSelectedIndexChanged(args: SelectedIndexChangedEventData) {
console.log("---> onSelectedIndexChanged", args.eventName);
console.log("---> oldIndex", args.oldIndex);
console.log("---> newIndex", args.newIndex);
}

export function onFirstTabStripItemTap(args: EventData) {
console.log("---> onFirstTabStripItemTap", args.eventName);
}

export function onSecondTabStripItemTap(args: EventData) {
console.log("---> onSecondTabStripItemTap", args.eventName);
}

export function onThirdTabStripItemTap(args: EventData) {
console.log("---> onThirdTabStripItemTap", args.eventName);
}
36 changes: 36 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/events-page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Page>

<BottomNavigation id="bottomNav" selectedIndexChanged="onSelectedIndexChanged">

<TabStrip>
<TabStripItem title="First" tap="onFirstTabStripItemTap"></TabStripItem>
<TabStripItem tap="onSecondTabStripItemTap">
<Label text="Second" />
</TabStripItem>
<TabStripItem title="First" tap="onThirdTabStripItemTap">
<Label text="Third" />
</TabStripItem>
</TabStrip>

<TabContentItem>
<StackLayout>
<Label text="First View" backgroundColor="red" />
<Button tap="goToSecond" text="go to second" />
</StackLayout>
</TabContentItem>
<TabContentItem>
<StackLayout>
<Label text="Second View" backgroundColor="green" />
<Button tap="goToThird" text="go to thrid" />
</StackLayout>
</TabContentItem>
<TabContentItem>
<StackLayout>
<Label text="First View" backgroundColor="blue" />
<Button tap="goToFirst" text="go to first" />
</StackLayout>
</TabContentItem>

</BottomNavigation>

</Page>
14 changes: 14 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/first-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { EventData } from "tns-core-modules/data/observable";
import { Button } from "tns-core-modules/ui/button/button";

export function goToSecond(args: EventData) {
console.log("---> goToSecond Page");
const button = <Button>args.object;
button.page.frame.navigate("bottom-navigation/second-page");
}

export function goBack(args: EventData) {
console.log("---> goBack");
const button = <Button>args.object;
button.page.frame.goBack();
}
7 changes: 7 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/first-page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Page backgroundColor="lightgreen" actionBarHidden="true">
<StackLayout>
<Label text="First Page" />
<Button tap="goToSecond" text="go to second page" />
<Button tap="goBack" text="go to back" />
</StackLayout>
</Page>
2 changes: 2 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/main-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export function loadExamples() {
examples.set("issue-5470", "bottom-navigation/issue-5470-page");
examples.set("background-color", "bottom-navigation/background-color-page");
examples.set("color", "bottom-navigation/color-page");
examples.set("events", "bottom-navigation/events-page");
examples.set("font", "bottom-navigation/font-page");
examples.set("text-transform", "bottom-navigation/text-transform-page");
examples.set("icon-title-placement", "bottom-navigation/icon-title-placement-page");
Expand All @@ -24,6 +25,7 @@ export function loadExamples() {
examples.set("fancy-fonts", "bottom-navigation/fancy-fonts-page");
examples.set("css-text-transform", "bottom-navigation/bottom-navigation-css-page");
examples.set("custom-tabstrip", "bottom-navigation/custom-tabstrip-page");
examples.set("reselect", "bottom-navigation/reselect-page");

return examples;
}
61 changes: 61 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/reselect-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { EventData } from "tns-core-modules/data/observable";
import { Frame } from "tns-core-modules/ui/frame/frame";
import { Page } from "tns-core-modules/ui/page";
import {
TabStripItemEventData, SelectedIndexChangedEventData, BottomNavigation, TabStrip,
} from "tns-core-modules/ui/bottom-navigation";

export function goToFirst(args: EventData) {
console.log("---> goToFirst");
const page = <Page>(<any>args.object).page;
const bottomNav = <BottomNavigation>page.getViewById("bottomNav");
bottomNav.selectedIndex = 0;
}

export function goToSecond(args: EventData) {
console.log("---> goToSecond");
const page = <Page>(<any>args.object).page;
const bottomNav = <BottomNavigation>page.getViewById("bottomNav");
bottomNav.selectedIndex = 1;
}

export function goToThird(args: EventData) {
console.log("---> goToThird");
const page = <Page>(<any>args.object).page;
const bottomNav = <BottomNavigation>page.getViewById("bottomNav");
bottomNav.selectedIndex = 2;
}

export function onSelectedIndexChanged(args: SelectedIndexChangedEventData) {
console.log("---> onSelectedIndexChanged", args.eventName);
console.log("---> oldIndex", args.oldIndex);
console.log("---> newIndex", args.newIndex);
}

export function onItemTap(args: TabStripItemEventData) {
console.log("---> onItemTap", args.eventName);
console.log("---> onItemTap", args.index);
console.log("---> onItemTap", args.object);

const tabStrip = <TabStrip>args.object;
const page = <Page>tabStrip.page;
const frame = <Frame>page.getViewById("frame");
const bottomNav = <BottomNavigation>page.getViewById("bottomNav");

console.log("---> onItemTap selectedIndex", bottomNav.selectedIndex);
if (bottomNav.selectedIndex === args.index && frame.canGoBack()) {
frame.goBack();
}
}

export function onFirstTabStripItemTap(args: EventData) {
console.log("---> onFirstTabStripItemTap", args.eventName);
}

export function onSecondTabStripItemTap(args: EventData) {
console.log("---> onSecondTabStripItemTap", args.eventName);
}

export function onThirdTabStripItemTap(args: EventData) {
console.log("---> onThirdTabStripItemTap", args.eventName);
}
37 changes: 37 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/reselect-page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<Page>

<BottomNavigation id="bottomNav" selectedIndexChanged="onSelectedIndexChanged">

<TabStrip itemTap="onItemTap">
<TabStripItem title="First" tap="onFirstTabStripItemTap"></TabStripItem>
<TabStripItem tap="onSecondTabStripItemTap">
<Label text="Second" />
</TabStripItem>
<TabStripItem title="First" tap="onThirdTabStripItemTap">
<Label text="Third" />
</TabStripItem>
</TabStrip>

<TabContentItem>
<StackLayout>
<Label text="First View" backgroundColor="red" id="label" />
<Button tap="goToSecond" text="go to second item" id="button" />
<Frame defaultPage="bottom-navigation/first-page" id="frame" />
</StackLayout>
</TabContentItem>
<TabContentItem>
<StackLayout>
<Label text="Second Content Item" backgroundColor="lightgreen" />
<Button tap="goToThird" text="go to thrid item" />
</StackLayout>
</TabContentItem>
<TabContentItem>
<StackLayout>
<Label text="First Content Item" backgroundColor="lightblue" />
<Button tap="goToFirst" text="go to first item" />
</StackLayout>
</TabContentItem>

</BottomNavigation>

</Page>
14 changes: 14 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/second-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { EventData } from "tns-core-modules/data/observable";
import { Button } from "tns-core-modules/ui/button/button";

export function goToFirst(args: EventData) {
console.log("---> goToFirst Page");
const button = <Button>args.object;
button.page.frame.navigate("bottom-navigation/first-page");
}

export function goBack(args: EventData) {
console.log("---> goBack");
const button = <Button>args.object;
button.page.frame.goBack();
}
7 changes: 7 additions & 0 deletions e2e/ui-tests-app/app/bottom-navigation/second-page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Page backgroundColor="lightblue" actionBarHidden="true">
<StackLayout>
<Label text="Second Page" />
<Button tap="goToFirst" text="go to first page" />
<Button tap="goBack" text="go back" />
</StackLayout>
</Page>
2 changes: 1 addition & 1 deletion e2e/ui-tests-app/app/tabs/default-page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@
<Label text="Second Tab" />
</TabStripItem>
</BottomNavigationBar> -->
</Page>
</Page>
42 changes: 42 additions & 0 deletions e2e/ui-tests-app/app/tabs/events-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { Tabs, SelectedIndexChangedEventData } from "tns-core-modules/ui/tabs";

export function goToFirst(args: EventData) {
console.log("---> goToFirst");
const page = <Page>(<any>args.object).page;
const tabsNav = <Tabs>page.getViewById("tabsNav");
tabsNav.selectedIndex = 0;
}

export function goToSecond(args: EventData) {
console.log("---> goToSecond");
const page = <Page>(<any>args.object).page;
const tabsNav = <Tabs>page.getViewById("tabsNav");
tabsNav.selectedIndex = 1;
}

export function goToThird(args: EventData) {
console.log("---> goToThird");
const page = <Page>(<any>args.object).page;
const tabsNav = <Tabs>page.getViewById("tabsNav");
tabsNav.selectedIndex = 2;
}

export function onSelectedIndexChanged(args: SelectedIndexChangedEventData) {
console.log("---> onSelectedIndexChanged", args.eventName);
console.log("---> oldIndex", args.oldIndex);
console.log("---> newIndex", args.newIndex);
}

export function onFirstTabStripItemTap(args: EventData) {
console.log("---> onFirstTabStripItemTap", args.eventName);
}

export function onSecondTabStripItemTap(args: EventData) {
console.log("---> onSecondTabStripItemTap", args.eventName);
}

export function onThirdTabStripItemTap(args: EventData) {
console.log("---> onThirdTabStripItemTap", args.eventName);
}
Loading