dependecy injection refactoring and elem scope fix

GenieFramework · Oct 26, 2021 · 41580c4 · 41580c4
1 parent c90cc58
commit 41580c4
Show file tree

Hide file tree

Showing 29 changed files with 147 additions and 85 deletions.
diff --git a/src/Badges.jl b/src/Badges.jl
@@ -5,7 +5,9 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export badge, Badge
 
-Genie.Renderer.Html.register_normal_element("q__badge", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__badge", context = Genie.Renderer.Html)
+end
 
 """
 floating::Bool = false
@@ -22,7 +24,7 @@ function badge( fieldname::Union{Symbol,Nothing} = nothing,
                 wrap::Function = StippleUI.DEFAULT_WRAPPER,
                 kwargs...) where {T<:Stipple.ReactiveModel}
   wrap() do
-    q__badge(args...;
+    Genie.Renderer.Html.q__badge(args...;
             attributes(
               [:fieldname => fieldname, kwargs...],
               StippleUI.API.ATTRIBUTES_MAPPINGS

diff --git a/src/Banners.jl b/src/Banners.jl
@@ -5,7 +5,9 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export banner
 
-Genie.Renderer.Html.register_normal_element("q__banner", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__banner", context = Genie.Renderer.Html)
+end
 
 function banner(content::String = "",
                 args...;
@@ -15,7 +17,7 @@ function banner(content::String = "",
                 kwargs...)
 
   wrap() do
-    q__banner(args...; kwargs...) do
+    Genie.Renderer.Html.q__banner(args...; kwargs...) do
       string(
         (icon !== nothing ? wrap(()->icon, Symbol("v-slot:avatar")) : ""),
         content,

diff --git a/src/BigNumbers.jl b/src/BigNumbers.jl
@@ -5,7 +5,9 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export bignumber
 
-Genie.Renderer.Html.register_normal_element("st__big__number", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("st__big__number", context = Genie.Renderer.Html)
+end
 
 """
 bignumber(label::String = "",
@@ -28,7 +30,7 @@ function bignumber( label::Union{String,Symbol} = "",
                     wrap::Function = StippleUI.DEFAULT_WRAPPER,
                     kwargs...)
   wrap() do
-    st__big__number(args...; attributes([:title => label, :number => number, kwargs...])...)
+    Genie.Renderer.Html.st__big__number(args...; attributes([:title => label, :number => number, kwargs...])...)
   end
 end
 

diff --git a/src/Buttons.jl b/src/Buttons.jl
@@ -5,8 +5,10 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export btn, btngroup, Btn
 
-Genie.Renderer.Html.register_normal_element("q__btn", context = @__MODULE__)
-Genie.Renderer.Html.register_normal_element("q__btn__group", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__btn", context = Genie.Renderer.Html)
+  Genie.Renderer.Html.register_normal_element("q__btn__group", context = Genie.Renderer.Html)
+end
 
 function btn( label::String = "",
               args...;
@@ -15,7 +17,7 @@ function btn( label::String = "",
               kwargs...)
 
   wrap() do
-    q__btn([isa(content, Function) ? content() : join(content)],
+    Genie.Renderer.Html.q__btn([isa(content, Function) ? content() : join(content)],
             args...;
             attributes([:label => label, kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
@@ -59,7 +61,7 @@ function btngroup(args...;
                     wrap::Function = StippleUI.DEFAULT_WRAPPER,
                     kwargs...)
   wrap() do
-    q__btn__group(args...; kwargs...)
+    Genie.Renderer.Html.q__btn__group(args...; kwargs...)
   end
 end
 

diff --git a/src/Cards.jl b/src/Cards.jl
@@ -5,24 +5,26 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export card, card_section, card_actions
 
-Genie.Renderer.Html.register_normal_element("q__card", context = @__MODULE__)
-Genie.Renderer.Html.register_normal_element("q__card__section", context = @__MODULE__)
-Genie.Renderer.Html.register_normal_element("q__card__actions", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__card", context = Genie.Renderer.Html)
+  Genie.Renderer.Html.register_normal_element("q__card__section", context = Genie.Renderer.Html)
+  Genie.Renderer.Html.register_normal_element("q__card__actions", context = Genie.Renderer.Html)
+end
 
 function card(args...;
               wrap::Function = StippleUI.DEFAULT_WRAPPER,
               kwargs...)
   wrap() do
-    q__card(args...; kwargs...)
+    Genie.Renderer.Html.q__card(args...; kwargs...)
   end
 end
 
 function card_section(args...; kwargs...)
-  q__card__section(args...; kwargs...)
+  Genie.Renderer.Html.q__card__section(args...; kwargs...)
 end
 
 function card_actions(args...; kwargs...)
-  q__card__actions(args...; kwargs...)
+  Genie.Renderer.Html.q__card__actions(args...; kwargs...)
 end
 
 end
diff --git a/src/Checkboxes.jl b/src/Checkboxes.jl
@@ -5,7 +5,9 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export checkbox
 
-Genie.Renderer.Html.register_normal_element("q__checkbox", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__checkbox", context = Genie.Renderer.Html)
+end
 
 function checkbox(label::String = "",
                   fieldname::Union{Symbol,Nothing} = nothing,
@@ -14,7 +16,8 @@ function checkbox(label::String = "",
                   kwargs...)
 
   wrap() do
-    q__checkbox(args...; attributes([:label => label, :fieldname => fieldname, kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
+    Genie.Renderer.Html.q__checkbox(args...; attributes([:label => label, :fieldname => fieldname, kwargs...],
+                                              StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
 end
 

diff --git a/src/Chips.jl b/src/Chips.jl
@@ -5,7 +5,9 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export chip
 
-Genie.Renderer.Html.register_normal_element("q__chip", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__chip", context = Genie.Renderer.Html)
+end
 
 function chip(label::String = "",
               fieldname::Union{Symbol,Nothing} = nothing,
@@ -14,7 +16,8 @@ function chip(label::String = "",
               kwargs...)
 
   wrap() do
-    q__chip(args...; attributes([:label => label, :fieldname => fieldname, kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
+    Genie.Renderer.Html.q__chip(args...; attributes([:label => label, :fieldname => fieldname, kwargs...],
+                                          StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
 end
 

diff --git a/src/Dashboards.jl b/src/Dashboards.jl
@@ -3,16 +3,18 @@ module Dashboards
 using Genie, Stipple, StippleUI, StippleUI.API
 import Genie.Renderer.Html: HTMLString, normal_element
 
-export dashboard
+function __init__()
+  Genie.Renderer.Html.register_normal_element("st__dashboard", context = Genie.Renderer.Html)
+end
 
-Genie.Renderer.Html.register_normal_element("st__dashboard", context = @__MODULE__)
+export dashboard
 
 function dashboard( args...;
                     wrap::Function = StippleUI.DEFAULT_WRAPPER,
                     kwargs...)
 
   wrap() do
-    st__dashboard(args...; kwargs...)
+    Genie.Renderer.Html.st__dashboard(args...; kwargs...)
   end
 end
 

diff --git a/src/DatePickers.jl b/src/DatePickers.jl
@@ -18,7 +18,9 @@ import Genie.Renderer.Html: HTMLString, normal_element, template
 
 export datepicker, DateRange, DatePicker
 
-Genie.Renderer.Html.register_normal_element("q__date", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__date", context = Genie.Renderer.Html)
+end
 
 """
     DateRange
@@ -49,7 +51,7 @@ function datepicker(
                     kwargs...)
 
   wrap() do
-    q__date([isa(content, Function) ? content() : join(content)],
+    Genie.Renderer.Html.q__date([isa(content, Function) ? content() : join(content)],
             args...;
             attributes(
                   [ :fieldname => fieldname,

diff --git a/src/Dialogs.jl b/src/Dialogs.jl
@@ -5,14 +5,16 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export dialog
 
-Genie.Renderer.Html.register_normal_element("q__dialog", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__dialog", context = Genie.Renderer.Html)
+end
 
 function dialog(args...;
                 wrap::Function = StippleUI.DEFAULT_WRAPPER,
                 kwargs...)
 
   wrap() do
-    q__dialog(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
+    Genie.Renderer.Html.q__dialog(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
 end
 

diff --git a/src/Drawers.jl b/src/Drawers.jl
@@ -5,14 +5,16 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export drawer
 
-Genie.Renderer.Html.register_normal_element("q__drawer", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__drawer", context = Genie.Renderer.Html)
+end
 
 function drawer(args...;
                 wrap::Function = StippleUI.DEFAULT_WRAPPER,
                 kwargs...)
 
   wrap() do
-    q__drawer(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
+    Genie.Renderer.Html.q__drawer(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
 end
 

diff --git a/src/Editors.jl b/src/Editors.jl
@@ -5,7 +5,9 @@ import Genie.Renderer.Html: HTMLString, normal_element, select, template
 
 export editor
 
-Genie.Renderer.Html.register_normal_element("q__editor", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__editor", context = Genie.Renderer.Html)
+end
 
 """
   editor(fieldname, args...; wrap, kwargs...)
@@ -26,7 +28,7 @@ function editor(fieldname::Symbol,
                 wrap::Function = StippleUI.DEFAULT_WRAPPER,
                 kwargs...)
   wrap() do
-    q__editor(args...; attributes([:fieldname => fieldname, kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
+    Genie.Renderer.Html.q__editor(args...; attributes([:fieldname => fieldname, kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
 end
 

diff --git a/src/FormInputs.jl b/src/FormInputs.jl
@@ -5,8 +5,10 @@ import Genie.Renderer.Html: HTMLString, normal_element, template
 
 export textfield, numberfield, textarea, filefield
 
-Genie.Renderer.Html.register_normal_element("q__input", context = @__MODULE__)
-Genie.Renderer.Html.register_normal_element("q__file", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__input", context = Genie.Renderer.Html)
+  Genie.Renderer.Html.register_normal_element("q__file", context = Genie.Renderer.Html)
+end
 
 function textfield( label::String = "",
                     fieldname::Union{Symbol,Nothing} = nothing,
@@ -15,7 +17,7 @@ function textfield( label::String = "",
                     wrap::Function = StippleUI.DEFAULT_WRAPPER,
                     kwargs...)
   wrap() do
-    q__input([isa(content, Function) ? content() : join(content)],
+    Genie.Renderer.Html.q__input([isa(content, Function) ? content() : join(content)],
               args...;
               attributes([:label => label,
                           :fieldname => fieldname,
@@ -38,7 +40,7 @@ function numberfield( label::String = "",
                       wrap::Function = StippleUI.DEFAULT_WRAPPER,
                       kwargs...)
   wrap() do
-    q__input( [isa(content, Function) ? content() : join(content)],
+    Genie.Renderer.Html.q__input( [isa(content, Function) ? content() : join(content)],
               args...;
               attributes([:label => label,
                           :fieldname => fieldname, kwargs...],
@@ -64,7 +66,8 @@ function filefield( label::String = "",
                     kwargs...)
 
   wrap() do
-    q__file(args...; attributes(
+    Genie.Renderer.Html.q__file(args...;
+            attributes(
                         [:label => label, :fieldname => fieldname, kwargs...],
                         Dict("fieldname" => "v-model",
                               "itemaligned" => "item-aligned", "stacklabel" => "stack-label", "bottomslots" => "bottom-slots",

diff --git a/src/Forms.jl b/src/Forms.jl
@@ -5,14 +5,16 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export form
 
-Genie.Renderer.Html.register_normal_element("q__form", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__form", context = Genie.Renderer.Html)
+end
 
 function form(args...;
               wrap::Function = StippleUI.DEFAULT_WRAPPER,
               noresetfocus::Bool = false,
               kwargs...)
   wrap() do
-    q__form(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
+    Genie.Renderer.Html.q__form(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
 end
 

diff --git a/src/Icons.jl b/src/Icons.jl
@@ -5,7 +5,9 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export icon
 
-Genie.Renderer.Html.register_normal_element("q__icon", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__icon", context = Genie.Renderer.Html)
+end
 
 function icon(name::Union{String,Symbol},
               args...;
@@ -14,7 +16,7 @@ function icon(name::Union{String,Symbol},
               kwargs...)
 
   wrap() do
-    q__icon([isa(content, Function) ? content() : join(content)], args...; attributes([:name => name, kwargs...])...)
+    Genie.Renderer.Html.q__icon([isa(content, Function) ? content() : join(content)], args...; attributes([:name => name, kwargs...])...)
   end
 end
 

diff --git a/src/Intersections.jl b/src/Intersections.jl
@@ -5,14 +5,16 @@ import Genie.Renderer.Html: HTMLString, normal_element
 
 export intersection
 
-Genie.Renderer.Html.register_normal_element("q__intersection", context = @__MODULE__)
+function __init__()
+  Genie.Renderer.Html.register_normal_element("q__intersection", context = Genie.Renderer.Html)
+end
 
 function intersection(args...;
                       wrap::Function = StippleUI.DEFAULT_WRAPPER,
                       kwargs...)
 
   wrap() do
-    q__intersection(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
+    Genie.Renderer.Html.q__intersection(args...; attributes([kwargs...], StippleUI.API.ATTRIBUTES_MAPPINGS)...)
   end
 end