diff --git a/Project.toml b/Project.toml index 1e39a570..5a30f31c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "StippleUI" uuid = "a3c5d34a-b254-4859-a8fa-b86abb7e84a3" authors = ["Adrian Salceanu "] -version = "0.14.3" +version = "0.14.4" [deps] Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" diff --git a/src/Badges.jl b/src/Badges.jl index 327453aa..49b189da 100644 --- a/src/Badges.jl +++ b/src/Badges.jl @@ -17,14 +17,14 @@ outline::Bool = true color::String = "blue" textcolor::String = "teal-10" """ -function badge( fieldname::Union{Symbol,Nothing} = nothing, +function badge( fieldname::Union{Symbol,String,Nothing} = nothing, args...; wrap::Function = StippleUI.DEFAULT_WRAPPER, kwargs...) where {T<:Stipple.ReactiveModel} wrap() do q__badge(args...; attributes( - [:fieldname => fieldname, kwargs...], + [(isa(fieldname, String) ? :label : :fieldname) => fieldname, kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS )...) end diff --git a/src/Buttons.jl b/src/Buttons.jl index 14ec2187..4b49b99d 100644 --- a/src/Buttons.jl +++ b/src/Buttons.jl @@ -3,10 +3,11 @@ module Buttons using Genie, Stipple, StippleUI, StippleUI.API import Genie.Renderer.Html: HTMLString, normal_element, register_normal_element -export btn, btngroup, Btn +export btn, btngroup, btndropdown, Btn register_normal_element("q__btn", context = @__MODULE__) register_normal_element("q__btn__group", context = @__MODULE__) +register_normal_element("q__btn__dropdown", context = @__MODULE__) function btn( label::String = "", args...; @@ -59,8 +60,18 @@ function btngroup(args...; wrap::Function = StippleUI.DEFAULT_WRAPPER, kwargs...) wrap() do - Genie.Renderer.Html.q__btn__group(args...; kwargs...) + q__btn__group(args...; kwargs...) end end + +function btndropdown(args...; + wrap::Function = StippleUI.DEFAULT_WRAPPER, + kwargs...) + wrap() do + q__btn__dropdown(args...; kwargs...) + end +end + + end diff --git a/src/Dashboards.jl b/src/Dashboards.jl index e1993d98..8bcefc08 100644 --- a/src/Dashboards.jl +++ b/src/Dashboards.jl @@ -34,7 +34,7 @@ function dashboard(elemid::Union{AbstractString,Symbol}, content::Union{String,V end function dashboard(model::M, args...; kwargs...) where {M<:ReactiveModel} - dashboard(vm(model), args...; channel = model.channel__, kwargs...) + dashboard(vm(model), args...; channel = getchannel(model), kwargs...) end end