tao_form 0.1.9 → 0.1.10

data/lib/tao_form/components/moment_picker/result_component.rb

@@ -18,8 +18,7 @@ module TaoForm
             super
           elsif builder && attribute_name
             super {
-              builder.send :"#{input_type}_field", attribute_name,
-                {disabled: options[:disabled], value: value}
+              builder.send :"#{input_type}_field", attribute_name, field_options
             }
           end
         end
@@ -28,6 +27,18 @@ module TaoForm
           :moment_picker_result
         end
 
+        private
+
+        def default_options
+          {class: 'tao-moment-picker-result'}
+        end
+
+        def field_options
+          opts = {disabled: options[:disabled]}
+          opts[:value] = value if value.present?
+          opts
+        end
+
       end
     end
   end

data/lib/tao_form/components/moment_picker/segment_list_component.rb

@@ -3,11 +3,12 @@ module TaoForm
     module MomentPicker
       class SegmentListComponent < TaoOnRails::Components::Base
 
-        attr_reader :segments
+        attr_reader :segments, :segment_options
 
         def initialize view, options = {}
-          @segments = options.delete(:segments)
           super view, options
+          @segments = @options.delete(:segments)
+          init_segment_options
         end
 
         def separator_segment? segment
@@ -16,11 +17,11 @@ module TaoForm
 
         def render_segment segment
           if segment.is_a? Hash
-            options = segment
             name = segment.delete(:name)
+            options = segment_options.merge segment
           else
-            options = {}
             name = segment
+            options = segment_options
           end
 
           view.send :"tao_moment_picker_#{name}_segment", options
@@ -30,6 +31,19 @@ module TaoForm
           :moment_picker_segment_list
         end
 
+        private
+
+        def default_options
+          {class: 'tao-moment-picker-segment-list'}
+        end
+
+        def init_segment_options
+          @segment_options = {
+            disable_before: options.delete(:disable_before),
+            disable_after: options.delete(:disable_after)
+          }
+        end
+
       end
     end
   end

data/lib/tao_form/components/moment_picker/segments/base.rb

@@ -7,7 +7,7 @@ module TaoForm
           private
 
           def default_options
-            {class: 'segment'}
+            {class: 'tao-moment-picker-segment'}
           end
 
         end

data/lib/tao_form/components/moment_picker/segments/date_segment_component.rb

@@ -11,7 +11,10 @@ module TaoForm
           private
 
           def default_options
-            super.merge({label_format: t(:label, date: '{{ date }}')})
+            merge_options(super, {
+              class: 'tao-moment-picker-date-segment',
+              label_format: t(:label, date: '{{ date }}')
+            })
           end
 
         end

data/lib/tao_form/components/moment_picker/segments/hour_segment_component.rb

@@ -11,7 +11,10 @@ module TaoForm
           private
 
           def default_options
-            super.merge({label_format: t(:label, hour: '{{ hour }}')})
+            merge_options(super, {
+              class: 'tao-moment-picker-hour-segment',
+              label_format: t(:label, hour: '{{ hour }}')
+            })
           end
 
         end

data/lib/tao_form/components/moment_picker/segments/minute_segment_component.rb

@@ -18,7 +18,10 @@ module TaoForm
           private
 
           def default_options
-            super.merge({label_format: t(:label, minute: '{{ minute }}')})
+            merge_options(super, {
+              class: 'tao-moment-picker-minute-segment',
+              label_format: t(:label, minute: '{{ minute }}')
+            })
           end
 
         end

data/lib/tao_form/components/moment_picker/segments/month_segment_component.rb

@@ -8,6 +8,14 @@ module TaoForm
             :moment_picker_month_segment
           end
 
+          private
+
+          def default_options
+            merge_options(super, {
+              class: 'tao-moment-picker-month-segment'
+            })
+          end
+
         end
       end
     end

data/lib/tao_form/components/moment_picker/segments/year_segment_component.rb

@@ -11,7 +11,10 @@ module TaoForm
           private
 
           def default_options
-            super.merge({label_format: t(:label, year: '{{ year }}')})
+            merge_options(super, {
+              class: 'tao-moment-picker-year-segment',
+              label_format: t(:label, year: '{{ year }}')
+            })
           end
 
         end

data/lib/tao_form/components/month_picker_component.rb

@@ -18,6 +18,12 @@ module TaoForm
         :month_picker
       end
 
+      private
+
+      def default_options
+        merge_options(super, {class: 'tao-month-picker'})
+      end
+
     end
   end
 end

data/lib/tao_form/components/radio_button_component.rb

@@ -34,6 +34,10 @@ module TaoForm
 
       private
 
+      def default_options
+        {class: 'tao-radio-button'}
+      end
+
       def init_field_options
         @field_options = {
           disabled: disabled

data/lib/tao_form/components/select/list_component.rb

@@ -10,7 +10,7 @@ module TaoForm
         private
 
         def default_options
-          {class: 'select-list'}
+          {class: 'tao-select-list select-list'}
         end
 
       end

data/lib/tao_form/components/select/multiple_result_component.rb

@@ -40,7 +40,7 @@ module TaoForm
         end
 
         def default_options
-          {class: 'select-result'}
+          {class: 'tao-multiple-select-result select-result'}
         end
 
       end

data/lib/tao_form/components/select/result_component.rb

@@ -38,7 +38,7 @@ module TaoForm
         end
 
         def default_options
-          {class: 'select-result'}
+          {class: 'tao-select-result select-result'}
         end
 
       end

data/lib/tao_form/components/select_component.rb

@@ -20,7 +20,14 @@ module TaoForm
 
       def render &block
         @block_for_render = block
-        super
+        if view.request.variant.mobile?
+          super
+        else
+          view.content_tag tag_name, html_options do
+            view.concat render_result
+            view.concat render_list
+          end
+        end
       end
 
       def render_result

data/lib/tao_form/components/switch_component.rb

@@ -6,6 +6,12 @@ module TaoForm
         :switch
       end
 
+      private
+
+      def default_options
+        {class: 'tao-switch'}
+      end
+
     end
   end
 end

data/lib/tao_form/components/time_picker_component.rb

@@ -21,7 +21,11 @@ module TaoForm
       private
 
       def default_options
-        super.merge({icon: :clock, minute_step: 5})
+        merge_options(super, {
+          class: 'tao-time-picker',
+          icon: :clock,
+          minute_step: 5
+        })
       end
 
     end

data/lib/tao_form/inputs.rb

@@ -7,3 +7,4 @@ require 'tao_form/inputs/collection_select_input'
 require 'tao_form/inputs/grouped_collection_select_input'
 require 'tao_form/inputs/date_time_input'
 require 'tao_form/inputs/month_input'
+require 'tao_form/inputs/date_range_input'

data/lib/tao_form/inputs/date_range_input.rb

@@ -0,0 +1,28 @@
+module TaoForm
+  module Inputs
+    class DateRangeInput < ::SimpleForm::Inputs::Base
+
+      def input(wrapper_options = nil)
+        merged_html_options = merge_wrapper_options(input_html_options, wrapper_options)
+        merged_component_options = component_options.merge(merged_html_options)
+        template.tao_date_range_picker(
+          @builder, attribute_name, merged_component_options
+        )
+      end
+
+      private
+
+      def use_html5_inputs?
+        true
+      end
+
+      def component_options
+        @component_options ||= input_options.slice(
+          :date_value_format, :date_display_format, :date_placeholder,
+          :disabled, :value, :date_icon
+        )
+      end
+
+    end
+  end
+end

data/lib/tao_form/inputs/date_time_input.rb

@@ -20,7 +20,7 @@ module TaoForm
         @component_options ||= input_options.slice(
           :value_format, :display_format, :date_display_format, :time_display_format,
           :date_placeholder, :time_placeholder, :placeholder, :icon, :disabled,
-          :value, :minute_step, :date_icon, :time_icon
+          :value, :minute_step, :date_icon, :time_icon, :disable_before, :disable_after
         )
       end
 

data/lib/tao_form/inputs/string_input.rb

@@ -4,14 +4,54 @@ module TaoForm
 
       def input(wrapper_options = nil)
         origin_input = super
-        prefix = options[:prefix].present? ? @builder.label(@attribute_name, options[:prefix], class: 'prefix') : ''
-        suffix = options[:suffix].present? ? @builder.label(@attribute_name, options[:suffix], class: 'suffix') : ''
 
-        field_class = ['text-field']
-        field_class << 'text-field-with-prefix' if prefix.present?
-        field_class << 'text-field-with-suffix' if suffix.present?
+        template.content_tag :div, class: field_class do
+          template.concat field_prefix
+          template.concat origin_input
+          template.concat field_suffix
+          template.concat(clear_link) if search_input?
+        end
+      end
+
+      private
+
+      def field_prefix
+        @field_prefix ||= begin
+          prefix = search_input? ? template.tao_icon(:search) : options[:prefix]
+          if prefix.present?
+            @builder.label(@attribute_name, prefix, class: 'prefix')
+          else
+            ''
+          end
+        end
+      end
+
+      def field_suffix
+        @field_suffix ||= if options[:suffix].present?
+          @builder.label(@attribute_name, options[:suffix], class: 'suffix')
+        else
+          ''
+        end
+      end
+
+      def field_class
+        @field_class ||= begin
+          classes = ['text-field']
+          classes << 'text-field-with-prefix' if field_prefix.present?
+          classes << 'text-field-with-suffix' if field_suffix.present?
+          classes << 'not-empty' if @builder.object.send(attribute_name).present?
+          classes
+        end
+      end
+
+      def clear_link
+        @clear_link ||= template.link_to 'javascript:;', class: 'link-clear' do
+          template.concat template.tao_icon(:close)
+        end
+      end
 
-        template.content_tag(:div, "#{prefix}#{origin_input}#{suffix}".html_safe, class: field_class)
+      def search_input?
+        input_type == :search
       end
 
     end

data/lib/tao_form/version.rb

@@ -1,3 +1,3 @@
 module TaoForm
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/views/components/tao_form/components/_date_range_picker.html.erb

@@ -0,0 +1,7 @@
+<%= content_tag component.tag_name, component.html_options do %>
+  <%= yield %>
+
+  <%= component.render_date_picker 'start' %>
+  <span class="to"><%= component.t :to %></span>
+  <%= component.render_date_picker 'end' %>
+<% end %>

data/lib/views/components/tao_form/components/_moment_picker.html+mobile.erb

@@ -3,13 +3,13 @@
 
   <%= tao_slide_box direction: 'rtl', size: '-40', without_padding: true, modal: true, class: 'slide-box' do %>
     <div class="header">
-      <div class="left">
+      <div class="left"></div>
+      <div class="title"><%= component.placeholder %></div>
+      <div class="right">
         <%= link_to 'javascript:;', class: 'link-close', title: I18n.t('tao_form.components.moment_picker.close') do %>
           <%= tao_icon :close %>
         <% end %>
       </div>
-      <div class="title"><%= component.placeholder %></div>
-      <div class="right"></div>
     </div>
 
     <%= component.render_segment_list %>

data/lib/views/components/tao_form/components/_select.html+mobile.erb

@@ -9,19 +9,20 @@
 
   <%= tao_slide_box direction: 'rtl', size: '-40', without_padding: true, modal: true, class: 'slide-box' do %>
     <div class="header">
-      <div class="left">
-        <%= link_to 'javascript:;', class: 'link-close', title: component.t(:close) do %>
-          <%= tao_icon :close %>
-        <% end %>
-      </div>
+      <div class="left"></div>
       <div class="title"><%= component.placeholder %></div>
       <div class="right">
-        <% if component.multiple %>
-          <%= link_to component.t(:ok), 'javascript:;', class: 'button button-small button-ok' %>
+        <%= link_to 'javascript:;', class: 'link-close', title: component.t(:close) do %>
+          <%= tao_icon :close %>
         <% end %>
       </div>
     </div>
     <%= component.render_result %>
     <%= component.render_list %>
+    <% if component.multiple %>
+      <div class="buttons">
+        <%= link_to component.t(:ok), 'javascript:;', class: 'button button-block button-ok' %>
+      </div>
+    <% end %>
   <% end %>
 <% end %>

data/lib/views/components/tao_form/components/_switch.html.erb

@@ -2,7 +2,7 @@
 
   <%= yield %>
 
-  <div class="switch-wrapper">
+  <div class="switch-wrapper" tabindex="0">
     <div class="switch-toggle"></div>
     <div class="switch-slot"></div>
   </div>

data/lib/views/components/tao_form/components/select/_result.html.erb

@@ -5,7 +5,7 @@
   <div class="placeholder">
     <%= component.placeholder %>
   </div>
-  <div class="icon-wrapper">
+  <div class="icon-wrapper arrow-icon-wrapper">
     <%= tao_icon :arrow_down %>
   </div>
   <%= link_to 'javascript:;', tabindex: '-1', class: 'link-clear', title: component.t(:clear_selected) do %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tao_form
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - your name
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tao_on_rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: tao_ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: ''
 email:
 - your email
@@ -110,8 +124,8 @@ files:
 - config/locales/simple_form/zh-CN.yml
 - config/locales/tao_form/components/date_picker/en.yml
 - config/locales/tao_form/components/date_picker/zh-CN.yml
-- config/locales/tao_form/components/datetime/en.yml
-- config/locales/tao_form/components/datetime/zh-CN.yml
+- config/locales/tao_form/components/date_range_picker/en.yml
+- config/locales/tao_form/components/date_range_picker/zh-CN.yml
 - config/locales/tao_form/components/moment_picker/en.yml
 - config/locales/tao_form/components/moment_picker/zh-CN.yml
 - config/locales/tao_form/components/month_picker/en.yml
@@ -161,6 +175,7 @@ files:
 - lib/assets/javascripts/tao/form/shared/element/base.coffee
 - lib/assets/javascripts/tao/form/shared/fields/checkbox.coffee
 - lib/assets/javascripts/tao/form/shared/fields/date_picker.coffee
+- lib/assets/javascripts/tao/form/shared/fields/date_range_picker.coffee
 - lib/assets/javascripts/tao/form/shared/fields/datetime_picker.coffee
 - lib/assets/javascripts/tao/form/shared/fields/moment_picker/element/base.coffee
 - lib/assets/javascripts/tao/form/shared/fields/moment_picker/result/base.coffee
@@ -183,12 +198,14 @@ files:
 - lib/assets/javascripts/tao/form/shared/fields/select/result/base.coffee
 - lib/assets/javascripts/tao/form/shared/fields/switch.coffee
 - lib/assets/javascripts/tao/form/shared/fields/time_picker.coffee
+- lib/assets/javascripts/tao/form/shared/init.coffee
 - lib/assets/javascripts/tao/form/shared/mixins/checkable.coffee
 - lib/assets/javascripts/tao/ui/icons/form.coffee
 - lib/assets/stylesheets/tao/form/_globals.scss
 - lib/assets/stylesheets/tao/form/_mixins.scss
 - lib/assets/stylesheets/tao/form/_variables.scss
 - lib/assets/stylesheets/tao/form/fields/checkbox.scss
+- lib/assets/stylesheets/tao/form/fields/date_range_picker.scss
 - lib/assets/stylesheets/tao/form/fields/datetime_picker.scss
 - lib/assets/stylesheets/tao/form/fields/index.scss
 - lib/assets/stylesheets/tao/form/fields/moment_picker/index.scss
@@ -217,6 +234,7 @@ files:
 - lib/assets/stylesheets/tao/form/mobile/_mixins.scss
 - lib/assets/stylesheets/tao/form/mobile/_variables.scss
 - lib/assets/stylesheets/tao/form/mobile/fields/checkbox.scss
+- lib/assets/stylesheets/tao/form/mobile/fields/date_range_picker.scss
 - lib/assets/stylesheets/tao/form/mobile/fields/datetime_picker.scss
 - lib/assets/stylesheets/tao/form/mobile/fields/index.scss
 - lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/index.scss
@@ -266,6 +284,7 @@ files:
 - lib/tao_form/components.rb
 - lib/tao_form/components/check_box_component.rb
 - lib/tao_form/components/date_picker_component.rb
+- lib/tao_form/components/date_range_picker_component.rb
 - lib/tao_form/components/datetime_picker_component.rb
 - lib/tao_form/components/field_component.rb
 - lib/tao_form/components/form_component.rb
@@ -293,6 +312,7 @@ files:
 - lib/tao_form/inputs/collection_check_boxes_input.rb
 - lib/tao_form/inputs/collection_radio_buttons_input.rb
 - lib/tao_form/inputs/collection_select_input.rb
+- lib/tao_form/inputs/date_range_input.rb
 - lib/tao_form/inputs/date_time_input.rb
 - lib/tao_form/inputs/grouped_collection_select_input.rb
 - lib/tao_form/inputs/month_input.rb
@@ -300,12 +320,12 @@ files:
 - lib/tao_form/inputs/string_input.rb
 - lib/tao_form/version.rb
 - lib/views/components/tao_form/components/_check_box.html.erb
+- lib/views/components/tao_form/components/_date_range_picker.html.erb
 - lib/views/components/tao_form/components/_datetime_picker.html.erb
 - lib/views/components/tao_form/components/_moment_picker.html+mobile.erb
 - lib/views/components/tao_form/components/_moment_picker.html.erb
 - lib/views/components/tao_form/components/_radio_button.html.erb
 - lib/views/components/tao_form/components/_select.html+mobile.erb
-- lib/views/components/tao_form/components/_select.html.erb
 - lib/views/components/tao_form/components/_switch.html.erb
 - lib/views/components/tao_form/components/moment_picker/_result.html+mobile.erb
 - lib/views/components/tao_form/components/moment_picker/_result.html.erb