Don’t layout if isIncludedInPinLayout is false

stleamist · stleamist · commit 152b8b6775e4 · 2023-03-23T23:45:04.000+09:00
diff --git a/Sources/Impl/PinLayout+Layouting.swift b/Sources/Impl/PinLayout+Layouting.swift
@@ -40,7 +40,7 @@ extension PinLayout {
     }
 
     func apply() {
-        guard !isLayouted else { return }
+        guard !isLayouted && view.isIncludedInPinLayout else { return }
         apply(onView: view)
         isLayouted = true
     }
diff --git a/Sources/PinLayout.swift b/Sources/PinLayout.swift
@@ -78,7 +78,7 @@ public class PinLayout<PinView: Layoutable> {
     }
     
     deinit {
-        if !isLayouted && Pin.logMissingLayoutCalls {
+        if !isLayouted && !view.isIncludedInPinLayout && Pin.logMissingLayoutCalls {
             warn("PinLayout commands have been issued without calling the 'layout()' method to complete the layout. (These warnings can be disabled by setting Pin.logMissingLayoutCalls to false)")
         }
         apply()

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ extension PinLayout {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func apply() {`
`43`		`- guard !isLayouted else { return }`
	`43`	`+ guard !isLayouted && view.isIncludedInPinLayout else { return }`
`44`	`44`	`apply(onView: view)`
`45`	`45`	`isLayouted = true`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public class PinLayout<PinView: Layoutable> {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`deinit {`
`81`		`- if !isLayouted && Pin.logMissingLayoutCalls {`
	`81`	`+ if !isLayouted && !view.isIncludedInPinLayout && Pin.logMissingLayoutCalls {`
`82`	`82`	`warn("PinLayout commands have been issued without calling the 'layout()' method to complete the layout. (These warnings can be disabled by setting Pin.logMissingLayoutCalls to false)")`
`83`	`83`	`}`
`84`	`84`	`apply()`