matestack-ui-core 0.7.1 → 0.7.5

data/app/concepts/matestack/ui/core/area/area.haml

@@ -0,0 +1 @@
+%area{@tag_attributes}

data/app/concepts/matestack/ui/core/area/area.rb

@@ -0,0 +1,18 @@
+module Matestack::Ui::Core::Area
+  class Area < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        alt: options[:alt],
+        coords: options[:coords].join(','),
+        download: options[:download],
+        href: options[:href],
+        hreflang: options[:hreflang],
+        media: options[:media],
+        rel: options[:rel],
+        shape: options[:shape],
+        target: options[:target],
+        type: options[:type]
+      })
+    end
+  end
+end

data/app/concepts/matestack/ui/core/article/article.haml

@@ -0,0 +1,5 @@
+%article{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/article/article.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Article
+  class Article < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/aside/aside.haml

@@ -0,0 +1,3 @@
+%aside{@tag_attributes}
+  - if block_given?
+    = yield

data/app/concepts/matestack/ui/core/aside/aside.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Aside
+  class Aside < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/async/async.haml

@@ -1,2 +1,2 @@
-%div{"v-if": "showing"}
+%div{@tag_attributes}
   = yield

data/app/concepts/matestack/ui/core/async/async.js

@@ -1,8 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
-
-import matestackEventHub from 'js/event-hub'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
@@ -60,6 +58,9 @@ const componentDef = {
         }
       }
     }
+    if(this.componentConfig["init_show"] == true){
+      this.showing = true
+    }
   },
   beforeDestroy: function() {
     const self = this

data/app/concepts/matestack/ui/core/async/async.rb

@@ -1,10 +1,12 @@
 module Matestack::Ui::Core::Async
-    class Async < Matestack::Ui::Core::Component::Dynamic
-
-      def setup
-        @rerender = true
-      end
-
+  class Async < Matestack::Ui::Core::Component::Dynamic
 
+    def setup
+      @rerender = true
+      @tag_attributes.merge!({
+        "v-if": "showing"
+      })
     end
+
   end
+end

data/app/concepts/matestack/ui/core/b/b.haml

@@ -0,0 +1,5 @@
+%b{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/b/b.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::B
+  class B < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/bdi/bdi.haml

@@ -0,0 +1,5 @@
+%bdi{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/bdi/bdi.rb

@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Bdi
+  class Bdi < Matestack::Ui::Core::Component::Static
+  end
+end

data/app/concepts/matestack/ui/core/bdo/bdo.haml

@@ -0,0 +1,5 @@
+%bdo{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/bdo/bdo.rb

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Bdo
+  class Bdo < Matestack::Ui::Core::Component::Static
+    REQUIRED_KEYS = [:dir]
+
+    def setup
+      @tag_attributes.merge!({
+        "dir": options[:dir]
+      })
+    end
+  end
+end

data/app/concepts/matestack/ui/core/blockquote/blockquote.rb

@@ -1,9 +1,11 @@
 module Matestack::Ui::Core::Blockquote
   class Blockquote < Matestack::Ui::Core::Component::Static
+
     def setup
       @tag_attributes.merge!({
         "cite": options[:cite]
-      })
+        })
     end
+
   end
 end

data/app/concepts/matestack/ui/core/button/button.haml

@@ -1,7 +1,5 @@
-- if options[:text].nil?
-  %button{@tag_attributes}
-    - if block_given?
-      = yield
-- else
-  %button{@tag_attributes}
+%button{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

data/app/concepts/matestack/ui/core/caption/caption.haml

@@ -1,6 +1,5 @@
 %caption{@tag_attributes}
-  - if options[:text].nil?
-    - if block_given?
-      = yield
+  - if options[:text].nil? && block_given?
+    = yield
   - else
     = options[:text]

data/app/concepts/matestack/ui/core/cite/cite.haml

@@ -0,0 +1,5 @@
+%cite{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/cite/cite.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Cite
+  class Cite < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/code/code.haml

@@ -0,0 +1,5 @@
+%code{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/code/code.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Code
+  class Code < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/collection/content/content.js

@@ -1,10 +1,8 @@
 import Vue from 'vue/dist/vue.esm'
-
-import matestackEventHub from 'js/event-hub'
-import queryParamsHelper from 'js/helpers/query-params-helper'
-
-import componentMixin from 'component/component'
-import asyncMixin from 'async/async'
+import matestackEventHub from '../../js/event-hub'
+import queryParamsHelper from '../../js/helpers/query-params-helper'
+import componentMixin from '../../component/component'
+import asyncMixin from '../../async/async'
 
 const componentDef = {
   mixins: [componentMixin, asyncMixin],

data/app/concepts/matestack/ui/core/collection/content/content.rb

@@ -8,7 +8,7 @@ module Matestack::Ui::Core::Collection::Content
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

data/app/concepts/matestack/ui/core/collection/filter/filter.js

@@ -1,9 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
-
-import matestackEventHub from 'js/event-hub'
-import queryParamsHelper from 'js/helpers/query-params-helper'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../../js/event-hub'
+import queryParamsHelper from '../../js/helpers/query-params-helper'
+import componentMixin from '../../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

data/app/concepts/matestack/ui/core/collection/filter/filter.rb

@@ -7,7 +7,7 @@ module Matestack::Ui::Core::Collection::Filter
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

data/app/concepts/matestack/ui/core/collection/filter/input/input.haml

@@ -1,8 +1,2 @@
 - if [:text, :number, :email, :date, :password].include?(options[:type])
-  %input{"v-model#{'.number' if options[:type] == :number}": input_key,
-    type: options[:type],
-    class: options[:class],
-    id: component_id,
-    "@keyup.enter": "submitFilter()",
-    ref: "filter.#{attr_key}",
-    placeholder: options[:placeholder]}
+  %input{@tag_attributes}

data/app/concepts/matestack/ui/core/collection/filter/input/input.rb

@@ -1,6 +1,18 @@
 module Matestack::Ui::Core::Collection::Filter::Input
   class Input < Matestack::Ui::Core::Component::Static
 
+    def setup
+      @tag_attributes.merge!({
+        "v-model#{'.number' if options[:type] == :number}": input_key,
+        type: options[:type],
+        class: options[:class],
+        id: component_id,
+        "@keyup.enter": "submitFilter()",
+        ref: "filter.#{attr_key}",
+        placeholder: options[:placeholder]
+      })
+    end
+
     def input_key
       'filter["' + options[:key].to_s + '"]'
     end

data/app/concepts/matestack/ui/core/collection/helper.rb

@@ -59,7 +59,6 @@ module Matestack::Ui::Core::Collection
 
   end
 
-
   module Helper
 
     def get_collection_filter collection_id, key=nil

data/app/concepts/matestack/ui/core/collection/order/order.js

@@ -1,9 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
-
-import matestackEventHub from 'js/event-hub'
-import queryParamsHelper from 'js/helpers/query-params-helper'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../../js/event-hub'
+import queryParamsHelper from '../../js/helpers/query-params-helper'
+import componentMixin from '../../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

data/app/concepts/matestack/ui/core/collection/order/order.rb

@@ -7,7 +7,7 @@ module Matestack::Ui::Core::Collection::Order
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

data/app/concepts/matestack/ui/core/collection/order/toggle/indicator/indicator.rb

@@ -3,7 +3,9 @@ module Matestack::Ui::Core::Collection::Order::Toggle::Indicator
 
     def response
       components {
-        plain "{{orderIndicator( '#{@component_config[:key]}', {asc: '#{@component_config[:asc]}', desc: '#{@component_config[:desc]}'} ) }}"
+        span @tag_attributes do
+          plain "{{orderIndicator( '#{@component_config[:key]}', {asc: '#{@component_config[:asc]}', desc: '#{@component_config[:desc]}'} ) }}"
+        end
       }
     end
 

data/app/concepts/matestack/ui/core/collection/order/toggle/toggle.rb

@@ -1,6 +1,5 @@
 module Matestack::Ui::Core::Collection::Order::Toggle
   class Toggle < Matestack::Ui::Core::Component::Static
 
-
   end
 end

data/app/concepts/matestack/ui/core/component/anonym-dynamic-component.js

@@ -1,5 +1,5 @@
 import Vue from 'vue/dist/vue.esm'
-import componentMixin from 'component/component'
+import componentMixin from './component'
 
 const componentDef = {
   mixins: [componentMixin]

data/app/concepts/matestack/ui/core/component/component.js

@@ -1,8 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
 import axios from 'axios'
 import VRuntimeTemplate from "v-runtime-template"
-
-import matestackEventHub from 'js/event-hub'
+import matestackEventHub from '../js/event-hub'
 
 const componentMixin = {
   props: ['componentConfig', 'params'],

data/app/concepts/matestack/ui/core/component/dynamic.rb

@@ -1,36 +1,9 @@
 module Matestack::Ui::Core::Component
   class Dynamic < Trailblazer::Cell
-
-
-    include ActionView::Helpers::ActiveModelHelper
-    include ActionView::Helpers::ActiveModelInstanceTag
-    include ActionView::Helpers::AssetTagHelper
-    include ActionView::Helpers::AssetUrlHelper
-    include ActionView::Helpers::AtomFeedHelper
-    include ActionView::Helpers::CacheHelper
-    include ActionView::Helpers::CaptureHelper
-    include ActionView::Helpers::CspHelper
-    include ActionView::Helpers::CsrfHelper
-    include ActionView::Helpers::DateHelper
-    include ActionView::Helpers::DebugHelper
-    include ActionView::Helpers::FormHelper
-    include ActionView::Helpers::FormOptionsHelper
-    include ActionView::Helpers::FormTagHelper
-    include ActionView::Helpers::JavaScriptHelper
-    include ActionView::Helpers::NumberHelper
-    include ActionView::Helpers::OutputSafetyHelper
-    include ActionView::Helpers::RecordTagHelper
-    # include ActionView::Helpers::RenderingHelper
-    include ActionView::Helpers::SanitizeHelper
-    include ActionView::Helpers::TagHelper
-    include ActionView::Helpers::TextHelper
-    include ActionView::Helpers::TranslationHelper
-    include ActionView::Helpers::UrlHelper
-    # include ActionView::Helpers::UrlHelper
-    # include ActionView::Helpers::TranslationHelper
-    include ::Cell::Haml
+    include Matestack::Ui::Core::Cell
     include Matestack::Ui::Core::ApplicationHelper
     include Matestack::Ui::Core::ToCell
+    include Matestack::Ui::Core::HasViewContext
 
     view_paths << "#{Matestack::Ui::Core::Engine.root}/app/concepts"
     view_paths << "#{::Rails.root}/app/matestack"
@@ -69,13 +42,14 @@ module Matestack::Ui::Core::Component
       @nodes = {}
       @cells = {}
       @included_config = options[:included_config]
+      @cached_params = options[:cached_params]
       @rerender = false
       @options = options
+      set_tag_attributes
+      setup
       generate_component_name
       generate_children_cells
-      set_tag_attributes
       validate_options
-      setup
     end
 
     def validate_options
@@ -160,7 +134,7 @@ module Matestack::Ui::Core::Component
       @nodes = Matestack::Ui::Core::ComponentNode.build(self, nil, &block)
 
       @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+        @cells[key] = to_cell("#{@component_key}__#{key}", node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
       end
     end
 
@@ -193,6 +167,37 @@ module Matestack::Ui::Core::Component
       result.join(" ")
     end
 
+    def render_child_component component_key, current_search_keys_array
+      if respond_to? :prepare
+        prepare
+      end
+
+      response
+
+      if current_search_keys_array.count > 1
+        if @nodes.dig(*current_search_keys_array) == nil
+          rest = []
+          while @nodes.dig(*current_search_keys_array) == nil
+            rest << current_search_keys_array.pop
+          end
+          node = @nodes.dig(*current_search_keys_array)
+          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
+          begin
+            return cell.render_child_component component_key, rest.reverse[1..-1]
+          rescue
+            return cell.render_content
+          end
+        else
+          node = @nodes.dig(*current_search_keys_array)
+          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
+          return cell.render_content
+        end
+      else
+        node = @nodes[current_search_keys_array[0]]
+        cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
+        return cell.render_content
+      end
+    end
 
     private
 
@@ -201,7 +206,7 @@ module Matestack::Ui::Core::Component
           #needs refactoring --> in some cases, :component_key, :children, :origin_url, :url_params, :included_config get passed into options[:children] which causes errors
           #quickfix: except them from iteration
           options[:children].except(:component_key, :children, :origin_url, :url_params, :included_config).each do |key, node|
-            @children_cells[key] = to_cell("#{@component_key}__#{key}", node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+            @children_cells[key] = to_cell("#{@component_key}__#{key}", node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
           end
         end
       end