Prevent updating layout while presenting/dismissing

kennic · Dec 3, 2020 · 38499ce · 38499ce
1 parent 2b03950
commit 38499ce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/NKModalPresenter.podspec b/NKModalPresenter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'NKModalPresenter'
-  s.version          = '1.5.5'
+  s.version          = '1.5.6'
   s.summary          = 'Present UIViewController modally'
   s.description      = <<-DESC
 Present UIViewController modally easily and beautifully with animation.

diff --git a/NKModalPresenter/NKModalController.swift b/NKModalPresenter/NKModalController.swift
@@ -450,17 +450,32 @@ public class NKModalController: NKModalContainerViewController {
 	}
 
 	public func updatePosition(_ position: NKModalPresentPosition, duration: TimeInterval? = nil, completion: (() -> Void)? = nil) {
+		guard targetPosition != position else { return }
 		targetPosition = position
-		updateLayout(duration: duration, completion: completion)
+
+		contentSize = getContentSize()
+		layoutView(duration: duration, completion: completion)
 	}
 
 	public func updateLayout(duration: TimeInterval? = nil, completion: (() -> Void)? = nil) {
-		contentSize = getContentSize()
+		guard !isDismissing else { return }
+
+		let newContentSize = getContentSize()
+		guard contentSize != newContentSize else { return }
+		guard !isPresenting else {
+			DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+				self.updateLayout(duration: duration, completion: completion)
+			}
+			return
+		}
+
+		contentSize = newContentSize
 		layoutView(duration: duration, completion: completion)
 	}
 
 	private func layoutView(duration: TimeInterval? = nil, completion: (() -> Void)? = nil) {
 		guard contentViewController != nil else { return }
+		guard !isDismissing else { return }
 
 		let cornerRadius = delegate?.cornerRadius(modalController: self) ?? self.cornerRadius
 		containerView.clipsToBounds = cornerRadius > 0