Fix behavior when tapping more detail button on EventMapView

app-ios/Sources/EventMapFeature/EventItem.swift

@@ -4,9 +4,8 @@ import Theme
 import shared
 
 struct EventItem: View {
-    @State private var isDescriptionExpanded: Bool = false
-    @State private var canBeExpanded: Bool = false
     let event: EventMapEvent
+    let onTappedMoreDetail: (URL) -> Void
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
@@ -28,29 +27,16 @@ struct EventItem: View {
                 Text(event.description_.currentLangTitle)
                     .foregroundStyle(AssetColors.Surface.onSurface.swiftUIColor)
                     .textStyle(.bodyLarge)
-                    .lineLimit(isDescriptionExpanded ? nil : 3)
-                    .background {
-                        ViewThatFits(in: .vertical) {
-                            Text(event.description_.currentLangTitle)
-                                .textStyle(.bodyLarge)
-                                .hidden()
-                            // Just for receiving onAppear event if the description exceeds its line limit
-                            Color.clear
-                                .onAppear {
-                                    canBeExpanded = true
-                                }
-                        }
-                    }
+
                 if let message = event.message {
                     Text(message.currentLangTitle)
                         .foregroundStyle(AssetColors.Tertiary.tertiary.swiftUIColor)
                         .textStyle(.bodyMedium)
                 }
 
-                if canBeExpanded {
+                if let urlString = event.moreDetailsUrl, let url = URL(string: urlString) {
                     Button {
-                        isDescriptionExpanded = true
-                        canBeExpanded = false
+                        onTappedMoreDetail(url)
                     } label: {
                         Text(String(localized: "Detail", bundle: .module))
                             .textStyle(.labelLarge)
@@ -71,10 +57,9 @@ struct EventItem: View {
         }
         .frame(maxWidth: .infinity)
         .padding(.horizontal, 16)
-        .animation(.default, value: isDescriptionExpanded)
     }
 }
 
 #Preview {
-    EventItem(event: EventMapEvent.companion.fakes().first!)
+    EventItem(event: EventMapEvent.companion.fakes().first!) { _ in }
 }

app-ios/Sources/EventMapFeature/EventMapReducer.swift

@@ -1,5 +1,7 @@
 import ComposableArchitecture
 import KMPClient
+import Model
+import Foundation
 @preconcurrency import shared
 
 @Reducer
@@ -12,18 +14,21 @@ public struct EventMapReducer: Sendable {
     public struct State: Equatable {
         public var selectedFloorMap: FloorMap = .first
         public var events: [EventMapEvent] = []
+        public var url: IdentifiableURL?
 
         public init() { }
     }
 
-    public enum Action {
+    public enum Action: BindableAction {
+        case binding(BindingAction<State>)
         case view(View)
         case `internal`(Internal)
 
         @CasePathable
         public enum View {
             case onAppear
             case selectFloorMap(FloorMap)
+            case moreDetailButtonTapped(URL)
         }
 
         public enum Internal {
@@ -32,6 +37,7 @@ public struct EventMapReducer: Sendable {
     }
 
     public var body: some ReducerOf<Self> {
+        BindingReducer()
         Reduce { state, action in
             switch action {
             case .view(.onAppear):
@@ -49,13 +55,20 @@ public struct EventMapReducer: Sendable {
                 state.selectedFloorMap = floor
                 return .none
 
+            case let .view(.moreDetailButtonTapped(url)):
+                state.url = IdentifiableURL(url)
+                return .none
+
             case let .internal(.response(.success(events))):
                 state.events = events
                 return .none
 
             case let .internal(.response(.failure(error))):
                 print(error.localizedDescription)
                 return .none
+
+            case .binding:
+                return .none
             }
         }
     }

app-ios/Sources/EventMapFeature/EventMapView.swift

@@ -34,7 +34,9 @@ public struct EventMapView: View {
 
             VStack(spacing: 24) {
                 ForEach(store.events, id: \.self) { event in
-                    EventItem(event: event)
+                    EventItem(event: event) { url in
+                        store.send(.view(.moreDetailButtonTapped(url)))
+                    }
                 }
             }
             // bottom floating tabbar padding
@@ -44,6 +46,10 @@ public struct EventMapView: View {
         .navigationBarTitleDisplayMode(.large)
         .navigationTitle(String(localized: "NavigationTitle", bundle: .module))
         .onAppear { store.send(.view(.onAppear)) }
+        .sheet(item: $store.url, content: { url in
+            SafariView(url: url.id)
+                .ignoresSafeArea()
+        })
     }
 }
 

app-ios/Tests/EventMapFeatureTests/EventMapTests.swift

@@ -1,5 +1,6 @@
 import XCTest
 import ComposableArchitecture
+import Model
 @testable import EventMapFeature
 
 final class EventMap_iosTests: XCTestCase {
@@ -12,4 +13,14 @@ final class EventMap_iosTests: XCTestCase {
             $0.selectedFloorMap = .firstBasement
         }
     }
+
+    @MainActor func testMoreDetailButtonTapped() async throws {
+        let store = TestStore(initialState: EventMapReducer.State()) {
+            EventMapReducer()
+        }
+        let url = URL(string: "https://portal.droidkaigi.jp")!
+        await store.send(.view(.moreDetailButtonTapped(url))) {
+            $0.url = IdentifiableURL(url)
+        }
+    }
 }