Merge pull request #447 from icerockdev/#446-plurals-js-hotfix

#446 fix plurals updating of js (and same issue in other cases)

Author: Alex009

README.md

@@ -58,7 +58,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.21.0"
+        classpath "dev.icerock.moko:resources-generator:0.21.1"
     }
 }
 
@@ -76,10 +76,10 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.21.0")
-    commonMainApi("dev.icerock.moko:resources-compose:0.21.0") // for compose multiplatform
+    commonMainApi("dev.icerock.moko:resources:0.21.1")
+    commonMainApi("dev.icerock.moko:resources-compose:0.21.1") // for compose multiplatform
 
-    commonTestImplementation("dev.icerock.moko:resources-test:0.21.0")
+    commonTestImplementation("dev.icerock.moko:resources-test:0.21.1")
 }
 
 multiplatformResources {
@@ -98,7 +98,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 
 ```
 framework {
-    export("dev.icerock.moko:resources:0.21.0")
+    export("dev.icerock.moko:resources:0.21.1")
     export("dev.icerock.moko:graphics:0.9.0") // toUIColor here
 }
 ```

gradle/moko.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.21.0"
+resourcesVersion = "0.21.1"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }

resources-compose/src/androidMain/kotlin/dev/icerock/moko/resources/compose/AssetResource.kt

@@ -14,7 +14,7 @@ import dev.icerock.moko.resources.AssetResource
 @Composable
 actual fun AssetResource.readTextAsState(): State<String?> {
     val context: Context = LocalContext.current
-    return produceState<String?>(null) {
+    return produceState<String?>(null, this, context) {
         value = readText(context)
     }
 }

resources-compose/src/androidMain/kotlin/dev/icerock/moko/resources/compose/FileResource.kt

@@ -14,7 +14,7 @@ import dev.icerock.moko.resources.FileResource
 @Composable
 actual fun FileResource.readTextAsState(): State<String?> {
     val context: Context = LocalContext.current
-    return produceState<String?>(null) {
+    return produceState<String?>(null, this, context) {
         value = readText(context)
     }
 }

resources-compose/src/appleMain/kotlin/dev/icerock/moko/resources/compose/FileResource.kt

@@ -11,7 +11,7 @@ import dev.icerock.moko.resources.FileResource
 
 @Composable
 actual fun FileResource.readTextAsState(): State<String?> {
-    return produceState<String?>(null) {
+    return produceState<String?>(null, this) {
         value = readText()
     }
 }

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/AssetResource.kt

@@ -11,7 +11,7 @@ import dev.icerock.moko.resources.AssetResource
 
 @Composable
 actual fun AssetResource.readTextAsState(): State<String?> {
-    return produceState<String?>(null) {
+    return produceState<String?>(null, this) {
         value = getText()
     }
 }

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/FileResource.kt

@@ -11,7 +11,7 @@ import dev.icerock.moko.resources.FileResource
 
 @Composable
 actual fun FileResource.readTextAsState(): State<String?> {
-    return produceState<String?>(null) {
+    return produceState<String?>(initialValue = null, this) {
         value = getText()
     }
 }

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/StringDescExt.kt

@@ -10,7 +10,7 @@ import dev.icerock.moko.resources.desc.StringDesc
 
 @Composable
 actual fun StringDesc.localized(): String {
-    return produceState("") {
+    return produceState("", this) {
         value = localized()
     }.value
 }

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/StringResource.kt

@@ -6,6 +6,7 @@ package dev.icerock.moko.resources.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
 import dev.icerock.moko.resources.PluralsResource
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.desc.Plural
@@ -15,19 +16,40 @@ import dev.icerock.moko.resources.desc.ResourceFormatted
 import dev.icerock.moko.resources.desc.StringDesc
 
 @Composable
-actual fun stringResource(resource: StringResource): String =
-    produceState("") { value = StringDesc.Resource(resource).localized() }.value
+actual fun stringResource(resource: StringResource): String {
+    val stringDesc: StringDesc = remember(resource) {
+        StringDesc.Resource(resource)
+    }
+    return localized(stringDesc)
+}
 
 @Composable
-actual fun stringResource(resource: StringResource, vararg args: Any): String =
-    produceState("") { value = StringDesc.ResourceFormatted(resource, *args).localized() }.value
+actual fun stringResource(resource: StringResource, vararg args: Any): String {
+    val stringDesc: StringDesc = remember(resource, args) {
+        StringDesc.ResourceFormatted(resource, *args)
+    }
+    return localized(stringDesc)
+}
 
 @Composable
-actual fun stringResource(resource: PluralsResource, quantity: Int): String =
-    produceState("") { value = StringDesc.Plural(resource, quantity).localized() }.value
+actual fun stringResource(resource: PluralsResource, quantity: Int): String {
+    val stringDesc: StringDesc = remember(resource, quantity) {
+        StringDesc.Plural(resource, quantity)
+    }
+    return localized(stringDesc)
+}
 
 @Composable
-actual fun stringResource(resource: PluralsResource, quantity: Int, vararg args: Any): String =
-    produceState("") {
-        value = StringDesc.PluralFormatted(resource, quantity, *args).localized()
+actual fun stringResource(resource: PluralsResource, quantity: Int, vararg args: Any): String {
+    val stringDesc: StringDesc = remember(resource, quantity, args) {
+        StringDesc.PluralFormatted(resource, quantity, *args)
+    }
+    return localized(stringDesc)
+}
+
+@Composable
+private fun localized(stringDesc: StringDesc): String {
+    return produceState(initialValue = "", stringDesc) {
+        value = stringDesc.localized()
     }.value
+}

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/internal/produceByteArray.kt

@@ -15,7 +15,7 @@ import org.w3c.fetch.Response
 
 @Composable
 internal fun produceByteArray(url: String): State<ByteArray?> {
-    return produceState<ByteArray?>(null) {
+    return produceState<ByteArray?>(null, url) {
         val response: Response = window.fetch(url).await()
 
         if (response.ok.not()) {