diff --git a/apple/Package.resolved b/apple/Package.resolved index da8bb1dc..35c4235d 100644 --- a/apple/Package.resolved +++ b/apple/Package.resolved @@ -1,12 +1,12 @@ { - "originHash" : "a87b5eb52f24da507463deb9842885eac0c3bc079ebe0d1e5f801969d2e6fc94", + "originHash" : "92925a4afbf12e7a1c40877deb1da433658971b0569cbfc7feb4876321b3a212", "pins" : [ { "identity" : "lui", "kind" : "remoteSourceControl", "location" : "ssh://git@github.com/logseq/lui.git", "state" : { - "revision" : "230783b998ecd1cce3712a1d1404e44ea94915cf" + "revision" : "cf618462e1c55e65a19f24a67f832137fb9fb667" } } ], diff --git a/apple/Package.swift b/apple/Package.swift index b1199a0c..9a8a6ddd 100644 --- a/apple/Package.swift +++ b/apple/Package.swift @@ -44,7 +44,7 @@ let package = Package( .library(name: "LogseqModel", type: .dynamic, targets: ["LogseqModel"]), ], dependencies: [ - .package(url: "ssh://git@github.com/logseq/lui.git", revision: "230783b998ecd1cce3712a1d1404e44ea94915cf") + .package(url: "ssh://git@github.com/logseq/lui.git", revision: "cf618462e1c55e65a19f24a67f832137fb9fb667") ], targets: [ .executableTarget( diff --git a/apple/Sources/Logseq/LGNavigationExtension.swift b/apple/Sources/Logseq/LGNavigationExtension.swift index f938a724..193d0a75 100644 --- a/apple/Sources/Logseq/LGNavigationExtension.swift +++ b/apple/Sources/Logseq/LGNavigationExtension.swift @@ -677,6 +677,7 @@ private struct LGNavigationContent: View { let bottomChromeIndex: Int? let rootTransform: ((AnyView) -> AnyView)? @State private var nativePop: LGNativeNavigationPop? + @State private var minimumScrollViewport: CGRect? #if os(iOS) @State private var transitions = LGNavigationTransitions() @State private var dockedKeyboardInset: CGFloat = 0 @@ -758,6 +759,16 @@ private struct LGNavigationContent: View { let _ = context.revision let _ = search?.context.revision navigationStack + .environment(\.luiMinimumScrollViewport, minimumScrollViewport) + .background { + GeometryReader { _ in + Color.clear + .onGeometryChange(for: CGRect.self) { $0.frame(in: .global) } action: { frame in + minimumScrollViewport = frame + } + } + .ignoresSafeArea(.all, edges: .bottom) + } .onPreferenceChange(LUIListSurfacePreferenceKey.self) { usesSystemBackground in usesSystemGroupedBackground = usesSystemBackground }