-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat(tab): add support for no tabstrip #7580
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.
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cb44472
feat(tab): add support for no tabstrip
MartoYankov 5526231
chore: fix typo
MartoYankov 6fb15db
wip: rework init lifecycles
MartoYankov 98a711d
Merge branch 'master' into myankov/no-tabstrip
dtopuzov 3ea161f
fix: incorrect top tab bar coordinates
MartoYankov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
e2e/ui-tests-app/app/bottom-navigation/custom-tabstrip-page.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| .custom-tabstrip { | ||
| height: 100; | ||
| vertical-align: bottom; | ||
| ios-overflow-safe-area-enabled: false; | ||
| } | ||
|
|
||
| .custom-tabstripitem { | ||
| height: 80; | ||
| width: 80; | ||
| vertical-align: center; | ||
| horizontal-align: center; | ||
| clip-path: circle(100% at 50% 50%); | ||
| } | ||
|
|
||
| .custom-title { | ||
| color: white; | ||
| vertical-align: center; | ||
| horizontal-align: center; | ||
| } | ||
|
|
||
| .skyblue { | ||
| background-color: skyblue; | ||
| } | ||
|
|
||
| .gold { | ||
| background-color: gold; | ||
| } | ||
|
|
||
| .olive { | ||
| background-color: olive; | ||
| } |
24 changes: 24 additions & 0 deletions
24
e2e/ui-tests-app/app/bottom-navigation/custom-tabstrip-page.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { EventData } from "tns-core-modules/data/observable"; | ||
| import { Page } from "tns-core-modules/ui/page"; | ||
| import { BottomNavigation } from "tns-core-modules/ui/bottom-navigation"; | ||
|
|
||
| export function goToFirst(args: EventData) { | ||
| const page = <Page>(<any>args.object).page; | ||
| const bottomNav = <BottomNavigation>page.getViewById("bottomNav"); | ||
|
|
||
| bottomNav.selectedIndex = 0; | ||
| } | ||
|
|
||
| export function goToSecond(args: EventData) { | ||
| const page = <Page>(<any>args.object).page; | ||
| const bottomNav = <BottomNavigation>page.getViewById("bottomNav"); | ||
|
|
||
| bottomNav.selectedIndex = 1; | ||
| } | ||
|
|
||
| export function goToThird(args: EventData) { | ||
| const page = <Page>(<any>args.object).page; | ||
| const bottomNav = <BottomNavigation>page.getViewById("bottomNav"); | ||
|
|
||
| bottomNav.selectedIndex = 2; | ||
| } |
41 changes: 41 additions & 0 deletions
41
e2e/ui-tests-app/app/bottom-navigation/custom-tabstrip-page.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Page> | ||
|
|
||
| <ActionBar title="BottomNavigation Custom TabStrip" icon="" class="action-bar"> | ||
| </ActionBar> | ||
|
|
||
| <GridLayout> | ||
| <GridLayout> | ||
| <BottomNavigation id="bottomNav" automationText="tabNavigation" > | ||
| <TabContentItem> | ||
| <GridLayout backgroundColor="skyblue"> | ||
| <Label text="First View"/> | ||
| </GridLayout> | ||
| </TabContentItem> | ||
| <TabContentItem> | ||
| <GridLayout backgroundColor="gold"> | ||
| <Label text="Second View"/> | ||
| </GridLayout> | ||
| </TabContentItem> | ||
| <TabContentItem> | ||
| <GridLayout backgroundColor="olive"> | ||
| <Label text="Third View"/> | ||
| </GridLayout> | ||
| </TabContentItem> | ||
| </BottomNavigation> | ||
| </GridLayout> | ||
|
|
||
| <GridLayout columns="*, *, *" class="custom-tabstrip"> | ||
| <GridLayout automationText="first-tab" col="0" class="custom-tabstripitem skyblue" tap="goToFirst"> | ||
| <Label text="First" class="custom-title"></Label> | ||
| </GridLayout> | ||
|
|
||
| <GridLayout automationText="second-tab" col="1" class="custom-tabstripitem gold" tap="goToSecond"> | ||
| <Label text="Second" class="custom-title"></Label> | ||
| </GridLayout> | ||
|
|
||
| <GridLayout automationText="third-tab" col="2" class="custom-tabstripitem olive" tap="goToThird"> | ||
| <Label text="Third" class="custom-title"></Label> | ||
| </GridLayout> | ||
| </GridLayout> | ||
| </GridLayout> | ||
| </Page> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| .custom-tabstrip { | ||
| height: 100; | ||
| vertical-align: bottom; | ||
| ios-overflow-safe-area-enabled: false; | ||
| } | ||
|
|
||
| .custom-tabstripitem { | ||
| height: 80; | ||
| width: 80; | ||
| vertical-align: center; | ||
| horizontal-align: center; | ||
| clip-path: circle(100% at 50% 50%); | ||
| } | ||
|
|
||
| .custom-title { | ||
| color: white; | ||
| vertical-align: center; | ||
| horizontal-align: center; | ||
| } | ||
|
|
||
| .skyblue { | ||
| background-color: skyblue; | ||
| } | ||
|
|
||
| .gold { | ||
| background-color: gold; | ||
| } | ||
|
|
||
| .olive { | ||
| background-color: olive; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { EventData } from "tns-core-modules/data/observable"; | ||
| import { Page } from "tns-core-modules/ui/page"; | ||
| import { Tabs } from "tns-core-modules/ui/tabs"; | ||
|
|
||
| export function goToFirst(args: EventData) { | ||
| const page = <Page>(<any>args.object).page; | ||
| const bottomNav = <Tabs>page.getViewById("tabsNav"); | ||
|
|
||
| bottomNav.selectedIndex = 0; | ||
| } | ||
|
|
||
| export function goToSecond(args: EventData) { | ||
| const page = <Page>(<any>args.object).page; | ||
| const bottomNav = <Tabs>page.getViewById("tabsNav"); | ||
|
|
||
| bottomNav.selectedIndex = 1; | ||
| } | ||
|
|
||
| export function goToThird(args: EventData) { | ||
| const page = <Page>(<any>args.object).page; | ||
| const bottomNav = <Tabs>page.getViewById("tabsNav"); | ||
|
|
||
| bottomNav.selectedIndex = 2; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Page> | ||
|
|
||
| <ActionBar title="Tabs Custom TabStrip" icon="" class="action-bar"> | ||
| </ActionBar> | ||
|
|
||
| <GridLayout> | ||
| <GridLayout> | ||
| <Tabs id="tabsNav" automationText="tabNavigation" > | ||
| <TabContentItem> | ||
| <GridLayout backgroundColor="skyblue"> | ||
| <Label text="First View"/> | ||
| </GridLayout> | ||
| </TabContentItem> | ||
| <TabContentItem> | ||
| <GridLayout backgroundColor="gold"> | ||
| <Label text="Second View"/> | ||
| </GridLayout> | ||
| </TabContentItem> | ||
| <TabContentItem> | ||
| <GridLayout backgroundColor="olive"> | ||
| <Label text="Third View"/> | ||
| </GridLayout> | ||
| </TabContentItem> | ||
| </Tabs> | ||
| </GridLayout> | ||
|
|
||
| <GridLayout columns="*, *, *" class="custom-tabstrip"> | ||
| <GridLayout automationText="first-tab" col="0" class="custom-tabstripitem skyblue" tap="goToFirst"> | ||
| <Label text="First" class="custom-title"></Label> | ||
| </GridLayout> | ||
|
|
||
| <GridLayout automationText="second-tab" col="1" class="custom-tabstripitem gold" tap="goToSecond"> | ||
| <Label text="Second" class="custom-title"></Label> | ||
| </GridLayout> | ||
|
|
||
| <GridLayout automationText="third-tab" col="2" class="custom-tabstripitem olive" tap="goToThird"> | ||
| <Label text="Third" class="custom-title"></Label> | ||
| </GridLayout> | ||
| </GridLayout> | ||
| </GridLayout> | ||
| </Page> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.