Skip to content

Fix bugs related to view controller containment #108

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
merged 3 commits into from
Dec 10, 2021
Merged

Fix bugs related to view controller containment #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfc4695
Fix bugs related to view controller containment
n8chur Dec 8, 2021
298a7a7
Add child workflows init container initializers
n8chur Dec 9, 2021
6aca0a6
Fix failing test
n8chur Dec 10, 2021
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
34 changes: 32 additions & 2 deletions WorkflowUI/Sources/Container/ContainerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@

super.init(nibName: nil, bundle: nil)

addChild(rootViewController)
rootViewController.didMove(toParent: self)

workflowHost
.rendering
.signal
Expand Down Expand Up @@ -75,9 +78,9 @@

view.backgroundColor = .white

addChild(rootViewController)
view.addSubview(rootViewController.view)
rootViewController.didMove(toParent: self)

updatePreferredContentSizeIfNeeded()
}

override public func viewDidLayoutSubviews() {
Expand All @@ -104,6 +107,33 @@
override public var supportedInterfaceOrientations: UIInterfaceOrientationMask {
return rootViewController.supportedInterfaceOrientations
}

override public var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
return rootViewController.preferredStatusBarUpdateAnimation
}

@available(iOS 14.0, *)
override public var childViewControllerForPointerLock: UIViewController? {
return rootViewController
}

override public func preferredContentSizeDidChange(
forChildContentContainer container: UIContentContainer
) {
super.preferredContentSizeDidChange(forChildContentContainer: container)

guard container === rootViewController else { return }

updatePreferredContentSizeIfNeeded()
}

private func updatePreferredContentSizeIfNeeded() {
let newPreferredContentSize = rootViewController.preferredContentSize

guard newPreferredContentSize != preferredContentSize else { return }

preferredContentSize = newPreferredContentSize
}
}

/// Wrapper around an AnyWorkflow that allows us to have a concrete
Expand Down
38 changes: 28 additions & 10 deletions WorkflowUI/Sources/ViewControllerDescription/DescribedViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
public init(description: ViewControllerDescription) {
self.currentViewController = description.buildViewController()
super.init(nibName: nil, bundle: nil)

addChild(currentViewController)
currentViewController.didMove(toParent: self)
}

public convenience init<S: Screen>(screen: S, environment: ViewEnvironment) {
Expand All @@ -50,7 +53,7 @@
view.addSubview(currentViewController.view)
currentViewController.view.frame = view.bounds
currentViewController.didMove(toParent: self)
preferredContentSize = currentViewController.preferredContentSize
updatePreferredContentSizeIfNeeded()
}
}
}
Expand All @@ -62,10 +65,9 @@
override public func viewDidLoad() {
super.viewDidLoad()

addChild(currentViewController)
view.addSubview(currentViewController.view)
currentViewController.didMove(toParent: self)
preferredContentSize = currentViewController.preferredContentSize

updatePreferredContentSizeIfNeeded()
}

override public func viewDidLayoutSubviews() {
Expand Down Expand Up @@ -93,15 +95,31 @@
return currentViewController.supportedInterfaceOrientations
}

override public func preferredContentSizeDidChange(forChildContentContainer container: UIContentContainer) {
override public var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
return currentViewController.preferredStatusBarUpdateAnimation
}

@available(iOS 14.0, *)
override public var childViewControllerForPointerLock: UIViewController? {
return currentViewController
}

override public func preferredContentSizeDidChange(
forChildContentContainer container: UIContentContainer
) {
super.preferredContentSizeDidChange(forChildContentContainer: container)

guard
(container as? UIViewController) == currentViewController,
container.preferredContentSize != preferredContentSize
else { return }
guard container === currentViewController else { return }

updatePreferredContentSizeIfNeeded()
}

private func updatePreferredContentSizeIfNeeded() {
let newPreferredContentSize = currentViewController.preferredContentSize

guard newPreferredContentSize != preferredContentSize else { return }

preferredContentSize = container.preferredContentSize
preferredContentSize = newPreferredContentSize
}
}

Expand Down
4 changes: 2 additions & 2 deletions WorkflowUI/Tests/DescribedViewControllerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
XCTAssertEqual(currentViewController.count, 0)
XCTAssertFalse(describedViewController.isViewLoaded)
XCTAssertFalse(currentViewController.isViewLoaded)
XCTAssertNil(currentViewController.parent)
XCTAssertEqual(currentViewController.parent, describedViewController)
}

func test_viewDidLoad() {
Expand Down Expand Up @@ -75,7 +75,7 @@
XCTAssertEqual((describedViewController.currentViewController as? CounterViewController)?.count, 1)
XCTAssertFalse(describedViewController.isViewLoaded)
XCTAssertFalse(describedViewController.currentViewController.isViewLoaded)
XCTAssertNil(describedViewController.currentViewController.parent)
XCTAssertEqual(describedViewController.currentViewController.parent, describedViewController)
}

func test_update_toCompatibleDescription_afterViewLoads() {
Expand Down