Fix close suggestion panel animation

intitni · intitni · commit d7b3bb027631 · 2023-04-07T18:05:59.000+08:00
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelView.swift b/Core/Sources/SuggestionWidget/SuggestionPanelView.swift
@@ -88,8 +88,8 @@ final class SuggestionPanelViewModel: ObservableObject {
             return
         }
 
-        activeTab = .suggestion
         isPanelDisplayed = false
+        activeTab = .suggestion
     }
 }
 
@@ -118,7 +118,6 @@ struct SuggestionPanelView: View {
                         .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
                         .fixedSize(horizontal: false, vertical: true)
                         .allowsHitTesting(viewModel.isPanelDisplayed)
-                        .preferredColorScheme(viewModel.colorScheme)
                     }
                 }
 
@@ -128,7 +127,6 @@ struct SuggestionPanelView: View {
                             .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
                             .fixedSize(horizontal: false, vertical: true)
                             .allowsHitTesting(viewModel.isPanelDisplayed)
-                            .preferredColorScheme(viewModel.colorScheme)
                     }
                 }
             }
@@ -140,6 +138,7 @@ struct SuggestionPanelView: View {
                     .allowsHitTesting(false)
             }
         }
+        .preferredColorScheme(viewModel.colorScheme)
         .opacity({
             guard viewModel.isPanelDisplayed else { return 0 }
             guard viewModel.content != nil || viewModel.chat != nil else { return 0 }

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ final class SuggestionPanelViewModel: ObservableObject {`
`88`	`88`	`return`
`89`	`89`	`}`
`90`	`90`
`91`		`- activeTab = .suggestion`
`92`	`91`	`isPanelDisplayed = false`
	`92`	`+ activeTab = .suggestion`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`@@ -118,7 +118,6 @@ struct SuggestionPanelView: View {`
`118`	`118`	`.frame(maxWidth: .infinity, maxHeight: Style.panelHeight)`
`119`	`119`	`.fixedSize(horizontal: false, vertical: true)`
`120`	`120`	`.allowsHitTesting(viewModel.isPanelDisplayed)`
`121`		`- .preferredColorScheme(viewModel.colorScheme)`
`122`	`121`	`}`
`123`	`122`	`}`
`124`	`123`
`@@ -128,7 +127,6 @@ struct SuggestionPanelView: View {`
`128`	`127`	`.frame(maxWidth: .infinity, maxHeight: Style.panelHeight)`
`129`	`128`	`.fixedSize(horizontal: false, vertical: true)`
`130`	`129`	`.allowsHitTesting(viewModel.isPanelDisplayed)`
`131`		`- .preferredColorScheme(viewModel.colorScheme)`
`132`	`130`	`}`
`133`	`131`	`}`
`134`	`132`	`}`
`@@ -140,6 +138,7 @@ struct SuggestionPanelView: View {`
`140`	`138`	`.allowsHitTesting(false)`
`141`	`139`	`}`
`142`	`140`	`}`
	`141`	`+ .preferredColorScheme(viewModel.colorScheme)`
`143`	`142`	`.opacity({`
`144`	`143`	`guard viewModel.isPanelDisplayed else { return 0 }`
`145`	`144`	`guard viewModel.content != nil \|\| viewModel.chat != nil else { return 0 }`