Merge branch 'main' of github.com:shaps80/SwiftUIBackports

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"
       }
     }
   ],

Sources/SwiftUIBackports/Shared/Task/Task.swift

@@ -140,22 +140,22 @@ private struct TaskModifier<ID: Equatable>: ViewModifier {
     var action: @Sendable () async -> Void
 
     @State private var task: Task<Void, Never>?
-    @State private var oldID: ID
+    @State private var publisher = PassthroughSubject<(), Never>()
 
     init(id: ID, priority: TaskPriority, action: @Sendable @escaping () async -> Void) {
         self.id = id
         self.priority = priority
         self.action = action
-        _oldID = .init(initialValue: id)
     }
 
     func body(content: Content) -> some View {
         content
-            .onReceive(Just(id)) { newID in
-                guard newID != oldID else { return }
+            .backport.onChange(of: id) { _ in
+                publisher.send()
+            }
+            .onReceive(publisher) { _ in
                 task?.cancel()
                 task = Task(priority: priority, operation: action)
-                oldID = newID
             }
             .onAppear {
                 task?.cancel()

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
         }

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
                 }

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
                 }

Sources/SwiftUIBackports/iOS/TextEditor/ColorProviders.swift

@@ -56,6 +56,39 @@ struct UICachedDeviceRGBColor: ColorProvider {
     }
 }
 
+struct NamedColor: ColorProvider {
+    var color: UIColor?
+
+    init(provider: Any) {
+        let mirror = Mirror(reflecting: provider)
+        if let colorName = mirror.descendant("name") as? String {
+            let bundle = mirror.descendant("bundle") as? Bundle
+            color = UIColor(named: colorName, in: bundle, compatibleWith: nil)
+        }
+    }
+}
+
+struct UICGColor: ColorProvider {
+    var color: UIColor?
+
+    init(provider: Any) {
+        if let color = provider as? UIColor {
+            self.color = color
+        }
+    }
+}
+
+struct NSCFType: ColorProvider {
+    var color: UIColor?
+
+    init(provider: Any) {
+        let isCGColor = CFGetTypeID(provider as CFTypeRef) == CGColor.typeID
+        if isCGColor {
+            color = UIColor(cgColor: provider as! CGColor)
+        }
+    }
+}
+
 struct UIDynamicCatalogSystemColor: ColorProvider {
     var color: UIColor?
 }
@@ -196,6 +229,12 @@ func resolveColorProvider(_ provider: Any) -> ColorProvider? {
         return DisplayP3(provider: provider)
     case "Resolved":
         return UICachedDeviceRGBColor(provider: provider)
+    case String(describing: NamedColor.self):
+        return NamedColor(provider: provider)
+    case String(describing: UICGColor.self):
+        return UICGColor(provider: provider)
+    case "__\(String(describing: NSCFType.self))":
+        return NSCFType(provider: provider)
     default:
         print("Unhandled color provider: \(String(describing: type(of: provider)))")
         return nil

Sources/SwiftUIBackports/iOS/UIHostingConfiguration/Cells/UICollectionViewCell.swift

@@ -14,8 +14,8 @@ extension UICollectionViewCell {
     }
 }
 
-@available(iOS, deprecated: 14)
-@available(tvOS, deprecated: 14)
+@available(iOS, deprecated: 16)
+@available(tvOS, deprecated: 16)
 @available(macOS, unavailable)
 @available(watchOS, unavailable)
 extension Backport where Wrapped: UICollectionViewCell {

Sources/SwiftUIBackports/iOS/UIHostingConfiguration/Cells/UITableViewCell.swift

@@ -14,8 +14,8 @@ extension UITableViewCell {
     }
 }
 
-@available(iOS, deprecated: 14)
-@available(tvOS, deprecated: 14)
+@available(iOS, deprecated: 16)
+@available(tvOS, deprecated: 16)
 @available(macOS, unavailable)
 @available(watchOS, unavailable)
 extension Backport where Wrapped: UITableViewCell {

Sources/SwiftUIBackports/iOS/UIHostingConfiguration/UIContentConfiguration.swift

@@ -7,8 +7,8 @@ import SwiftUI
 /// default styling and content for a content view. The content configuration encapsulates
 /// all of the supported properties and behaviors for content view customization.
 /// You use the configuration to create the content view.
-@available(iOS, deprecated: 14)
-@available(tvOS, deprecated: 14)
+@available(iOS, deprecated: 16)
+@available(tvOS, deprecated: 16)
 @available(macOS, unavailable)
 @available(watchOS, unavailable)
 public protocol BackportUIContentConfiguration {