From 2cfaf07e659a55dd4c00dc50c62799947fc73f14 Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Wed, 18 Aug 2021 22:47:14 +0200 Subject: [PATCH] transform supporti multiple functions applied --- .../jetbrains/compose/web/css/properties/transform.kt | 4 ++-- web/core/src/jsTest/kotlin/css/TransformTests.kt | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt index fda13f095d..57b98fc5f4 100644 --- a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt +++ b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt @@ -61,6 +61,6 @@ fun translateYTransform(ty: CSSPercentageValue) = TransformFunction { "translate fun translateZTransform(tz: CSSLengthValue) = TransformFunction { "translateZ($tz)" } -fun StyleBuilder.transform(transformFunction: TransformFunction) { - property("transform", transformFunction.apply()) +fun StyleBuilder.transform(vararg transformFunction: TransformFunction) { + property("transform", transformFunction.joinToString(" ") { it.apply() }) } \ No newline at end of file diff --git a/web/core/src/jsTest/kotlin/css/TransformTests.kt b/web/core/src/jsTest/kotlin/css/TransformTests.kt index a385d9097a..70a1d2730a 100644 --- a/web/core/src/jsTest/kotlin/css/TransformTests.kt +++ b/web/core/src/jsTest/kotlin/css/TransformTests.kt @@ -237,4 +237,13 @@ class TransformTests { assertEquals("translateZ(7px)", nextChild().style.transform) } + + @Test + fun mutlipleTransforms() = runTest { + composition { + Div({ style { transform(perspectiveTransform(3.cm), translate(10.px, 3.px), rotateYTransform(3.deg)) } }) + } + + assertEquals("perspective(3cm) translate(10px, 3px) rotateY(3deg)", nextChild().style.transform) + } } \ No newline at end of file