a

Author: JWI

Sources/UIKitBackend/UIKitBackend+Container.swift

@@ -8,10 +8,10 @@ final class ScrollWidget: ContainerWidget {
     private var childHeightConstraint: NSLayoutConstraint?
 
     private lazy var contentLayoutGuideConstraints: [NSLayoutConstraint] = [
-        scrollView.contentLayoutGuide.leadingAnchor.constraint(equalTo: child.view.leadingAnchor),
-        scrollView.contentLayoutGuide.trailingAnchor.constraint(equalTo: child.view.trailingAnchor),
-        scrollView.contentLayoutGuide.topAnchor.constraint(equalTo: child.view.topAnchor),
-        scrollView.contentLayoutGuide.bottomAnchor.constraint(equalTo: child.view.bottomAnchor),
+        scrollView.leadingAnchor.constraint(equalTo: child.view.leadingAnchor),
+        scrollView.trailingAnchor.constraint(equalTo: child.view.trailingAnchor),
+        scrollView.topAnchor.constraint(equalTo: child.view.topAnchor),
+        scrollView.bottomAnchor.constraint(equalTo: child.view.bottomAnchor),
     ]
 
     override func loadView() {

Sources/UIKitBackend/UIKitBackend+Window.swift

@@ -70,8 +70,8 @@ final class RootViewController: UIViewController {
 
 
         /*NSLayoutConstraint.activate([
-            child.view.widthAnchor.constraint(equalTo: view.safeAreaLayoutGuide.widthAnchor),
-            child.view.heightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.heightAnchor),
+            child.view.widthAnchor.constraint(equalTo: viewAnchor.widthAnchor),
+            child.view.heightAnchor.constraint(equalTo: viewAnchor.heightAnchor),
         ])*/
 
         child.view.frame = view.bounds
@@ -116,7 +116,7 @@ extension UIKitBackend {
 
         //MARK: changed for now, understandably will have to be patched.
         if #available(iOS 11, *) {
-            //let size = window.safeAreaLayoutGuide.layoutFrame.size
+            //let size = windowAnchor.layoutFrame.size
             //return SIMD2(Int(size.width), Int(size.height))
             let size = window.bounds.size
             return SIMD2(Int(size.width), Int(size.height))

Sources/UIKitBackend/Widget.swift

@@ -36,14 +36,14 @@ extension WidgetProtocolHelpers {
         }
 
         if let leftConstraint,
-            leftConstraint.secondAnchor === superview.safeAreaLayoutGuide.leftAnchor
+            leftConstraint.secondAnchor === superview.leftAnchor
         {
             leftConstraint.constant = CGFloat(x)
             leftConstraint.isActive = true
         } else {
             self.leftConstraint?.isActive = false
             let leftConstraint = view.leftAnchor.constraint(
-                equalTo: superview.safeAreaLayoutGuide.leftAnchor, constant: CGFloat(x))
+                equalTo: superview.leftAnchor, constant: CGFloat(x))
             self.leftConstraint = leftConstraint
             // Set the constraint priority for leftConstraint (and topConstraint) to just
             // under "required" so that we don't get warnings about unsatisfiable constraints
@@ -62,14 +62,14 @@ extension WidgetProtocolHelpers {
         }
 
         if let topConstraint,
-            topConstraint.secondAnchor === superview.safeAreaLayoutGuide.topAnchor
+            topConstraint.secondAnchor === superview.topAnchor
         {
             topConstraint.constant = CGFloat(y)
             topConstraint.isActive = true
         } else {
             self.topConstraint?.isActive = false
             let topConstraint = view.topAnchor.constraint(
-                equalTo: superview.safeAreaLayoutGuide.topAnchor, constant: CGFloat(y))
+                equalTo: superview.topAnchor, constant: CGFloat(y))
             self.topConstraint = topConstraint
             topConstraint.priority = .init(UILayoutPriority.required.rawValue - 1.0)
             topConstraint.isActive = true