Skip to content

refactor: deprecated topmost() usage #2029

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
tbozhikov merged 2 commits into from
Oct 23, 2019
Merged

refactor: deprecated topmost() usage #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9c61e3
refactor: deprecated topmost() usage
manoldonev Oct 22, 2019
b44df23
Merge branch 'master' into mdonev/deprecated-api-fix
elena-p Oct 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
4 changes: 2 additions & 2 deletions nativescript-angular/directives/dialogs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { AppHostView } from "../app-host-view";
import { DetachedLoader } from "../common/detached-loader";
import { PageFactory, PAGE_FACTORY } from "../platform-providers";
import { once } from "../common/utils";
import { topmost, Frame } from "tns-core-modules/ui/frame";
import { Frame } from "tns-core-modules/ui/frame";
import { ShowModalOptions } from "tns-core-modules/ui/core/view";

export type BaseShowModalOptions = Pick<ShowModalOptions, Exclude<keyof ShowModalOptions, "closeCallback" | "context">>;
Expand Down Expand Up @@ -86,7 +86,7 @@ export class ModalDialogService {

let frame = parentView;
if (!(parentView instanceof Frame)) {
frame = (parentView.page && parentView.page.frame) || topmost();
frame = (parentView.page && parentView.page.frame) || Frame.topmost();
}

this.location._beginModalNavigation(frame);
Expand Down
8 changes: 4 additions & 4 deletions nativescript-angular/platform-providers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { InjectionToken, Injectable } from "@angular/core";

import { topmost, Frame } from "tns-core-modules/ui/frame";
import { Frame } from "tns-core-modules/ui/frame";
import { View } from "tns-core-modules/ui/core/view";
import { Page } from "tns-core-modules/ui/page";
import { device, Device } from "tns-core-modules/platform";
Expand All @@ -26,7 +26,7 @@ export function getDefaultPage(): Page {
return rootPage;
}

const frame = topmost();
const frame = Frame.topmost();
if (frame && frame.currentPage) {
return frame.currentPage;
}
Expand All @@ -38,7 +38,7 @@ export const defaultPageProvider = { provide: Page, useFactory: getDefaultPage }

// Use an exported function to make the AoT compiler happy.
export function getDefaultFrame(): Frame {
return topmost();
return Frame.topmost();
}

export const defaultFrameProvider = { provide: Frame, useFactory: getDefaultFrame };
Expand Down Expand Up @@ -67,7 +67,7 @@ export const defaultPageFactoryProvider = { provide: PAGE_FACTORY, useValue: def
export class FrameService {
// TODO: Add any methods that are needed to handle frame/page navigation
getFrame(): Frame {
let topmostFrame = topmost();
let topmostFrame = Frame.topmost();
return topmostFrame;
}
}
2 changes: 1 addition & 1 deletion nativescript-angular/router/ns-location-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ export class NSLocationStrategy extends LocationStrategy {
this._modalNavigationDepth--;
}

// currentOutlet should be the one that corresponds to the topmost() frame
// currentOutlet should be the one that corresponds to the topmost frame
const topmostOutlet = this.getOutletByFrame(this.frameService.getFrame());
const outlet = this.findOutletByModal(this._modalNavigationDepth, isShowingModal) || topmostOutlet;

Expand Down
4 changes: 2 additions & 2 deletions nativescript-angular/testing/src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import { View } from "tns-core-modules/ui/core/view";
import { topmost } from "tns-core-modules/ui/frame";
import { Frame } from "tns-core-modules/ui/frame";
import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { NgModule, Type } from "@angular/core";
Expand All @@ -17,7 +17,7 @@ const TESTING_ROOT_ID = "__testing_container";
* Get a reference to the fixtures container.
*/
export function testingRootView(): LayoutBase {
const rootPageLayout = topmost().currentPage.content as LayoutBase;
const rootPageLayout = Frame.topmost().currentPage.content as LayoutBase;

let testingRoot: LayoutBase;
rootPageLayout.eachChild(child => {
Expand Down