Improve IDs

EmilioPelaez · Jan 2, 2025 · d5edd14 · d5edd14
1 parent a908199
commit d5edd14
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/Sources/HierarchyResponder/Events/View+EventPublishing.swift b/Sources/HierarchyResponder/Events/View+EventPublishing.swift
@@ -37,7 +37,7 @@ public extension View {
 	 once it's published. The order of the subscribers is determined by the order
 	 in which they were added to the view hierarchy.
 	 */
-	func publisher<E: Event>(for event: E.Type, id: String, destination: PublishingDestination = .lastLevel, register: @escaping (EventPublisher<E>?) -> Void) -> some View {
+	func publisher<E: Event>(for event: E.Type, id: String = UUID().uuidString, destination: PublishingDestination = .lastLevel, register: @escaping (EventPublisher<E>?) -> Void) -> some View {
 		modifier(EventPublisherModifier(id: id, destination: destination, register: register))
 	}
 
@@ -47,7 +47,7 @@ public extension View {
 	 event is published, as long as the current subscriber matches the event's
 	 destination.
 	 */
-	func subscribe<E: Event>(to event: E.Type, id: String, handler: @escaping (E) -> Void) -> some View {
+	func subscribe<E: Event>(to event: E.Type, id: String = UUID().uuidString, handler: @escaping (E) -> Void) -> some View {
 		modifier(EventSubscriberModifier(id: id, eventType: event, handler: handler))
 	}
 }
diff --git a/Sources/HierarchyResponder/Internal/Publishing/EventPublisherModifier.swift b/Sources/HierarchyResponder/Internal/Publishing/EventPublisherModifier.swift
@@ -26,16 +26,16 @@ struct EventPublisherModifier<E: Event>: ViewModifier {
 
 	@State var containers: Set<PublishersContainer> = []
 
-	init(id: String = UUID().uuidString, destination: PublishingDestination, register: @escaping (EventPublisher<E>?) -> Void) {
+	init(id: String, destination: PublishingDestination, register: @escaping (EventPublisher<E>?) -> Void) {
 		self.id = id
 		self.destination = destination
 		self.register = register
 	}
 
 	func body(content: Content) -> some View {
 		content
-			.publisherRegistrar(for: E.self, childContainers: $containers)
-			.onChange(of: containers) { containers in
+			.publisherRegistrar(for: E.self, id: id, childContainers: $containers)
+			.onAppearAndChange(of: containers) { containers in
 				updatePublisher(containers: containers, destination: destination)
 			}
 			.onChange(of: destination) { destination in

diff --git a/Sources/HierarchyResponder/Internal/Publishing/EventSubscriberModifier.swift b/Sources/HierarchyResponder/Internal/Publishing/EventSubscriberModifier.swift
@@ -34,7 +34,7 @@ struct EventSubscriberModifier<E: Event>: ViewModifier {
 
 	func body(content: Content) -> some View {
 		content
-			.publisherRegistrar(for: E.self, childContainers: $containers)
+			.publisherRegistrar(for: E.self, id: id, childContainers: $containers)
 			.onAppearAndChange(of: registrars) { registrars in
 				registerPublisher(registrars, containers: containers)
 			}

diff --git a/Sources/HierarchyResponder/Internal/Publishing/PublisherRegistrarModifier.swift b/Sources/HierarchyResponder/Internal/Publishing/PublisherRegistrarModifier.swift
@@ -8,20 +8,23 @@
 import SwiftUI
 
 extension View {
-	func publisherRegistrar<E: Event>(for event: E.Type, childContainers: Binding<Set<PublishersContainer>>) -> some View {
-		modifier(PublisherRegistrarModifier(event: event, childContainers: childContainers))
+	func publisherRegistrar<E: Event>(for event: E.Type, id: String, childContainers: Binding<Set<PublishersContainer>>) -> some View {
+		modifier(PublisherRegistrarModifier(event: event, id: id, childContainers: childContainers))
 	}
 }
 
 struct PublisherRegistrarModifier<E: Event>: ViewModifier {
 	@Environment(\.eventSubscriptionRegistrars) var registrars
 
+	let id: String
 	@Binding var childContainers: Set<PublishersContainer>
 
-	@State var registrar: EventSubscriptionRegistrar = .init { _, _ in }
+	@State var registrar: EventSubscriptionRegistrar
 
-	init(event: E.Type, childContainers: Binding<Set<PublishersContainer>>) {
+	init(event: E.Type, id: String, childContainers: Binding<Set<PublishersContainer>>) {
+		self.id = id
 		self._childContainers = childContainers
+		self._registrar = .init(initialValue: .init(id: id) { _, _ in })
 	}
 
 	var updatedRegistrars: [ObjectIdentifier: EventSubscriptionRegistrar] {
@@ -37,7 +40,7 @@ struct PublisherRegistrarModifier<E: Event>: ViewModifier {
 	}
 
 	func createRegistrar() {
-		registrar = .init { id, container in
+		registrar = .init(id: id) { id, container in
 			if let container {
 				childContainers.update(with: container)
 			} else if let container = childContainers.first(where: { $0.id == id }) {