Keep compact sidebar search above keyboard

Author: tiensonqin

apple/src/bonsai_apple.ml

@@ -4216,7 +4216,7 @@ module For_testing = struct
           ^ " sidebar-safe-area-padding=swift top=max-safe-area-plus-5-or-54 \
              bottom=max-safe-area-or-34"
           ^ " sidebar-shell-background=home-body-ignores-safe-area-outside-clip"
-          ^ " sidebar-bottom-controls=safe-area-inset top-padding=10"
+          ^ " sidebar-bottom-controls=safe-area-inset keyboard-aware top-padding=10"
           ^ " sidebar-scroll-disabled=dragging content-scroll-disabled=open-or-dragging"
           ^ " sidebar-route-selection-animation=swift-interactive-spring \
              route-change-and-close"

apple/swiftui/BonsaiNativeSwiftUI.swift

@@ -1536,6 +1536,7 @@ private struct BonsaiNativeNodeView: View {
   @State private var compactSidebarDragOffset: CGFloat = 0
   @State private var compactSidebarDragAxis: DragAxis?
   @State private var isCompactSidebarDragging = false
+  @State private var sidebarKeyboardBottomPadding: CGFloat = 0
   @State private var toolbarExportFilename = "Export.txt"
   @State private var toolbarExportContentType = "public.plain-text"
   @State private var toolbarExportContent = ""
@@ -2194,6 +2195,16 @@ private struct BonsaiNativeNodeView: View {
             .background(bonsaiHomeBodyBackground.ignoresSafeArea(.container, edges: .all))
             .opacity(progress)
             .scrollDisabled(isCompactSidebarDragging)
+            .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillChangeFrameNotification)) { notification in
+              sidebarKeyboardBottomPadding = compactSidebarKeyboardBottomPadding(
+                notification: notification,
+                containerMaxY: proxy.frame(in: .global).maxY,
+                safeAreaBottom: proxy.safeAreaInsets.bottom
+              )
+            }
+            .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification)) { _ in
+              sidebarKeyboardBottomPadding = 0
+            }
 
           ZStack(alignment: .top) {
             if node.sidebarCompactTopBarVisible {
@@ -2278,10 +2289,23 @@ private struct BonsaiNativeNodeView: View {
       sidebarBottomControls
         .padding(.horizontal, 12)
         .padding(.top, 10)
+        .padding(.bottom, sidebarKeyboardBottomPadding)
+        .animation(.easeOut(duration: 0.2), value: sidebarKeyboardBottomPadding)
     }
     .frame(maxHeight: .infinity, alignment: .topLeading)
   }
 
+  private func compactSidebarKeyboardBottomPadding(
+    notification: Notification,
+    containerMaxY: CGFloat,
+    safeAreaBottom: CGFloat
+  ) -> CGFloat {
+    guard let keyboardFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect
+    else { return 0 }
+    let overlap = max(0, containerMaxY - keyboardFrame.minY)
+    return max(0, overlap - safeAreaBottom)
+  }
+
   private func compactSidebarVisibleWidth(revealWidth: CGFloat) -> CGFloat {
     max(0, min(revealWidth, (isCompactSidebarOpen ? revealWidth : 0) + compactSidebarDragOffset))
   }

apple/test/bonsai_apple_test.ml

@@ -338,7 +338,7 @@ let test_compact_sidebar_top_bar_uses_system_toolbar_item_chrome () =
   require
     (contains
        rendered
-       ~substring:"sidebar-bottom-controls=safe-area-inset top-padding=10")
+       ~substring:"sidebar-bottom-controls=safe-area-inset keyboard-aware top-padding=10")
     "compact sidebar bottom controls should match the Swift safe-area inset layout";
   require
     (contains
@@ -366,6 +366,18 @@ let test_compact_sidebar_top_bar_uses_system_toolbar_item_chrome () =
     "compact sidebar should use the same open and close interaction behavior as Swift"
 ;;
 
+let test_compact_sidebar_bottom_search_tracks_keyboard () =
+  let source = read_file swiftui_source_path in
+  require
+    (contains source ~substring:"sidebarKeyboardBottomPadding")
+    "compact sidebar bottom search should add keyboard-aware bottom padding instead of \
+     staying behind the keyboard";
+  require
+    (contains source ~substring:"keyboardWillChangeFrameNotification")
+    "compact sidebar should observe keyboard frame changes for the custom full-screen \
+     drawer"
+;;
+
 let test_image_semantic_color_renders () =
   Backend.reset ();
   let component _graph =
@@ -1008,6 +1020,7 @@ let () =
   test_sidebar_history_actions_are_separate_and_clickable ();
   test_sidebar_actions_can_keep_compact_drawer_open ();
   test_compact_sidebar_top_bar_uses_system_toolbar_item_chrome ();
+  test_compact_sidebar_bottom_search_tracks_keyboard ();
   test_compact_sidebar_close_paths_share_swift_animation ();
   test_navigation_value_links_keep_primary_tap_for_link ();
   test_image_semantic_color_renders ();