From 8b5270a8bd2bfb27a2b25c1a62629a4ba73ba50d Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Sat, 7 Nov 2026 01:23:56 -0800
Subject: [PATCH 1/2] Keep iOS journal height independent of keyboard and
 navigation state

---
 apple/Package.resolved                           |  4 ++--
 apple/Package.swift                              |  2 +-
 apple/Sources/Logseq/LGNavigationExtension.swift | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apple/Package.resolved b/apple/Package.resolved
index da8bb1dc..0fd68b75 100644
--- a/apple/Package.resolved
+++ b/apple/Package.resolved
@@ -1,12 +1,12 @@
 {
-  "originHash" : "a87b5eb52f24da507463deb9842885eac0c3bc079ebe0d1e5f801969d2e6fc94",
+  "originHash" : "025467972f3219ccda879b9359d8c942bd86811458c06126b1b6f879de1a6406",
   "pins" : [
     {
       "identity" : "lui",
       "kind" : "remoteSourceControl",
       "location" : "ssh://git@github.com/logseq/lui.git",
       "state" : {
-        "revision" : "230783b998ecd1cce3712a1d1404e44ea94915cf"
+        "revision" : "a2a05fa74629ce07900d8cd2555b00bcd0d9f6b3"
       }
     }
   ],
diff --git a/apple/Package.swift b/apple/Package.swift
index b1199a0c..15c05e90 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: "a2a05fa74629ce07900d8cd2555b00bcd0d9f6b3")
     ],
     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
             }

From 44aaab2937fe3d911f0170ef9edbebcf8cd09a19 Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Sat, 7 Nov 2026 01:57:07 -0800
Subject: [PATCH 2/2] Pin LUI to merged journal height fix

---
 apple/Package.resolved | 4 ++--
 apple/Package.swift    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apple/Package.resolved b/apple/Package.resolved
index 0fd68b75..35c4235d 100644
--- a/apple/Package.resolved
+++ b/apple/Package.resolved
@@ -1,12 +1,12 @@
 {
-  "originHash" : "025467972f3219ccda879b9359d8c942bd86811458c06126b1b6f879de1a6406",
+  "originHash" : "92925a4afbf12e7a1c40877deb1da433658971b0569cbfc7feb4876321b3a212",
   "pins" : [
     {
       "identity" : "lui",
       "kind" : "remoteSourceControl",
       "location" : "ssh://git@github.com/logseq/lui.git",
       "state" : {
-        "revision" : "a2a05fa74629ce07900d8cd2555b00bcd0d9f6b3"
+        "revision" : "cf618462e1c55e65a19f24a67f832137fb9fb667"
       }
     }
   ],
diff --git a/apple/Package.swift b/apple/Package.swift
index 15c05e90..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: "a2a05fa74629ce07900d8cd2555b00bcd0d9f6b3")
+        .package(url: "ssh://git@github.com/logseq/lui.git", revision: "cf618462e1c55e65a19f24a67f832137fb9fb667")
     ],
     targets: [
         .executableTarget(