matestack-ui-core 0.7.1 → 0.7.5

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

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

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

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

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

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

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

@@ -0,0 +1,14 @@
+module Matestack::Ui::Core::Iframe
+  class Iframe < Matestack::Ui::Core::Component::Static
+
+    def setup
+      @tag_attributes.merge!({
+        src: options[:src],
+        height: options[:height],
+        width: options[:width],
+        srcdoc: options[:srcdoc]
+      })
+    end
+
+  end
+end

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

@@ -1 +1 @@
-= image_tag(ActionController::Base.helpers.asset_path(options[:path]), height: options[:height], width: options[:width], alt: options[:alt], class: options[:class], id: options[:id])
+%img{@tag_attributes}

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

@@ -1,5 +1,15 @@
 module Matestack::Ui::Core::Img
   class Img < Matestack::Ui::Core::Component::Static
 
+    def setup
+      @tag_attributes.merge!({
+        src: ActionController::Base.helpers.asset_path(options[:path]),
+        height: options[:height],
+        width: options[:width],
+        usemap: options[:usemap],
+        alt: options[:alt]
+      })
+    end
+
   end
 end

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

@@ -1,3 +1,2 @@
-%input{@tag_attributes}
-  - if block_given?
-    = yield
+%input{ @tag_attributes,
+  type: type }

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

@@ -1,5 +1,9 @@
 module Matestack::Ui::Core::Input
   class Input < Matestack::Ui::Core::Component::Static
 
+    def type
+      options[:type]
+    end
+
   end
 end

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

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

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

@@ -0,0 +1,10 @@
+module Matestack::Ui::Core::Ins
+  class Ins < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        cite: options[:cite],
+        datetime: options[:datetime]
+      })
+    end
+  end
+end

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

@@ -0,0 +1,2 @@
+- @children_cells.each do |key, cell|
+  = cell.call(:show)

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

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Isolate
+  class Isolate < Matestack::Ui::Core::Component::Static
+
+    def setup
+      @component_key = @component_key + "__" + @argument.to_s
+      @component_key = @component_key + "(" + @cached_params.to_json + ")" if @cached_params.present?
+      @component_config[:component_key] = @component_key
+    end
+
+  end
+end

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

@@ -1,30 +1,53 @@
 import Vue from 'vue/dist/vue.esm'
+import { turbolinksAdapterMixin } from 'vue-turbolinks';
 
-import app from 'app/app'
-import async from 'async/async'
-import pageContent from 'page/content'
-import store from 'app/store'
-import component from 'component/component'
-import anonymDynamicComponent from 'component/anonym-dynamic-component'
-import html from 'html/html'
-import transition from 'transition/transition'
-import action from 'action/action'
-import form from 'form/form'
-import view from 'view/view'
-import onclick from 'onclick/onclick'
-import collectionContent from 'collection/content/content'
-import collectionFilter from 'collection/filter/filter'
-import collectionOrder from 'collection/order/order'
+// Import from app/concepts/matestack/ui/core:
+import app from '../app/app'
+import async from '../async/async'
+import pageContent from '../page/content'
+import store from '../app/store'
+import component from '../component/component'
+import anonymDynamicComponent from '../component/anonym-dynamic-component'
+import html from '../html/html'
+import transition from '../transition/transition'
+import action from '../action/action'
+import form from '../form/form'
+import onclick from '../onclick/onclick'
+import collectionContent from '../collection/content/content'
+import collectionFilter from '../collection/filter/filter'
+import collectionOrder from '../collection/order/order'
 
 let matestackUiApp = undefined
 
+// this event fires first and always
 document.addEventListener('DOMContentLoaded', () => {
-
-    matestackUiApp = new Vue({
+  // somehow we need to inject the turbolinks mixin even
+  // if the turbolinks:load event will recreate the vue instance
+  // skipping the injection here caused errors when submitting forms or action
+  // if they were present on the first page, which was loaded and activated turbolinks
+  // the mixin does not impact the app when turbolinks is disabled
+  matestackUiApp = new Vue({
       el: "#matestack_ui",
+      mixins: [turbolinksAdapterMixin],
       store: store
-    })
+  })
+})
 
+// this event fires after DOMContentLoaded and only if turbolinks are enabled
+document.addEventListener('turbolinks:load', () => {
+  // we need to empty the currently stored pageTemplate state variable
+  // otherwise the matestack page will jump back to the latest pageTemplate
+  // fetched during the last matestack transition as the turbolinks powered
+  // page transition does not write the matestack store pageTemplate state variable
+  store.commit('resetPageTemplate')
+  // we need to destroy the vue app instance
+  matestackUiApp.$destroy();
+  // and recreate it right afterwards in order to work when used with turbolinks
+  matestackUiApp = new Vue({
+      el: "#matestack_ui",
+      mixins: [turbolinksAdapterMixin],
+      store: store
+  })
 })
 
 export default Vue

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

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

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

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

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

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

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

@@ -1,5 +1,10 @@
 module Matestack::Ui::Core::Label
   class Label < Matestack::Ui::Core::Component::Static
-
+    def setup
+      @tag_attributes.merge!({
+        for: options[:for],
+        form: options[:form]
+      })
+    end
   end
 end

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

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

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

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

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

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

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

@@ -9,7 +9,8 @@ module Matestack::Ui::Core::Link
         "id": component_id,
         "method": options[:method],
         "target": options[:target] ||= nil,
-        "href": link_path
+        "href": link_path,
+        "title": options[:title]
       })
     end
 

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+%meter{@tag_attributes}
+  - if block_given?
+    = yield
+    

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

@@ -0,0 +1,14 @@
+module Matestack::Ui::Core::Meter
+  class Meter < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        value: options[:value],
+        min: options[:min],
+        max: options[:max],
+        low: options[:low],
+        high: options[:high],
+        optimum: options[:optimum]
+      })
+    end
+  end
+end

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

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+module Matestack::Ui::Core::Object
+  class Object < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        width: options[:width],
+        height: options[:height],
+        data: options[:data],
+        form: options[:form],
+        name: options[:name],
+        type: options[:type],
+        usemap: options[:usemap]
+      })
+    end
+  end
+end

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

@@ -1,2 +1,2 @@
-%div{"@click": "perform"}
+%div{@tag_attributes, "@click": "perform"}
   = yield

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

@@ -1,8 +1,7 @@
 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],

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

@@ -1,6 +1,5 @@
 module Matestack::Ui::Core::Onclick
     class Onclick < Matestack::Ui::Core::Component::Dynamic
 
-
-    end
   end
+end

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

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

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

@@ -0,0 +1,10 @@
+module Matestack::Ui::Core::Optgroup
+  class Optgroup < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        label: options[:label]
+      )
+    end
+  end
+end

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

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

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

@@ -0,0 +1,12 @@
+module Matestack::Ui::Core::Option
+  class Option < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        selected: options[:selected] ||= nil,
+        label: options[:label],
+        value: options[:value]
+      )
+    end
+  end
+end

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

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

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

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Output
+  class Output < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        name: options[:name],
+        for: options[:for],
+        form: options[:form]
+      )
+    end
+  end
+end

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

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

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

@@ -2,9 +2,10 @@ module Matestack::Ui::Core::Page
   class Page < Trailblazer::Cell
 
     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"
 
@@ -53,7 +54,7 @@ module Matestack::Ui::Core::Page
 
     def nodes_to_cell
       @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(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
       end
     end
 
@@ -65,9 +66,15 @@ module Matestack::Ui::Core::Page
       Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
     end
 
+    def isolate(&block)
+      return block
+    end
+
 
     def show(component_key=nil, only_page=false)
       prepare
+      return resolve_isolated_component(component_key) if !component_key.nil? && component_key.include?("isolate")
+
       response
 
       render_mode = nil
@@ -85,34 +92,68 @@ module Matestack::Ui::Core::Page
         concept(@app_class).call(:show, @page_id, @nodes)
       when :render_component
         begin
-          if component_key.include?("__")
-            keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
-            page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
-            if page_content_keys.any?
-              keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
-            end
-            node = @nodes.dig(*keys_array)
-            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
-            return cell.render_content
-          else
-            node = @nodes[component_key]
-            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
-            return cell.render_content
-          end
-        rescue
-          raise "Component '#{component_key}' could not be resolved. Notice: Rerendering currently works only on page-level. \
-          You are therefore currently not able to use 'async' within a component for example!"
+          render_child_component component_key
+        rescue => e
+          raise "Component '#{component_key}' could not be resolved, because of #{e},\n#{e.backtrace.join("\n")}"
         end
       end
     end
 
-
     def page_id
       @custom_page_id ||= @page_id
     end
 
+    def render_child_component component_key
+      if component_key.include?("__")
+        keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
+        page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
+        if page_content_keys.any?
+          keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
+        end
+        if @nodes.dig(*keys_array) == nil
+          rest = []
+          while @nodes.dig(*keys_array) == nil
+            rest << keys_array.pop
+          end
+          node = @nodes.dig(*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_child_component component_key, rest.reverse[1..-1]
+        else
+          node = @nodes.dig(*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[component_key]
+        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
 
+      def resolve_isolated_component component_key
+        keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
+        isolate_keys = keys_array.select{|key| key.match(/^isolate_/)}
+        keys_array = keys_array.drop(keys_array.find_index(isolate_keys[0])+2)
+        isolated_scope_method = keys_array[0]
+        if isolated_scope_method.include?("(")
+          isolated_scope_method_name = isolated_scope_method.split("(").first
+          isolated_scope_method_argument = isolated_scope_method.split("(").last.split(")").first
+          isolated_scope_method_argument = JSON.parse(isolated_scope_method_argument)
+          isolated_block = self.send(isolated_scope_method_name, isolated_scope_method_argument.with_indifferent_access)
+        else
+          isolated_block = self.send(isolated_scope_method)
+        end
+        nodes = Matestack::Ui::Core::PageNode.build(
+          self, nil, context[:params], &isolated_block
+        )
+        node = nodes.dig(*keys_array.drop(2))
+        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
+
       def generate_page_name
         name_parts = self.class.name.split("::").map { |name| name.underscore }
         @page_id = name_parts.join("_")
@@ -145,7 +186,5 @@ module Matestack::Ui::Core::Page
         end
       end
 
-
   end
-
 end