From d9509dd17ebfc879b773d0ff5c1345b85fc8c2fa Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Sat, 5 Jun 2021 02:53:56 +0200 Subject: [PATCH] Remove CSSSizeOrAuto completely Use CSSAuto or CSSSize instead (and overloading when needed) --- .../src/jsMain/kotlin/androidx/compose/web/css/CSSHelpers.kt | 4 +--- .../src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) 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 ae5280dda6..24c0873d76 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,12 +1,10 @@ @file:Suppress("UNUSED") package org.jetbrains.compose.web.css -interface CSSAutoValue : CSSSizeOrAutoValue +interface CSSAutoValue : StylePropertyValue val auto = "auto".unsafeCast() -external interface CSSSizeOrAutoValue : StylePropertyValue - enum class Direction { rtl, ltr; diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt index e70d018a37..6ef1b7ab65 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt @@ -1,6 +1,6 @@ package org.jetbrains.compose.web.css -interface CSSSizeValue : CSSUnitValue, CSSSizeOrAutoValue +interface CSSSizeValue : CSSUnitValue, StylePropertyValue interface CSSRelValue : CSSSizeValue interface CSSpercentValue : CSSRelValue