javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(page): frame getter for custom Frames (#9195)

Browse Source
This commit is contained in:
Igor Randjelovic
2021-02-04 16:55:16 +01:00
committed by GitHub
parent 87418cdb11
commit 6da7d90e25
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/ui/frame/frame-common.ts
View File

@@ -10,6 +10,7 @@ import { getAncestor } from '../core/view-base';
import { Builder } from '../builder'; import { Builder } from '../builder';
import { sanitizeModuleName } from '../builder/module-name-sanitizer'; import { sanitizeModuleName } from '../builder/module-name-sanitizer';
import { profile } from '../../profiling'; import { profile } from '../../profiling';
import { FRAME_SYMBOL } from './frame-helpers';
export { NavigationType } from './frame-interfaces'; export { NavigationType } from './frame-interfaces';
export type { AndroidActivityCallbacks, AndroidFragmentCallbacks, AndroidFrame, BackstackEntry, NavigationContext, NavigationEntry, NavigationTransition, TransitionState, ViewEntry, iOSFrame } from './frame-interfaces'; export type { AndroidActivityCallbacks, AndroidFragmentCallbacks, AndroidFrame, BackstackEntry, NavigationContext, NavigationEntry, NavigationTransition, TransitionState, ViewEntry, iOSFrame } from './frame-interfaces';
@@ -700,6 +701,9 @@ export class FrameBase extends CustomLayoutView {
} }
} }
// Mark as a Frame with an unique Symbol
FrameBase.prototype[FRAME_SYMBOL] = true;
export function getFrameById(id: string): FrameBase { export function getFrameById(id: string): FrameBase {
console.log('getFrameById() is deprecated. Use Frame.getFrameById() instead.'); console.log('getFrameById() is deprecated. Use Frame.getFrameById() instead.');

19
packages/core/ui/frame/frame-helpers.ts Normal file
View File

@@ -0,0 +1,19 @@
/**
* Unique symbol to mark Frame instances.
*
* We use a symbol because in some cases importing the Frame to do
* instanceof checks introduces circular references.
*
* Having the symbol in it's own file prevents any potential circular
* references and allows checking if an object is a frame
*/
export const FRAME_SYMBOL = Symbol('FRAME_SYMBOL');
/**
* Helper to determine if the passed object is a Frame
*
* @param object
*/
export function isFrame(object: any) {
return object && object[FRAME_SYMBOL] === true;
}

5
packages/core/ui/page/page-common.ts
View File

@@ -7,6 +7,7 @@ import { Style } from '../styling/style';
import { Color } from '../../color'; import { Color } from '../../color';
import { EventData } from '../../data/observable'; import { EventData } from '../../data/observable';
import type { Frame } from '../frame'; import type { Frame } from '../frame';
import { isFrame } from '../frame/frame-helpers';
import { ActionBar } from '../action-bar'; import { ActionBar } from '../action-bar';
import { KeyframeAnimationInfo } from '../animation/keyframe-animation'; import { KeyframeAnimationInfo } from '../animation/keyframe-animation';
import { profile } from '../../profiling'; import { profile } from '../../profiling';
@@ -92,9 +93,9 @@ export class PageBase extends ContentView {
} }
get frame(): Frame { get frame(): Frame {
const frame = this.parent; const parent = this.parent;
return frame && frame.constructor.name === 'Frame' ? (frame as Frame) : undefined; return isFrame(parent) ? (parent as Frame) : undefined;
} }
private createNavigatedData(eventName: string, isBackNavigation: boolean): NavigatedData { private createNavigatedData(eventName: string, isBackNavigation: boolean): NavigatedData {