From 414ae1056ac3dee910ef4e9eebfce9c2f937583d Mon Sep 17 00:00:00 2001
From: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>
Date: Thu, 15 Jul 2021 00:19:13 +0200
Subject: [PATCH] CSSVariableValueAs does not inherit from StylePropertyValue

---
 .../kotlin/org/jetbrains/compose/web/css/StyleBuilder.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleBuilder.kt b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleBuilder.kt
index 457edc4a2d..2870671ea6 100644
--- a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleBuilder.kt
+++ b/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleBuilder.kt
@@ -36,7 +36,7 @@ fun StyleBuilder.variable(variableName: String, value: String)
 fun StyleBuilder.variable(variableName: String, value: Number)
         = variable(variableName, value.unsafeCast<StylePropertyValue>())
 
-external interface CSSVariableValueAs<out T: StylePropertyValue>: StylePropertyValue
+external interface CSSVariableValueAs<out T: StylePropertyValue>
 
 // after adding `variable` word `add` became ambiguous
 @Deprecated(
@@ -55,13 +55,15 @@ class CSSVariable<out TValue: StylePropertyValue>(val name: String)
 private inline fun <TValue : StylePropertyValue?> variableValue(variableName: String, fallback: TValue? = null) =
     "var(--$variableName${fallback?.let { ", $it" } ?: ""})".unsafeCast<TValue>()
 
-fun <TValue: StylePropertyValue> CSSVariable<TValue>.value(fallback: TValue? = null) =
+fun <TValue: StylePropertyValue> CSSVariable<TValue>.value(fallback: TValue? = null): TValue =
         variableValue(
             name,
             fallback
         )
 
-fun <TValue: CSSVariableValueAs<TValue>> CSSVariable<TValue>.value(fallback: TValue? = null) =
+fun <TValue> CSSVariable<TValue>.value(fallback: TValue? = null): TValue
+    where TValue: CSSVariableValueAs<TValue>, TValue: StylePropertyValue
+    =
     variableValue(
         name,
         fallback