Skip to content

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

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
MartoYankov merged 1 commit into from
Oct 30, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion tns-core-modules/ui/core/view/view.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,9 +892,10 @@ export namespace ios {
let parent = tabView && tabView.parent;

// 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
// TODO: Try moving UILayoutViewController out of view module
if (parent && !parent.nativeViewProtected) {
while (parent && !parent.nativeViewProtected) {
parent = parent.parent;
}

Expand Down
3 changes: 2 additions & 1 deletion tns-core-modules/ui/page/page.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,10 @@ class UIViewControllerImpl extends UIViewController {
let frameParent = frame && frame.parent;

// 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
// TODO: Try moving UIViewControllerImpl out of page module
if (frameParent && !frameParent.nativeViewProtected) {
while (frameParent && !frameParent.nativeViewProtected) {
frameParent = frameParent.parent;
}

Expand Down