myg 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ef34aff3aa0db415984360e708fec7e9ef1e9a51f2ee8e8586df1d8c439536
-  data.tar.gz: f88a8fc86c73d011ea1eafd9ab54e067e372330e7a0652905cb9b778bf42c0e7
+  metadata.gz: 46652e6ad7944576ea5cd122a5eaf0c07e0a698b5d3326451e07cf2ade54e5da
+  data.tar.gz: 821c2dcf533c86ba2d21260a2a658043fe6fe539baec4fb350dfd426f4e73d54
 SHA512:
-  metadata.gz: c12b67b108bb9e46e551353a0b1914ea0d5981f0dee9eb7d686b0eb171fa51ca32459ba242c406a8130326ad865dac1f417b8d411bc99ce0a5e8bb8ddd9228d3
-  data.tar.gz: '09894914422a24c4e4ade92cf4e8c2bb7c363704e9f56bd171f467e8dd8c47b94ed8143ca6cd21f9d33cf5eaf8dde2bca8ec1238bfee1429cf8eb372e741def2'
+  metadata.gz: 8241de5af2e7f67df4249462bf8fa70730a4b9631672831fb1abe705d88fc3f8ee6a3b034103156765d0d4847e1a12c8708ff3d093e772ccb029ae5c0fbd7ee2
+  data.tar.gz: e1180b08215359428d6e98d68dc133c49bb452b746d46a56cf29d40369e5a947b5225549a629ad2c8646aedadd0c5b6b243ce3ef5efbafecdb7440d2dc61b529

data/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 * nothing yet
 
+### 2.7.0 - 2018/03/16
+
+* features
+    * add `hint` component
+    * add `progress` component
+* enhancements
+    * added `id` option to `tabs` component
+
 ### 2.6.0 - 2018/03/07
 
 * features

data/README.md

@@ -77,8 +77,10 @@ These are the components currently supported by Myg on Rails:
 * [`checkbox`](components/myg/checkbox.md)
 * [`drawer`](components/myg/drawer.md)
 * [`form-field`](components/myg/form-field.md)
+* [`hint`](components/myg/hint.md)
 * [`input`](components/myg/input.md)
 * [`label`](components/myg/label.md)
+* [`progress`](components/myg/progress.md)
 * [`radio`](components/myg/radio.md)
 * [`slider`](components/myg/slider.md)
 * [`switch`](components/myg/switch.md)

data/app/views/mozaic/myg/_form-field.html.erb

@@ -4,13 +4,14 @@
 <% if options[:floating_label] %><% input_html = {
     class_name: options[:class_name],
     attribute: options[:attribute],
-    type: ('file' if options[:file]),
     placeholder: options[:floating_label]
 } %><% else %><% input_html = {
     class_name: options[:class_name],
-    attribute: options[:attribute],
-    type: ('file' if options[:file])
+    attribute: options[:attribute]
 } %><% end %>
+<% input_defaults = {
+    type: ('file' if options[:file])
+} %>
 <% label_html = {
     class_name: options[:class_name],
     attribute: options[:attribute]
@@ -36,11 +37,11 @@
     <% end %>
     <% if options[:floating_label] %>
         <%= content_tag 'div', class: 'myg-input--container' do %>
-            <%= component "myg/#{options[:as]}", (options[:input_html] || {}).merge(input_html) %>
+            <%= component "myg/#{options[:as]}", input_defaults.merge((options[:input_html] || {}).merge(input_html)) %>
             <%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:floating_label] %><% end %>
         <% end %>
     <% else %>
-        <%= component "myg/#{options[:as]}", (options[:input_html] || {}).merge(input_html) %>
+        <%= component "myg/#{options[:as]}", input_defaults.merge((options[:input_html] || {}).merge(input_html)) %>
         <% if options[:file] %><%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:file] %><% end %><% end %>
     <% end %>
     <% if options[:inline_label] %>
@@ -54,4 +55,7 @@
             <% end %>
         <% end %>
     <% end %>
+    <% if options[:hint] %>
+        <%= component 'myg/hint', options[:hint_html] || {} do %><%= options[:hint].html_safe %><% end %>
+    <% end %>
 <% end %>

data/app/views/mozaic/myg/_hint.html.erb

@@ -0,0 +1,7 @@
+<% html = {
+    class: ['myg-hint', options[:class]].join(' ')
+} %>
+
+<%= content_tag 'div', options.merge(html) do %>
+    <%= block.html_safe %>
+<% end %>

data/app/views/mozaic/myg/_label.html.erb

@@ -1,11 +1,11 @@
-<% class_name = options.delete :class_name %>
-<% attribute = options.delete :attribute %>
-<% id = class_name ? "#{class_name.to_s.downcase}_#{attribute}" : "#{attribute}" %>
-<% html = {
-    class: ['myg-label', options[:class]].join(' '),
-    for: id
-} %>
-
-<%= content_tag 'label', options.merge(html) do %>
-    <%= block %>
-<% end %>
+<% class_name = options.delete :class_name %>
+<% attribute = options.delete :attribute %>
+<% id = class_name ? "#{class_name.to_s.downcase}_#{attribute}" : "#{attribute}" %>
+<% html = {
+    class: ['myg-label', options[:class]].join(' '),
+    for: id
+} %>
+
+<%= content_tag 'label', options.merge(html) do %>
+    <%= block.html_safe %>
+<% end %>

data/app/views/mozaic/myg/_progress.html.erb

@@ -0,0 +1,15 @@
+<% html = {
+    class: ['myg-progress mdc-linear-progress', ('mdc-linear-progress--indeterminate' if options.delete(:indeterminate)), options[:class]].join(' '),
+    role: 'progressbar'
+} %>
+
+<%= content_tag 'div', options.merge(html) do %>
+    <div class="mdc-linear-progress__buffering-dots"></div>
+    <div class="mdc-linear-progress__buffer"></div>
+    <div class="mdc-linear-progress__bar mdc-linear-progress__primary-bar">
+        <span class="mdc-linear-progress__bar-inner"></span>
+    </div>
+    <div class="mdc-linear-progress__bar mdc-linear-progress__secondary-bar">
+        <span class="mdc-linear-progress__bar-inner"></span>
+    </div>
+<% end %>

data/app/views/mozaic/myg/_tabs.html.erb

@@ -10,11 +10,11 @@
         <% tab_html = {
             class: ['mdc-tab', options.dig(:tab_html, :class), ('mdc-tab--active' if tab[:active])].join(' '),
             aria: {
-                controls: tab[:name].underscore
+                controls: tab[:id] || tab[:name].underscore
             },
             role: 'tab'
         } %>
-        <%= link_to tab[:name], tab[:href] || "##{tab[:name].underscore}", (options[:tab_html] || {}).merge(tab_html) %>
+        <%= link_to tab[:name], tab[:href] || "##{tab[:id] || tab[:name].underscore}", (options[:tab_html] || {}).merge(tab_html) %>
     <% end %>
     <span class="mdc-tab-bar__indicator"></span>
 <% end %>
@@ -29,7 +29,7 @@
         <% options[:tabs]&.each do |tab| %>
             <% panel_html = {
                 class: ['myg-tabs--panel', options.dig(:panel_html, :class), ('myg-tabs--shown' if tab[:active])].join(' '),
-                id: tab[:name].underscore,
+                id: tab[:id] || tab[:name].underscore,
                 role: 'tabpanel',
                 aria: {
                     hidden: (tab[:active] ? false : true)

data/lib/generators/templates/install/stylesheets/_myg.sass

@@ -19,6 +19,7 @@
 // @import "myg-footer/footer"
 // @import "myg-form-field/form-field"
 // @import "myg-grid/grid"
+// @import "myg-hint/hint"
 // @import "myg-icon/fonts/myg/myg"
 // @import "myg-icon/fonts/myg-o/myg-o"
 // @import "myg-icon/fonts/google/google"
@@ -59,6 +60,8 @@
 // +myg-input--classes
 // +myg-label--classes
 // +myg-layout--classes
+// +myg-list--classes
+// +myg-progress--classes
 // +myg-radio--classes
 // +myg-switch--classes
 // +myg-tabs--classes

data/lib/myg/railtie.rb

@@ -9,8 +9,10 @@ module Myg
                 config.define_component 'myg/checkbox'
                 config.define_component 'myg/drawer'
                 config.define_component 'myg/form-field'
+                config.define_component 'myg/hint'
                 config.define_component 'myg/input'
                 config.define_component 'myg/label'
+                config.define_component 'myg/progress', indeterminate: false
                 config.define_component 'myg/radio'
                 config.define_component 'myg/slider', discrete: false, disabled: false, value: 0, min: 0, max: 50, label: 'Select value'
                 config.define_component 'myg/switch'

data/lib/myg/version.rb

@@ -1,5 +1,5 @@
 module Myg
 
-    VERSION = '2.6.0'
+    VERSION = '2.7.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myg
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -109,8 +109,10 @@ files:
 - app/views/mozaic/myg/_checkbox.html.erb
 - app/views/mozaic/myg/_drawer.html.erb
 - app/views/mozaic/myg/_form-field.html.erb
+- app/views/mozaic/myg/_hint.html.erb
 - app/views/mozaic/myg/_input.html.erb
 - app/views/mozaic/myg/_label.html.erb
+- app/views/mozaic/myg/_progress.html.erb
 - app/views/mozaic/myg/_radio.html.erb
 - app/views/mozaic/myg/_slider.html.erb
 - app/views/mozaic/myg/_switch.html.erb