Commit f9c61e3

committed

refactor: deprecated topmost() usage

1 parent c22d44e commit f9c61e3Copy full SHA for f9c61e3

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import { AppHostView } from "../app-host-view";`
`17`	`17`	`import { DetachedLoader } from "../common/detached-loader";`
`18`	`18`	`import { PageFactory, PAGE_FACTORY } from "../platform-providers";`
`19`	`19`	`import { once } from "../common/utils";`
`20`		`-import { topmost,Frame } from "tns-core-modules/ui/frame";`
	`20`	`+import { Frame } from "tns-core-modules/ui/frame";`
`21`	`21`	`import { ShowModalOptions } from "tns-core-modules/ui/core/view";`
`22`	`22`
`23`	`23`	`export type BaseShowModalOptions = Pick<ShowModalOptions, Exclude<keyof ShowModalOptions, "closeCallback" \| "context">>;`
`@@ -86,7 +86,7 @@ export class ModalDialogService {`
`86`	`86`
`87`	`87`	`let frame = parentView;`
`88`	`88`	`if (!(parentView instanceof Frame)) {`
`89`		`- frame = (parentView.page && parentView.page.frame) \|\| topmost();`
	`89`	`+ frame = (parentView.page && parentView.page.frame) \|\| Frame.topmost();`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`this.location._beginModalNavigation(frame);`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { InjectionToken, Injectable } from "@angular/core";`
`2`	`2`
`3`		`-import { topmost,Frame } from "tns-core-modules/ui/frame";`
	`3`	`+import { Frame } from "tns-core-modules/ui/frame";`
`4`	`4`	`import { View } from "tns-core-modules/ui/core/view";`
`5`	`5`	`import { Page } from "tns-core-modules/ui/page";`
`6`	`6`	`import { device, Device } from "tns-core-modules/platform";`
`@@ -26,7 +26,7 @@ export function getDefaultPage(): Page {`
`26`	`26`	`return rootPage;`
`27`	`27`	`}`
`28`	`28`
`29`		`- const frame = topmost();`
	`29`	`+ const frame = Frame.topmost();`
`30`	`30`	`if (frame && frame.currentPage) {`
`31`	`31`	`return frame.currentPage;`
`32`	`32`	`}`
`@@ -38,7 +38,7 @@ export const defaultPageProvider = { provide: Page, useFactory: getDefaultPage }`
`38`	`38`
`39`	`39`	`// Use an exported function to make the AoT compiler happy.`
`40`	`40`	`export function getDefaultFrame(): Frame {`
`41`		`- return topmost();`
	`41`	`+ return Frame.topmost();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`export const defaultFrameProvider = { provide: Frame, useFactory: getDefaultFrame };`
`@@ -67,7 +67,7 @@ export const defaultPageFactoryProvider = { provide: PAGE_FACTORY, useValue: def`
`67`	`67`	`export class FrameService {`
`68`	`68`	`// TODO: Add any methods that are needed to handle frame/page navigation`
`69`	`69`	`getFrame(): Frame {`
`70`		`- let topmostFrame = topmost();`
	`70`	`+ let topmostFrame = Frame.topmost();`
`71`	`71`	`return topmostFrame;`
`72`	`72`	`}`
`73`	`73`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ export class NSLocationStrategy extends LocationStrategy {`
`411`	`411`	`this._modalNavigationDepth--;`
`412`	`412`	`}`
`413`	`413`
`414`		`- // currentOutlet should be the one that corresponds to the topmost() frame`
	`414`	`+ // currentOutlet should be the one that corresponds to the topmost frame`
`415`	`415`	`const topmostOutlet = this.getOutletByFrame(this.frameService.getFrame());`
`416`	`416`	`const outlet = this.findOutletByModal(this._modalNavigationDepth, isShowingModal) \|\| topmostOutlet;`
`417`	`417`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`import { View } from "tns-core-modules/ui/core/view";`
`3`		`-import { topmost } from "tns-core-modules/ui/frame";`
	`3`	`+import { Frame } from "tns-core-modules/ui/frame";`
`4`	`4`	`import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";`
`5`	`5`	`import { ComponentFixture, TestBed } from "@angular/core/testing";`
`6`	`6`	`import { NgModule, Type } from "@angular/core";`
`@@ -17,7 +17,7 @@ const TESTING_ROOT_ID = "__testing_container";`
`17`	`17`	`* Get a reference to the fixtures container.`
`18`	`18`	`*/`
`19`	`19`	`export function testingRootView(): LayoutBase {`
`20`		`- const rootPageLayout = topmost().currentPage.content as LayoutBase;`
	`20`	`+ const rootPageLayout = Frame.topmost().currentPage.content as LayoutBase;`
`21`	`21`
`22`	`22`	`let testingRoot: LayoutBase;`
`23`	`23`	`rootPageLayout.eachChild(child => {`

Comments

(0)