From 48e7e7af01eed3e2c02b041ebd2d7e745845e4d0 Mon Sep 17 00:00:00 2001 From: John Palacios Date: Fri, 1 Sep 2023 20:54:56 -0600 Subject: [PATCH] Fix dismissal of presentedViewController by other views --- .../View/MCEmojiPickerRepresentableController.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/MCEmojiPicker/View/MCEmojiPickerRepresentableController.swift b/Sources/MCEmojiPicker/View/MCEmojiPickerRepresentableController.swift index 6dcadd5..df186d5 100644 --- a/Sources/MCEmojiPicker/View/MCEmojiPickerRepresentableController.swift +++ b/Sources/MCEmojiPicker/View/MCEmojiPickerRepresentableController.swift @@ -123,10 +123,11 @@ public struct MCEmojiPickerRepresentableController: UIViewControllerRepresentabl context.coordinator.addPickerDismissingObserver() representableController.present(emojiPicker, animated: true) case false: - if representableController.presentedViewController is MCEmojiPickerViewController { + if representableController.presentedViewController is MCEmojiPickerViewController && context.coordinator.isPresented { representableController.presentedViewController?.dismiss(animated: true) } } + context.coordinator.isPresented = isPresented } } @@ -137,6 +138,7 @@ extension MCEmojiPickerRepresentableController { public class Coordinator: NSObject, MCEmojiPickerDelegate { public var isNewEmojiSet = false + public var isPresented = false private var representableController: MCEmojiPickerRepresentableController