From 15a6b5601e57d60a14f4e9b4630fb58e3eebd407 Mon Sep 17 00:00:00 2001
From: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>
Date: Thu, 3 Jun 2021 01:22:22 +0200
Subject: [PATCH] Remove CSSKeywordValue from API completely

And subsequently simplify auto invocation
---
 .../jsMain/kotlin/androidx/compose/web/css/CSS.kt   | 13 +------------
 .../kotlin/androidx/compose/web/css/CSSHelpers.kt   |  7 ++-----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt
index ac401ade79..ae882b6da3 100644
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt
@@ -36,9 +36,7 @@ fun StyleSheet.insertRule(cssRule: String, index: Int? = null): Int {
 val ElementCSSInlineStyle.attributeStyleMap
     get() = this.asDynamic().attributeStyleMap.unsafeCast<StylePropertyMap>()
 
-external interface CSSStyleValue {
-    // toString() : string
-}
+external interface CSSStyleValue
 
 @JsName("CSSStyleValue")
 open external class CSSStyleValueJS : CSSStyleValue {
@@ -79,15 +77,6 @@ external class CSSUnparsedValue(members: Array<CSSUnparsedSegment>) : CSSStyleVa
     operator fun set(index: Int, value: CSSUnparsedSegment)
 }
 
-external interface CSSKeywordValue : CSSStyleValue {
-    val value: String
-}
-
-@JsName("CSSKeywordValue")
-external class CSSKeywordValueJS(value: String) : CSSKeywordValue {
-    override val value: String
-}
-
 // type CSSNumberish = number | CSSNumericValue
 interface CSSNumberish {
     companion object {
diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSHelpers.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSHelpers.kt
index 3c70c8cfc8..cd2ff835c2 100644
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSHelpers.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSHelpers.kt
@@ -1,11 +1,9 @@
 @file:Suppress("UNUSED")
-
 package org.jetbrains.compose.web.css
 
-interface CSSAutoValue : CSSKeywordValue
+interface CSSAutoValue : CSSStyleValue
 
-val auto = CSSKeywordValueJS("auto").unsafeCast<CSSAutoValue>()
-fun asCSSAutoValue(value: dynamic) = (value as? CSSKeywordValueJS).unsafeCast<CSSAutoValue>()
+val auto = StylePropertyValue("auto").unsafeCast<CSSAutoValue>()
 
 // type CSSSizeOrAutoValue = CSSSizeValue | CSSAutoValue
 interface CSSSizeOrAutoValue : CSSStyleValue, StylePropertyValue {
@@ -16,7 +14,6 @@ interface CSSSizeOrAutoValue : CSSStyleValue, StylePropertyValue {
 }
 
 fun CSSSizeOrAutoValue.asCSSSizeValue() = this.asDynamic() as? CSSUnitValueJS
-fun CSSSizeOrAutoValue.asCSSAutoValue(): CSSAutoValue = asCSSAutoValue(this.asDynamic())
 
 enum class Direction {
     rtl,