Merge pull request #9110 from thunderbird/revert-9082-fix-issue-9081

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.runtime.saveable.rememberSaveable

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.vector.ImageVector

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolder

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolderType

@Suppress("LongMethod")

@Composable

internal fun FolderListItem(

    displayFolder: DisplayFolder,

            .fillMaxWidth()

            .animateContentSize(),

    ) {

        val hasExpandableItems = remember { treeFolder !== null && treeFolder.children.isNotEmpty() }

        NavigationDrawerItem(

            label = mapFolderName(displayFolder, folderNameFormatter, parentPrefix),

            selected = selected,

            onClick = {

                if (hasExpandableItems) {

                    isExpanded.value = !isExpanded.value

                } else {

                    onClick(displayFolder)

                }

            },

            onClick = { onClick(displayFolder) },

            modifier = Modifier.fillMaxWidth(),

            icon = {

                Icon(

                    unreadCount = unreadCount,

                    starredCount = starredCount,

                    showStarredCount = showStarredCount,

                    expandableState = if (hasExpandableItems) isExpanded else null,

                    expandableState = if (treeFolder !== null && treeFolder.children.isNotEmpty()) isExpanded else null,

                )

            },

        )