Fix tabbar sticking to keyboard

This commit is contained in:
OlegAba
2023-03-08 22:03:44 -05:00
committed by William Casarin
parent 094ac34135
commit 20505236ae
2 changed files with 37 additions and 38 deletions

View File

@@ -214,7 +214,6 @@ struct ContentView: View {
} }
} }
} }
.ignoresSafeArea(.keyboard)
} }
var MaybeSearchView: some View { var MaybeSearchView: some View {
@@ -257,7 +256,6 @@ struct ContentView: View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
if let damus = self.damus_state { if let damus = self.damus_state {
NavigationView { NavigationView {
ZStack {
TabView { // Prevents navbar appearance change on scroll TabView { // Prevents navbar appearance change on scroll
MainContent(damus: damus) MainContent(damus: damus)
.toolbar() { .toolbar() {
@@ -299,7 +297,6 @@ struct ContentView: View {
} }
} }
.tabViewStyle(.page(indexDisplayMode: .never)) .tabViewStyle(.page(indexDisplayMode: .never))
}
.overlay( .overlay(
SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation()) SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
) )
@@ -308,8 +305,10 @@ struct ContentView: View {
TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline) TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
.padding([.bottom], 8) .padding([.bottom], 8)
.background(Color(uiColor: .systemBackground).ignoresSafeArea())
} }
} }
.ignoresSafeArea(.keyboard)
.onAppear() { .onAppear() {
self.connect() self.connect()
setup_notifications() setup_notifications()

View File

@@ -206,7 +206,7 @@ struct EditMetadataView: View {
} }
} }
} }
.ignoresSafeArea() .ignoresSafeArea(edges: .top)
} }
} }