Merge pull request #242 from AndriyGo/master

f3dm76 · web-flow · commit 53b9a5ae0e96 · 2025-04-11T21:43:07.000+07:00
fix: checks if scroll view calculated its height only on iOS
diff --git a/Sources/PopupView/PopupView.swift b/Sources/PopupView/PopupView.swift
@@ -451,10 +451,12 @@ public struct Popup<PopupContent: View>: ViewModifier {
                 }
 
                 .onChange(of: sheetContentRect.size) { sheetContentRect in
+                    #if os(iOS)
                     // check if scrollView has already calculated its height, otherwise sheetContentRect is already non-zero but yet incorrect
                     if case .scroll(_) = type, scrollViewRect.height == 0 {
                         return
                     }
+                    #endif
                     positionIsCalculatedCallback()
                     if shouldShowContent.wrappedValue { // already displayed but the size has changed
                         actualCurrentOffset = targetCurrentOffset

Original file line number	Diff line number	Diff line change
`@@ -451,10 +451,12 @@ public struct Popup<PopupContent: View>: ViewModifier {`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`.onChange(of: sheetContentRect.size) { sheetContentRect in`
	`454`	`+ #if os(iOS)`
`454`	`455`	`// check if scrollView has already calculated its height, otherwise sheetContentRect is already non-zero but yet incorrect`
`455`	`456`	`if case .scroll(_) = type, scrollViewRect.height == 0 {`
`456`	`457`	`return`
`457`	`458`	`}`
	`459`	`+ #endif`
`458`	`460`	`positionIsCalculatedCallback()`
`459`	`461`	`if shouldShowContent.wrappedValue { // already displayed but the size has changed`
`460`	`462`	`actualCurrentOffset = targetCurrentOffset`