add default to theme methods (#3214)

* add default to theme methods * add test --------- Co-authored-by: Pepijn de Vos <pepijn.devos@juliacomputing.com>
MakieOrg · Sep 7, 2023 · 7ebe960 · 7ebe960
1 parent 882c827
commit 7ebe960
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/MakieCore/src/recipes.jl b/MakieCore/src/recipes.jl
@@ -56,8 +56,8 @@ end
 # Since we can use Combined like a scene in some circumstances, we define this alias
 theme(x::SceneLike, args...) = theme(x.parent, args...)
 theme(x::AbstractScene) = x.theme
-theme(x::AbstractScene, key) = deepcopy(x.theme[key])
-theme(x::AbstractPlot, key) = deepcopy(x.attributes[key])
+theme(x::AbstractScene, key; default=nothing) = deepcopy(get(x.theme, key, default))
+theme(x::AbstractPlot, key; default=nothing) = deepcopy(get(x.attributes, key, default))
 
 Attributes(x::AbstractPlot) = x.attributes
 

diff --git a/src/theming.jl b/src/theming.jl
@@ -197,7 +197,7 @@ function with_theme(f, theme = Theme(); kwargs...)
     end
 end
 
-theme(::Nothing, key::Symbol) = theme(key)
+theme(::Nothing, key::Symbol; default=nothing) = theme(key; default)
 function theme(key::Symbol; default=nothing)
     if haskey(CURRENT_DEFAULT_THEME, key)
         val = to_value(CURRENT_DEFAULT_THEME[key])

diff --git a/test/scenes.jl b/test/scenes.jl
@@ -4,4 +4,6 @@
     @testset "getproperty(scene, :$field)" for field in fieldnames(Scene)
         @test getproperty(scene, field) !== missing # well, just don't error
     end
+    @test theme(nothing, :nonexistant, default=1) == 1
+    @test theme(scene, :nonexistant, default=1) == 1
 end