Skip to content
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

Always remove child view controller from DescribedViewController #115

Merged
merged 2 commits into from
Jan 8, 2022
Merged

Always remove child view controller from DescribedViewController #115

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
9c436e0
Always remove child view controller
Jan 7, 2022
6299332
Add and fix tests
Jan 8, 2022
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
18 changes: 10 additions & 8 deletions WorkflowUI/Sources/ViewControllerDescription/DescribedViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,21 @@
if description.canUpdate(viewController: currentViewController) {
description.update(viewController: currentViewController)
} else {
if isViewLoaded {
currentViewController.willMove(toParent: nil)
currentViewController.view.removeFromSuperview()
currentViewController.removeFromParent()
}
currentViewController.willMove(toParent: nil)
currentViewController.viewIfLoaded?.removeFromSuperview()
currentViewController.removeFromParent()

currentViewController = description.buildViewController()

addChild(currentViewController)

if isViewLoaded {
addChild(currentViewController)
view.addSubview(currentViewController.view)
currentViewController.view.frame = view.bounds
currentViewController.didMove(toParent: self)
view.addSubview(currentViewController.view)
updatePreferredContentSizeIfNeeded()
}

currentViewController.didMove(toParent: self)
}
}

Expand Down
3 changes: 2 additions & 1 deletion WorkflowUI/Tests/DescribedViewControllerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@

// Then
XCTAssertNotEqual(initialChildViewController, describedViewController.currentViewController)
XCTAssertNil(initialChildViewController.parent)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test validates the fix. It fails on main.

XCTAssertEqual((describedViewController.currentViewController as? MessageViewController)?.message, "Test")
XCTAssertFalse(describedViewController.isViewLoaded)
XCTAssertFalse(describedViewController.currentViewController.isViewLoaded)
XCTAssertNil(describedViewController.currentViewController.parent)
XCTAssertEqual(describedViewController.currentViewController.parent, describedViewController)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually do want this child-parent relationship set up, which is also fixed

}

func test_update_toIncompatibleDescription_afterViewLoads() {
Expand Down