From a83c5098928b27ec4f7932b7574fd51c7e6916a2 Mon Sep 17 00:00:00 2001
From: Joseph Ivie <joseph@lightningkite.com>
Date: Wed, 20 Mar 2024 09:00:16 -0600
Subject: [PATCH] More popover fixes

---
 .../kotlin/com/lightningkite/rock/views/ViewWriter.kt       | 6 +++---
 .../com/lightningkite/rock/views/direct/modifiers.js.kt     | 2 ++
 2 files changed, 5 insertions(+), 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
index 269be010..2edb1016 100644
--- 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
index 44a3a290..71b5eec2 100644
--- 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"