@@ -143,6 +143,18 @@ class ActiveCombatScreen(
143143 freshCombatant,
144144 viewModel,
145145 advantageCap,
146+ onDetailOpenRequest = {
147+ navigator.push(
148+ when (freshCombatant) {
149+ is CombatantItem .Npc -> NpcDetailScreen (freshCombatant.npcId)
150+ is CombatantItem .Character -> CharacterDetailScreen (
151+ freshCombatant.characterId,
152+ comingFromCombat = true ,
153+ )
154+ }
155+ )
156+ coroutineScope.launch { bottomSheetState.hide() }
157+ },
146158 onRemoveRequest = combatantId?.let {
147159 {
148160 coroutineScope.launch {
@@ -327,6 +339,7 @@ class ActiveCombatScreen(
327339 viewModel : CombatScreenModel ,
328340 advantageCap : Advantage ,
329341 onRemoveRequest : (() -> Unit )? ,
342+ onDetailOpenRequest : () -> Unit ,
330343 ) {
331344 Column (
332345 Modifier
@@ -342,17 +355,7 @@ class ActiveCombatScreen(
342355 Text (
343356 combatant.name,
344357 style = MaterialTheme .typography.h6,
345- modifier = Modifier .clickable {
346- navigator.push(
347- when (combatant) {
348- is CombatantItem .Npc -> NpcDetailScreen (combatant.npcId)
349- is CombatantItem .Character -> CharacterDetailScreen (
350- combatant.characterId,
351- comingFromCombat = true ,
352- )
353- }
354- )
355- }
358+ modifier = Modifier .clickable(onClick = onDetailOpenRequest)
356359 )
357360
358361 if (onRemoveRequest != null ) {
0 commit comments