voom-presenters 0.1.11 → 2.0.1

data/lib/voom/presenters/dsl/components/content.rb

@@ -1,13 +1,3 @@
-require_relative 'menu'
-require_relative 'mixins/common'
-require_relative 'mixins/event'
-require_relative 'mixins/attaches'
-require_relative 'mixins/text_fields'
-require_relative 'mixins/selects'
-require_relative 'mixins/snackbars'
-require_relative 'mixins/date_time_fields'
-require_relative 'mixins/images'
-
 module Voom
   module Presenters
     module DSL
@@ -19,17 +9,47 @@ module Voom
           include Mixins::DateTimeFields
           include Mixins::Selects
           include Mixins::Snackbars
-          include Mixins::Images
+          include Mixins::Steppers
+          include Mixins::Sliders
+          include Mixins::Chipset
+          include Mixins::Icons
+          include Mixins::Dialogs
+          include Mixins::FileInputs
+          include Mixins::Avatar
+          include Mixins::Progress
+
+          attr_reader :hidden,
+                      :float,
+                      :components,
+                      :shows_errors,
+                      :width,
+                      :height,
+                      :position,
+                      :text_align,
+                      :padding,
+                      :inline,
+                      :background_color
 
-          attr_reader :hidden, :components, :shows_errors
-         
           def initialize(**attribs_, &block)
             super(type: :content, **attribs_, &block)
             @components = []
             @hidden = attribs.delete(:hidden){false}
+            @float = attribs.delete(:float){false}
+            @width = attribs.delete(:width){nil}
+            @height = attribs.delete(:height){nil}
             @shows_errors = attribs.delete(:shows_errors){false}
+            @position = Array(attribs.delete(:position)).compact
+            @text_align = attribs.delete(:text_align){'left'}
+            padding = attribs.delete(:padding) {nil}
+            @padding = validate_padding(coerce_padding(padding)).uniq if padding != nil
+            @inline = attribs.delete(:inline){false}
+            @background_color = attribs.delete(:background_color)
             expand!
           end
+
+          private
+          include Mixins::Padding
+
         end
       end
     end

data/lib/voom/presenters/dsl/components/date_field.rb

@@ -1,4 +1,4 @@
-require_relative 'datetime_base'
+require 'voom/presenters/dsl/components/datetime_base'
 
 module Voom
   module Presenters

data/lib/voom/presenters/dsl/components/datetime_base.rb

@@ -1,5 +1,3 @@
-require_relative 'text_field'
-
 module Voom
   module Presenters
     module DSL
@@ -26,7 +24,6 @@ module Voom
           def clear_icon(icon=nil, **attribs, &block)
             return @clear_icon if locked?
             @clear_icon = icon ? Components::Icon.new(parent: self, icon: icon,
-                                                      context: context,
                                                       **attribs, &block) : nil
           end
 

data/lib/voom/presenters/dsl/components/datetime_field.rb

@@ -1,5 +1,3 @@
-require_relative 'datetime_base'
-
 module Voom
   module Presenters
     module DSL

data/lib/voom/presenters/dsl/components/dialog.rb

@@ -1,19 +1,31 @@
-require_relative 'mixins/common'
-require_relative 'mixins/attaches'
-
 module Voom
   module Presenters
     module DSL
       module Components
-        class Dialog < Base
+        class Dialog < EventBase
           include Mixins::Common
           include Mixins::Attaches
-          attr_accessor :width, :height, :buttons, :components, :shows_errors
+          include Mixins::Steppers
+          include Mixins::Sliders
+          include Mixins::Event
+          include Mixins::Progress
+
+          attr_accessor :percent_width,
+                        :percent_height,
+                        :px_width,
+                        :px_height,
+                        :buttons,
+                        :components,
+                        :shows_errors
 
           def initialize(**attribs_, &block)
             super(type: :dialog, **attribs_, &block)
-            @width = attribs.delete(:width)
-            @height = attribs.delete(:height)
+            width = attribs.delete(:width)
+            height = attribs.delete(:height)
+            @percent_width = width&.end_with?("%") ? width : nil
+            @percent_height = height&.end_with?("%") ? height : nil
+            @px_width = !width&.end_with?("%") ? width : nil
+            @px_height = !height&.end_with?("%") ? height : nil
             @shows_errors = attribs.delete(:shows_errors){true}
 
             @buttons = []
@@ -24,27 +36,43 @@ module Voom
           def title(*title, **options, &block)
             return @title if locked?
             @title = Components::Typography.new(parent: self, type: :title,
-                                                text: title, context: context,
+                                                text: title,
                                                                  **options, &block)
           end
 
           def heading(*text, **options, &block)
             components << Components::Typography.new(parent: self, type: :heading,
-                                                     text: text, context: context,
+                                                     text: text,
                                                   **options, &block)
           end
 
           def body(*text, **options, &block)
             components << Components::Typography.new(parent: self, type: :body,
-                                                     text: text, context: context,
+                                                     text: text,
                                                      **options, &block)
           end
 
-          def button(text=nil, **attribs, &block)
-            @buttons << Button.new(parent: self, text: text,
-                                   context: context,
+          def actions(**attribs, &block)
+            return @actions if locked?
+            @actions = Actions.new(parent: self,
                                    **attribs, &block)
           end
+
+          class Actions < Base
+            attr_accessor :buttons
+
+            def initialize(**attribs_, &block)
+              super(type: :action, **attribs_, &block)
+              @buttons = []
+              expand!
+            end
+
+            def button(text = nil, **options, &block)
+              @buttons << Components::Button.new(parent: self, text: text,
+                                                 **options, &block)
+            end
+          end
+
         end
       end
     end

data/lib/voom/presenters/dsl/components/drawer.rb

@@ -1,17 +1,16 @@
-require_relative 'mixins/common'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class Drawer < Base
           include Mixins::Common
+          include Mixins::Attaches
 
-          attr_accessor :title, :components
+          attr_accessor :title, :subtitle, :components
 
           def initialize(**attribs_, &block)
             super(type: :drawer, **attribs_, &block)
-            self.title(attribs.delete(:title)) if attribs.key?(:title)
+            self.title(attribs.delete(:title)) if attribs.fetch(:title){nil}
             @components = []
 
             expand!
@@ -19,18 +18,24 @@ module Voom
 
           def menu(**attribs, &block)
             return @menu if locked?
-            @menu = Menu.new(parent: self, context: context,
+            @menu = Menu.new(parent: self,
                              **attribs, &block)
           end
 
           def attach(presenter, **params, &block)
-            pom = Voom::Presenters::App[presenter].call.expand_child(parent: self, context: context.merge(params), &block)
-            @menu = pom.components.select {|i| i.type==:menu}.first
+            pom = super
+            @menu = pom.components.select {|i| i.type == :menu}.first
           end
 
           def title(*text, **attribs, &block)
             return @title if locked?
-            @title = Components::Typography.new(parent: self, type: :text, text: text, context: context, **attribs, &block)
+            @title = Components::Typography.new(parent: self, type: :text, text: text, **attribs, &block)
+          end
+
+
+          def subtitle(*text, **attribs, &block)
+            return @subtitle if locked?
+            @subtitle = Components::Typography.new(parent: self, type: :text, text: text, **attribs, &block)
           end
 
         end

data/lib/voom/presenters/dsl/components/event.rb

@@ -4,101 +4,128 @@ module Voom
       module Components
         class Event < Base
           attr_accessor :event, :actions
+          # Alias common event names
+          EVENT_MAP = {focus: :focusin, blur: :focusout, onload: :after_init}
 
           def initialize(**attribs_, &block)
             super(type: :event, **attribs_, &block)
-            @event = attribs.delete(:event)
+            @event = alias_event(attribs.delete(:event))
             @actions = []
             expand!
           end
 
-          def loads(presenter=nil, path: nil, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :loads,
-                                               presenter: presenter,
-                                               path: path,
-                                               params: params, &block)
+          def <<(comp)
+            @actions << comp
           end
 
-          def replaces(target, presenter, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :replaces,
-                                               target: target,
-                                               presenter: presenter,
-                                               params: params, &block)
+          def loads(presenter = nil, path: nil, target: nil, input_tag: nil, wait_for_download: nil, **params, &block)
+            self << Actions::Loads.new(parent: self,
+                                       presenter: presenter,
+                                       path: path,
+                                       target: target,
+                                       input_tag: input_tag,
+                                       wait_for_download: wait_for_download,
+                                       params: params, &block)
+          end
+
+          def replaces(target, presenter, input_tag: nil, ignore_input_values: [], **params, &block)
+            self << Actions::Replaces.new(parent: self,
+                                          target: target,
+                                          presenter: presenter,
+                                          input_tag: input_tag,
+                                          ignore_input_values: Array(ignore_input_values),
+                                          params: params, &block)
           end
 
           # Method can be one of :post, :put, :delete or :patch
-          def posts(path, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :post,
-                                               path: path,
-                                               params: params, &block)
+          def posts(path, input_tag: nil, headers: nil, **params, &block)
+            self << Actions::Posts.new(parent: self,
+                                       path: path,
+                                       input_tag: input_tag,
+                                       headers: headers,
+                                       params: params, &block)
           end
 
           alias creates posts
 
-          def updates(path, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :update,
-                                               path: path,
-                                               params: params, &block)
+          def updates(path, input_tag: nil, headers: nil, **params, &block)
+            self << Actions::Updates.new(parent: self,
+                                         path: path,
+                                         input_tag: input_tag,
+                                         headers: headers,
+                                         params: params, &block)
           end
 
-          def deletes(path, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :delete,
-                                               path: path,
-                                               params: params, &block)
+          def deletes(path, input_tag: nil, headers: nil, **params, &block)
+            self << Actions::Deletes.new(parent: self,
+                                         path: path,
+                                         input_tag: input_tag,
+                                         headers: headers,
+                                         params: params, &block)
           end
 
           def dialog(dialog_id, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :dialog,
-                                               target: dialog_id,
-                                               params: params, &block)
+            self << Actions::Dialog.new(parent: self,
+                                        target: dialog_id,
+                                        params: params, &block)
           end
 
           def toggle_visibility(component_id, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :toggle_visibility,
-                                               target: component_id,
+            self << Actions::ToggleVisibility.new(parent: self,
+                                                  target: component_id,
+                                                  params: params, &block)
+          end
+
+          def toggle_disabled(component_id, **params, &block)
+            self << Actions::ToggleDisabled.new(parent: self,
+                                                  target: component_id,
+                                                  params: params, &block)
+          end
+
+          def prompt_if_dirty(dialog_id, input_tag: nil, **params, &block)
+            self << Actions::PromptIfDirty.new(parent: self,
+                                               target: dialog_id,
+                                               input_tag: input_tag,
                                                params: params, &block)
           end
 
+          # Removes the component and all its children
+          # Takes either an id or a list of ids.
+          def remove(*ids, **params, &block)
+            self << Actions::Remove.new(parent: self,
+                                        params: params.merge(ids: ids), &block)
+          end
+
+          alias removes remove
+
           def show(component_id, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :toggle_visibility,
-                                               target: component_id,
-                                               params: params.merge(action: :show), &block)
+            self << Actions::ToggleVisibility.new(parent: self,
+                                                  target: component_id,
+                                                  params: params.merge(action: :show), &block)
           end
 
           def hide(component_id, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :toggle_visibility,
-                                               target: component_id,
-                                               params: params.merge(action: :hide), &block)
+            self << Actions::ToggleVisibility.new(parent: self,
+                                                  target: component_id,
+                                                  params: params.merge(action: :hide), &block)
           end
 
           def snackbar(text, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :snackbar,
-                                               params: params.merge(text: text), &block)
+            self << Actions::Snackbar.new(parent: self,
+                                          params: params.merge(text: text), &block)
           end
 
           def autocomplete(path, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :autocomplete,
-                                               path: path,
-                                               target: "#{parent(:text_field).id}-list",
-                                               params: params, &block)
+            @actions << Actions::Autocomplete.new(parent: self,
+                                                 type: :autocomplete,
+                                                 path: path,
+                                                 target: "#{parent(:text_field).id}-list",
+                                                 params: params, &block)
           end
 
           def navigates(direction, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :navigates,
-                                               direction: direction,
-                                               params: params.merge(direction: direction), &block)
+            self << Actions::Navigates.new(parent: self,
+                                           params: params.merge(direction: direction), &block)
           end
 
           alias navigate navigates
@@ -107,12 +134,43 @@ module Voom
           # Takes either an id or a list of ids.
           # If the id is that of a form then all the clearable inputs on the form will be cleared.
           def clear(*ids, **params, &block)
-            @actions << Components::Action.new(parent: self,
-                                               type: :clear,
-                                               params: params.merge(ids: ids), &block)
+            self << Actions::Clear.new(parent: self,
+                                       params: params.merge(ids: ids), &block)
           end
-
           alias clears clear
+
+          def close_dialog(component_id, **params, &block)
+            self << Actions::CloseDialog.new(parent: self,
+                                        target: component_id,
+                                        params: params, &block)
+          end
+
+          def post_message(msg, **params, &block)
+            self << Actions::PostMessage.new(parent: self,
+                                             params: params.merge(message: msg), &block)
+          end
+
+          def stepper(navigate, **params, &block)
+            self << Actions::Stepper.new(parent: self,
+                                         params: params.merge(navigate: navigate, stepper_id: parent(:stepper).id), &block)
+          end
+
+          private
+
+          def alias_event(event)
+            EVENT_MAP.fetch(event.to_sym) {event.to_sym}
+          end
+
+          def initialize_plugins
+            self.class.include_plugins(:DSLEventActions, :DSLHelpers, plugins: _plugins_)
+          end
+
+          def _plugins_
+            @parent.send(:_plugins_) if @parent
+          end
+
+
+          include Voom::Presenters::DSL::Components::Mixins::LastResponse
         end
       end
     end