From 51cf2e99471fed48a38a8ebed99b8b44915e159f Mon Sep 17 00:00:00 2001
From: Darren Burns <darrenb900@gmail.com>
Date: Mon, 21 Oct 2024 10:28:48 +0100
Subject: [PATCH] Finish merge

---
 src/textual/app.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/textual/app.py b/src/textual/app.py
index d66940aa30..dec0bbcbba 100644
--- a/src/textual/app.py
+++ b/src/textual/app.py
@@ -493,11 +493,11 @@ class MyApp(App[None]):
     INLINE_PADDING: ClassVar[int] = 1
     """Number of blank lines above an inline app."""
 
-    _PSEUDO_CLASSES: ClassVar[dict[str, Callable[[App], bool]]] = {
+    _PSEUDO_CLASSES: ClassVar[dict[str, Callable[[App[Any]], bool]]] = {
         "focus": lambda app: app.app_focus,
         "blur": lambda app: not app.app_focus,
-        "dark": lambda app: app.dark,
-        "light": lambda app: not app.dark,
+        "dark": lambda app: app.current_theme.dark,
+        "light": lambda app: not app.current_theme.dark,
         "inline": lambda app: app.is_inline,
         "ansi": lambda app: app.ansi_color,
         "nocolor": lambda app: app.no_color,
@@ -1227,6 +1227,12 @@ def available_themes(self) -> dict[str, Theme]:
         """
         return {**BUILTIN_THEMES, **self._registered_themes}
 
+    @property
+    def current_theme(self) -> Theme:
+        theme = self.get_theme(self.theme)
+        assert theme is not None  # validated by _validate_theme
+        return theme
+
     def _validate_theme(self, theme_name: str) -> str:
         if theme_name not in self.available_themes:
             message = (