@momo-kits/native-kits 0.163.1-sp.3-debug → 0.163.1-sp.4-debug

package/.claude/settings.local.json

@@ -72,7 +72,63 @@
       "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -configuration Debug clean build CODE_SIGNING_ALLOWED=NO)",
       "Bash(git commit *)",
       "Bash(npm view *)",
-      "Bash(echo \"EXIT=$? -> not resolvable\")"
+      "Bash(echo \"EXIT=$? -> not resolvable\")",
+      "Bash(yarn install *)",
+      "Bash(RCT_NEW_ARCH_ENABLED=1 pod install)",
+      "Bash(xcodebuild -workspace MoMoPlatform.xcworkspace -list)",
+      "Bash(git --no-pager diff --stat ios/Application/Localize.swift ios/Application/Navigation/NavigationContainer.swift ios/Popup/PopupDisplay.swift ios/Popup/PopupNotify.swift ios/Template/TrustBanner/TrustBanner.swift)",
+      "Bash(git rm *)",
+      "Bash(echo \"EXIT=$?\")",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits diff sample/iosApp/iosApp/Demo/ButtonDemo.swift)",
+      "Bash(python3 *)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits status --short)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits log --oneline -3)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits log --oneline -5 -- ios/Button/Button.swift)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits diff ios/native-kits.podspec compose/compose.podspec gradle.properties package.json)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits show HEAD:ios/Button/Button.swift)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits diff package.json ios/native-kits.podspec)",
+      "Bash(grep -n \"must be a \\\\`.background\\\\` of the label\" /Users/sophia/Workspace/momo/momo-app/node_modules/@momo-kits/native-kits/ios/Button/Button.swift)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-native-kits show -s --format=\"%h %ci %s\" 953b234d)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-app show -s --format=\"%h %ci %s\" f8757a14437)",
+      "Bash(git -C /Users/sophia/Workspace/momo/momo-app log -S '\"@momo-kits/native-kits\": \"0.163.1-beta.18\"' --format=\"%h %ci %s\" -- package.json)",
+      "Bash(swiftc -O repro_isfull.swift -o repro_isfull)",
+      "Bash(./repro_isfull)",
+      "Bash(grep -n '^\\\\[32;1m$\\\\|section_start\\\\|xcodebuild.*-workspace\\\\|xcodebuild.*archive\\\\|Prebuilt\\\\|prebuilt\\\\|framework.*download\\\\|rugby\\\\|Rugby' /private/tmp/claude-503/-Users-sophia-Workspace-momo-momo-native-kits/7e2b5bd7-f8b3-42f7-b242-127fa8eabd12/scratchpad/job_trace.log)",
+      "Bash(grep -n '\\\\[32;1m\\\\$' /private/tmp/claude-503/-Users-sophia-Workspace-momo-momo-native-kits/7e2b5bd7-f8b3-42f7-b242-127fa8eabd12/scratchpad/job_trace.log)",
+      "Bash(npm pack *)",
+      "Bash(mkdir -p b13 b18)",
+      "Bash(tar xzf *)",
+      "Bash(git *)",
+      "Bash(tar -tzf momo-kits-native-kits-0.163.1-beta.18.tgz)",
+      "Bash(tar -xzf momo-kits-native-kits-0.163.1-beta.18.tgz package/ios/Button/Button.swift)",
+      "Bash(tar -xzf momo-kits-native-kits-0.162.28.tgz package/ios/Button/Button.swift -C .)",
+      "Bash(mkdir -p old)",
+      "Bash(tar -xzf momo-kits-native-kits-0.162.28.tgz -C old package/ios/Button/Button.swift)",
+      "Bash(nm '/private/tmp/claude-503/-Users-sophia-Workspace-momo-momo-native-kits/7e2b5bd7-f8b3-42f7-b242-127fa8eabd12/scratchpad/ipa_extract/Payload/MoMoPlatform UAT.app/MoMoPlatform UAT')",
+      "Bash(xcodebuild -workspace /Users/sophia/Workspace/momo/momo-native-kits/sample/iosApp/iosApp.xcworkspace -list)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -derivedDataPath build-verify build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -derivedDataPath build-verify build)",
+      "Bash(./gradlew :sample:shared:syncComposeResourcesForIos)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' -derivedDataPath build-verify build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -quiet build)",
+      "Bash(xcodebuild -workspace sample/iosApp/iosApp.xcworkspace -list)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -destination 'id=0228A4B2-57E0-4E56-BFAD-DB9E95044AD9' -derivedDataPath /private/tmp/claude-503/-Users-sophia-Workspace-momo-momo-native-kits/6986983a-795d-419d-9d78-fcc100e87876/scratchpad/dd build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -destination 'id=1E6F9A79-5E64-4590-BEA2-828D75D99393' -derivedDataPath /private/tmp/claude-503/-Users-sophia-Workspace-momo-momo-native-kits/6986983a-795d-419d-9d78-fcc100e87876/scratchpad/dd build)",
+      "Bash([ -s $S/kb.png ])",
+      "Bash(sips -g pixelWidth -g pixelHeight /private/tmp/claude-503/-Users-sophia-Workspace-momo-momo-native-kits/6986983a-795d-419d-9d78-fcc100e87876/scratchpad/kb.png)",
+      "Bash(defaults read *)",
+      "Bash(defaults write *)",
+      "Bash(xcrun xcodebuild *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -quiet build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' -quiet build)",
+      "Read(//tmp/claude-503/-Users-sophia-Workspace-momo-momo-native-kits/3e8adc08-a7e7-4169-aee6-8b22a6996f38/scratchpad/**)",
+      "Bash(echo \"parse-exit=$?\")",
+      "Bash(echo \"=== exit $?\")",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -configuration Debug build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' -configuration Debug build)",
+      "Bash(./gradlew :sample:shared:compileCommonMainKotlinMetadata -q)",
+      "Bash(echo \"gradle=$?\")"
     ]
   }
 }

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.163.1-sp.3-debug"
+        version = "0.163.1-sp.4-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.163.1-sp.3-debug'
+    spec.version                  = '0.163.1-sp.4-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextOverflow
@@ -49,7 +50,7 @@ import vn.momo.kits.utils.ifTrue
 internal fun RenderRightIconSearch(
     loading: Boolean,
     icon: String,
-    color: Color,
+    color: Color?,
     onClick: () -> Unit,
     iconModifier: Modifier = Modifier
 ) {
@@ -57,7 +58,7 @@ internal fun RenderRightIconSearch(
         Box(Modifier.padding(horizontal = Spacing.S)) {
             CircularProgressIndicator(
                 modifier = Modifier.size(16.dp),
-                color = color,
+                color = color ?: AppTheme.current.colors.text.default,
                 trackColor = Color.Transparent,
                 strokeWidth = 2.dp
             )
@@ -90,7 +91,7 @@ data class InputSearchProps(
     val onPressButtonText: () -> Unit = {},
     val disabled: Boolean = false,
     val icon: String = "",
-    val iconColor: Color = Color(0xff),
+    val iconColor: Color? = Color.Unspecified,
     val onRightIconPressed: () -> Unit = {},
     val onFocus: () -> Unit = {},
     val onBlur: () -> Unit = {},
@@ -113,7 +114,6 @@ data class InputSearchProps(
 fun InputSearch(
     inputSearchProps: InputSearchProps = InputSearchProps(
         text = remember { mutableStateOf("") },
-        iconColor = AppTheme.current.colors.text.default
     ),
 ) {
     var isFocused by remember { mutableStateOf(false) }
@@ -121,7 +121,7 @@ fun InputSearch(
     val disabledColor = AppTheme.current.colors.text.disable
     var textColor = AppTheme.current.colors.text.default
     var placeholderColor = AppTheme.current.colors.text.hint
-    var iconTintColor = inputSearchProps.iconColor
+    var iconTintColor = inputSearchProps.iconColor?.takeOrElse { AppTheme.current.colors.text.default }
 
     if (inputSearchProps.disabled) {
         textColor = disabledColor

package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Item.kt

@@ -1,6 +1,6 @@
 package vn.momo.kits.layout
 
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
@@ -32,5 +32,7 @@ internal fun Item(
         m = m.width(grid.sizeForSpan(widthSpan))
         if (heightSpan > 0) m = m.height(grid.sizeForSpan(heightSpan))
     }
-    Box(modifier = m) { content() }
+    // A Column (not a Box) so multiple children flow VERTICALLY instead of stacking
+    // on top of each other — matches the React Item's flex-column content.
+    Column(modifier = m) { content() }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/BottomSheet.kt

@@ -28,6 +28,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalDensity
@@ -57,6 +58,9 @@ internal fun BottomSheet(
     header: BottomHeader,
     isSurface: Boolean = false,
     barrierDismissible: Boolean = true,
+    draggable: Boolean = true,
+    useBottomInset: Boolean = true,
+    footerComponent: (@Composable () -> Unit)? = null,
     onDismiss: (() -> Unit)?
 ) {
     val screenHeightDp = getScreenHeight()
@@ -161,30 +165,35 @@ internal fun BottomSheet(
                 .noFeedbackClickable {  },
             contentAlignment = Alignment.BottomCenter
         ) {
-            Column(Modifier.padding(bottom = AppNavigationBar.current)) {
+            val bottomInset = if (useBottomInset) {
+                (AppNavigationBar.current - keyboardSizeState().value).coerceAtLeast(0.dp)
+            } else 0.dp
+            Column(Modifier.padding(bottom = bottomInset)) {
                 Box(
                     modifier = Modifier
                         .height(72.dp)
                         .fillMaxWidth()
-                        .pointerInput(Unit) {
-                            detectDragGestures(
-                                onDrag = { change, dragAmount ->
-                                    change.consume()
-                                    coroutineScope.launch {
-                                        val newOffset = (sheetOffset.value + dragAmount.y).coerceAtLeast(0f)
-                                        sheetOffset.snapTo(newOffset)
-                                    }
-                                },
-                                onDragEnd = {
-                                    coroutineScope.launch {
-                                        if (sheetOffset.value > sheetCloseOffset) {
-                                            closeEvent()
-                                        } else {
-                                            sheetOffset.animateTo(0f)
+                        .conditional(draggable) {
+                            pointerInput(Unit) {
+                                detectDragGestures(
+                                    onDrag = { change, dragAmount ->
+                                        change.consume()
+                                        coroutineScope.launch {
+                                            val newOffset = (sheetOffset.value + dragAmount.y).coerceAtLeast(0f)
+                                            sheetOffset.snapTo(newOffset)
+                                        }
+                                    },
+                                    onDragEnd = {
+                                        coroutineScope.launch {
+                                            if (sheetOffset.value > sheetCloseOffset) {
+                                                closeEvent()
+                                            } else {
+                                                sheetOffset.animateTo(0f)
+                                            }
                                         }
                                     }
-                                }
-                            )
+                                )
+                            }
                         }
                 ) {
                     Column(
@@ -235,12 +244,50 @@ internal fun BottomSheet(
                     }
                 }
                 Divider()
-                content()
+                if (footerComponent != null) {
+                    Box(Modifier.weight(1f, fill = false)) {
+                        content()
+                    }
+                    BottomSheetFooter(footerComponent)
+                } else {
+                    content()
+                }
             }
         }
     }
 }
 
+@Composable
+private fun BottomSheetFooter(footerComponent: @Composable () -> Unit) {
+    val shadowBrush = remember {
+        Brush.verticalGradient(
+            colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.05f))
+        )
+    }
+
+    Box {
+        Box(
+            Modifier
+                .fillMaxWidth()
+                .background(AppTheme.current.colors.background.surface)
+                .conditional(IsShowBaseLineDebug) {
+                    border(1.dp, Colors.blue_03)
+                }
+                .padding(vertical = Spacing.S)
+        ) {
+            footerComponent()
+        }
+
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(6.dp)
+                .offset(x = 0.dp, y = (-6).dp)
+                .background(shadowBrush)
+        )
+    }
+}
+
 sealed class BottomHeader {
     data class Title(
         val data: String = "Bottom Sheet Title",

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt

@@ -139,10 +139,13 @@ class Navigator(
         isSurface: Boolean = false,
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null,
-        bottomSheetHeader: BottomHeader? = null
+        bottomSheetHeader: BottomHeader? = null,
+        draggable: Boolean = true,
+        useBottomInset: Boolean = true,
+        footerComponent: (@Composable () -> Unit)? = null
     ){
         val id = currentScreen()?.id ?: -1
-        OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.BOTTOM_SHEET, isSurface, barrierDismissible, onDismiss, bottomSheetHeader)
+        OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.BOTTOM_SHEET, isSurface, barrierDismissible, onDismiss, bottomSheetHeader, draggable, useBottomInset, footerComponent)
     }
 
     fun showSnackBar(snackBar: SnackBar, onDismiss: (() -> Unit)? = null) {
@@ -257,6 +260,9 @@ sealed class OverplayComponentParams {
         val onDismiss: (() -> Unit)? = null,
         val barrierDismissible: Boolean = true,
         val bottomSheetHeader: BottomHeader? = null,
+        val draggable: Boolean = true,
+        val useBottomInset: Boolean = true,
+        val footerComponent: (@Composable () -> Unit)? = null,
     ) : OverplayComponentParams()
 
     class SnackBar : OverplayComponentParams()
@@ -288,10 +294,13 @@ object OverplayComponentRegistry {
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)?,
         bottomSheetHeader: BottomHeader? = null,
+        draggable: Boolean = true,
+        useBottomInset: Boolean = true,
+        footerComponent: (@Composable () -> Unit)? = null,
     ){
         val params = when(type){
             OverplayComponentType.MODAL -> OverplayComponentParams.Modal(onDismiss, barrierDismissible)
-            OverplayComponentType.BOTTOM_SHEET -> OverplayComponentParams.BottomSheet(isSurface, onDismiss, barrierDismissible, bottomSheetHeader)
+            OverplayComponentType.BOTTOM_SHEET -> OverplayComponentParams.BottomSheet(isSurface, onDismiss, barrierDismissible, bottomSheetHeader, draggable, useBottomInset, footerComponent)
             OverplayComponentType.SNACK_BAR -> OverplayComponentParams.SnackBar()
         }
 
@@ -333,6 +342,9 @@ object OverplayComponentRegistry {
                     header = params.bottomSheetHeader ?: Title(),
                     isSurface = params.isSurface,
                     barrierDismissible = params.barrierDismissible,
+                    draggable = params.draggable,
+                    useBottomInset = params.useBottomInset,
+                    footerComponent = params.footerComponent,
                     onDismiss = params.onDismiss
                 )
             }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.163.1-sp.3
+version=0.163.1-sp.4
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/Components.swift

@@ -100,6 +100,20 @@ public struct HeaderBackground: View {
                         .frame(height: height)
                         .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
                         .background(backgroundColor)
+                        .overlay(
+                            headerTransparent ? AnyView(EmptyView()) :
+                            AnyView(
+                                Rectangle()
+                                    .fill(LinearGradient(
+                                        gradient: Gradient(colors: [
+                                            Color(red: 1, green: 0.8, blue: 0.87),
+                                            Color(red: 1, green: 0.8, blue: 0.87).opacity(0.5)
+                                        ]),
+                                        startPoint: .top,
+                                        endPoint: .bottom))
+                                    .opacity(opacity)
+                                    .frame(height: height))
+                        )
                     if !headerTransparent {
                         Rectangle()
                             .fill(Color.black.opacity(0.1))
@@ -132,17 +146,6 @@ public struct HeaderBackground: View {
     }
 }
 
-// MARK: - Header right width preference
-
-/// Reports the measured width of the header-right area so the animated search
-/// header can compute its trailing inset (mirrors Compose's headerRightWidthPx).
-public struct HeaderRightWidthKey: PreferenceKey {
-    public static var defaultValue: CGFloat = 0
-    public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
-    }
-}
-
 // MARK: - Bottom-tab root preference
 
 /// Set by `BottomTab` on appear so its enclosing `StackScreen` can detect that
@@ -232,9 +235,6 @@ public struct Header: View {
 
                         if let headerRight = headerRight {
                             AnyView(headerRight())
-                                .background(GeometryReader { geo in
-                                    Color.clear.preference(key: HeaderRightWidthKey.self, value: geo.size.width)
-                                })
                         }
                     }
                     .padding(.horizontal, 12)

package/ios/Application/HeaderRight.swift

@@ -101,98 +101,69 @@ struct ToolkitHeaderRight: View {
     var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
-    @Environment(\.applicationEnvironment) private var environment
-
-    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"]
-    }
+    @EnvironmentObject private var environment: ApplicationEnvironment
     
     // 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"],
-                "context": contextMap
-            ]
-        ) { response in
-            if let result = parseResponse(response) as? [String: Any],
-               result["success"] as? Bool == true {
-                isFavorite.toggle()
-            }
+            params: ["item": ["key": "onFavorite"]]
+        ) { _ in
+            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: [
-                "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)
-            ]
+            params: paramMap
         ) { _ in }
     }
     
     private func onPressClose() {
         environment.composeApi?.request(
             funcName: "dismissAll",
-            params: nil
+            params: ""
         ) { _ in }
     }
     
     private func onPressMore() {
+        let context = environment.applicationContext
         let params: [String: Any] = [
-            "useSystemTools": headerRight?.useSystemTools ?? true,
+            "useSystemTools": headerRight?.useSystemTools,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": contextMap
+            "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
+            ]
         ]
         environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
-            if let toolResponse = parseResponse(response) as? String {
-                headerRight?.toolCallback?(toolResponse)
+            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)
             }
         }
     }
@@ -224,7 +195,7 @@ struct ToolkitHeaderRight: View {
         } ?? false
         
         HStack(alignment: .center, spacing: 0) {
-            if shouldShowShortcut {
+            if headerRight?.useShortcut == true {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
@@ -235,17 +206,15 @@ struct ToolkitHeaderRight: View {
             }
             
             HStack(alignment: .center, spacing: 0) {
-                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: "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)
@@ -262,9 +231,6 @@ struct ToolkitHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
-        .onAppear {
-            loadFavoriteState()
-        }
     }
 }
 

package/ios/Application/Navigation/component/Header.swift

@@ -22,7 +22,7 @@ public struct NavigationHeader: View {
     /// Optional rich title (mirrors Compose's `HeaderTitle`); `.user` renders an
     /// avatar group, `.default`/nil renders plain `title`.
     var headerTitle: HeaderTitle?
-    var headerRight: (() -> any View)? = { HeaderRight() }
+    var headerRight: (() -> any View)? = { NavigationHeaderRight() }
     var goBack: (() -> Void)?
     var opacity: CGFloat = 1
     var animatedHeader: AnimatedHeader?

package/ios/Application/Navigation/component/HeaderRightWidthKey.swift

@@ -0,0 +1,11 @@
+import SwiftUI
+
+/// Reports the measured width of the header-right area so the animated search
+/// header can compute its trailing inset (mirrors Compose's headerRightWidthPx).
+/// Written by the header views (`NavigationHeader`) and read by `StackScreen`.
+public struct HeaderRightWidthKey: PreferenceKey {
+    public static var defaultValue: CGFloat = 0
+    public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}