Merge pull request #2 from petergp/fix/scrollview-offset

indragiek · web-flow · commit d66c4e091502 · 2019-05-03T13:00:22.000-06:00
Frame for subviews of UIScrollView
diff --git a/InAppViewDebugger/ViewElement.swift b/InAppViewDebugger/ViewElement.swift
@@ -23,7 +23,8 @@ import UIKit
     }
     
     public var frame: CGRect {
-        return view?.frame ?? .zero
+        let offset = contentOffsetForView(view)
+        return view?.frame.offsetBy(dx: offset.x, dy: offset.y) ?? .zero
     }
     
     public var isHidden: Bool {
@@ -155,3 +156,9 @@ fileprivate func snapshotView(_ view: UIView) -> CGImage? {
     }
     return image
 }
+
+fileprivate func contentOffsetForView(_ view: UIView?) -> CGPoint {
+    guard let scrollView = view?.superview as? UIScrollView else { return .zero }
+    let contentOffset = scrollView.contentOffset
+    return CGPoint(x: -contentOffset.x, y: -contentOffset.y)
+}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ import UIKit`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public var frame: CGRect {`
`26`		`- return view?.frame ?? .zero`
	`26`	`+ let offset = contentOffsetForView(view)`
	`27`	`+ return view?.frame.offsetBy(dx: offset.x, dy: offset.y) ?? .zero`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public var isHidden: Bool {`
`@@ -155,3 +156,9 @@ fileprivate func snapshotView(_ view: UIView) -> CGImage? {`
`155`	`156`	`}`
`156`	`157`	`return image`
`157`	`158`	`}`
	`159`	`+`
	`160`	`+fileprivate func contentOffsetForView(_ view: UIView?) -> CGPoint {`
	`161`	`+ guard let scrollView = view?.superview as? UIScrollView else { return .zero }`
	`162`	`+ let contentOffset = scrollView.contentOffset`
	`163`	`+ return CGPoint(x: -contentOffset.x, y: -contentOffset.y)`
	`164`	`+}`