Skip to content

Fix navigate back type #663

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
merged 4 commits into from
Jun 6, 2020
Merged

Fix navigate back type #663

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b20d68a
fix: adding backstackentry to navigateback type
ebsi-bblake Jun 5, 2020
2f67d60
fix: adding backstackentry to navigateback type
ebsi-bblake Jun 5, 2020
417880d
fix: adding backstackentry to navigateback type
ebsi-bblake Jun 5, 2020
c50426b
fix: argument order
rigor789 Jun 6, 2020
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
20 changes: 15 additions & 5 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { Page, NavigationEntry } from 'tns-core-modules/ui/frame/frame'
import {
Page,
NavigationEntry,
BackstackEntry,
} from 'tns-core-modules/ui/frame/frame'
import { ItemEventData } from 'tns-core-modules/ui/list-view'
import { View } from 'tns-core-modules/ui/core/view'
import { ShowModalOptions } from 'tns-core-modules/ui/core/view-base'
Expand All @@ -17,7 +21,12 @@ export type navigateTo = (
component: VueConstructor,
options?: NavigationEntryVue,
cb?: () => Page,
) => Promise<Page>;
) => Promise<Page>

export type navigateBack = (
options?: NavigationEntryVue,
backstackEntry?: BackstackEntry,
) => void

export interface ModalOptions extends Partial<ShowModalOptions> {
target?: any; // optional Vue target to open the modal from
Expand All @@ -29,7 +38,7 @@ export interface NativeScriptVue<V = View> extends Vue {
nativeView: V

$navigateTo: navigateTo
$navigateBack: () => void
$navigateBack: navigateBack

$modal?: { close: (data?: any) => Promise<typeof data> };

Expand All @@ -47,9 +56,10 @@ export interface NativeScriptVue<V = View> extends Vue {
$start: () => void
}

export interface NativeScriptVueConstructor extends VueConstructor<NativeScriptVue> {
export interface NativeScriptVueConstructor extends VueConstructor<NativeScriptVue>
{
navigateTo: navigateTo
navigateBack: () => void
navigateBack: navigateBack
/**
* Registers NativeScript Plugin.
* @param elementName Name of the element to use in your template
Expand Down