Update kotlin-react-intl wrapper to v5.21.0

oxiadenine · Oct 23, 2021 · ad3db88 · ad3db88
1 parent 66818d9
commit ad3db88
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 18 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,6 +8,6 @@ kotlin-styled.version=5.3.1-pre.258
 
 kotlin-antd.version=4.8.6-pre.15
 kotlin-moment.version=2.29.1-pre.14
-kotlin-react-intl.version=5.20.13-pre.14
+kotlin-react-intl.version=5.21.0-pre.15
 kotlin-react-responsive.version=8.2.0-pre.14
 kotlin-uikit.version=3.7.6-pre.13
diff --git a/kotlin-react-intl/react-intl-samples/src/main/kotlin/samples/App.kt b/kotlin-react-intl/react-intl-samples/src/main/kotlin/samples/App.kt
@@ -30,6 +30,7 @@ class App : RComponent<Props, State>() {
         }
         styledDiv {
             css { +AppStyles.content }
+            plural()
             timeZone()
             messages()
             injected()

diff --git a/kotlin-react-intl/react-intl-samples/src/main/kotlin/samples/Plural.kt b/kotlin-react-intl/react-intl-samples/src/main/kotlin/samples/Plural.kt
@@ -0,0 +1,31 @@
+package samples
+
+import kotlinx.html.js.onClickFunction
+import react.*
+import react.dom.button
+import reactintl.components.plural.formattedPlural
+import reactintl.components.provider.intlProvider
+
+private val app = fc<Props> {
+    val (dogs, setDogs) = useState(1)
+
+    intlProvider {
+        attrs {
+            locale = "en"
+            defaultLocale = "en"
+        }
+        formattedPlural {
+            attrs {
+                value = dogs
+                one = ReactNode("I have a unique dog")
+                other = ReactNode("I have $dogs dogs")
+            }
+        }
+        button {
+            attrs.onClickFunction = { setDogs(dogs + 1) }
+            +"Add dogs"
+        }
+    }
+}
+
+fun RBuilder.plural() = child(app)
diff --git a/kotlin-react-intl/src/main/kotlin/reactintl/ReactIntl.kt b/kotlin-react-intl/src/main/kotlin/reactintl/ReactIntl.kt
@@ -19,7 +19,7 @@ external fun <K, T : MessageDescriptor, U> defineMessages(msgs: U): U
 @JsName("defineMessage")
 external fun <T : MessageDescriptor> defineMessage(msg: T): T
 
-external interface IntlShape : ResolvedIntlConfig, IntlFormatters<Any /* String, ReactNode */> {
+external interface IntlShape : ResolvedIntlConfig, IntlFormatters<ReactNode> {
     var formatters: Formatters
 }
 
@@ -33,7 +33,7 @@ external interface IntlCache {
     var displayNames: Record<String, DisplayNames>
 }
 
-external interface ResolvedIntlConfig : CoreResolvedIntlConfig<Any /* String | ReactNode */> {
+external interface ResolvedIntlConfig : CoreResolvedIntlConfig<ReactNode> {
     var textComponent: ComponentType<Props>
     var wrapRichTextChunksInFragment: Boolean?
 }

diff --git a/kotlin-react-intl/src/main/kotlin/reactintl/components/datetime/FormattedDateTime.kt b/kotlin-react-intl/src/main/kotlin/reactintl/components/datetime/FormattedDateTime.kt
@@ -53,7 +53,7 @@ external interface FormattedTimePartsProps : FormatDateOptions, Props {
 external interface FormattedDateTimeRangeProps : FormatDateOptions, Props {
     var from: Any /* Number | Date */
     var to: Any /* Number | Date */
-    fun children(value: Any /* String | ReactNode */): ReactElement?
+    fun children(value: ReactNode): ReactElement?
 }
 
 external interface Formats : IntlDateTime.DateTimeFormatOptions {

diff --git a/kotlin-react-intl/src/main/kotlin/reactintl/components/list/FormattedList.kt b/kotlin-react-intl/src/main/kotlin/reactintl/components/list/FormattedList.kt
@@ -12,7 +12,7 @@ external class FormattedListComponent : Component<FormattedListProps, State> {
 }
 
 external interface FormattedListProps : ListFormatOptions, Props {
-    var value: Array<Any /* String | ReactNode */>
+    var value: Array<ReactNode>
 }
 
 external interface FormattedListPartsProps : FormatListOptions, Props {

diff --git a/kotlin-react-intl/src/main/kotlin/reactintl/components/message/FormattedMessage.kt b/kotlin-react-intl/src/main/kotlin/reactintl/components/message/FormattedMessage.kt
@@ -8,15 +8,14 @@ import react.*
 import reactintl.*
 
 @JsName("FormattedMessage")
-external class FormattedMessageComponent :
-    Component<FormattedMessageProps<Record<String, Any /* String | ReactNode */>>, State> {
+external class FormattedMessageComponent : Component<FormattedMessageProps<Record<String, ReactNode>>, State> {
     override fun render(): ReactElement?
 }
 
-external interface FormattedMessageProps<V : Record<String, Any /* String | ReactNode */>> : MessageDescriptor, Props {
+external interface FormattedMessageProps<V : Record<String, ReactNode>> : MessageDescriptor, Props {
     var values: V?
     var tagName: Any?
-    var children: ((nodes: Array<Any /* String | ReactNode */>) -> ReactElement)?
+    var children: ((nodes: Array<ReactNode>) -> ReactElement)?
     var ignoreTag: Boolean?
 }
 

diff --git a/kotlin-react-intl/src/main/kotlin/reactintl/components/message/FormattedMessageDsl.kt b/kotlin-react-intl/src/main/kotlin/reactintl/components/message/FormattedMessageDsl.kt
@@ -3,5 +3,5 @@ package reactintl.components.message
 import kotlinext.js.Record
 import react.*
 
-fun RBuilder.formattedMessage(handler: RHandler<FormattedMessageProps<Record<String, Any /* String | ReactNode */>>>) =
+fun RBuilder.formattedMessage(handler: RHandler<FormattedMessageProps<Record<String, ReactNode>>>) =
     child(FormattedMessageComponent::class, handler)
diff --git a/kotlin-react-intl/src/main/kotlin/reactintl/components/plural/FormattedPlural.kt b/kotlin-react-intl/src/main/kotlin/reactintl/components/plural/FormattedPlural.kt
@@ -14,13 +14,13 @@ external class FormattedPluralComponent : Component<FormattedPluralProps, State>
 external interface FormattedPluralProps : FormatPluralOptions, Props {
     var value: Number
     var intl: IntlShape
-    var other: Any /* String | ReactNode */
-    var zero: Any? /* String | ReactNode */
-    var one: Any? /* String | ReactNode */
-    var two: Any? /* String | ReactNode */
-    var few: Any? /* String | ReactNode */
-    var many: Any? /* String | ReactNode */
-    var children: ((value: Any? /* String | ReactNode */) -> ReactElement?)?
+    var other: ReactNode
+    var zero: ReactNode?
+    var one: ReactNode?
+    var two: ReactNode?
+    var few: ReactNode?
+    var many: ReactNode?
+    var children: ((value: ReactNode?) -> ReactElement?)?
 }
 
 external object IntlPlural {

diff --git a/kotlin-react-intl/src/main/kotlin/reactintl/components/provider/Provider.kt b/kotlin-react-intl/src/main/kotlin/reactintl/components/provider/Provider.kt
@@ -19,4 +19,4 @@ external interface ProviderState : State {
     var prevConfig: IntlConfig
 }
 
-external val createIntl: CreateIntlFn<Any /* String | ReactNode */, IntlConfig, IntlShape>
+external val createIntl: CreateIntlFn<ReactNode, IntlConfig, IntlShape>