Merge pull request shaps80#63 from roland-schmitz-ocu/issue_62_endles…

…s-recursion Fix endless recursion by avoiding to link _delegates more than once
hguandl · Sep 15, 2023 · d9c284e · d9c284e
2 parents 1cd2760 + 8bdf039
commit d9c284e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/shaps80/SwiftBackports",
       "state" : {
-        "revision" : "fafbeabf78b7e364abbbb7565cdfeee42af16211",
-        "version" : "1.0.2"
+        "revision" : "ddca6a237c1ba2291d5a3cc47ec8480ce6e9f805",
+        "version" : "1.0.3"
       }
     }
   ],

diff --git a/Sources/SwiftUIBackports/iOS/FocusState/ViewFocused.swift b/Sources/SwiftUIBackports/iOS/FocusState/ViewFocused.swift
@@ -60,7 +60,7 @@ private final class Coordinator: NSObject, ObservableObject, UITextFieldDelegate
     func observe(field: UITextField) {
         self.field = field
 
-        if field.delegate !== self {
+        if field.delegate !== self && _delegate == nil {
             _delegate = field.delegate
             field.delegate = self
         }

diff --git a/Sources/SwiftUIBackports/iOS/Presentation/Detents.swift b/Sources/SwiftUIBackports/iOS/Presentation/Detents.swift
@@ -169,7 +169,7 @@ private extension Backport.Representable {
         override func willMove(toParent parent: UIViewController?) {
             super.willMove(toParent: parent)
             if let controller = parent?.sheetPresentationController {
-                if controller.delegate !== self {
+                if controller.delegate !== self && _delegate == nil {
                     _delegate = controller.delegate
                     controller.delegate = self
                 }

diff --git a/Sources/SwiftUIBackports/iOS/Presentation/InteractiveDismiss.swift b/Sources/SwiftUIBackports/iOS/Presentation/InteractiveDismiss.swift
@@ -194,7 +194,7 @@ private extension Backport.Representable {
         override func willMove(toParent parent: UIViewController?) {
             super.willMove(toParent: parent)
             if let controller = parent?.presentationController {
-                if controller.delegate !== self {
+                if controller.delegate !== self  && _delegate == nil {
                     _delegate = controller.delegate
                     controller.delegate = self
                 }