glimmer-dsl-opal 0.4.0 → 0.7.0

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -4,10 +4,10 @@ module Glimmer
   module SWT
     class TabItemProxy < CompositeProxy
       include Glimmer
-      attr_reader :text, :content_visible      
+      attr_reader :text, :content_visible
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         content {
           on_widget_selected {
             @parent.hide_all_tab_content
@@ -35,7 +35,7 @@ module Glimmer
     
       def selector
         super + '-tab'
-      end      
+      end
       
       def observation_request_to_event_mapping
         {
@@ -47,7 +47,7 @@ module Glimmer
       
       def listener_path
         tab_path
-      end      
+      end
       
       def tab_path
         "#{parent.tabs_path} > ##{tab_id}"
@@ -72,13 +72,13 @@ module Glimmer
       
       # This contains the tab content
       def dom
-        tab_item_id = id        
+        tab_item_id = id
         tab_item_class_string = [name, 'hide'].join(' ')
         @dom ||= html {
           div(id: tab_item_id, class: tab_item_class_string) {
           }
         }.to_s
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/table_column_proxy.rb

@@ -1,12 +1,51 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/swt_proxy'
 
 module Glimmer
   module SWT
     class TableColumnProxy < WidgetProxy
+      STYLE = <<~CSS
+        th.table-column {
+          background: rgb(246, 246, 246);
+          text-align: left;
+          padding: 5px;
+        }
+        
+        th.table-column .sort-direction {
+          float: right;
+        }
+      CSS
       include Glimmer
       
-      attr_reader :text, :width      
+      attr_accessor :sort_block, :sort_by_block
+      attr_reader :text, :width,
+                  :no_sort, :sort_property, :editor
+      alias no_sort? no_sort
+      
+      def initialize(parent, args, block)
+        @no_sort = args.delete(:no_sort)
+        super(parent, args, block)
+        unless no_sort?
+          content {
+            on_widget_selected { |event|
+              parent.sort_by_column!(self)
+            }
+          }
+        end
+      end
+      
+      def sort_property=(args)
+        @sort_property = args unless args.empty?
+      end
+      
+      def sort_direction
+        parent.sort_direction if parent.sort_column == self
+      end
       
+      def redraw_sort_direction
+        sort_icon_dom_element.attr('class', sort_icon_class)
+      end
+            
       def text=(value)
         @text = value
         redraw
@@ -21,36 +60,47 @@ module Glimmer
         parent.columns_path
       end
       
-      def css
-        <<~CSS
-          width: #{width}px;
-        CSS
-      end
-    
       def element
         'th'
       end
       
+      def sort_icon_class
+        @sort_icon_class = 'sort-direction'
+        @sort_icon_class += (sort_direction == SWTProxy[:up] ? ' ui-icon ui-icon-caret-1-n' : ' ui-icon ui-icon-caret-1-s') unless sort_direction.nil?
+        @sort_icon_class
+      end
+      
+      def sort_icon_dom_element
+        dom_element.find('.sort-direction')
+      end
+      
       def observation_request_to_event_mapping
         {
           'on_widget_selected' => {
-            event: 'click'
+            event: 'click',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                event_listener.call(event)
+                redraw_sort_direction
+              }
+            }
           },
         }
-      end      
+      end
       
       def dom
         table_column_text = text
         table_column_id = id
-        table_column_id_style = css
+        table_column_id_style = "width: #{width}px;"
         table_column_css_classes = css_classes
         table_column_css_classes << name
         @dom ||= html {
           th(id: table_column_id, style: table_column_id_style, class: table_column_css_classes.to_a.join(' ')) {
-            table_column_text
+            span {table_column_text}
+            span(class: sort_icon_class)
           }
         }.to_s
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/table_item_proxy.rb

@@ -3,10 +3,17 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class TableItemProxy < WidgetProxy
+      STYLE = <<~CSS
+        tr.table-item:nth-child(even):not(.selected) {
+          background: rgb(243, 244, 246);
+        }
+      CSS
+      
       attr_reader :data
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        # TODO check if there is a need to remove this observer when removing widget from table upon items update
         on_widget_selected { |event|
           parent.select(parent.index_of(self), event.meta?)
         }
@@ -54,7 +61,7 @@ module Glimmer
       end
       
       def redraw
-        super() #TODO re-enalbe and remove below lines
+        super() #TODO re-enable and remove below lines
 
         # TODO perhaps turn the following lambdas into methods
         table_item_edit_handler = lambda do |event, cancel = false|
@@ -70,11 +77,11 @@ module Glimmer
             redraw
           end
         end
-        table_item_edit_cancel_handler = lambda do |event|           
+        table_item_edit_cancel_handler = lambda do |event|
           Async::Task.new do
             table_item_edit_handler.call(event, true)
           end
-        end   
+        end
         table_item_edit_key_handler = lambda do |event|
           Async::Task.new do
             if event.key_code == 13
@@ -91,7 +98,7 @@ module Glimmer
             Async::Task.new do
               table_item_input.focus
               table_item_input.on('keyup', &table_item_edit_key_handler)
-              table_item_input.on('focusout', &table_item_edit_cancel_handler)                
+              table_item_input.on('focusout', &table_item_edit_cancel_handler)
             end
           end
         end
@@ -132,7 +139,7 @@ module Glimmer
           tr(id: table_item_id, style: table_item_id_style, class: table_item_css_classes.to_a.join(' ')) {
             table_item_text_array.each_with_index do |table_item_text, column_index|
               td('data-column-index' => column_index) {
-                if @edit_column_index == column_index                  
+                if @edit_column_index == column_index
                   input(type: 'text', value: table_item_text, style: "max-width: #{table_item_max_width - 11}px;")
                 else
                   table_item_text

data/lib/glimmer/swt/table_proxy.rb

@@ -4,46 +4,82 @@ require 'glimmer/swt/table_column_proxy'
 module Glimmer
   module SWT
     class TableProxy < WidgetProxy
-      attr_reader :columns, :selection
-      attr_accessor :column_properties
+      attr_reader :columns, :selection,
+                  :sort_type, :sort_column, :sort_property, :sort_block, :sort_by_block, :additional_sort_properties
+      attr_accessor :column_properties, :item_count, :data
       alias items children
+      alias model_binding data
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @columns = []
         @children = []
         @selection = []
+        if editable?
+          on_mouse_up { |event|
+            edit_table_item(event.table_item, event.column_index)
+          }
+        end
       end
       
       # Only table_columns may be added as children
-      def add_child(child)
+      def post_initialize_child(child)
         if child.is_a?(TableColumnProxy)
           @columns << child
         else
-          @children << child        
+          @children << child
         end
         child.redraw
       end
       
+      def post_add_content
+        return if @initially_sorted
+        initial_sort!
+        @initially_sorted = true
+      end
+      
+      def get_data(key=nil)
+        data
+      end
+      
       def remove_all
         items.clear
         redraw
       end
       
+      def editable?
+        args.include?(:editable)
+      end
+      alias editable editable?
+      
+      def selection
+        @selection.to_a
+      end
+      
       def selection=(new_selection)
-        changed = (@selection + new_selection) - (@selection & new_selection)
+        new_selection = new_selection.to_a
+        changed = (selection + new_selection) - (selection & new_selection)
         @selection = new_selection
         changed.each(&:redraw)
       end
             
-      def items=(new_items)        
+      def items=(new_items)
         @children = new_items
         redraw
       end
       
+      def item_count=(value)
+        @item_count = value
+        redraw_empty_items
+      end
+      
+      def cells_for(model)
+        column_properties.map {|property| model.send(property)}
+      end
+      
       def search(&condition)
         items.select {|item| condition.nil? || condition.call(item)}
-      end      
+      end
       
       def index_of(item)
         items.index(item)
@@ -61,8 +97,147 @@ module Glimmer
         self.selection = new_selection
       end
       
+      def search(&condition)
+        items.select {|item| condition.nil? || condition.call(item)}
+      end
+      
+      def sort_block=(comparator)
+        @sort_block = comparator
+      end
+      
+      def sort_by_block=(property_picker)
+        @sort_by_block = property_picker
+      end
+      
+      def sort_property=(new_sort_property)
+        @sort_property = [new_sort_property].flatten.compact
+      end
+      
+      def detect_sort_type
+        @sort_type = sort_property.size.times.map { String }
+        array = model_binding.evaluate_property
+        sort_property.each_with_index do |a_sort_property, i|
+          values = array.map { |object| object.send(a_sort_property) }
+          value_classes = values.map(&:class).uniq
+          if value_classes.size == 1
+            @sort_type[i] = value_classes.first
+          elsif value_classes.include?(Integer)
+            @sort_type[i] = Integer
+          elsif value_classes.include?(Float)
+            @sort_type[i] = Float
+          end
+        end
+      end
+      
+      def column_sort_properties
+        column_properties.zip(columns.map(&:sort_property)).map do |pair|
+          [pair.compact.last].flatten.compact
+        end
+      end
+      
+      def sort_direction
+        @sort_direction == :ascending ? SWTProxy[:up] : SWTProxy[:down]
+      end
+      
+      def sort_direction=(value)
+        @sort_direction = value == SWTProxy[:up] ? :ascending : :descending
+      end
+      
+      # Sorts by specified TableColumnProxy object. If nil, it uses the table default sort instead.
+      def sort_by_column!(table_column_proxy=nil)
+        index = columns.to_a.index(table_column_proxy) unless table_column_proxy.nil?
+        new_sort_property = table_column_proxy.nil? ? @sort_property : table_column_proxy.sort_property || [column_properties[index]]
+        
+        return if table_column_proxy.nil? && new_sort_property.nil? && @sort_block.nil? && @sort_by_block.nil?
+        if new_sort_property && table_column_proxy.nil? && new_sort_property.size == 1 && (index = column_sort_properties.index(new_sort_property))
+          table_column_proxy = columns[index]
+        end
+        if new_sort_property && new_sort_property.size == 1 && !additional_sort_properties.to_a.empty?
+          selected_additional_sort_properties = additional_sort_properties.clone
+          if selected_additional_sort_properties.include?(new_sort_property.first)
+            selected_additional_sort_properties.delete(new_sort_property.first)
+            new_sort_property += selected_additional_sort_properties
+          else
+            new_sort_property += additional_sort_properties
+          end
+        end
+        
+        new_sort_property = [new_sort_property].flatten.compact unless new_sort_property.is_a?(Array)
+        @sort_direction = @sort_direction.nil? || @sort_property.first != new_sort_property.first || @sort_direction == :descending ? :ascending : :descending
+        
+        @sort_property = new_sort_property
+        table_column_index = column_properties.index(new_sort_property.to_s.to_sym)
+        table_column_proxy ||= columns[table_column_index] if table_column_index
+        @sort_column = table_column_proxy if table_column_proxy
+                
+        if table_column_proxy
+          @sort_by_block = nil
+          @sort_block = nil
+        end
+        @sort_type = nil
+        if table_column_proxy&.sort_by_block
+          @sort_by_block = table_column_proxy.sort_by_block
+        elsif table_column_proxy&.sort_block
+          @sort_block = table_column_proxy.sort_block
+        else
+          detect_sort_type
+        end
+                
+        sort!
+      end
+      
+      def initial_sort!
+        sort_by_column!
+      end
+      
+      def sort!
+        return unless sort_property && (sort_type || sort_block || sort_by_block)
+        array = model_binding.evaluate_property
+        array = array.sort_by(&:hash) # this ensures consistent subsequent sorting in case there are equivalent sorts to avoid an infinite loop
+        # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
+        if sort_block
+          sorted_array = array.sort(&sort_block)
+        elsif sort_by_block
+          sorted_array = array.sort_by(&sort_by_block)
+        else
+          sorted_array = array.sort_by do |object|
+            sort_property.each_with_index.map do |a_sort_property, i|
+              value = object.send(a_sort_property)
+              # handle nil and difficult to compare types gracefully
+              if sort_type[i] == Integer
+                value = value.to_i
+              elsif sort_type[i] == Float
+                value = value.to_f
+              elsif sort_type[i] == String
+                value = value.to_s
+              end
+              value
+            end
+          end
+        end
+        sorted_array = sorted_array.reverse if @sort_direction == :descending
+        model_binding.call(sorted_array)
+      end
+      
+      def additional_sort_properties=(*args)
+        @additional_sort_properties = args unless args.empty?
+      end
+      
       def edit_table_item(table_item, column_index)
-        table_item.edit(column_index)
+        table_item&.edit(column_index) unless column_index.nil?
+      end
+      
+      def header_visible=(value)
+        @header_visible = value
+        if @header_visible
+          thead_dom_element.remove_class('hide')
+        else
+          thead_dom_element.add_class('hide')
+        end
+      end
+      
+      def header_visible
+        @header_visible
       end
       
       def selector
@@ -84,9 +259,9 @@ module Glimmer
             event.singleton_class.send(:define_method, :column_index) do
               (table_data || event.target).attr('data-column-index')
             end
-            event_listener.call(event)              
+            event_listener.call(event)
           }
-        } 
+        }
 
         {
           'on_mouse_down' => {
@@ -96,13 +271,26 @@ module Glimmer
           'on_mouse_up' => {
             event: 'mouseup',
             event_handler: mouse_handler,
+          },
+          'on_widget_selected' => {
+            event: 'mouseup',
           }
         }
       end
       
       def redraw
         super()
-        @columns.to_a.each(&:redraw)  
+        @columns.to_a.each(&:redraw)
+        redraw_empty_items
+      end
+      
+      def redraw_empty_items
+        if @children&.size.to_i < item_count.to_i
+          item_count.to_i.times do
+            empty_columns = column_properties&.size.to_i.times.map { |i| "<td data-column-index='#{i}'></td>" }
+            items_dom_element.append("<tr class='table-item empty-table-item'>#{empty_columns}</tr>")
+          end
+        end
       end
       
       def element
@@ -125,7 +313,7 @@ module Glimmer
         Document.find(items_path)
       end
       
-      def columns_dom        
+      def columns_dom
         tr {
         }
       end
@@ -134,9 +322,13 @@ module Glimmer
         thead {
           columns_dom
         }
-      end            
+      end
+      
+      def thead_dom_element
+        dom_element.find('thead')
+      end
       
-      def items_dom        
+      def items_dom
         tbody {
         }
       end
@@ -154,6 +346,23 @@ module Glimmer
           }
         }.to_s
       end
+      
+      private
+
+      def property_type_converters
+        super.merge({
+          selection: lambda do |value|
+            if value.is_a?(Array)
+              search {|ti| value.include?(ti.get_data) }
+            else
+              search {|ti| ti.get_data == value}
+            end
+          end,
+        })
+      end
+      
     end
+    
   end
+  
 end