glimmer-dsl-opal 0.0.9 → 0.1.0

data/lib/glimmer/{opal/tab_item.rb → swt/tab_item_proxy.rb}

@@ -1,32 +1,32 @@
-require 'glimmer/opal/div_proxy'
+require 'glimmer/swt/composite_proxy'
 
 module Glimmer
-  module Opal
-    class TabItem < DivProxy
+  module SWT
+    class TabItemProxy < CompositeProxy
       include Glimmer
       attr_reader :text, :content_visible      
       
       def initialize(parent, args)
         super(parent, args)
         css_classes << 'tab-item'
-        content do
+        content {
           on_widget_selected {
             @parent.hide_all_tab_content
             show
           }
-        end
-      end
-      
-      def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::TabItemExpression.new, &block)
+        }
       end
       
       def show
+        # TODO refactor/rewrite via simply class application in jquery
+#         Document.find(path).remove_class('hide')
         @content_visible = true
-        redraw      
+        redraw
       end
       
       def hide
+        # TODO refactor/rewrite via simply class application in jquery
+#         Document.find(path).add_class('hide')
         @content_visible = false
         redraw
       end
@@ -36,10 +36,6 @@ module Glimmer
         redraw
       end
     
-      def name
-        'button'
-      end
-      
       def selector
         super + '-tab'
       end      
@@ -50,49 +46,56 @@ module Glimmer
             event: 'click'
           },
         }
+      end
+      
+      def listener_path
+        tab_path
       end      
       
       def redraw        
         if @tab_dom
           old_tab_dom = @tab_dom
           @tab_dom = nil
-          old_tab_dom.replace tab_dom
+          Document.find(tab_path).replace_with(tab_dom)
         else
-          tab_dom
+          Document.find(parent.tabs_path).append(tab_dom)
         end
-        super
-      end      
+        super()
+      end
+      
+      def tab_path
+        "#{parent.tabs_path} > ##{tab_id}"
+      end
       
+      def tab_id
+        id + '-tab'
+      end
+        
       def tab_dom
-        tab_id = id + '-tab'
-        tab_text = text
-        tab_active = content_visible ? 'active' : ''
-        @tab_dom ||= DOM {
-          button(id: tab_id, class: "tab #{tab_active}") {
-            tab_text
+        tab_selected = @content_visible ? 'selected' : ''
+        @tab_dom ||= html {
+          button(id: tab_id, class: "tab #{tab_selected}") {
+            @text
           }
-        }
+        }.to_s
       end
       
       def dom
         tab_item_id = id
         tab_item_id_style = css
         tab_item_css_classes = css_classes
-        if content_visible
+        css_classes << name
+        if @content_visible
           tab_item_css_classes.delete('hide')
         else
           tab_item_css_classes << 'hide' 
         end
-        if !@parent.tabs.include?(self)
-          @parent.tabs_dom << tab_dom
-          @parent.tabs << self
-        end
-        @dom ||= DOM {
-          div(id: tab_item_id, style: tab_item_id_style, class: tab_item_css_classes.to_a.join(' ')) {
+        tab_item_class_string = tab_item_css_classes.to_a.join(' ')
+        @dom ||= html {
+          div(id: tab_item_id, style: tab_item_id_style, class: tab_item_class_string) {
           }
-        }
+        }.to_s
       end      
     end
   end
 end
-require 'glimmer/dsl/opal/tab_item_expression'

data/lib/glimmer/{opal/table_column.rb → swt/table_column_proxy.rb}

@@ -1,9 +1,10 @@
-require 'glimmer/opal/element_proxy'
+require 'glimmer/swt/widget_proxy'
 
 module Glimmer
-  module Opal
-    class TableColumn < ElementProxy
+  module SWT
+    class TableColumnProxy < WidgetProxy
       include Glimmer
+      
       attr_reader :text, :width      
       
       def text=(value)
@@ -16,13 +17,17 @@ module Glimmer
         redraw
       end
       
+      def parent_path
+        parent.columns_path
+      end
+      
       def css
         <<~CSS
-          width: #{width};
+          width: #{width}px;
         CSS
       end
     
-      def name
+      def element
         'th'
       end
       
@@ -39,11 +44,12 @@ module Glimmer
         table_column_id = id
         table_column_id_style = css
         table_column_css_classes = css_classes
-        @dom ||= DOM {
+        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
           }
-        }
+        }.to_s
       end      
     end
   end

data/lib/glimmer/{opal/table_item.rb → swt/table_item_proxy.rb}

@@ -1,8 +1,8 @@
-  require 'glimmer/opal/element_proxy'
+require 'glimmer/swt/widget_proxy'
 
 module Glimmer
-  module Opal
-    class TableItem < ElementProxy
+  module SWT
+    class TableItemProxy < WidgetProxy
       attr_reader :data
       
       def initialize(parent, args)
@@ -45,10 +45,58 @@ module Glimmer
         @data_hash ||= {}
       end
       
-      def name
+      def parent_path
+        parent.items_path
+      end
+      
+      def element
         'tr'
       end
       
+      def redraw
+        super() #TODO re-enalbe and remove below lines
+
+        # TODO perhaps turn the following lambdas into methods
+        table_item_edit_handler = lambda do |event, cancel = false|
+          Async::Task.new do
+            text_value = event.target.value
+            edit_property = parent.column_properties[@edit_column_index]
+            edit_model = get_data
+            if !cancel && edit_model.send(edit_property) != text_value
+              edit_model.send("#{edit_property}=", text_value)
+              set_text(@edit_column_index, text_value)
+            end
+            @edit_column_index = nil
+            redraw
+          end
+        end
+        table_item_edit_cancel_handler = lambda do |event|           
+          Async::Task.new do
+            table_item_edit_handler.call(event, true)
+          end
+        end   
+        table_item_edit_key_handler = lambda do |event|
+          Async::Task.new do
+            if event.key_code == 13
+              table_item_edit_handler.call(event)
+            elsif event.key_code == 27
+              table_item_edit_cancel_handler.call(event)
+            end
+          end
+        end
+        
+        if @edit_column_index
+          table_item_input = dom_element.find("td:nth-child(#{@edit_column_index + 1}) input")
+          if !table_item_input.empty?
+            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)                
+            end
+          end
+        end
+      end
+      
       def edit(column_index)
         return if @edit_column_index == column_index.to_i
         parent.select(parent.index_of(self), false)
@@ -63,13 +111,14 @@ module Glimmer
       end
       
       def max_column_width(column_index)
-        parent.dom.css("tr td:nth-child(#{column_index + 1})").first.width
+        parent_dom_element.find("tr td:nth-child(#{column_index + 1})").first.width
       end
       
       def dom
         table_item_id = id
         table_item_id_style = css
         table_item_css_classes = css_classes
+        table_item_css_classes << name
         table_item_selection = parent.selection.include?(self)
         if table_item_selection
           table_item_css_classes << 'selected'
@@ -77,40 +126,13 @@ module Glimmer
           table_item_css_classes.delete('selected')
         end
         table_item_text_array = text_array
-        table_item_edit_column_index = @edit_column_index
-        table_item_max_width = max_column_width(table_item_edit_column_index) if table_item_edit_column_index
-        table_item_edit_handler = lambda do |event, cancel = false|
-          Async::Task.new do
-            text_value = event.target.value
-            edit_property = parent.column_properties[table_item_edit_column_index]
-            edit_model = get_data
-            if !cancel && edit_model.send(edit_property) != text_value
-              edit_model.send("#{edit_property}=", text_value)
-              set_text(table_item_edit_column_index, text_value)
-            end
-            @edit_column_index = nil
-            redraw
-          end
-        end
-        table_item_edit_cancel_handler = lambda do |event|           
-          Async::Task.new do
-            table_item_edit_handler.call(event, true)
-          end
-        end   
-        table_item_edit_key_handler = lambda do |event|
-          Async::Task.new do
-            if event.code == 13
-              table_item_edit_handler.call(event)
-            elsif event.code == 27
-              table_item_edit_cancel_handler.call(event)
-            end
-          end
-        end
-        @dom ||= DOM {
+        table_item_max_width = max_column_width(@edit_column_index) if @edit_column_index
+
+        @dom ||= html {
           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 table_item_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
@@ -118,18 +140,7 @@ module Glimmer
               }
             end
           }
-        }.tap do |the_dom|
-          if table_item_edit_column_index
-            table_item_input = the_dom.css("td:nth-child(#{table_item_edit_column_index + 1}) input").first
-            if table_item_input
-              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)                
-              end
-            end
-          end
-        end
+        }.to_s
       end
     end
   end

data/lib/glimmer/swt/table_proxy.rb

@@ -0,0 +1,177 @@
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/table_column_proxy'
+
+module Glimmer
+  module SWT
+    class TableProxy < WidgetProxy
+      attr_reader :columns, :selection
+      attr_accessor :column_properties
+      alias items children
+      
+      def initialize(parent, args)
+        super(parent, args)
+        @columns = []
+        @children = []
+        @selection = []
+      end
+      
+      # Only table_columns may be added as children
+      def add_child(child)
+        if child.is_a?(TableColumnProxy)
+          @columns << child
+        else
+          @children << child        
+        end
+        child.redraw
+      end
+      
+      def remove_all
+        items.clear
+        redraw
+      end
+      
+      def selection=(new_selection)
+        changed = (@selection + new_selection) - (@selection & new_selection)
+        @selection = new_selection
+        changed.each(&:redraw)
+      end
+            
+      def items=(new_items)        
+        @children = new_items
+        redraw
+      end
+      
+      def search(&condition)
+        items.select {|item| condition.nil? || condition.call(item)}
+      end      
+      
+      def index_of(item)
+        items.index(item)
+      end
+      
+      def select(index, meta = false)
+        new_selection = @selection.clone
+        selected_item = items[index]
+        if @selection.include?(selected_item)
+          new_selection.delete(selected_item) if meta
+        else
+          new_selection = [] if !meta || (!has_style?(:multi) && @selection.to_a.size >= 1)
+          new_selection << selected_item
+        end
+        self.selection = new_selection
+      end
+      
+      def edit_table_item(table_item, column_index)
+        table_item.edit(column_index)
+      end
+      
+      def selector
+        super + ' tbody'
+      end
+      
+      def observation_request_to_event_mapping
+        mouse_handler = -> (event_listener) {
+          -> (event) {
+            event.singleton_class.send(:define_method, :table_item=) do |item|
+              @table_item = item
+            end
+            event.singleton_class.send(:define_method, :table_item) do
+              @table_item
+            end
+            table_row = event.target.parents('tr').first
+            table_data = event.target.parents('td').first
+            event.table_item = items.detect {|item| item.id == table_row.attr('id')}
+            event.singleton_class.send(:define_method, :column_index) do
+              (table_data || event.target).attr('data-column-index')
+            end
+            event_listener.call(event)              
+          }
+        } 
+
+        {
+          'on_mouse_down' => {
+            event: 'mousedown',
+            event_handler: mouse_handler,
+          },
+          'on_mouse_up' => {
+            event: 'mouseup',
+            event_handler: mouse_handler,
+          }
+        }
+      end
+      
+      def redraw
+        super()
+        @columns.to_a.each(&:redraw)  
+      end
+      
+#       def redraw
+#         if @dom
+#           old_dom = @dom
+#           @dom = nil
+#           old_dom.replace dom
+#         else
+#           dom
+#         end
+#         if @last_redrawn_children != @children
+#           items_dom_element.empty
+#           @last_redrawn_children = @children
+#           @children = []
+#           @last_redrawn_children.each do |child|            
+#             add_child(child)
+#           end
+#         end
+#       end
+      
+      def element
+        'table'
+      end
+      
+      def columns_path
+        path + ' thead tr'
+      end
+
+      def columns_dom_element
+        Document.find(columns_path)
+      end
+      
+      def items_path
+        path + ' tbody'
+      end
+
+      def items_dom_element
+        Document.find(items_path)
+      end
+      
+      def columns_dom        
+        tr {
+        }
+      end
+      
+      def thead_dom
+        thead {
+          columns_dom
+        }
+      end            
+      
+      def items_dom        
+        tbody {
+        }
+      end
+      
+      def dom
+        table_id = id
+        table_id_style = css
+        table_id_css_classes = css_classes
+        table_id_css_classes << 'table'
+        table_id_css_classes_string = table_id_css_classes.to_a.join(' ')
+        @dom ||= html {
+          table(id: table_id, style: table_id_style, class: table_id_css_classes_string) {
+            thead_dom
+            items_dom
+          }
+        }.to_s
+      end
+    end
+  end
+end