More popover fixes

lightningkite · Mar 20, 2024 · a83c509 · a83c509
1 parent 1f94c2b
commit a83c509
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/library/src/commonMain/kotlin/com/lightningkite/rock/views/ViewWriter.kt b/library/src/commonMain/kotlin/com/lightningkite/rock/views/ViewWriter.kt
@@ -34,7 +34,7 @@ class ViewWriter(
         it.currentTheme = currentTheme
         it.lastTheme = lastTheme
         it.isRoot = isRoot
-        it.transitionNextView = transitionNextView
+        it.transitionNextView = TransitionNextView.No
         it.includePaddingAtStackEmpty = includePaddingAtStackEmpty
         it.changedThemes = changedThemes
     }
@@ -48,7 +48,7 @@ class ViewWriter(
         it.currentTheme = currentTheme
         it.lastTheme = lastTheme
         it.isRoot = isRoot
-        it.transitionNextView = transitionNextView
+        it.transitionNextView = TransitionNextView.No
         it.includePaddingAtStackEmpty = includePaddingAtStackEmpty
         it.changedThemes = changedThemes
     }
@@ -62,7 +62,7 @@ class ViewWriter(
         it.currentTheme = currentTheme
         it.lastTheme = lastTheme
         it.isRoot = isRoot
-        it.transitionNextView = transitionNextView
+        it.transitionNextView = TransitionNextView.No
         it.includePaddingAtStackEmpty = includePaddingAtStackEmpty
         it.changedThemes = changedThemes
     }

diff --git a/library/src/jsMain/kotlin/com/lightningkite/rock/views/direct/modifiers.js.kt b/library/src/jsMain/kotlin/com/lightningkite/rock/views/direct/modifiers.js.kt
@@ -143,6 +143,8 @@ actual fun ViewWriter.hasPopover(
             makeElement()
             stayOpen = true
             with(newViews)  {
+                currentTheme = rootTheme
+                lastTheme = rootTheme
                 dismissBackground {
                     native.style.position = "absolute"
                     native.style.left = "0"