glimmer-dsl-opal 0.7.0 → 0.7.5

data/lib/glimmer/swt/label_proxy.rb

@@ -4,11 +4,10 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class LabelProxy < WidgetProxy
-      attr_reader :text, :background_image, :image, :alignment
+      attr_reader :text, :background_image, :image
       
       def initialize(parent, args, block)
         super(parent, args, block)
-        self.alignment = [:left, :center, :right].detect {|align| args.detect { |arg| SWTProxy[align] == arg } }
       end
 
       def text=(value)
@@ -32,6 +31,15 @@ module Glimmer
       def element
         'label'
       end
+      
+      def alignment
+        if @alignment.nil?
+          found_arg = nil
+          @alignment = [:left, :center, :right].detect {|align| found_arg = args.detect { |arg| SWTProxy[align] == SWTProxy[arg] } }
+          args.delete(found_arg)
+        end
+        @alignment
+      end
 
       def alignment=(value)
         # TODO consider storing swt value in the future instead
@@ -44,7 +52,7 @@ module Glimmer
         label_id = id
         label_class = name
         @dom ||= html {
-          label(id: label_id, class: label_class) {
+          label(id: label_id, class: label_class, style: "text-align: #{alignment};") {
             label_text
           }
         }.to_s

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -3,6 +3,7 @@ require 'glimmer/swt/property_owner'
 module Glimmer
   module SWT
     class LayoutDataProxy
+      # TODO make this polymorphic as GridData or RowData subclasses
       include Glimmer::SWT::PropertyOwner
       attr_reader :parent,
                   :args,
@@ -44,10 +45,11 @@ module Glimmer
       def horizontal_alignment=(horizontal_alignment)
         @horizontal_alignment = horizontal_alignment
         return if @horizontal_alignment.nil?
-        if @horizontal_alignment == 'fill'
-          @parent.dom_element.css('width', '100%') if width_hint.nil?
-        else
-          @parent.dom_element.css('text-align', @horizontal_alignment)
+        if @horizontal_alignment != 'fill'
+          @parent.dom_element.css('text-align', @horizontal_alignment.to_s)
+          @parent.dom_element.css('place-self', @horizontal_alignment.to_s)
+          @parent.dom_element.css('margin-left', 'auto') if ['right', 'center'].include?(@horizontal_alignment.to_s)
+          @parent.dom_element.css('margin-right', 'auto') if ['left', 'center'].include?(@horizontal_alignment.to_s)
         end
         # TODO
 #         reapply
@@ -85,18 +87,19 @@ module Glimmer
       
       def grab_excess_horizontal_space=(grab_excess_horizontal_space)
         @grab_excess_horizontal_space = grab_excess_horizontal_space
-        @parent.dom_element.css('width', "100%") if @grab_excess_horizontal_space && width_hint.nil?
+        @parent.dom_element.css('justify-self', @horizontal_alignment) if @grab_excess_horizontal_space && @horizontal_alignment != 'fill' && width_hint.nil?
+        @parent.parent.dom_element.css('justify-content', "normal") if @grab_excess_horizontal_space
 #         reapply
       end
 
       def grab_excess_vertical_space=(grab_excess_vertical_space)
         @grab_excess_vertical_space = grab_excess_vertical_space
-        @parent.dom_element.css('height', "100%") if @grab_excess_vertical_space && height_hint.nil?
-        # TODO
+        @parent.dom_element.css('height', "100%") if @grab_excess_vertical_space && @vertical_alignment == 'fill' && height_hint.nil?
 #         reapply
       end
 
       def reapply
+        # TODO remove reapply method
 #         @parent.css = <<~CSS
 #         CSS
       end

data/lib/glimmer/swt/layout_proxy.rb

@@ -18,7 +18,7 @@ module Glimmer
           a_layout_class = Glimmer::SWT.const_get(class_name_main.to_sym) rescue Glimmer::SWT.const_get(class_name_alternative.to_sym)
           a_layout_class if a_layout_class.ancestors.include?(Glimmer::SWT::LayoutProxy)
         rescue => e
-          puts "Layout #{keyword} was not found!"
+          Glimmer::Config.logger.debug "Layout #{keyword} was not found!"
           nil
         end
         

data/lib/glimmer/swt/message_box_proxy.rb

@@ -8,7 +8,7 @@ module Glimmer
       
       def initialize(parent, args, block)
         i = 0
-        @parent = parent || DisplayProxy.instance.shells.first
+        @parent = parent || DisplayProxy.instance.shells.last
         @args = args
         @block = block
         @children = Set.new
@@ -30,16 +30,8 @@ module Glimmer
         dom_element.find('.modal-content .message').html(@text)
       end
       
-      def document
-        element = self
-        begin
-          element = element.parent
-        end while(element.parent)
-        element
-      end
-      
       def open
-        document.post_initialize_child(self)
+        parent.post_initialize_child(self)
       end
       
       def hide

data/lib/glimmer/swt/table_column_proxy.rb

@@ -74,6 +74,15 @@ module Glimmer
         dom_element.find('.sort-direction')
       end
       
+      # Sets editor (e.g. combo)
+      def editor=(*args)
+        @editor = args
+      end
+      
+      def editable?
+        !@editor&.include?(:none)
+      end
+      
       def observation_request_to_event_mapping
         {
           'on_widget_selected' => {

data/lib/glimmer/swt/table_editor.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/control_editor'
+
+module Glimmer
+  module SWT
+    # Emulates SWT's native org.eclipse.swt.custom.TableEditor
+    class TableEditor < ControlEditor
+      alias table composite
+      
+      def editor=(editor_widget, table_item, table_column_index)
+        # TODO consider making editor not gain an ID or gain a separate set of IDs to avoid clashing with standard widget predictability of ID
+        @table_item = table_item
+        @table_column_index = table_column_index
+        @editor_widget = editor_widget
+        @old_value = table_item.cell_dom_element(table_column_index).html
+        table_item.cell_dom_element(table_column_index).html('')
+        editor_widget.render(table_item.cell_dom_element(table_column_index))
+        # TODO tweak the width perfectly so it doesn't expand the table cell
+#         editor_widget.dom_element.css('width', 'calc(100% - 20px)')
+        editor_widget.dom_element.css('width', "#{minimumWidth}%") # TODO implement property with pixels (and perhaps derive percentage separately from pixels)
+        editor_widget.dom_element.css('height', "#{minimumHeight}px")
+        editor_widget.dom_element.add_class('table-editor')
+        # TODO consider relying on autofocus instead
+        editor_widget.dom_element.focus
+        # TODO consider doing the following line only for :text editor
+        editor_widget.dom_element.select
+      end
+      alias set_editor editor=
+      alias setEditor editor=
+      
+      def cancel!
+        done!
+      end
+      
+      def save!
+        done!
+      end
+      
+      def done!
+        @table_item.cell_dom_element(@table_column_index).html(@old_value) unless @old_value.nil?
+        @old_value = nil
+      end
+    end
+  end
+end

data/lib/glimmer/swt/table_item_proxy.rb

@@ -1,9 +1,33 @@
+# Copyright (c) 2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
     class TableItemProxy < WidgetProxy
       STYLE = <<~CSS
+        tr.table-item td {
+          padding-bottom: 0;
+        }
         tr.table-item:nth-child(even):not(.selected) {
           background: rgb(243, 244, 246);
         }
@@ -60,6 +84,10 @@ module Glimmer
         'tr'
       end
       
+      def cell_dom_element(column_index)
+        dom_element.find("td:nth-child(#{column_index + 1})")
+      end
+      
       def redraw
         super() #TODO re-enable and remove below lines
 
@@ -111,6 +139,14 @@ module Glimmer
         redraw
       end
       
+      def redraw_selection
+        if parent.selection.include?(self)
+          dom_element.add_class('selected')
+        else
+          dom_element.remove_class('selected')
+        end
+      end
+      
       def on_widget_selected(&block)
         event = 'click'
         delegate = $document.on(event, selector, &block)

data/lib/glimmer/swt/table_proxy.rb

@@ -1,20 +1,251 @@
+# Copyright (c) 2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/table_column_proxy'
+require 'glimmer/swt/table_item_proxy'
+require 'glimmer/swt/table_editor'
 
 module Glimmer
   module SWT
-    class TableProxy < WidgetProxy
+    class TableProxy < CompositeProxy
       attr_reader :columns, :selection,
-                  :sort_type, :sort_column, :sort_property, :sort_block, :sort_by_block, :additional_sort_properties
+                  :sort_type, :sort_column, :sort_property, :sort_block, :sort_by_block, :additional_sort_properties,
+                  :editor, :table_editor
       attr_accessor :column_properties, :item_count, :data
       alias items children
       alias model_binding data
       
+      class << self
+        include Glimmer
+        
+        def editors
+          @editors ||= {
+            # ensure editor can work with string keys not just symbols (leave one string in for testing)
+            text: {
+              widget_value_property: :text,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                table_proxy.table_editor.minimumWidth = 90
+                table_proxy.table_editor.minimumHeight = 10
+                table_editor_widget_proxy = text(*args) {
+                  text model.send(property)
+                  focus true
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                }
+#                 table_editor_widget_proxy.swt_widget.selectAll # TODO select all
+                table_editor_widget_proxy
+              end,
+            },
+            combo: {
+              widget_value_property: :text,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumWidth = 90
+                table_proxy.table_editor.minimumHeight = 18
+                table_editor_widget_proxy = combo(*args) {
+                  items model.send("#{property}_options")
+                  text model.send(property)
+                  focus true
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                  on_widget_selected {
+                    if !OS.windows? || !first_time || first_time && model.send(property) != table_editor_widget_proxy.text
+                      table_proxy.finish_edit!
+                    end
+                  }
+                }
+                table_editor_widget_proxy
+              end,
+            },
+            checkbox: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                checkbox(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit!
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                }
+              end,
+            },
+            date: {
+              widget_value_property: :date_time,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumWidth = 90
+                table_proxy.table_editor.minimumHeight = 15
+                date(*args) {
+                  date_time model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                }
+              end,
+            },
+            date_drop_down: {
+              widget_value_property: :date_time,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumWidth = 80
+                table_proxy.table_editor.minimumHeight = 15
+                date_drop_down(*args) {
+                  date_time model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                }
+              end,
+            },
+            time: {
+              widget_value_property: :date_time,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumWidth = 80
+                table_proxy.table_editor.minimumHeight = 15
+                time(*args) {
+                  date_time model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit!
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                }
+              end,
+            },
+            radio: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                radio(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit!
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                }
+              end,
+            },
+            spinner: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                table_editor_widget_proxy = spinner(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                }
+                table_editor_widget_proxy
+              end,
+            },
+          }
+        end
+      end
+      
       def initialize(parent, args, block)
         super(parent, args, block)
         @columns = []
         @children = []
+        @editors = []
         @selection = []
+        @table_editor = TableEditor.new(self)
+        @table_editor.horizontalAlignment = SWTProxy[:left]
+        @table_editor.grabHorizontal = true
+        @table_editor.minimumWidth = 90
+        @table_editor.minimumHeight = 20
         if editable?
           on_mouse_up { |event|
             edit_table_item(event.table_item, event.column_index)
@@ -26,10 +257,24 @@ module Glimmer
       def post_initialize_child(child)
         if child.is_a?(TableColumnProxy)
           @columns << child
-        else
+          child.render
+        elsif child.is_a?(TableItemProxy)
           @children << child
+          child.render
+        else
+          @editors << child
+        end
+      end
+      
+      # Executes for the parent of a child that just got disposed
+      def post_dispose_child(child)
+        if child.is_a?(TableColumnProxy)
+          @columns&.delete(child)
+        elsif child.is_a?(TableItemProxy)
+          @children&.delete(child)
+        else
+          @editors&.delete(child)
         end
-        child.redraw
       end
       
       def post_add_content
@@ -38,6 +283,10 @@ module Glimmer
         @initially_sorted = true
       end
       
+      def default_layout
+        nil
+      end
+      
       def get_data(key=nil)
         data
       end
@@ -60,11 +309,12 @@ module Glimmer
         new_selection = new_selection.to_a
         changed = (selection + new_selection) - (selection & new_selection)
         @selection = new_selection
-        changed.each(&:redraw)
+        changed.each(&:redraw_selection)
       end
             
       def items=(new_items)
         @children = new_items
+        # TODO optimize in the future by sorting elements in DOM directly when no change to elements occur other than sort
         redraw
       end
       
@@ -97,10 +347,6 @@ 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
@@ -110,7 +356,7 @@ module Glimmer
       end
       
       def sort_property=(new_sort_property)
-        @sort_property = [new_sort_property].flatten.compact
+        @sort_property = new_sort_property.to_collection
       end
       
       def detect_sort_type
@@ -131,7 +377,7 @@ module Glimmer
       
       def column_sort_properties
         column_properties.zip(columns.map(&:sort_property)).map do |pair|
-          [pair.compact.last].flatten.compact
+          pair.compact.last.to_collection
         end
       end
       
@@ -162,7 +408,7 @@ module Glimmer
           end
         end
         
-        new_sort_property = [new_sort_property].flatten.compact unless new_sort_property.is_a?(Array)
+        new_sort_property = new_sort_property.to_collection 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
@@ -223,9 +469,118 @@ module Glimmer
         @additional_sort_properties = args unless args.empty?
       end
       
-      def edit_table_item(table_item, column_index)
-        table_item&.edit(column_index) unless column_index.nil?
+      def editor=(args)
+        @editor = args
+      end
+      
+      # Indicates if table is in edit mode, thus displaying a text widget for a table item cell
+      def edit_mode?
+        !!@edit_mode
+      end
+      
+      def cancel_edit!
+        @cancel_edit&.call if @edit_mode
+      end
+
+      def finish_edit!
+        @finish_edit&.call if @edit_mode
+      end
+
+      # Indicates if table is editing a table item because the user hit ENTER or focused out after making a change in edit mode to a table item cell.
+      # It is set to false once change is saved to model
+      def edit_in_progress?
+        !!@edit_in_progress
+      end
+      
+      def edit_selected_table_item(column_index, before_write: nil, after_write: nil, after_cancel: nil)
+        edit_table_item(selection.first, column_index, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
       end
+
+        # TODO migrate the following to the next method
+#       def edit_table_item(table_item, column_index)
+#         table_item&.edit(column_index) unless column_index.nil?
+#       end
+      
+      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
+        return if table_item.nil? || (@edit_mode && @edit_table_item == table_item && @edit_column_index == column_index)
+        @edit_column_index = column_index
+        @edit_table_item = table_item
+        column_index = column_index.to_i
+        model = table_item.data
+        property = column_properties[column_index]
+        cancel_edit!
+        return unless columns[column_index].editable?
+        action_taken = false
+        @edit_mode = true
+        
+        editor_config = columns[column_index].editor || editor
+        editor_config = editor_config.to_collection
+        editor_widget_options = editor_config.last.is_a?(Hash) ? editor_config.last : {}
+        editor_widget_arg_last_index = editor_config.last.is_a?(Hash) ? -2 : -1
+        editor_widget = (editor_config[0] || :text).to_sym
+        editor_widget_args = editor_config[1..editor_widget_arg_last_index]
+        model_editing_property = editor_widget_options[:property] || property
+        widget_value_property = TableProxy::editors.symbolize_keys[editor_widget][:widget_value_property]
+        
+        @cancel_edit = lambda do |event=nil|
+          @cancel_in_progress = true
+          @table_editor.cancel!
+          @table_editor_widget_proxy&.dispose
+          @table_editor_widget_proxy = nil
+          after_cancel&.call
+          @edit_in_progress = false
+          @cancel_in_progress = false
+          @cancel_edit = nil
+          @edit_table_item = @edit_column_index = nil if (@edit_mode && @edit_table_item == table_item && @edit_column_index == column_index)
+          @edit_mode = false
+        end
+        
+        @finish_edit = lambda do |event=nil|
+          new_value = @table_editor_widget_proxy&.send(widget_value_property)
+          if table_item.disposed?
+            @cancel_edit.call
+          elsif !new_value.nil? && !action_taken && !@edit_in_progress && !@cancel_in_progress
+            action_taken = true
+            @edit_in_progress = true
+            if new_value == model.send(model_editing_property)
+              @cancel_edit.call
+            else
+              before_write&.call
+              @table_editor.save!(widget_value_property: widget_value_property)
+              model.send("#{model_editing_property}=", new_value) # makes table update itself, so must search for selected table item again
+              # Table refresh happens here because of model update triggering observers, so must retrieve table item again
+              edited_table_item = search { |ti| ti.data == model }.first
+              show_item(edited_table_item)
+              @table_editor_widget_proxy&.dispose
+              @table_editor_widget_proxy = nil
+              after_write&.call(edited_table_item)
+              @edit_in_progress = false
+              @edit_table_item = @edit_column_index = nil
+            end
+          end
+        end
+
+        content {
+          @table_editor_widget_proxy = TableProxy::editors.symbolize_keys[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
+        }
+        @table_editor.set_editor(@table_editor_widget_proxy, table_item, column_index)
+      rescue => e
+        Glimmer::Config.logger.error {e.full_message}
+        raise e
+      end
+      
+      def show_item(table_item)
+        table_item.dom_element.focus
+      end
+      
+      def add_listener(underscored_listener_name, &block)
+        enhanced_block = lambda do |event|
+          event.extend(TableListenerEvent)
+          block.call(event)
+        end
+        super(underscored_listener_name, &enhanced_block)
+      end
+              
       
       def header_visible=(value)
         @header_visible = value
@@ -259,7 +614,8 @@ 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) unless event.table_item.nil? && event.column_index.nil?
           }
         }
 
@@ -274,7 +630,8 @@ module Glimmer
           },
           'on_widget_selected' => {
             event: 'mouseup',
-          }
+            event_handler: mouse_handler,
+          },
         }
       end
       
@@ -337,7 +694,8 @@ module Glimmer
         table_id = id
         table_id_style = css
         table_id_css_classes = css_classes
-        table_id_css_classes << 'table'
+        table_id_css_classes << 'table' unless table_id_css_classes.include?('table')
+        table_id_css_classes << 'editable' if editable? && !table_id_css_classes.include?('editable')
         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) {