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

fix-next(ios): handle nesting in proxyViewContainer ng (#6475)

Browse Source
This commit is contained in:
Martin Yankov
2018-10-30 14:00:00 +02:00
committed by GitHub
parent 95c4ec5a96
commit 58c9d424f5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tns-core-modules/ui/core/view/view.ios.ts
View File

@ -892,9 +892,10 @@ export namespace ios {
let parent = tabView && tabView.parent; let parent = tabView && tabView.parent;
// Handle Angular scenario where TabView is in a ProxyViewContainer // Handle Angular scenario where TabView is in a ProxyViewContainer
// It is possible to wrap components in ProxyViewContainers indefinitely
// Not using instanceof ProxyViewContainer to avoid circular dependency // Not using instanceof ProxyViewContainer to avoid circular dependency
// TODO: Try moving UILayoutViewController out of view module // TODO: Try moving UILayoutViewController out of view module
if (parent && !parent.nativeViewProtected) { while (parent && !parent.nativeViewProtected) {
parent = parent.parent; parent = parent.parent;
} }

3
tns-core-modules/ui/page/page.ios.ts
View File

@ -227,9 +227,10 @@ class UIViewControllerImpl extends UIViewController {
let frameParent = frame && frame.parent; let frameParent = frame && frame.parent;
// Handle Angular scenario where TabView is in a ProxyViewContainer // Handle Angular scenario where TabView is in a ProxyViewContainer
// It is possible to wrap components in ProxyViewContainers indefinitely
// Not using instanceof ProxyViewContainer to avoid circular dependency // Not using instanceof ProxyViewContainer to avoid circular dependency
// TODO: Try moving UIViewControllerImpl out of page module // TODO: Try moving UIViewControllerImpl out of page module
if (frameParent && !frameParent.nativeViewProtected) { while (frameParent && !frameParent.nativeViewProtected) {
frameParent = frameParent.parent; frameParent = frameParent.parent;
} }