update

Author: hiroshihorie

Sources/LiveKitComponents/Components.swift

@@ -21,7 +21,7 @@ public let liveKitComponentsVersion = "0.0.1"
 
 public typealias ComponentBuilder<Content: View> = () -> Content
 public typealias ParticipantComponentBuilder<Content: View> = (_: Participant) -> Content
-public typealias TrackPublicationComponentBuilder<Content: View> = (_: TrackPublication) -> Content
+public typealias TrackReferenceComponentBuilder<Content: View> = (_: TrackReference) -> Content
 
 public typealias ParticipantLayoutBuilder<Content: View> = (_ participant: Participant,
                                                             _ geometry: GeometryProxy) -> Content

Sources/LiveKitComponents/ForEach/ForEachTrackPublication.swift renamed to Sources/LiveKitComponents/ForEach/ForEachTrack.swift

@@ -23,7 +23,7 @@ import SwiftUI
 /// - filter: Type of track to loop through, defaults to `.video`.
 ///
 /// > Note: References `Participant` environment object.
-public struct ForEachTrackPublication<Content: View>: View {
+public struct ForEachTrack<Content: View>: View {
     public enum Filter {
         case all
         case video
@@ -33,10 +33,10 @@ public struct ForEachTrackPublication<Content: View>: View {
     @EnvironmentObject var participant: Participant
 
     let filter: Filter
-    let content: TrackPublicationComponentBuilder<Content>
+    let content: TrackReferenceComponentBuilder<Content>
 
     public init(filter: Filter = .video,
-                @ViewBuilder content: @escaping TrackPublicationComponentBuilder<Content>)
+                @ViewBuilder content: @escaping TrackReferenceComponentBuilder<Content>)
     {
         self.filter = filter
         self.content = content
@@ -53,8 +53,10 @@ public struct ForEachTrackPublication<Content: View>: View {
 
     public var body: some View {
         ForEach(computedTrackPublications()) { trackPublication in
-            content(trackPublication)
-                .environmentObject(trackPublication)
+            let trackReference = TrackReference(participant: participant,
+                                                publication: trackPublication)
+            content(trackReference)
+                .environmentObject(trackReference)
         }
     }
 }

Sources/LiveKitComponents/TrackReference.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 LiveKit
+ * Copyright 2024 LiveKit
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,36 +14,38 @@
  * limitations under the License.
  */
 
-import SwiftUI
 import LiveKit
+import SwiftUI
 
-public struct TrackReference {
-    let participantSid: Sid?
-    let publicationSid: Sid
-    let source: Track.Source
-}
-
-public struct TrackFinder<FoundView: View, NotFoundView: View>: View {
-
-    @EnvironmentObject var room: Room
-
-    let reference: TrackReference
-    let foundBuilder: ComponentBuilder<FoundView>
-    let notFoundBuilder: ComponentBuilder<NotFoundView>
-
-    public init(_ reference: TrackReference,
-                @ViewBuilder found: @escaping ComponentBuilder<FoundView>,
-                @ViewBuilder notFound: @escaping ComponentBuilder<NotFoundView>) {
-
-        self.reference = reference
-        self.foundBuilder = found
-        self.notFoundBuilder = notFound
+open class TrackReference: ObservableObject {
+    public let participant: Participant
+    public let publication: TrackPublication?
+    public let name: String?
+    public let source: Track.Source?
+
+    public init(participant: Participant, publication: TrackPublication? = nil, name: String? = nil, source: Track.Source? = nil) {
+        self.participant = participant
+        self.publication = publication
+        self.name = name
+        self.source = source
     }
 
-    public var body: some View {
-
-        // TODO: Implement logic...
+    /// Attempts to reseolve ``TrackPublication`` in order: publication, name, source.
+    public func resolve() -> TrackPublication? {
+        if let publication {
+            return publication
+        } else if let name, let source, let publication = participant.trackPublications.first(where: { $0.value.name == name && $0.value.source == source })?.value {
+            return publication
+        } else if let name, let publication = participant.trackPublications.first(where: { $0.value.name == name })?.value {
+            return publication
+        } else if let source, let publication = participant.trackPublications.first(where: { $0.value.source == source })?.value {
+            return publication
+        }
+
+        return nil
+    }
 
-        AnyView(foundBuilder())
+    public var isResolvable: Bool {
+        resolve() != nil
     }
 }

Sources/LiveKitComponents/Views/Participant/ParticipantView.swift

@@ -30,12 +30,15 @@ public struct ParticipantView: View {
     public var body: some View {
         GeometryReader { geometry in
             ZStack(alignment: .topLeading) {
-                if let trackPublication = participant.firstCameraPublication {
+                let cameraReference = TrackReference(participant: participant, source: .camera)
+
+                if cameraReference.isResolvable {
                     VideoTrackPublicationView()
-                        .environmentObject(trackPublication)
+                        .environmentObject(cameraReference)
                 } else {
                     ui.videoDisabledView(geometry: geometry)
                 }
+
                 if showInformation {
                     ParticipantInformationView()
                         .padding(5)

Sources/LiveKitComponents/Views/TrackPublication/VideoTrackPublicationView.swift

@@ -18,7 +18,7 @@ import LiveKit
 import SwiftUI
 
 public struct VideoTrackPublicationView: View {
-    @EnvironmentObject var trackPublication: TrackPublication
+    @EnvironmentObject var trackReference: TrackReference
     @EnvironmentObject var ui: UIPreference
 
     var layoutMode: VideoView.LayoutMode = .fill
@@ -29,7 +29,8 @@ public struct VideoTrackPublicationView: View {
             ZStack {
                 ui.videoDisabledView(geometry: geometry)
 
-                if let track = trackPublication.track as? VideoTrack,
+                if let trackPublication = trackReference.resolve(),
+                   let track = trackPublication.track as? VideoTrack,
                    trackPublication.isSubscribed,
                    !trackPublication.isMuted
                 {