From 54e147242e037dbf885b41fe22cf43f0797aeef8 Mon Sep 17 00:00:00 2001
From: Nebojsa Vuksic <nebojsa.vuksic@jetbrains.com>
Date: Thu, 31 Jul 2025 10:45:24 +0200
Subject: [PATCH] Extract MyLocations Widget to a separate function

---
 .../weatherApp/ui/WeatherAppSample.kt         | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/main/kotlin/org/jetbrains/plugins/template/weatherApp/ui/WeatherAppSample.kt b/src/main/kotlin/org/jetbrains/plugins/template/weatherApp/ui/WeatherAppSample.kt
index d617b09..0855144 100644
--- a/src/main/kotlin/org/jetbrains/plugins/template/weatherApp/ui/WeatherAppSample.kt
+++ b/src/main/kotlin/org/jetbrains/plugins/template/weatherApp/ui/WeatherAppSample.kt
@@ -66,8 +66,6 @@ private fun LeftColumn(
     myLocationsViewModelApi: MyLocationsViewModelApi,
     modifier: Modifier = Modifier,
 ) {
-    val myLocations = myLocationsViewModelApi.myLocationsFlow.collectAsState(emptyList()).value
-
     Column(modifier) {
         GroupHeader(
             ComposeTemplateBundle.message("weather.app.my.locations.header.text"),
@@ -78,46 +76,52 @@ private fun LeftColumn(
 
         Spacer(modifier = Modifier.height(10.dp))
 
-        val listState = rememberSelectableLazyListState()
+        MyLocationsList(Modifier.fillMaxSize(), myLocationsViewModelApi)
+    }
+}
 
-        // JEWEL-938 This will trigger on SelectableLazyColum's `onSelectedIndexesChange` callback
-        LaunchedEffect(myLocations) {
-            var lastActiveItemIndex = -1
-            val selectedItemKeys = mutableSetOf<String>()
-            myLocations.forEachIndexed { index, location ->
-                if (location.isSelected) {
-                    if (lastActiveItemIndex == -1) {
-                        // Only the first selected item should be active
-                        lastActiveItemIndex = index
-                    }
-                    // Must match the key used in the `items()` call's `key` parameter to ensure correct item identity.
-                    selectedItemKeys.add(location.location.label)
+@Composable
+internal fun MyLocationsList(modifier: Modifier = Modifier, myLocationsViewModelApi: MyLocationsViewModelApi) {
+    val myLocations = myLocationsViewModelApi.myLocationsFlow.collectAsState(emptyList()).value
+
+    val listState = rememberSelectableLazyListState()
+    // JEWEL-938 This will trigger on SelectableLazyColum's `onSelectedIndexesChange` callback
+    LaunchedEffect(myLocations) {
+        var lastActiveItemIndex = -1
+        val selectedItemKeys = mutableSetOf<String>()
+        myLocations.forEachIndexed { index, location ->
+            if (location.isSelected) {
+                if (lastActiveItemIndex == -1) {
+                    // Only the first selected item should be active
+                    lastActiveItemIndex = index
                 }
+                // Must match the key used in the `items()` call's `key` parameter to ensure correct item identity.
+                selectedItemKeys.add(location.location.label)
             }
-            // Sets the first selected item as an active item to avoid triggering on click event when user clocks on it
-            listState.lastActiveItemIndex = lastActiveItemIndex
-            // Sets keys of selected items
-            listState.selectedKeys = selectedItemKeys
         }
+        // Sets the first selected item as an active item to avoid triggering on click event when user clocks on it
+        listState.lastActiveItemIndex = lastActiveItemIndex
+        // Sets keys of selected items
+        listState.selectedKeys = selectedItemKeys
+    }
 
-        SelectableLazyColumn(
-            modifier = Modifier.fillMaxSize(),
-            selectionMode = SelectionMode.Single,
-            state = listState,
-            onSelectedIndexesChange = { indices ->
-                val selectedLocationIndex = indices.firstOrNull() ?: return@SelectableLazyColumn
-                myLocationsViewModelApi.onLocationSelected(selectedLocationIndex)
-            },
-        ) {
-            items(
-                items = myLocations,
-                key = { item -> item.location.label },
-            ) { item ->
+    SelectableLazyColumn(
+        modifier = modifier,
+        selectionMode = SelectionMode.Single,
+        state = listState,
+        onSelectedIndexesChange = { indices ->
+            val selectedLocationIndex = indices.firstOrNull() ?: return@SelectableLazyColumn
+            myLocationsViewModelApi.onLocationSelected(selectedLocationIndex)
+        },
+    ) {
+        items(
+            items = myLocations,
+            key = { item -> item.location.label },
+        ) { item ->
 
-                ContentItemRow(
-                    item = item.location, isSelected = item.isSelected, isActive = isActive
-                )
-            }
+            ContentItemRow(
+                item = item.location, isSelected = item.isSelected, isActive = isActive
+            )
         }
     }
 }