@momo-kits/native-kits 0.162.2-sp.5 → 0.162.2-sp.6-debug

package/gradlew

@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/ios/Application/HeaderRight.swift

@@ -102,68 +102,97 @@ struct ToolkitHeaderRight: View {
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
+
+    private func apiValue(_ value: Any?) -> Any {
+        value ?? NSNull()
+    }
+
+    private var contextMap: [String: Any] {
+        let context = environment.applicationContext
+        return [
+            "appId": apiValue(context?.appId),
+            "code": apiValue(context?.appCode),
+            "name": apiValue(context?.appName),
+            "icon": apiValue(context?.appIcon),
+            "description": apiValue(context?.description),
+            "support": apiValue(context?.support),
+            "toolkitConfig": apiValue(context?.toolkitConfig),
+            "providerId": apiValue(context?.providerId),
+            "permissions": apiValue(context?.permissions)
+        ]
+    }
+
+    private var shouldShowShortcut: Bool {
+        headerRight?.useShortcut == true && !(headerRight?.useMore == true && environment.applicationContext == nil)
+    }
+
+    private func parseResponse(_ response: String) -> Any? {
+        guard let jsonData = response.data(using: .utf8),
+              let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] else {
+            return nil
+        }
+        return json["response"]
+    }
     
     // MARK: - Actions
+    private func loadFavoriteState() {
+        environment.composeApi?.request(
+            funcName: "isFavoriteApp",
+            params: ["code": apiValue(environment.applicationContext?.appCode)]
+        ) { response in
+            if let isFavorite = parseResponse(response) as? Bool {
+                self.isFavorite = isFavorite
+            }
+        }
+    }
+
     private func onPressShortcut() {
         environment.composeApi?.request(
             funcName: "onToolAction",
-            params: ["item": ["key": "onFavorite"]]
-        ) { _ in
-            isFavorite.toggle()
+            params: [
+                "item": ["key": "onFavorite"],
+                "context": contextMap
+            ]
+        ) { response in
+            if let result = parseResponse(response) as? [String: Any],
+               result["success"] as? Bool == true {
+                isFavorite.toggle()
+            }
         }
     }
     
     private func onPressHelpCenter() {
-        let context = environment.applicationContext
-        let paramMap: [String: Any] = [
-            "appId": context?.appId,
-            "code": context?.appCode,
-            "name": context?.appName,
-            "icon": context?.appIcon,
-            "description": context?.description
-        ]
         environment.composeApi?.request(
             funcName: "showHelpCenter",
-            params: paramMap
+            params: [
+                "appId": apiValue(environment.applicationContext?.appId),
+                "code": apiValue(environment.applicationContext?.appCode),
+                "name": apiValue(environment.applicationContext?.appName),
+                "icon": apiValue(environment.applicationContext?.appIcon),
+                "description": apiValue(environment.applicationContext?.description)
+            ]
         ) { _ in }
     }
     
     private func onPressClose() {
         environment.composeApi?.request(
             funcName: "dismissAll",
-            params: ""
+            params: nil
         ) { _ in }
     }
     
     private func onPressMore() {
-        let context = environment.applicationContext
         let params: [String: Any] = [
-            "useSystemTools": headerRight?.useSystemTools,
+            "useSystemTools": headerRight?.useSystemTools ?? true,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": [
-                "appId": context?.appId,
-                "code": context?.appCode,
-                "name": context?.appName,
-                "icon": context?.appIcon,
-                "description": context?.description,
-                "support": context?.support,
-                "toolkitConfig": context?.toolkitConfig,
-                "providerId": context?.providerId,
-                "permissions": context?.permissions
-            ]
+            "context": contextMap
         ]
         environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
-            do {
-                if let jsonData = response.data(using: .utf8),
-                   let json = try JSONSerialization.jsonObject(with: jsonData) as? [String: Any],
-                   let toolResponse = json["response"] as? String {
-                    headerRight?.toolCallback?(toolResponse)
-                }
-            } catch {
-                print("Error parsing response:", error)
+            if let toolResponse = parseResponse(response) as? String {
+                headerRight?.toolCallback?(toolResponse)
             }
         }
     }
@@ -195,7 +224,7 @@ struct ToolkitHeaderRight: View {
         } ?? false
         
         HStack(alignment: .center, spacing: 0) {
-            if headerRight?.useShortcut == true {
+            if shouldShowShortcut {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
@@ -206,15 +235,17 @@ struct ToolkitHeaderRight: View {
             }
             
             HStack(alignment: .center, spacing: 0) {
-                Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
-                    .padding(4)
-                    .onTapGesture {
-                        onPressHelpCenter()
-                    }
-                
-                Rectangle()
-                    .fill(tintColor ?? Colors.black20)
-                    .frame(width: 0.5, height: 12)
+                if environment.applicationContext != nil {
+                    Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
+                        .padding(4)
+                        .onTapGesture {
+                            onPressHelpCenter()
+                        }
+                    
+                    Rectangle()
+                        .fill(tintColor ?? Colors.black20)
+                        .frame(width: 0.5, height: 12)
+                }
                 
                 Icon(source: "16_basic_home", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
@@ -231,6 +262,9 @@ struct ToolkitHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
+        .onAppear {
+            loadFavoriteState()
+        }
     }
 }
 

package/ios/Application/Navigation/BottomTab/BottomTab.swift

@@ -96,7 +96,8 @@ public struct BottomTab: View {
 /// Bottom safe-area inset (home indicator).
 @available(iOS 16.0, *)
 private func safeAreaBottomInset() -> CGFloat {
-    UIApplication.shared.connectedScenes
+    let bottomInset = UIApplication.shared.connectedScenes
         .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
         .first ?? 0
+    return min(bottomInset, 21)
 }

package/ios/Application/Navigation/NavigationContainer.swift

@@ -15,19 +15,23 @@ public struct NavigationContainer<Initial: View>: View {
     @StateObject private var navigator: Navigator
 
     private let setNavigator: ((Navigator) -> Void)?
+    private let composeApi: KitComposeApi?
 
     public init(
         initialScreenName: String = "",
         @ViewBuilder initialScreen: @escaping () -> Initial,
         options: NavigationOptions? = nil,
+        composeApi: KitComposeApi? = nil,
         setNavigator: ((Navigator) -> Void)? = nil
     ) {
         let nav = Navigator(
             initialScreenName: initialScreenName.isEmpty ? (options?.screenName ?? "") : initialScreenName,
             initialContent: { AnyView(initialScreen()) },
-            options: options
+            options: options,
+            composeApi: composeApi
         )
         _navigator = StateObject(wrappedValue: nav)
+        self.composeApi = composeApi
         self.setNavigator = setNavigator
     }
 
@@ -49,7 +53,12 @@ public struct NavigationContainer<Initial: View>: View {
                     .environmentObject(navigator)
             }
         }
-        .onAppear { setNavigator?(navigator) }
+        .onAppear {
+            if navigator.composeApi == nil {
+                navigator.composeApi = composeApi
+            }
+            setNavigator?(navigator)
+        }
     }
 
     @ViewBuilder

package/ios/Application/Navigation/Navigator.swift

@@ -102,12 +102,15 @@ public final class Navigator: ObservableObject {
     private var overplayDismissHandler: (() -> Void)?
 
     public private(set) var rootRoute: DynamicScreenRoute
+    public var composeApi: KitComposeApi?
 
     public init(
         initialScreenName: String = "",
         initialContent: @escaping () -> AnyView,
-        options: NavigationOptions? = nil
+        options: NavigationOptions? = nil,
+        composeApi: KitComposeApi? = nil
     ) {
+        self.composeApi = composeApi
         self.rootRoute = DynamicScreenRegistry.shared.register(
             screenName: initialScreenName,
             content: initialContent,
@@ -198,6 +201,7 @@ public final class Navigator: ObservableObject {
                 let removed = path.removeLast()
                 DynamicScreenRegistry.shared.unregister(id: removed.id)
             } else {
+                composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
                 break
             }
             remaining -= 1

package/ios/Application/Navigation/Overplay/BottomSheet.swift

@@ -54,6 +54,7 @@ struct BottomSheetView<Content: View>: View {
     private let closeThreshold: CGFloat = 100
 
     private var screenHeight: CGFloat { UIScreen.main.bounds.height }
+    private var bottomInset: CGFloat { safeAreaBottomInset() }
 
     private var backgroundColor: Color {
         // Compose uses background.surface (white) for `isSurface`, otherwise
@@ -106,6 +107,9 @@ struct BottomSheetView<Content: View>: View {
                 .frame(height: 1)
 
             content()
+
+            backgroundColor
+                .frame(height: bottomInset)
         }
         .frame(maxWidth: .infinity)
         .frame(maxHeight: screenHeight - safeAreaTopInset() - 90, alignment: .bottom)
@@ -174,3 +178,11 @@ struct BottomSheetView<Content: View>: View {
         }
     }
 }
+
+@available(iOS 16.0, *)
+private func safeAreaBottomInset() -> CGFloat {
+    let bottomInset = UIApplication.shared.connectedScenes
+        .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
+        .first ?? 0
+    return min(bottomInset, 21)
+}

package/ios/Application/Screen.swift

@@ -229,6 +229,7 @@ public struct Screen<Content: View>: View {
 struct Footer: View {
     var footerView: AnyView
     var keyboardSize: CGFloat
+    var bottomInset: CGFloat = 0
 
     var body: some View {
         VStack {
@@ -236,7 +237,7 @@ struct Footer: View {
         }
         .padding(.vertical, Spacing.S)
         .padding(.horizontal, Spacing.M)
-        .padding(.bottom, keyboardSize)
+        .padding(.bottom, keyboardSize + bottomInset)
         .background(Colors.black01)
         .overlay(
             Rectangle()

package/ios/Application/StackScreen.swift

@@ -132,8 +132,10 @@ public struct StackScreen<Content: View>: View {
     // MARK: - Body
 
     public var body: some View {
-        GeometryReader { _ in
+        GeometryReader { geometry in
             let keyboardSize: CGFloat = useAvoidKeyboard ? max(keyboardHeight, 0) : 0
+            let bottomInset = min(geometry.safeAreaInsets.bottom, 21)
+            let contentBottomInset = footer == nil ? bottomInset : 0
 
             ZStack(alignment: .top) {
                 // Background color
@@ -145,6 +147,7 @@ public struct StackScreen<Content: View>: View {
                         VStack(alignment: horizontalAlignment, spacing: 0) {
                             headerAndContent
                         }
+                        .padding(.bottom, contentBottomInset)
 
                         FloatingContent(
                             fabProps: fabProps,
@@ -153,7 +156,7 @@ public struct StackScreen<Content: View>: View {
                         )
                     }
 
-                    FooterContent(footer: footer, keyboardSize: keyboardSize)
+                    FooterContent(footer: footer, keyboardSize: keyboardSize, bottomInset: bottomInset)
                 }
 
                 // Animated search bar overlay (mirrors Compose's SearchAnimated layer).
@@ -440,10 +443,11 @@ private struct HideKeyboardOnTap: ViewModifier {
 private struct FooterContent: View {
     let footer: (() -> AnyView)?
     let keyboardSize: CGFloat
+    let bottomInset: CGFloat
 
     var body: some View {
         if let footerView = footer?() {
-            Footer(footerView: footerView, keyboardSize: keyboardSize)
+            Footer(footerView: footerView, keyboardSize: keyboardSize, bottomInset: bottomInset)
         }
     }
 }