@momo-kits/native-kits 0.154.1-beta.8 → 0.154.1-beta.9

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

@@ -4,18 +4,6 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.staticCompositionLocalOf
 import vn.momo.kits.components.TrustBannerData
 
-
-private fun Map<String, Any?>?.string(key: String): String? =
-    (this?.get(key) as? String)
-
-@Suppress("UNCHECKED_CAST")
-private fun Map<String, Any?>?.mapStringAny(key: String): Map<String, Any?> =
-    (this?.get(key) as? Map<String, Any?>) ?: emptyMap()
-
-@Suppress("UNCHECKED_CAST")
-private fun Map<String, Any?>?.listOfMapStringAny(key: String): List<Map<String, Any>> =
-    (this?.get(key) as? List<Map<String, Any>>) ?: emptyList()
-
 @Immutable
 data class FeatureFlags(
     val showBaseLineDebug: Boolean? = false,
@@ -64,30 +52,37 @@ data class MiniAppContext(
             "permissions"   to (context?.permissions ?: emptyList()),
         )
 
-        fun fromMap(data: Map<String, Any?>?): MiniAppContext = MiniAppContext(
-            appIcon       = data.string(KEY_ICON) ?: "",
-            appName       = data?.get(KEY_NAME),
-            appId         = data.string(KEY_APP_ID) ?: "",
-            appCode       = data.string(KEY_CODE) ?: "",
-            description   = data?.get(KEY_DESCRIPTION),
-            support       = data.mapStringAny(KEY_SUPPORT),
-            toolkitConfig = data.mapStringAny(KEY_TOOLKIT_CFG),
-            providerId    = computeProviderId(
-                originAppId = data.string(KEY_ORIGIN_APP),
-                appId       = data.string(KEY_APP_ID)
-            ),
-            permissions   = data.listOfMapStringAny(KEY_PERMISSIONS),
-        )
+        fun merge(parent: MiniAppContext?, child: MiniAppContext?): MiniAppContext? {
+            if (parent == null && child == null) return null
+            if (parent == null) return child
+            if (child == null) return parent
+
+            return MiniAppContext(
+                appIcon = parent.appIcon.ifBlank { child.appIcon },
+                appName = parent.appName ?: child.appName,
+                appId = parent.appId.ifBlank { child.appId },
+                appCode = parent.appCode.ifBlank { child.appCode },
+                description = parent.description ?: child.description,
+                support = mergeMaps(parent.support, child.support),
+                toolkitConfig = mergeMaps(parent.toolkitConfig, child.toolkitConfig),
+                providerId = parent.providerId.ifBlank { child.providerId },
+                permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
+                features = mergeFeatureFlags(parent.features, child.features)
+            )
+        }
+
+        private fun mergeMaps(parent: Map<String, Any?>, child: Map<String, Any?>): Map<String, Any?> {
+            return child + parent
+        }
 
-        private fun computeProviderId(originAppId: String?, appId: String?): String {
-            val id = when {
-                !originAppId.isNullOrBlank() -> originAppId
-                !appId.isNullOrBlank()       -> appId
-                else                         -> null
-            } ?: return "unknown"
+        private fun mergeFeatureFlags(parent: FeatureFlags?, child: FeatureFlags?): FeatureFlags? {
+            if (parent == null && child == null) return null
+            if (parent == null) return child
+            if (child == null) return parent
 
-            val parts = id.split('.')
-            return parts.getOrNull(1) ?: "unknown"
+            return FeatureFlags(
+                showBaseLineDebug = parent.showBaseLineDebug ?: child.showBaseLineDebug
+            )
         }
     }
 }

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

@@ -58,6 +58,9 @@ fun NavigationContainer(
         AppNavigationBar.current
     }
 
+    val parentContext = ApplicationContext.current
+    val mergedContext = MiniAppContext.merge(parentContext, applicationContext)
+
     val theme = remember { mutableStateOf(initialTheme) }
 
     LaunchedEffect(Unit) {
@@ -80,7 +83,7 @@ fun NavigationContainer(
         AppThemeController provides { theme.value = it },
         AppStatusBar provides statusBarHeight,
         AppNavigationBar provides navigationBarHeight,
-        ApplicationContext provides applicationContext,
+        ApplicationContext provides mergedContext,
         AppConfig provides config,
         AppLanguage provides language,
     ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.154.1-beta.8",
+  "version": "0.154.1-beta.9",
   "private": false,
   "dependencies": {
     "@momo-platform/native-max-api": "1.0.18"