Skip to content

Commit 9594a0b

Browse files
committed
final fixes
1 parent 3e4d3a7 commit 9594a0b

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

Sources/UIKitBackend/UIKitBackend+SplitView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import UIKit
88
private let sidebarContainer: ContainerWidget
99
private let mainContainer: ContainerWidget
1010

11-
init(sidebarWidget: any WidgetProtocol, mainWidget: any WidgetProtocol) {
11+
init(sidebarWidget: some WidgetProtocol, mainWidget: some WidgetProtocol) {
1212
// UISplitViewController requires its children to be controllers, not views
1313
sidebarContainer = ContainerWidget(child: sidebarWidget)
1414
mainContainer = ContainerWidget(child: mainWidget)

Sources/UIKitBackend/UIViewControllerRepresentable.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,24 @@ final class ControllerRepresentingWidget<Representable: UIViewControllerRepresen
148148
var representable: Representable
149149
var context: UIViewControllerRepresentableContext<Representable.Coordinator>?
150150

151-
lazy var subcontroller: Representable.UIViewControllerType =
152-
{
153-
let subcontroller = representable.makeUIViewController(context: context!)
154-
155-
view.addSubview(subcontroller.view)
156-
addChild(subcontroller)
157-
subcontroller.didMove(toParent: self)
158-
159-
subcontroller.view.translatesAutoresizingMaskIntoConstraints = false
160-
NSLayoutConstraint.activate([
161-
subcontroller.view.topAnchor.constraint(equalTo: view.topAnchor),
162-
subcontroller.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
163-
subcontroller.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
164-
subcontroller.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
165-
])
166-
167-
return subcontroller
168-
}()
151+
lazy var subcontroller: Representable.UIViewControllerType = {
152+
let subcontroller = representable.makeUIViewController(context: context!)
153+
154+
view.addSubview(subcontroller.view)
155+
addChild(subcontroller)
156+
157+
subcontroller.view.translatesAutoresizingMaskIntoConstraints = false
158+
NSLayoutConstraint.activate([
159+
subcontroller.view.topAnchor.constraint(equalTo: view.topAnchor),
160+
subcontroller.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
161+
subcontroller.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
162+
subcontroller.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
163+
])
164+
165+
subcontroller.didMove(toParent: self)
166+
167+
return subcontroller
168+
}()
169169

170170
func update(with environment: EnvironmentValues) {
171171
if context == nil {

Sources/UIKitBackend/UIViewRepresentable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func defaultViewSize(proposal: SIMD2<Int>, view: UIView) -> ViewSize {
8181
intrinsicSize.height < 0.0 ? 10 : Int(intrinsicSize.height.rounded(.awayFromZero))
8282
),
8383
minimumWidth: Int(minimumSize.width.rounded(.towardZero)),
84-
minimumHeight: Int(minimumSize.width.rounded(.towardZero)),
84+
minimumHeight: Int(minimumSize.height.rounded(.towardZero)),
8585
maximumWidth: maximumSize.width,
8686
maximumHeight: maximumSize.height
8787
)

0 commit comments

Comments
 (0)