motion-prime 0.3.3 → 0.4.0

data/motion-prime/sections/{base.rb → base_section.rb}

@@ -15,42 +15,26 @@ module MotionPrime
     KEYBOARD_HEIGHT_LANDSCAPE = 162
     DEFAULT_CONTENT_HEIGHT = 65
     include ::MotionSupport::Callbacks
-    include MotionPrime::HasAuthorization
-    include MotionPrime::HasNormalizer
+    include HasAuthorization
+    include HasNormalizer
+    include DrawMixin
 
     attr_accessor :screen, :model, :name, :options, :elements, :section_styles
     class_attribute :elements_options, :container_options, :keyboard_close_bindings
     define_callbacks :render
 
     def initialize(options = {})
-      super
       @options = options
+      self.screen = options[:screen]
       @model = options[:model]
       @name = options[:name] ||= default_name
       @options_block = options[:block]
-      load_section
-    end
-
-    def style_options
-      @style_options ||= if section_styles.present?
-        Styles.for(section_styles.values.flatten)
-      else
-        {}
-      end
     end
 
     def container_options
       @container_options ||= (style_options.delete(:container) || {}).merge(base_container_options)
     end
 
-    def base_container_options
-      @base_container_options ||= begin
-        container_options = self.class.container_options.try(:clone) || {}
-        container_options.merge!(options.delete(:container) || {})
-        normalize_options(container_options)
-      end
-    end
-
     def container_height
       container_options[:height] || DEFAULT_CONTENT_HEIGHT
     end
@@ -68,16 +52,33 @@ module MotionPrime
     end
 
     def load_section
+      return if @section_loaded
+      if @section_loading
+        sleep 0.1
+        return @section_loaded ? false : load_section
+      end
+      @section_loading = true
       create_elements
-      self.instance_eval(&@options_block) if @options_block.is_a?(Proc)
+      @section_loading = false
+      return @section_loaded = true
     end
 
-    def reload_section
-      self.elements.values.map(&:view).flatten.compact.each { |view| view.removeFromSuperview }
+    def load_section!
+      @section_loaded = false
       load_section
+    end
+
+    def reload_section
+      self.elements_to_render.values.map(&:view).flatten.compact.each { |view| view.removeFromSuperview }
+      load_section!
       run_callbacks :render do
         render!
       end
+
+      if @table && !self.is_a?(BaseFieldSection)
+        cell.setNeedsDisplay
+        @table.table_view.reloadData
+      end
     end
 
     def create_elements
@@ -85,15 +86,29 @@ module MotionPrime
       elements_options.each do |key, opts|
         add_element(key, opts)
       end
+      self.instance_eval(&@options_block) if @options_block.is_a?(Proc)
+    end
+
+    def load_elements
+      self.elements.values.each do |element|
+        element.computed_options if element.respond_to?(:computed_options)
+      end
     end
 
-    def add_element(key, opts)
+    def add_element(key, options)
       return unless render_element?(key)
+      opts = options.clone
       index = opts.delete(:at)
       options = build_options_for_element(opts)
       options[:name] ||= key
-      options[:type] ||= (options[:text] || options[:attributed_text_options]) ? :label : :view
-      element = MotionPrime::BaseElement.factory(options.delete(:type), options)
+
+      type = options.delete(:type)
+      element = if self.is_a?(BaseFieldSection) || self.is_a?(BaseHeaderSection) || options.delete(:as).to_s == 'view'
+        MotionPrime::BaseElement.factory(type, options)
+      else
+        MotionPrime::DrawElement.factory(type, options) || MotionPrime::BaseElement.factory(type, options)
+      end
+
       if index
         self.elements = Hash[self.elements.to_a.insert index, [key, element]]
       else
@@ -105,29 +120,25 @@ module MotionPrime
       true
     end
 
-    def build_options_for_element(opts)
-      # we should clone options to prevent overriding options
-      # in next element with same name in another class
-      options = opts.clone
-      options.merge(section: self)
-    end
-
     def cell
-      first_element = elements.values.first
-      first_element.view.superview.superview
+      container_view || begin
+        first_element = elements.values.first
+        first_element.view.superview.superview
+      end
     end
 
     def render(container_options = {})
       self.container_options.merge!(container_options)
-      self.screen = container_options.delete(:to)
+      load_section
+
       run_callbacks :render do
         render!
       end
     end
 
     def render!
-      elements.each do |key, element|
-        element.render(to: screen)
+      elements_to_render.each do |key, element|
+        element.render
       end
     end
 
@@ -140,14 +151,18 @@ module MotionPrime
     end
 
     def hide
-      elements.values.each do |element|
-        element.view.hidden = true
+      if container_view
+        container_view.hidden = true
+      else
+        elements.values.each(&:hide)
       end
     end
 
     def show
-      elements.values.each do |element|
-        element.view.hidden = false
+      if container_view
+        container_view.hidden = false
+      else
+        elements.values.each(&:show)
       end
     end
 
@@ -181,19 +196,6 @@ module MotionPrime
                                            object: nil
     end
 
-    def bind_keyboard_close
-      return unless self.class.keyboard_close_bindings.present?
-      Array.wrap(self.instance_eval(&self.class.keyboard_close_bindings[:tap_on])).each do |view|
-        gesture_recognizer = UITapGestureRecognizer.alloc.initWithTarget(self, action: :hide_keyboard)
-        view.addGestureRecognizer(gesture_recognizer)
-        gesture_recognizer.cancelsTouchesInView = false
-      end
-    end
-
-    def keyboard_close_bindings_options
-      @keyboard_close_bindings_options ||= normalize_options(self.class.keyboard_close_bindings.clone, self)
-    end
-
     def hide_keyboard
       elements = Array.wrap(keyboard_close_bindings_options[:elements])
       views = Array.wrap(keyboard_close_bindings_options[:views])
@@ -202,6 +204,53 @@ module MotionPrime
       (views + Array.wrap(keyboard_close_bindings_options[:views])).compact.each(&:resignFirstResponder)
     end
 
+    protected
+      def bind_keyboard_close
+        return unless self.class.keyboard_close_bindings.present?
+        Array.wrap(self.instance_eval(&self.class.keyboard_close_bindings[:tap_on])).each do |view|
+          gesture_recognizer = UITapGestureRecognizer.alloc.initWithTarget(self, action: :hide_keyboard)
+          view.addGestureRecognizer(gesture_recognizer)
+          gesture_recognizer.cancelsTouchesInView = false
+        end
+      end
+
+      def keyboard_close_bindings_options
+        @keyboard_close_bindings_options ||= normalize_options(self.class.keyboard_close_bindings.clone, self)
+      end
+      def elements_to_draw
+        self.elements.select { |key, element| element.is_a?(DrawElement) }
+      end
+
+      def elements_to_render
+        self.elements.select { |key, element| element.is_a?(BaseElement) }
+      end
+
+      def build_options_for_element(opts)
+        # we should clone options to prevent overriding options
+        # in next element with same name in another class
+        options = opts.clone
+        options[:type] ||= (options[:text] || options[:attributed_text_options]) ? :label : :view
+        options.merge(screen: screen, section: self)
+      end
+
+    private
+      def style_options
+        @style_options ||= if section_styles.present?
+          # TODO: pass through normalizer?
+          Styles.for(section_styles.values.flatten)
+        else
+          {}
+        end
+      end
+
+      def base_container_options
+        @base_container_options ||= begin
+          container_options = self.class.container_options.try(:clone) || {}
+          container_options.merge!(options.delete(:container) || {})
+          normalize_options(container_options)
+        end
+      end
+
     class << self
       def element(name, options = {}, &block)
         options[:name] ||= name

data/motion-prime/sections/form/base_field_section.rb

@@ -1,6 +1,6 @@
-motion_require '../table/base_cell_section'
 module MotionPrime
-  class BaseFieldSection < BaseCellSection
+  class BaseFieldSection < BaseSection
+    include CellSectionMixin
     include BW::KVO
 
     attr_reader :form
@@ -36,7 +36,7 @@ module MotionPrime
           if @status_for_updated == :rendered
             reload_section
           else
-            load_section
+            load_section!
             form.table_view.reloadData
           end
         end
@@ -61,7 +61,7 @@ module MotionPrime
       end
       self
     rescue
-      puts "can't focus on element #{self.class_name_without_kvo}"
+      NSLog("can't focus on element #{self.class_name_without_kvo}")
     end
 
     def blur
@@ -72,7 +72,7 @@ module MotionPrime
       end
       self
     rescue
-      puts "can't blur on element #{self.class_name_without_kvo}"
+      NSLog("can't blur on element #{self.class_name_without_kvo}")
     end
 
     def bind_text_input
@@ -124,7 +124,7 @@ module MotionPrime
     def container_height
       return 0 if container_options[:hidden]
       element = element(:error_message)
-      error_height = element ? element.content_height + 5 : 0
+      error_height = element ? element.cached_content_height + 5 : 0
       super + error_height
     end
   end

data/motion-prime/sections/form/base_header_section.rb

@@ -1,7 +1,6 @@
-motion_require '../table/base_cell_section'
 module MotionPrime
-  class BaseHeaderSection < BaseCellSection
-    include CellSection
+  class BaseHeaderSection < BaseSection
+    include CellSectionMixin
     DEFAULT_HEADER_HEIGHT = 20
 
     element :title, text: proc { @options[:title] }

data/motion-prime/sections/form.rb

@@ -23,9 +23,7 @@ module MotionPrime
     attr_accessor :fields, :field_indexes, :keyboard_visible, :rendered_views, :section_headers, :section_header_options
 
     def table_data
-      if @groups_count == 1
-        fields.values
-      else
+      if @has_groups
         section_indexes = []
         data = fields.inject([]) do |result, (key, field)|
           section = self.class.fields_options[key][:group].to_i
@@ -37,6 +35,8 @@ module MotionPrime
         end
         self.section_header_options.delete_if.each_with_index { |opts, id| data[id].nil? }
         data.compact
+      else
+        fields.values
       end
     end
 
@@ -46,7 +46,6 @@ module MotionPrime
 
     def render_table
       init_form_fields
-      reset_data_stamps
       options = {
         styles: table_styles.values.flatten,
         delegate: self,
@@ -57,9 +56,9 @@ module MotionPrime
 
     def render_cell(index, table)
       field = rows_for_section(index.section)[index.row]
-      screen.table_view_cell section: field, reuse_identifier: cell_name(table, index), parent_view: table_view do |cell_view|
-        field.cell_view = cell_view if field.respond_to?(:cell_view)
-        field.render(to: screen)
+      screen.table_view_cell section: field, reuse_identifier: cell_name(table, index), parent_view: table_view do |container_view, container_element|
+        field.container_element = container_element
+        field.render
       end
     end
 
@@ -67,14 +66,21 @@ module MotionPrime
       field = section.name.to_sym
       index = field_indexes[field].split('_').map(&:to_i)
       path = NSIndexPath.indexPathForRow(index.last, inSection: index.first)
-      table_view.beginUpdates
       section.cell.try(:removeFromSuperview)
 
       fields[field] = load_field(self.class.fields_options[field])
-      @data = nil
+      fields[field].load_section
+      if flat_data?
+        @data[path.row] = fields[field]
+      else
+        @data[path.section][path.row] = fields[field]
+      end
+
       set_data_stamp(field_indexes[field])
+
+      # table_view.beginUpdates
       table_view.reloadRowsAtIndexPaths([path], withRowAnimation: UITableViewRowAnimationNone)
-      table_view.endUpdates
+      # table_view.endUpdates
     end
 
     def reset_data_stamps
@@ -178,6 +184,18 @@ module MotionPrime
     def textViewDidBeginEditing(text_view)
       on_input_edit(text_view)
     end
+    def textViewDidChange(text_view) # bug in iOS 7 - cursor is out of textView bounds
+      line = text_view.caretRectForPosition(text_view.selectedTextRange.start)
+      overflow = line.origin.y + line.size.height -
+        (text_view.contentOffset.y + text_view.bounds.size.height - text_view.contentInset.bottom - text_view.contentInset.top)
+      if overflow > 0
+        offset = text_view.contentOffset
+        offset.y += overflow + text_view.textContainerInset.bottom
+        UIView.animate(duration: 0.2) do
+          text_view.setContentOffset(offset)
+        end
+      end
+    end
 
     def textView(text_view, shouldChangeTextInRange:range, replacementText:string)
       textField(text_view, shouldChangeCharactersInRange:range, replacementString:string)
@@ -201,7 +219,7 @@ module MotionPrime
 
     def load_field(field)
       klass = "MotionPrime::#{field[:type].classify}FieldSection".constantize
-      klass.new(field.merge(table: self))
+      klass.new(field.merge(screen: screen, table: self))
     end
 
     def render_field?(name, options)
@@ -215,7 +233,7 @@ module MotionPrime
 
     def render_header(section)
       return unless options = self.section_header_options.try(:[], section)
-      self.section_headers[section] ||= BaseHeaderSection.new(options.merge(table: self))
+      self.section_headers[section] ||= BaseHeaderSection.new(options.merge(screen: screen, table: self))
     end
 
     def header_for_section(section)
@@ -225,10 +243,10 @@ module MotionPrime
 
     def tableView(table, viewForHeaderInSection: section)
       return unless header = header_for_section(section)
-      wrapper = MotionPrime::BaseElement.factory(:view, styles: cell_styles(header).values.flatten, parent_view: table_view)
-      wrapper.render(to: screen) do |cell_view|
-        header.cell_view = cell_view if header.respond_to?(:cell_view)
-        header.render(to: screen)
+      wrapper = MotionPrime::BaseElement.factory(:view, screen: screen, styles: cell_styles(header).values.flatten, parent_view: table_view)
+      wrapper.render do |container_view, container_element|
+        header.container_element = container_element
+        header.render
       end
     end
 
@@ -265,8 +283,9 @@ module MotionPrime
 
     def reload_data
       @groups_count = nil
+      reset_data
       init_form_fields
-      super
+      table_view.reloadData
     end
 
     private
@@ -285,6 +304,8 @@ module MotionPrime
           section_indexes[section_id] += 1
         end
         init_form_headers
+        @has_groups = section_header_options.present? || @groups_count > 1
+        reset_data_stamps
       end
 
       def init_form_headers

data/motion-prime/sections/tabbed.rb

@@ -7,7 +7,7 @@ module MotionPrime
     #   tab :info, default: true, page_section: :info_tab
     #   tab :map, page_section: :map_tab
     #   # page_section options will be converted to section class and added to section.
-    #   # e.g. in this sample: InfoTabSection.new(model: model).render(to: screen)
+    #   # e.g. in this sample: InfoTabSection.new(screen: screen, model: model).render
     # end
     #
     include MotionPrime::HasNormalizer
@@ -104,8 +104,8 @@ module MotionPrime
         index = 0
         tab_options.each do |key, options|
           section_class = options[:page_section].classify
-          page = "::#{section_class}Section".constantize.new(model: model)
-          page.render(to: screen)
+          page = "::#{section_class}Section".constantize.new(screen: screen, model: model)
+          page.render
           page.hide if index != tab_default
           self.tab_pages << page
           index += 1