@momo-kits/native-kits 0.163.1-beta.2-debug → 0.163.1-beta.20-debug

package/.claude/settings.local.json

@@ -0,0 +1,112 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/maven-metadata.xml\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko/maven-metadata.xml\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko/0.144.6/skiko-0.144.6.module\")",
+      "Bash(curl -s -o /dev/null -w '%{http_code}' https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.__TRACKED_VAR__)",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.148.1/skiko-android-0.148.1.pom\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.5/skiko-android-0.144.5.pom\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://dl.google.com/dl/android/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl -s \"https://search.maven.org/solrsearch/select?q=a:skiko-android&rows=5&wt=json\")",
+      "Bash(curl -sL -o /dev/null -w \"%{http_code} %{url_effective}\\\\n\" \"https://repo1.maven.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl *)",
+      "Bash(./gradlew :sample:androidApp:dependencies --configuration debugRuntimeClasspath)",
+      "Bash(./gradlew :sample:shared:compileDebugKotlinAndroid)",
+      "Bash(./gradlew :sample:androidApp:compileDebugKotlin)",
+      "Bash(ls -d *.xcodeproj)",
+      "Bash(grep -c ChipDemo.swift __TRACKED_VAR__/project.pbxproj)",
+      "Bash(grep -c PBXFileSystemSynchronizedRootGroup __TRACKED_VAR__/project.pbxproj)",
+      "Bash(grep -c InformationDemo.swift __TRACKED_VAR__/project.pbxproj)",
+      "Bash(plutil -lint project.pbxproj)",
+      "Bash(xcode-select -p)",
+      "Bash(/usr/bin/xcrun xcodebuild *)",
+      "Bash(echo \"exit: $?\")",
+      "Bash(/Applications/Xcode26.app/Contents/Developer/usr/bin/xcodebuild -version)",
+      "Bash(./gradlew :compose:tasks --all)",
+      "Bash(grep -n \"vanniktech\\\\|mavenPublishing\\\\|^publishing\\\\|version = gitlabVersion\\\\|namespace =\\\\|compileSdk =\\\\|minSdk =\\\\|GitLabPackages\\\\|name = \\\\\"\\\\${gitlabRepo}Packages\\\\\"\")",
+      "Bash(git checkout *)",
+      "Bash(./gradlew :compose:publishAllPublicationsToGitLabPackagesRepository --dry-run)",
+      "Bash(git fetch *)",
+      "Bash(git pull *)",
+      "Bash(git push *)",
+      "Bash(git branch *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -list)",
+      "Bash(xcrun simctl *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(pod install *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'id=1E6F9A79-5E64-4590-BEA2-828D75D99393' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(xcrun swiftc *)",
+      "Bash(echo \"=== exit: $? \\(1=none found\\) ===\")",
+      "Bash(cat Radius.swift)",
+      "Bash(cat Spacing.swift)",
+      "Bash(echo \"exit=$?\")",
+      "Bash(ruby *)",
+      "Bash(xcodebuild -list -workspace iosApp.xcworkspace)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro' build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' build)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' build)",
+      "Bash(xcodebuild build *)",
+      "Bash(git stash *)",
+      "Bash(plutil -lint sample/iosApp/iosApp.xcodeproj/project.pbxproj)",
+      "Bash(git add *)",
+      "Bash(git commit -m 'feat: DS-646 [ci build] *)",
+      "Bash(git commit -q -m 'fix:  DS-656 [ci build] *)",
+      "Bash(xargs git log --oneline -1)",
+      "Bash(git rev-list *)",
+      "Bash(git status *)",
+      "Bash(git rebase *)",
+      "Bash(git merge *)",
+      "Bash(git reset *)",
+      "Bash(awk '/^ *)",
+      "Bash(git ls-tree *)",
+      "Bash(awk *)",
+      "Read(//Users/sophia/Workspace/momo/momo-app/**)",
+      "Bash(git log *)",
+      "Bash(xcodebuild -version)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "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(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)"
+    ]
+  }
+}

package/CLAUDE.md

@@ -40,7 +40,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 ## Architecture essentials
 
 - **Entry point:** wrap content in `NavigationContainer(...)` from `navigation/`. It builds the `Navigator`, takes a host-supplied `Localize` (falls back to an empty one), and provides the CompositionLocals below. **Do not use** `ApplicationContainer` (`application/NavigationContainer.kt`) — deprecated and does **not** wire `LocalLocalize` / `LocalNavigator` / `LocalMaxApi`.
-- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize`, `ScaleSizeMaxRate` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
+- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
 - **Platform code** goes through `expect`/`actual` in `platform/` — never reference Android/iOS APIs from `commonMain` directly.
 - **Native bridge:** `IMaxApi` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge (dismiss, tracking, device info, language).
 - Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.163.1-beta.2-debug"
+        version = "0.163.1-beta.20-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -77,6 +77,7 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
             implementation(libs.compottie)
+            implementation(libs.gif.image)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)

package/compose/build.gradle.kts.backup

@@ -77,6 +77,7 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
             implementation(libs.compottie)
+            implementation(libs.gif.image)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)

package/compose/compose.podspec

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

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/OsFontScale.android.kt

@@ -0,0 +1,7 @@
+package vn.momo.kits.platform
+
+import androidx.compose.runtime.Composable
+
+// Android's LocalDensity.fontScale already tracks Configuration.fontScale live.
+@Composable
+actual fun ProvideOsFontScale(content: @Composable () -> Unit) = content()

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -8,7 +8,10 @@ import android.graphics.PorterDuffColorFilter
 import android.os.Build
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
@@ -21,7 +24,7 @@ import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.LottieProperty
 import com.airbnb.lottie.compose.LottieAnimation
 import com.airbnb.lottie.compose.LottieCompositionSpec
-import com.airbnb.lottie.compose.LottieConstants
+import com.airbnb.lottie.compose.animateLottieCompositionAsState
 import com.airbnb.lottie.compose.rememberLottieComposition
 import com.airbnb.lottie.compose.rememberLottieDynamicProperties
 import com.airbnb.lottie.compose.rememberLottieDynamicProperty
@@ -78,11 +81,14 @@ actual fun LottieAnimation(
     tintColor: Color?,
     bgColor: Color?,
     placedAsOverlay: Boolean,
+    iterations: Int,
+    isPlaying: Boolean,
+    onEvent: ((String) -> Unit)?,
     modifier: Modifier,
     useCompose: Boolean
 ) {
     if (useCompose) {
-        ComposeLottieAnimation(path, tintColor, bgColor, modifier)
+        ComposeLottieAnimation(path, tintColor, bgColor, iterations, isPlaying, onEvent, modifier)
         return
     }
 
@@ -110,9 +116,30 @@ actual fun LottieAnimation(
         )
     )
 
+    val lottieState = animateLottieCompositionAsState(
+        composition = composition,
+        iterations = iterations,
+        isPlaying = isPlaying,
+        restartOnPlay = false,
+    )
+
+    val currentOnEvent by rememberUpdatedState(onEvent)
+
+    LaunchedEffect(isPlaying) {
+        currentOnEvent?.invoke(if (isPlaying) LottieEvent.Start else LottieEvent.Pause)
+    }
+
+    LaunchedEffect(lottieState) {
+        var armed = false
+        snapshotFlow { lottieState.isAtEnd }.collect { atEnd ->
+            if (!atEnd) armed = true
+            else if (armed) { armed = false; currentOnEvent?.invoke(LottieEvent.Finish) }
+        }
+    }
+
     LottieAnimation(
         composition = composition,
-        iterations = LottieConstants.IterateForever,
+        progress = { lottieState.progress },
         dynamicProperties = if (tintColor != null) dynamicProperties else null,
         modifier = modifier
     )

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt

@@ -28,7 +28,9 @@ data class MiniAppContext(
     val providerId: String = "",
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
-    val fontScaleConfig: FontScaleConfig? = null,
+    val scaleSizeMaxRate: Float? = null,
+    val userScaleRate: Float? = null,
+    val useOSScaleRate: Boolean? = null,
 ) {
     companion object {
 
@@ -60,7 +62,9 @@ data class MiniAppContext(
                 providerId = parent.providerId.ifBlank { child.providerId },
                 permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
                 features = mergeFeatureFlags(parent.features, child.features),
-                fontScaleConfig = parent.fontScaleConfig ?: child.fontScaleConfig,
+                scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
+                userScaleRate = parent.userScaleRate ?: child.userScaleRate,
+                useOSScaleRate = parent.useOSScaleRate ?: child.useOSScaleRate,
             )
         }
 
@@ -98,11 +102,5 @@ val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?>
     null
 }
 
-@Immutable
-data class FontScaleConfig(
-    val useOSFontScale: Boolean = true,
-    val userScaleRate: Float? = null,
-    val osFontScale: Float? = null,
-)
-
-val LocalFontScaleConfig = staticCompositionLocalOf { FontScaleConfig() }
+@Deprecated("Max font scale is fixed at MAX_FONT_SCALE (1.5); this CompositionLocal is no longer read.")
+val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }

package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderRight.kt

@@ -139,7 +139,7 @@ private fun ToolkitHeaderRight(
     }
 
     fun onPressClose() {
-        api?.request("dismissAll", "")
+        api?.request("dismissAll", "", { _ -> })
     }
 
     fun onPressMore() {
@@ -167,8 +167,7 @@ private fun ToolkitHeaderRight(
                 if (toolResponse != null) {
                     headerRight?.toolCallback?.invoke(toolResponse)
                 }
-            } catch (e: Exception) {
-                println("Error parsing response: $e")
+            } catch (_: Exception) {
             }
         }
     }

package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt

@@ -7,6 +7,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import vn.momo.kits.const.*
 import vn.momo.kits.modifier.DeprecatedModifier
+import vn.momo.kits.platform.ProvideOsFontScale
 import vn.momo.kits.platform.getStatusBarHeight
 
 @Deprecated("Use IMaxApi instead", ReplaceWith("IMaxApi"))
@@ -93,6 +94,7 @@ fun ApplicationContainer(
 
     val appStatusBarHeight = statusBarHeight ?: getStatusBarHeight()
 
+    ProvideOsFontScale {
     CompositionLocalProvider(
         AppTheme provides appTheme,
         PlatformApi provides composeApi,
@@ -103,5 +105,6 @@ fun ApplicationContainer(
             content()
         }
     }
+    }
 
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/application/WidgetContainer.kt

@@ -0,0 +1,56 @@
+package vn.momo.kits.application
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Theme
+import vn.momo.kits.navigation.LocalMaxApi
+import vn.momo.kits.platform.ProvideOsFontScale
+import vn.momo.maxapi.IMaxApi
+
+
+@Composable
+fun WidgetContainer(
+    theme: Theme? = null,
+    miniAppContext: MiniAppContext? = null,
+    maxApi: IMaxApi? = null,
+    localize: Localize? = null,
+    content: @Composable () -> Unit,
+) {
+    val parentContext = LocalContext.current
+    val mergedContext = remember(parentContext, miniAppContext) {
+        MiniAppContext.merge(parentContext, miniAppContext)
+    }
+    val resolvedTheme = theme ?: AppTheme.current
+    val resolvedLocalize = localize ?: LocalLocalize.current
+    val resolvedMaxApi = maxApi ?: LocalMaxApi.current
+
+    LaunchedEffect(resolvedMaxApi, localize) {
+        val api = resolvedMaxApi ?: return@LaunchedEffect
+        val target = localize ?: return@LaunchedEffect
+        runCatching {
+            api.getLanguage(callback = { data ->
+                if (parseLanguage(data) == Localize.EN) target.changeLanguage(Localize.EN)
+            })
+        }
+    }
+
+    ProvideOsFontScale {
+        CompositionLocalProvider(
+            AppTheme provides resolvedTheme,
+            LocalContext provides mergedContext,
+            LocalLocalize provides resolvedLocalize,
+            LocalMaxApi provides resolvedMaxApi,
+        ) {
+            content()
+        }
+    }
+}
+
+private fun parseLanguage(raw: Map<String, Any?>?): String? {
+    val code = (raw?.get("response") as? String)?.trim()?.lowercase()
+    if (code.isNullOrEmpty()) return null
+    return if (code.startsWith(Localize.EN)) Localize.EN else Localize.VI
+}

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

@@ -95,11 +95,13 @@ private fun getStyle(size: Size): TextStyle {
     return styleCache[size] ?: Typography.actionDefaultBold
 }
 
-private fun getIconSize(size: Size): Dp = iconSizeCache[size] ?: 24.dp
+@InternalApi
+fun getIconSize(size: Size): Dp = iconSizeCache[size] ?: 24.dp
 private fun getIconSpace(size: Size): Dp = iconSpaceCache[size] ?: Spacing.S
 
+@InternalApi
 @Composable
-internal fun getTextColor(loading: Boolean, type: ButtonType): Color {
+fun getTextColor(loading: Boolean, type: ButtonType): Color {
     val theme = AppTheme.current
 
     return remember(type, theme, loading) {
@@ -140,7 +142,6 @@ fun RenderIcon(
     useTintColor: Boolean = true,
     icon: String = "",
     forceLoading: Boolean = false,
-    bgColor: Color? = null,
     textColor: Color? = null,
 ) {
     val iconSize = remember(size) { getIconSize(size) }
@@ -156,9 +157,10 @@ fun RenderIcon(
         Box(modifier) {
             LottieAnimation(
                 modifier = Modifier.size(iconSize),
-                bgColor = bgColor,
+                bgColor = null,
                 tintColor = color,
-                path = "files/lottie_circle_loader"
+                path = "files/lottie_circle_loader",
+                useCompose = true
             )
         }
     } else if (icon.isNotEmpty()) {
@@ -183,8 +185,9 @@ private fun shouldLoadingOnLeft(iconLeft: String, iconRight: String): Boolean {
     }
 }
 
+@InternalApi
 @Composable
-internal fun getTypeStyle(
+fun getTypeStyle(
     type: ButtonType,
     color: Color? = AppTheme.current.colors.primary,
     size: Size,
@@ -219,8 +222,9 @@ internal fun getTypeStyle(
     }
 }
 
+@InternalApi
 @Composable
-internal fun getButtonBackgroundColor(
+fun getButtonBackgroundColor(
     loading: Boolean,
     type: ButtonType
 ): Color {
@@ -336,7 +340,6 @@ fun Button(
                 useTintColor = useTintColor,
                 icon = iconLeft,
                 forceLoading = loading && loadingOnLeft,
-                bgColor = bgColor,
                 textColor = textColor
             )
             RenderTitle(size, title, textColor = textColor)
@@ -346,7 +349,6 @@ fun Button(
                 useTintColor = useTintColor,
                 icon = iconRight,
                 forceLoading = loading && !loadingOnLeft,
-                bgColor = bgColor,
                 textColor = textColor
             )
         }

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

@@ -209,7 +209,6 @@ internal class CupertinoOverscrollEffect(
     private fun availableDelta(delta: Offset, source: CupertinoScrollSource): Offset {
         val (x, overscrollX) = availableDelta(delta.x, overscrollOffset.x, source)
         val (y, overscrollY) = availableDelta(delta.y, overscrollOffset.y, source)
-        println("availableDelta delta=${delta.y} consumed y=$y overscrollY=$overscrollY source=${source}")
         overscrollOffset = Offset(overscrollX, overscrollY)
 
         return Offset(x, y)

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

@@ -5,6 +5,7 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -12,6 +13,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
@@ -21,69 +23,58 @@ import vn.momo.kits.const.Radius
 import vn.momo.kits.modifier.conditional
 
 data class IconSpecs(
-    val width: Dp,
-    val height: Dp,
-    val radius: Dp,
-    val size: Dp
+    val box: Dp,
+    val icon: Dp,
 )
 
 enum class IconSize(val value: IconSpecs) {
-    LARGE(
-        IconSpecs(
-            height = 48.dp,
-            radius = Radius.XL,
-            width = 48.dp,
-            size = 48.dp
-        )
-    ),
-    SMALL(
-        IconSpecs(
-            height = 40.dp,
-            radius = Radius.XL,
-            width = 40.dp,
-            size = 40.dp
-        )
-    )
+    LARGE(IconSpecs(box = 48.dp, icon = 24.dp)),
+    MEDIUM(IconSpecs(box = 36.dp, icon = 16.dp)),
+    SMALL(IconSpecs(box = 28.dp, icon = 16.dp)),
 }
 
-// Pre-computed shape to avoid repeated creation
-private val iconButtonShape = RoundedCornerShape(Radius.XL)
+enum class IconShape {
+    CIRCLE,
+    SQUARE,
+}
 
-// Cache for icon sizes to avoid repeated calculations
-private val iconSizeMap = mapOf(
-    IconSize.SMALL to 16.dp,
-    IconSize.LARGE to 24.dp
-)
+// Square keeps an 8dp rounded corner; circle is fully rounded regardless of size.
+private val squareShape = RoundedCornerShape(Radius.S)
+
+private fun IconShape.toShape(): Shape = when (this) {
+    IconShape.CIRCLE -> CircleShape
+    IconShape.SQUARE -> squareShape
+}
 
 @Composable
-internal fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
+internal fun getIconStyle(type: ButtonType, shape: Shape, color: Color? = null): Modifier {
     val theme = AppTheme.current
 
-    return remember(type, color, theme) {
+    return remember(type, shape, color, theme) {
         when (type) {
             ButtonType.DISABLED -> Modifier
-                .background(theme.colors.background.disable, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.background.disable, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.PRIMARY -> Modifier
-                .background(theme.colors.primary, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.primary, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.SECONDARY -> Modifier
-                .background(theme.colors.background.surface, iconButtonShape)
-                .border(1.dp, theme.colors.border.default, iconButtonShape)
+                .background(theme.colors.background.surface, shape)
+                .border(1.dp, theme.colors.border.default, shape)
 
             ButtonType.OUTLINE -> Modifier
-                .background(theme.colors.background.surface, iconButtonShape)
-                .border(1.dp, color ?: theme.colors.primary, iconButtonShape)
+                .background(theme.colors.background.surface, shape)
+                .border(1.dp, color ?: theme.colors.primary, shape)
 
             ButtonType.TONAL -> Modifier
-                .background(theme.colors.background.tonal, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.background.tonal, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.DANGER -> Modifier
-                .background(theme.colors.error.primary, iconButtonShape)
-                .border(0.dp, Color.Unspecified, iconButtonShape)
+                .background(theme.colors.error.primary, shape)
+                .border(0.dp, Color.Unspecified, shape)
 
             ButtonType.TEXT -> Modifier
         }
@@ -103,38 +94,32 @@ fun IconButton(
     onClick: () -> Unit,
     type: ButtonType = ButtonType.PRIMARY,
     size: IconSize = IconSize.SMALL,
+    shape: IconShape = IconShape.CIRCLE,
     icon: String = "",
 ) {
-    // Memoize icon size calculation
-    val iconSize = remember(size) {
-        iconSizeMap[size] ?: 16.dp
-    }
+    val specs = size.value
 
-    // Memoize enabled state
     val isEnabled = remember(type) {
         type != ButtonType.DISABLED
     }
 
-    // Memoize radius for clipping
-    val radius = remember(size) {
-        size.value.radius
-    }
+    val boxShape = remember(shape) { shape.toShape() }
 
     Box(
         modifier = Modifier
-            .size(size.value.size)
-            .then(getIconStyle(type))
+            .size(specs.box)
+            .then(getIconStyle(type, boxShape))
             .conditional(IsShowBaseLineDebug) {
                 border(1.dp, Colors.blue_03)
             }
-            .clip(RoundedCornerShape(radius))
+            .clip(boxShape)
             .clickable(enabled = isEnabled, onClick = onClick),
         contentAlignment = Alignment.Center
     ) {
         Icon(
             source = icon,
             color = getIconColor(type),
-            size = iconSize,
+            size = specs.icon,
         )
     }
-}
+}