@momo-kits/native-kits 0.121.0-beta.3 → 0.121.0-beta.6

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

@@ -127,7 +127,6 @@ private fun ToolkitHeaderRight(
     val isLoading by remember { mutableStateOf(false) }
     val api = PlatformApi.current as? ComposeApi
     val context = ApplicationContext.current
-    val isWhiteList = WhiteList.current
 
     fun onPressShortcut() {
         api?.request("onToolAction", mapOf("item" to mapOf("key" to "onFavorite"))) {
@@ -135,8 +134,6 @@ private fun ToolkitHeaderRight(
         }
     }
 
-
-
     fun onPressHelpCenter() {
         val paramMap = mapOf(
             "appId" to context?.appId,
@@ -151,7 +148,7 @@ private fun ToolkitHeaderRight(
     }
 
     fun onPressClose() {
-        if(isWhiteList == true) {
+        if(DesignSystemWhiteList == true) {
             api?.request("dismissAll", "", { _ -> })
         }
         else {
@@ -253,7 +250,7 @@ private fun ToolkitHeaderRight(
             }
 
             Icon(
-                source = if(isWhiteList == true) "16_basic_home" else "16_navigation_close_circle",
+                source = if(DesignSystemWhiteList == true) "16_basic_home" else "16_navigation_close_circle",
                 size = 20.dp,
                 color = tintIconColor,
                 modifier = Modifier.padding(4.dp).clickable { onPressClose() }

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

@@ -85,10 +85,6 @@ val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
     null
 }
 
-val WhiteList = staticCompositionLocalOf<Boolean?> {
-    null
-}
-
 val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
@@ -144,8 +140,7 @@ fun ApplicationContainer(
         AppStatusBar provides appStatusBarHeight,
         ApplicationContext provides applicationContext,
         AppConfig provides config,
-        AppLanguage provides language,
-        WhiteList provides isWhiteList
+        AppLanguage provides language
     ) {
         content()
     }

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

@@ -1,6 +1,7 @@
 package vn.momo.kits.components
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -80,7 +81,6 @@ fun Image(
 ) {
     var imageOptions = Options()
     var imageState by remember { mutableStateOf(ImageState.Loading) }
-    var urlToLoad by remember(source) { mutableStateOf(source) }
     val density = LocalDensity.current
 
     options?.let {
@@ -92,26 +92,27 @@ fun Image(
         )
     }
 
-    Box(
+    BoxWithConstraints(
         modifier = modifier
-            .semantics { contentDescription = "img|$source" }
-            .onSizeChanged { size ->
-                if (source is String) {
-                    val host = getHostFromUrl(source)
-                    if (host != null && supportedDomains.contains(host)) {
-                        val widthPx = size.width.toFloat()
-                        val pixelRatio = density.density
-                        val pixelFitForWidth = widthPx * pixelRatio
-                        val sizeKey = closestSizeForWidth(pixelFitForWidth)
-                        urlToLoad = appendQueryParam(source, "size", sizeKey)
-                    } else {
-                        urlToLoad = source
-                    }
+            .semantics { contentDescription = "img|$source" },
+    ) {
+        val urlToLoad by remember(source, maxWidth, maxHeight) {
+            val sourceImage = if (source is String) {
+                val host = getHostFromUrl(source)
+                if (host != null && supportedDomains.contains(host)) {
+                    val widthPx = with(density) { maxWidth.roundToPx() }
+                    val pixelRatio = density.density
+                    val pixelFitForWidth = widthPx * pixelRatio
+                    val sizeKey = closestSizeForWidth(pixelFitForWidth)
+                    appendQueryParam(source, "size", sizeKey)
                 } else {
-                    urlToLoad = source
+                    source
                 }
+            } else {
+                source
             }
-    ) {
+            mutableStateOf(sourceImage)
+        }
         AsyncImage(
             modifier = Modifier.matchParentSize(),
             model = urlToLoad,
@@ -124,6 +125,7 @@ fun Image(
             onSuccess = { imageState = ImageState.Success },
             onError = { imageState = ImageState.Error },
         )
+
         when (imageState) {
             ImageState.Loading -> if (loading) Skeleton()
             ImageState.Error -> Icon(

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

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import vn.momo.kits.const.Colors
@@ -53,12 +54,20 @@ fun Modifier.shimmerLoadingAnimation(
                 repeatMode = RepeatMode.Restart,
             ),
         )
-        this.background(
-            brush = Brush.linearGradient(
-                colors = shimmerColors,
-                start = Offset(x = translateAnimation.value - widthOfShadowBrush, y = 0.0f),
-                end = Offset(x = translateAnimation.value, y = angleOfAxisY),
-            ),
-        )
+        drawBehind {
+            drawRect(
+                brush = Brush.linearGradient(
+                    colors = shimmerColors,
+                    start = Offset(
+                        x = translateAnimation.value - widthOfShadowBrush,
+                        y = 0.0f,
+                    ),
+                    end = Offset(
+                        x = translateAnimation.value,
+                        y = angleOfAxisY
+                    ),
+                )
+            )
+        }
     }
 }

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

@@ -18,6 +18,7 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.max
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
@@ -42,25 +43,32 @@ fun DateTimePicker(
     maxDate: LocalDateTime? = null,
     arrayLabelTime: List<String> = emptyList()
 ) {
-    val effectiveSelectedValue = remember {
+    val effectiveSelectedValue = remember(selectedValue) {
         selectedValue ?: getCurrentDateTime()
     }
-    val effectiveMinDate = remember {
+
+    val effectiveMinDate = remember(minDate) {
         minDate ?: createRelativeDate(-10)
     }
-    val effectiveMaxDate = remember {
+
+    val effectiveMaxDate = remember(maxDate) {
         maxDate ?: createRelativeDate(10)
     }
 
-    val initialValue = remember {
+    val needCheckRange = remember(minDate, maxDate) {
+        minDate == null && maxDate == null
+    }
+
+    val initialValue = remember(effectiveMinDate, effectiveMaxDate, effectiveSelectedValue) {
         when {
+            !needCheckRange -> effectiveSelectedValue
             effectiveSelectedValue < effectiveMinDate -> effectiveMinDate
             effectiveSelectedValue > effectiveMaxDate -> effectiveMaxDate
             else -> effectiveSelectedValue
         }
     }
 
-    var currentDate by remember {
+    var currentDate by remember(initialValue) {
         mutableStateOf(
             PickerData(
                 day = initialValue.dayOfMonth,
@@ -72,7 +80,7 @@ fun DateTimePicker(
         )
     }
 
-    val onWheelChangeValue = remember {
+    val onWheelChangeValue = remember(currentDate, effectiveMinDate, effectiveMaxDate) {
         { name: String, value: String ->
             var day = if (name == "day") value.toInt() else currentDate.day
             var month = if (name == "month") value.toInt() else currentDate.month
@@ -80,11 +88,18 @@ fun DateTimePicker(
             val hour = if (name == "hour") value.toInt() else currentDate.hour
             val minute = if (name == "minute") value.toInt() else currentDate.minute
             val timeMode = if (name == "timeMode") value else currentDate.timeMode
-            if (name == "year" && (year == effectiveMaxDate.year || year == effectiveMinDate.year)) {
-                month = month.coerceIn(
-                    effectiveMinDate.monthNumber,
-                    effectiveMaxDate.monthNumber,
-                )
+            if (name == "year") {
+                month = when (year) {
+                    effectiveMaxDate.year -> month.coerceIn(
+                        1,
+                        effectiveMaxDate.monthNumber
+                    )
+                    effectiveMinDate.year -> month.coerceIn(
+                        effectiveMinDate.monthNumber,
+                        12,
+                    )
+                    else -> month
+                }
             }
             if (name == "month" || name == "year") {
                 val maxDayOfMonth = when (month) {
@@ -119,7 +134,7 @@ fun DateTimePicker(
         snapshotFlow { currentDate }
             .mapNotNull {
                 val dateTime = it.toLocalDateTime()
-                if (dateTime in effectiveMinDate..effectiveMaxDate) dateTime
+                if (!needCheckRange || dateTime in effectiveMinDate..effectiveMaxDate) dateTime
                 else null
             }
             .onEach(onChange)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.121.0-beta.3",
+  "version": "0.121.0-beta.6",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/build/ios/Debug-iphonesimulator/Compose Kits.app/PkgInfo

@@ -1 +0,0 @@
-APPL????

package/build/ios/Debug-iphonesimulator/Compose Kits.app/_CodeSignature/CodeResources

@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>AppIcon60x60@2x.png</key>
-		<data>
-		l0tZNqHIXLQHAlddMsJPE72bYn0=
-		</data>
-		<key>AppIcon76x76@2x~ipad.png</key>
-		<data>
-		0KnC4u0atM5/TWAEI8nQZzbUNoM=
-		</data>
-		<key>Assets.car</key>
-		<data>
-		nTlp03F7kYIP+DJZVXNtqqIxUfE=
-		</data>
-		<key>Compose Kits.debug.dylib</key>
-		<data>
-		DEG4ELXpzTvyKO4EWbcuxLLSzMY=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		RDveVfPijoZTuyjsDMGYqT3f1UQ=
-		</data>
-		<key>PkgInfo</key>
-		<data>
-		n57qDP4tZfLD1rCS43W0B4LQjzE=
-		</data>
-		<key>__preview.dylib</key>
-		<data>
-		uHLUqTOGNZC13Mc2QwqQmGs6r0o=
-		</data>
-		<key>compose-resources/font/momosignature.otf</key>
-		<data>
-		mzCKksICl+wu9eQDFbuOdOg2Nm4=
-		</data>
-		<key>compose-resources/font/sfprotext_black.ttf</key>
-		<data>
-		4yY2QXhxUdQcC/IAnVwxo7DMLWI=
-		</data>
-		<key>compose-resources/font/sfprotext_bold.ttf</key>
-		<data>
-		Yy5s6hcbJ25d0fE7FSxwL79WLO4=
-		</data>
-		<key>compose-resources/font/sfprotext_heavy.ttf</key>
-		<data>
-		v8dcVF2+Kox8PW1iI+QqqlzLlDI=
-		</data>
-		<key>compose-resources/font/sfprotext_light.ttf</key>
-		<data>
-		7MjaMsLqxgRMgH6UU3UYC3zaOiA=
-		</data>
-		<key>compose-resources/font/sfprotext_medium.ttf</key>
-		<data>
-		O432GM0j6DhDsWqKMt4d3J3kTfQ=
-		</data>
-		<key>compose-resources/font/sfprotext_regular.ttf</key>
-		<data>
-		aGSkWBaLXmJpgEd2zP9Ztzy1ad8=
-		</data>
-		<key>compose-resources/font/sfprotext_semibold.ttf</key>
-		<data>
-		lWCuQS1zx8mvcjM9tQRktOWXsPk=
-		</data>
-		<key>compose-resources/font/sfprotext_thin.ttf</key>
-		<data>
-		9H29KVLvEvVeTm9zRYYmmGKCMbI=
-		</data>
-		<key>compose-resources/font/sfprotext_ultralight.ttf</key>
-		<data>
-		9QiaRneaqo8m+cp3wK3FbayKGnk=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>AppIcon60x60@2x.png</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			KgkeGYNpK9BwfVsT9hJCRngNzTM29qhTSMqfBM+aObk=
-			</data>
-		</dict>
-		<key>AppIcon76x76@2x~ipad.png</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			IetV/yMtySFD3XQIITLzUt/LkZzTvZVD+K3ryBmq2Y0=
-			</data>
-		</dict>
-		<key>Assets.car</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			pCi688CfDYCXBugBkv83ZT1OMt9pNht4rVyr3gn50F8=
-			</data>
-		</dict>
-		<key>Compose Kits.debug.dylib</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			p3WoLFhOhBHZKcMOcX8VsaI3qdZAo5cd7cB5ZNEf/8k=
-			</data>
-		</dict>
-		<key>__preview.dylib</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			FPKQQocxME9//7CQVsHYfFyskV3FbN/4xggKpGibL3E=
-			</data>
-		</dict>
-		<key>compose-resources/font/momosignature.otf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			F+KACN9wuF9mWxIVhxWq+PkDcml6zb4ucs5YVSEujZI=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_black.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			P6yiqkR05Jp8RbLpL0itO1wuJSRgB/7snI+8HT5bMMY=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_bold.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			51IjeHYgu4uhufl/aMXh++ZZ2SzGFDnLgbTO8eyMBUQ=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_heavy.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			V91Ol+EfW+Unj3hHdr7ky2gfOpdXAI4A3dtHmkng/JM=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_light.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			USMyFRxAk+cdg/dCoK9OvsSOkV7h3J2C6ss7BZen9Dc=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_medium.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			x+/F2AN2ZKWUaA8XnlXG+JwiA2bam7jS0MrDUEfHp5U=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_regular.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			bVUUwEqBQJpRuPFxYto9fFRCuPi412m1No8lOKbCzPk=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_semibold.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			lf1iocm4OI3ZS9MN3Ss1IT/O+g8cPqEmhzWgwrdiO8Q=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_thin.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			cRobdX4o3CpLEwUj/OCAlCILWNNt0kVSBSmE+6pczNk=
-			</data>
-		</dict>
-		<key>compose-resources/font/sfprotext_ultralight.ttf</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			p4Vbq779e9H0ggk+MMN6NwR0ubBDLx7lxJStqnO5d9c=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

package/build/ios/Debug-iphonesimulator/Compose Kits.app.dSYM/Contents/Info.plist

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.com.myapplication.MyApplication</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>