Browse Source

Get rid of redundnant typecases in CSSUnits

pull/756/head
Shagen Ogandzhanian 3 years ago
parent
commit
8e546f84f8
  1. 64
      web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt
  2. 67
      web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt

64
web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt

@ -362,54 +362,54 @@ inline fun Element.computedStyleMap(): StylePropertyMapReadOnly =
external class CSS {
companion object {
fun number(value: Number): CSSUnitValue
fun percent(value: Number): CSSUnitValue
fun percent(value: Number): CSSpercentValue
// <length>
fun em(value: Number): CSSUnitValue
fun ex(value: Number): CSSUnitValue
fun ch(value: Number): CSSUnitValue
fun ic(value: Number): CSSUnitValue
fun rem(value: Number): CSSUnitValue
fun lh(value: Number): CSSUnitValue
fun rlh(value: Number): CSSUnitValue
fun vw(value: Number): CSSUnitValue
fun vh(value: Number): CSSUnitValue
fun vi(value: Number): CSSUnitValue
fun vb(value: Number): CSSUnitValue
fun vmin(value: Number): CSSUnitValue
fun vmax(value: Number): CSSUnitValue
fun cm(value: Number): CSSUnitValue
fun mm(value: Number): CSSUnitValue
fun Q(value: Number): CSSUnitValue
fun em(value: Number): CSSemValue
fun ex(value: Number): CSSexValue
fun ch(value: Number): CSSchValue
fun ic(value: Number): CSSicValue
fun rem(value: Number): CSSremValue
fun lh(value: Number): CSSlhValue
fun rlh(value: Number): CSSrlhValue
fun vw(value: Number): CSSvwValue
fun vh(value: Number): CSSvhValue
fun vi(value: Number): CSSviValue
fun vb(value: Number): CSSvbValue
fun vmin(value: Number): CSSvminValue
fun vmax(value: Number): CSSvmaxValue
fun cm(value: Number): CSScmValue
fun mm(value: Number): CSSmmValue
fun Q(value: Number): CSSQValue
// function _in(value: Number) : CSSUnitValue
// export
// { _in as in }
fun pt(value: Number): CSSUnitValue
fun pc(value: Number): CSSUnitValue
fun px(value: Number): CSSUnitValue
fun pt(value: Number): CSSptValue
fun pc(value: Number): CSSpcValue
fun px(value: Number): CSSpxValue
// <angle>
fun deg(value: Number): CSSUnitValue
fun grad(value: Number): CSSUnitValue
fun rad(value: Number): CSSUnitValue
fun turn(value: Number): CSSUnitValue
fun deg(value: Number): CSSdegValue
fun grad(value: Number): CSSgradValue
fun rad(value: Number): CSSradValue
fun turn(value: Number): CSSturnValue
// <time>
fun s(value: Number): CSSUnitValue
fun ms(value: Number): CSSUnitValue
fun s(value: Number): CSSsValue
fun ms(value: Number): CSSmsValue
// <frequency>
fun Hz(value: Number): CSSUnitValue
fun kHz(value: Number): CSSUnitValue
fun Hz(value: Number): CSSHzValue
fun kHz(value: Number): CSSkHzValue
// <resolution>
fun dpi(value: Number): CSSUnitValue
fun dpcm(value: Number): CSSUnitValue
fun dppx(value: Number): CSSUnitValue
fun dpi(value: Number): CSSdpiValue
fun dpcm(value: Number): CSSdpcmValue
fun dppx(value: Number): CSSdppxValue
// <flex>
fun fr(value: Number): CSSUnitValue
fun fr(value: Number): CSSfrValue
}
}

67
web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt

@ -1,7 +1,4 @@
@file:Suppress("UNUSED")
package org.jetbrains.compose.web.css
external interface CSSSizeValue : CSSUnitValue, CSSSizeOrAutoValue
// fake interfaces to distinguish units
@ -55,73 +52,73 @@ val Number.number
get(): CSSUnitValue = CSS.number(this)
val Number.percent
get(): CSSpercentValue = CSS.percent(this).unsafeCast<CSSpercentValue>()
get(): CSSpercentValue = CSS.percent(this)
val Number.em
get(): CSSemValue = CSS.em(this).unsafeCast<CSSemValue>()
get(): CSSemValue = CSS.em(this)
val Number.ex
get(): CSSexValue = CSS.ex(this).unsafeCast<CSSexValue>()
get(): CSSexValue = CSS.ex(this)
val Number.ch
get(): CSSchValue = CSS.ch(this).unsafeCast<CSSchValue>()
get(): CSSchValue = CSS.ch(this)
val Number.ic
get(): CSSicValue = CSS.ic(this).unsafeCast<CSSicValue>()
get(): CSSicValue = CSS.ic(this)
val Number.rem
get(): CSSremValue = CSS.rem(this).unsafeCast<CSSremValue>()
get(): CSSremValue = CSS.rem(this)
val Number.lh
get(): CSSlhValue = CSS.lh(this).unsafeCast<CSSlhValue>()
get(): CSSlhValue = CSS.lh(this)
val Number.rlh
get(): CSSrlhValue = CSS.rlh(this).unsafeCast<CSSrlhValue>()
get(): CSSrlhValue = CSS.rlh(this)
val Number.vw
get(): CSSvwValue = CSS.vw(this).unsafeCast<CSSvwValue>()
get(): CSSvwValue = CSS.vw(this)
val Number.vh
get(): CSSvhValue = CSS.vh(this).unsafeCast<CSSvhValue>()
get(): CSSvhValue = CSS.vh(this)
val Number.vi
get(): CSSviValue = CSS.vi(this).unsafeCast<CSSviValue>()
get(): CSSviValue = CSS.vi(this)
val Number.vb
get(): CSSvbValue = CSS.vb(this).unsafeCast<CSSvbValue>()
get(): CSSvbValue = CSS.vb(this)
val Number.vmin
get(): CSSvminValue = CSS.vmin(this).unsafeCast<CSSvminValue>()
get(): CSSvminValue = CSS.vmin(this)
val Number.vmax
get(): CSSvmaxValue = CSS.vmax(this).unsafeCast<CSSvmaxValue>()
get(): CSSvmaxValue = CSS.vmax(this)
val Number.cm
get(): CSScmValue = CSS.cm(this).unsafeCast<CSScmValue>()
get(): CSScmValue = CSS.cm(this)
val Number.mm
get(): CSSmmValue = CSS.mm(this).unsafeCast<CSSmmValue>()
get(): CSSmmValue = CSS.mm(this)
val Number.Q
get(): CSSQValue = CSS.Q(this).unsafeCast<CSSQValue>()
get(): CSSQValue = CSS.Q(this)
val Number.pt
get(): CSSptValue = CSS.pt(this).unsafeCast<CSSptValue>()
get(): CSSptValue = CSS.pt(this)
val Number.pc
get(): CSSpcValue = CSS.pc(this).unsafeCast<CSSpcValue>()
get(): CSSpcValue = CSS.pc(this)
val Number.px
get(): CSSpxValue = CSS.px(this).unsafeCast<CSSpxValue>()
get(): CSSpxValue = CSS.px(this)
val Number.deg
get(): CSSdegValue = CSS.deg(this).unsafeCast<CSSdegValue>()
get(): CSSdegValue = CSS.deg(this)
val Number.grad
get(): CSSgradValue = CSS.grad(this).unsafeCast<CSSgradValue>()
get(): CSSgradValue = CSS.grad(this)
val Number.rad
get(): CSSradValue = CSS.rad(this).unsafeCast<CSSradValue>()
get(): CSSradValue = CSS.rad(this)
val Number.turn
get(): CSSturnValue = CSS.turn(this).unsafeCast<CSSturnValue>()
get(): CSSturnValue = CSS.turn(this)
val Number.s
get(): CSSsValue = CSS.s(this).unsafeCast<CSSsValue>()
get(): CSSsValue = CSS.s(this)
val Number.ms
get(): CSSmsValue = CSS.ms(this).unsafeCast<CSSmsValue>()
get(): CSSmsValue = CSS.ms(this)
val Number.Hz
get(): CSSHzValue = CSS.Hz(this).unsafeCast<CSSHzValue>()
get(): CSSHzValue = CSS.Hz(this)
val Number.kHz
get(): CSSkHzValue = CSS.kHz(this).unsafeCast<CSSkHzValue>()
get(): CSSkHzValue = CSS.kHz(this)
val Number.dpi
get(): CSSdpiValue = CSS.dpi(this).unsafeCast<CSSdpiValue>()
get(): CSSdpiValue = CSS.dpi(this)
val Number.dpcm
get(): CSSdpcmValue = CSS.dpcm(this).unsafeCast<CSSdpcmValue>()
get(): CSSdpcmValue = CSS.dpcm(this)
val Number.dppx
get(): CSSdppxValue = CSS.dppx(this).unsafeCast<CSSdppxValue>()
get(): CSSdppxValue = CSS.dppx(this)
val Number.fr
get(): CSSfrValue = CSS.fr(this).unsafeCast<CSSfrValue>()
get(): CSSfrValue = CSS.fr(this)

Loading…
Cancel
Save