From 6fbdae9e8335cc7266fc42123c80060b69e9a3b9 Mon Sep 17 00:00:00 2001
From: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>
Date: Wed, 14 Jul 2021 23:26:11 +0200
Subject: [PATCH] CSSVariable is a class

---
 .../jetbrains/compose/web/css/StyleBuilder.kt | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 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 a0214fb3cc..9a783dce81 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
@@ -14,15 +14,15 @@ interface StyleBuilder {
     fun property(propertyName: String, value: StylePropertyValue)
     fun variable(variableName: String, value: StylePropertyValue)
 
-    operator fun <TValue: StylePropertyValue> CSSStyleVariable<TValue>.invoke(value: TValue) {
+    operator fun <TValue: StylePropertyValue> CSSVariable<TValue>.invoke(value: TValue) {
         variable(name, value.toString())
     }
 
-    operator fun CSSStyleVariable<StylePropertyString>.invoke(value: String) {
+    operator fun CSSVariable<StylePropertyString>.invoke(value: String) {
         variable(name, value)
     }
 
-    operator fun CSSStyleVariable<StylePropertyNumber>.invoke(value: Number) {
+    operator fun CSSVariable<StylePropertyNumber>.invoke(value: Number) {
         variable(name, value)
     }
 }
@@ -57,13 +57,9 @@ fun StyleBuilder.add(
 
 interface CSSVariables
 
-interface CSSVariable {
-    val name: String
-}
-
-class CSSStyleVariable<out TValue: StylePropertyValue>(override val name: String) : CSSVariable
+class CSSVariable<out TValue: StylePropertyValue>(val name: String)
 
-fun <TValue: StylePropertyValue> CSSStyleVariable<TValue>.value(fallback: TValue? = null) =
+fun <TValue: StylePropertyValue> CSSVariable<TValue>.value(fallback: TValue? = null) =
     CSSVariableValue<TValue>(
         variableValue(
             name,
@@ -71,7 +67,7 @@ fun <TValue: StylePropertyValue> CSSStyleVariable<TValue>.value(fallback: TValue
         )
     )
 
-fun <TValue: CSSVariableValueAs<TValue>> CSSStyleVariable<TValue>.value(fallback: TValue? = null) =
+fun <TValue: CSSVariableValueAs<TValue>> CSSVariable<TValue>.value(fallback: TValue? = null) =
     CSSVariableValue<TValue>(
         variableValue(
             name,
@@ -80,8 +76,8 @@ fun <TValue: CSSVariableValueAs<TValue>> CSSStyleVariable<TValue>.value(fallback
     )
 
 fun <TValue: StylePropertyValue> CSSVariables.variable() =
-    ReadOnlyProperty<Any?, CSSStyleVariable<TValue>> { _, property ->
-        CSSStyleVariable(property.name)
+    ReadOnlyProperty<Any?, CSSVariable<TValue>> { _, property ->
+        CSSVariable(property.name)
     }
 
 interface StyleHolder {