Merge remote-tracking branch 'origin/main'

lightningkite · Mar 19, 2024 · 41f3e91 · 41f3e91
2 parents 9c73f66 + ba36650
commit 41f3e91
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 62 deletions.
diff --git a/library/src/commonMain/kotlin/com/lightningkite/rock/models/Svg.kt b/library/src/commonMain/kotlin/com/lightningkite/rock/models/Svg.kt
diff --git a/library/src/commonMain/kotlin/com/lightningkite/rock/models/Theme.kt b/library/src/commonMain/kotlin/com/lightningkite/rock/models/Theme.kt
@@ -13,6 +13,7 @@ data class Theme(
     val outline: Paint = Color.black,
     val outlineWidth: Dimension = 0.px,
     val background: Paint = Color.white,
+    val card: (Theme.() -> Theme) = { this },
     val hover: (Theme.() -> Theme) = {
         copy(
             background = this.background.closestColor().highlight(0.2f),
@@ -88,6 +89,9 @@ data class Theme(
 ) {
     val icon: Paint get() = iconOverride ?: foreground
 
+    private var cardCache: Theme? = null
+    @JsName("cardDirect")
+    fun card() = cardCache ?: card(this).also { cardCache = it }
     private var dialogCache: Theme? = null
     @JsName("dialogDirect")
     fun dialog() = dialogCache ?: dialog(this).also { dialogCache = it }

diff --git a/library/src/commonMain/kotlin/com/lightningkite/rock/models/data.kt b/library/src/commonMain/kotlin/com/lightningkite/rock/models/data.kt
@@ -96,36 +96,6 @@ data class SizeConstraints(
     val height: Dimension? = null,
 )
 
-data class Insets(
-    val left: Dimension? = null,
-    val top: Dimension? = null,
-    val right: Dimension? = null,
-    val bottom: Dimension? = null
-) {
-    constructor(all: Dimension) : this(all, all, all, all)
-
-    companion object {
-        fun zero() = Insets(0.px)
-
-        val none = zero()
-
-        fun symmetric(horizontal: Dimension = 0.px, vertical: Dimension = 0.px) =
-            Insets(horizontal, vertical, horizontal, vertical)
-    }
-}
-
-data class TextStyle(
-    val color: Color = Color.black,
-    val disabledColor: Color = Color.gray,
-    val size: Double = 14.0,
-    val font: Font = systemDefaultFont,
-    val bold: Boolean = false,
-    val italic: Boolean = false,
-    val allCaps: Boolean = false,
-    val lineSpacingMultiplier: Double = 1.0,
-    val letterSpacing: Dimension = 0.px,
-)
-
 enum class Align {
     Start, Center, End, Stretch
 }

diff --git a/library/src/commonMain/kotlin/com/lightningkite/rock/views/ViewContextExtensions.kt b/library/src/commonMain/kotlin/com/lightningkite/rock/views/ViewContextExtensions.kt
@@ -42,7 +42,7 @@ var ViewWriter.navigator by viewWriterAddonLateInit<RockNavigator>()
 @ViewModifierDsl3 inline fun ViewWriter.tweakTheme(crossinline calculate: suspend (Theme)->Theme?): ViewWrapper {
     return themeModifier { val e = it(); calculate(e) ?: e }
 }
-@ViewModifierDsl3 val ViewWriter.card: ViewWrapper get() = themeFromLast { it }
+@ViewModifierDsl3 val ViewWriter.card: ViewWrapper get() = themeFromLast { it.card() }
 @ViewModifierDsl3 val ViewWriter.dialog: ViewWrapper get() = themeFromLast { it.dialog() }
 @ViewModifierDsl3 val ViewWriter.hover: ViewWrapper get() = themeFromLast { it.hover() }
 @ViewModifierDsl3 val ViewWriter.down: ViewWrapper get() = themeFromLast { it.down() }

diff --git a/library/src/jsMain/kotlin/com/lightningkite/rock/views/NView.js.kt b/library/src/jsMain/kotlin/com/lightningkite/rock/views/NView.js.kt
@@ -81,7 +81,7 @@ actual var NView.spacing: Dimension
     set(value) {
         style.setProperty("--spacing", value.value)
         val cn = "spacingOf${value.value.replace(".", "_").filter { it.isLetterOrDigit() || it == '_' }}"
-        DynamicCSS.styleIfMissing(".$cn.$cn.$cn.$cn.$cn > *, .$cn.$cn.$cn.$cn.$cn > .hidingContainer > *", mapOf(
+        DynamicCSS.styleIfMissing(".$cn.$cn.$cn.$cn.$cn.$cn.$cn > *, .$cn.$cn.$cn.$cn.$cn.$cn.$cn > .hidingContainer > *", mapOf(
             "--parentSpacing" to value.value
         ))
         className = className.split(' ').filter { !it.startsWith("spacingOf") }.plus(cn).joinToString(" ")

diff --git a/library/src/jsMain/kotlin/com/lightningkite/rock/views/direct/ImageView.js.kt b/library/src/jsMain/kotlin/com/lightningkite/rock/views/direct/ImageView.js.kt
@@ -83,7 +83,6 @@ fun ImageView.setSrc(url: String) {
         }
         for(index in 0..<myIndex) {
             val it = children[index]
-            (it as? HTMLElement)?.style?.opacity = "0"
             window.setTimeout({
                 native.removeChild(it)
             }, 150)