From 803084a03a701cb018fda8505600a23dcaeb5c1f Mon Sep 17 00:00:00 2001
From: Alexander Boswell <alboswel@microsoft.com>
Date: Fri, 14 Jun 2024 20:55:24 -0700
Subject: [PATCH 1/3] fix animation for list item

---
 ios/FluentUI/List/ListItem.swift | 78 ++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/ios/FluentUI/List/ListItem.swift b/ios/FluentUI/List/ListItem.swift
index e4f4038ae..00ce3dfb4 100644
--- a/ios/FluentUI/List/ListItem.swift
+++ b/ios/FluentUI/List/ListItem.swift
@@ -47,42 +47,53 @@ public struct ListItem<LeadingContent: View,
         tokenSet.update(fluentTheme)
 
         @ViewBuilder
-        var labelStack: some View {
-            let titleView = Text(title)
-                                .foregroundColor(Color(uiColor: tokenSet[.titleColor].uiColor))
-                                .font(Font(tokenSet[.titleFont].uiFont))
-                                .frame(minHeight: ListItemTokenSet.titleHeight)
-                                .lineLimit(titleLineLimit)
-                                .truncationMode(titleTruncationMode)
-                                .accessibilityIdentifier(AccessibilityIdentifiers.title)
+        var titleView: some View {
+            Text(title)
+                .foregroundColor(Color(uiColor: tokenSet[.titleColor].uiColor))
+                .font(Font(tokenSet[.titleFont].uiFont))
+                .frame(minHeight: ListItemTokenSet.titleHeight)
+                .lineLimit(titleLineLimit)
+                .truncationMode(titleTruncationMode)
+                .accessibilityIdentifier(AccessibilityIdentifiers.title)
+        }
+
+        @ViewBuilder
+        var subtitleView: some View {
+            let subtitleView = Text(subtitle)
+                .foregroundColor(Color(uiColor: tokenSet[.subtitleColor].uiColor))
+                .lineLimit(subtitleLineLimit)
+                .truncationMode(subtitleTruncationMode)
+                .accessibilityIdentifier(AccessibilityIdentifiers.subtitle)
 
             switch layoutType {
-            case .oneLine:
+            case .oneLine, .twoLines:
+                subtitleView
+                    .font(Font(tokenSet[.subtitleTwoLinesFont].uiFont))
+                    .frame(minHeight: ListItemTokenSet.subtitleTwoLineHeight)
+            case .threeLines:
+                subtitleView
+                    .font(Font(tokenSet[.subtitleThreeLinesFont].uiFont))
+                    .frame(minHeight: ListItemTokenSet.subtitleThreeLineHeight)
+            }
+        }
+
+        @ViewBuilder
+        var labelStack: some View {
+            VStack(alignment: .leading, spacing: ListItemTokenSet.labelVerticalSpacing) {
                 titleView
-            case .twoLines, .threeLines:
-                let subtitleView = Text(subtitle)
-                    .foregroundColor(Color(uiColor: tokenSet[.subtitleColor].uiColor))
-                    .lineLimit(subtitleLineLimit)
-                    .truncationMode(subtitleTruncationMode)
-                    .accessibilityIdentifier(AccessibilityIdentifiers.subtitle)
-                VStack(alignment: .leading, spacing: ListItemTokenSet.labelVerticalSpacing) {
-                    titleView
-                    if layoutType == .twoLines {
-                        subtitleView
-                            .font(Font(tokenSet[.subtitleTwoLinesFont].uiFont))
-                            .frame(minHeight: ListItemTokenSet.subtitleTwoLineHeight)
-                    } else {
-                        subtitleView
-                            .font(Font(tokenSet[.subtitleThreeLinesFont].uiFont))
-                            .frame(minHeight: ListItemTokenSet.subtitleThreeLineHeight)
-                        Text(footer)
-                            .foregroundColor(Color(uiColor: tokenSet[.footerColor].uiColor))
-                            .font(Font(tokenSet[.footerFont].uiFont))
-                            .frame(minHeight: ListItemTokenSet.footerHeight)
-                            .lineLimit(footerLineLimit)
-                            .truncationMode(footerTruncationMode)
-                            .accessibilityIdentifier(AccessibilityIdentifiers.footer)
-                    }
+
+                if layoutType == .twoLines || layoutType == .threeLines {
+                    subtitleView
+                }
+
+                if layoutType == .threeLines {
+                    Text(footer)
+                        .foregroundColor(Color(uiColor: tokenSet[.footerColor].uiColor))
+                        .font(Font(tokenSet[.footerFont].uiFont))
+                        .frame(minHeight: ListItemTokenSet.footerHeight)
+                        .lineLimit(footerLineLimit)
+                        .truncationMode(footerTruncationMode)
+                        .accessibilityIdentifier(AccessibilityIdentifiers.footer)
                 }
             }
         }
@@ -158,6 +169,7 @@ public struct ListItem<LeadingContent: View,
                 HStack(spacing: 0) {
                     leadingContentView
                     labelStack
+                        .animation(.easeInOut, value: layoutType)
                     Spacer(minLength: 0)
                     if combineTrailingContentAccessibilityElement {
                         trailingContentView

From 2d9090369ea9a1e910300402996bb19dce22cafb Mon Sep 17 00:00:00 2001
From: Alexander Boswell <alboswel@microsoft.com>
Date: Fri, 14 Jun 2024 22:17:29 -0700
Subject: [PATCH 2/3] clean up code

---
 ios/FluentUI/List/ListItem.swift | 35 +++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/ios/FluentUI/List/ListItem.swift b/ios/FluentUI/List/ListItem.swift
index 00ce3dfb4..9cd97d731 100644
--- a/ios/FluentUI/List/ListItem.swift
+++ b/ios/FluentUI/List/ListItem.swift
@@ -77,23 +77,30 @@ public struct ListItem<LeadingContent: View,
             }
         }
 
+        @ViewBuilder
+        var footerView: some View {
+            Text(footer)
+                .foregroundColor(Color(uiColor: tokenSet[.footerColor].uiColor))
+                .font(Font(tokenSet[.footerFont].uiFont))
+                .frame(minHeight: ListItemTokenSet.footerHeight)
+                .lineLimit(footerLineLimit)
+                .truncationMode(footerTruncationMode)
+                .accessibilityIdentifier(AccessibilityIdentifiers.footer)
+        }
+
         @ViewBuilder
         var labelStack: some View {
             VStack(alignment: .leading, spacing: ListItemTokenSet.labelVerticalSpacing) {
-                titleView
-
-                if layoutType == .twoLines || layoutType == .threeLines {
+                switch layoutType {
+                case .oneLine:
+                    titleView
+                case .twoLines:
+                    titleView
                     subtitleView
-                }
-
-                if layoutType == .threeLines {
-                    Text(footer)
-                        .foregroundColor(Color(uiColor: tokenSet[.footerColor].uiColor))
-                        .font(Font(tokenSet[.footerFont].uiFont))
-                        .frame(minHeight: ListItemTokenSet.footerHeight)
-                        .lineLimit(footerLineLimit)
-                        .truncationMode(footerTruncationMode)
-                        .accessibilityIdentifier(AccessibilityIdentifiers.footer)
+                case .threeLines:
+                    titleView
+                    subtitleView
+                    footerView
                 }
             }
         }
@@ -169,7 +176,7 @@ public struct ListItem<LeadingContent: View,
                 HStack(spacing: 0) {
                     leadingContentView
                     labelStack
-                        .animation(.easeInOut, value: layoutType)
+                        .animation(.default, value: layoutType)
                     Spacer(minLength: 0)
                     if combineTrailingContentAccessibilityElement {
                         trailingContentView

From 5132dccda132c1ac43a9697bf270a0eda9125c49 Mon Sep 17 00:00:00 2001
From: Alexander Boswell <alboswel@microsoft.com>
Date: Mon, 17 Jun 2024 14:25:10 -0700
Subject: [PATCH 3/3] update per comments

---
 ios/FluentUI/List/ListItem.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ios/FluentUI/List/ListItem.swift b/ios/FluentUI/List/ListItem.swift
index 9cd97d731..9a6d06083 100644
--- a/ios/FluentUI/List/ListItem.swift
+++ b/ios/FluentUI/List/ListItem.swift
@@ -66,7 +66,10 @@ public struct ListItem<LeadingContent: View,
                 .accessibilityIdentifier(AccessibilityIdentifiers.subtitle)
 
             switch layoutType {
-            case .oneLine, .twoLines:
+            case .oneLine:
+                // Subtitle is not shown for oneLine
+                EmptyView()
+            case .twoLines:
                 subtitleView
                     .font(Font(tokenSet[.subtitleTwoLinesFont].uiFont))
                     .frame(minHeight: ListItemTokenSet.subtitleTwoLineHeight)