javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-release-in-master

Browse Source
This commit is contained in:
vakrilov
2019-12-03 15:51:59 +02:00
parent ab09064345 7b78f3b0c6
commit 6c24650c86
118 changed files with 3073 additions and 1813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
nativescript-core/ui/frame/frame-common.ts
View File

@ -1,23 +1,19 @@
// Definitions.
import { Frame as FrameDefinition, NavigationEntry, BackstackEntry, NavigationTransition } from ".";
import { Page } from "../page";
// Types.
import { getAncestor, viewMatchesModuleContext } from "../core/view/view-common";
import { Frame as FrameDefinition } from ".";
import { BackstackEntry, NavigationContext, NavigationEntry, NavigationTransition, NavigationType } from "./frame-interfaces";
import { Page } from "../page";
import { View, CustomLayoutView, isIOS, isAndroid, traceEnabled, traceWrite, traceCategories, Property, CSSType } from "../core/view";
// Requires.
import { frameStack, topmost as frameStackTopmost, _pushInFrameStack, _popFromFrameStack, _removeFromFrameStack } from "./frame-stack";
import { getAncestor, viewMatchesModuleContext } from "../core/view/view-common";
import { Builder } from "../builder";
import { sanitizeModuleName } from "../builder/module-name-sanitizer";
import { profile } from "../../profiling";
import { frameStack, topmost as frameStackTopmost, _pushInFrameStack, _popFromFrameStack, _removeFromFrameStack } from "./frame-stack";
import { sanitizeModuleName } from "../builder/module-name-sanitizer";
export * from "./frame-interfaces";
export * from "../core/view";
export enum NavigationType {
back,
forward,
replace
}
function buildEntryFromArgs(arg: any): NavigationEntry {
let entry: NavigationEntry;
if (typeof arg === "string") {
@ -35,13 +31,6 @@ function buildEntryFromArgs(arg: any): NavigationEntry {
return entry;
}
export interface NavigationContext {
entry: BackstackEntry;
// TODO: remove isBackNavigation for NativeScript 6.0
isBackNavigation: boolean;
navigationType: NavigationType;
}
@CSSType("Frame")
export class FrameBase extends CustomLayoutView implements FrameDefinition {
public static androidOptionSelectedEvent = "optionSelected";