glimmer-dsl-opal 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15339e6707f761011f074d030dc58a41733c3ea249da444745c1c6696ab90468
-  data.tar.gz: 440722c63a85a92c02dac9a0955bcb5b26d620be1338727521674d63a3d5c9b6
+  metadata.gz: b4e81c8aae870295468f5c0e573da962daa58837efda4742c9855313ae29f42a
+  data.tar.gz: 40df246c27977d3fa862a452cdfb2dd99ad0b506374408c69e25666b3fc7fa50
 SHA512:
-  metadata.gz: 7daddcebb68f6d612c011f2d99c3af01073f3740a3fb82bd9a4a1bd96c748db358c61c6d3ad1502aa23f5061fb8041921c680a729bf39d0fa971cfa55059e4d7
-  data.tar.gz: 15cea650eacfb8dbb05dc4892754b160cd0ad5ec0d5e5c0a5c87636e1fbc69f43d9a3fcc250edd3c9febc2bae1ab0a3ecf9fe47f295363de9b13cc47e86debc3
+  metadata.gz: c46c3bdfcc129557ac54640d2d905cb7495f010ff1b81422c5b55529a01ecb67c698b4724029b62b9cbc6bcb46727763185ba1b4469c0355259d16acd1f228f1
+  data.tar.gz: 803c487121b4092f024fabca666e359fcdfeca87482b95a391e6b857b19dca28f46a845fc46e6c189e73254c1aa3a1f53d8cbe51c113f425be5019544a353913

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.7.1
+
+- Combo table editor (enabled in Hello, Table! sample)
+- Fix issue with table cell selection for editing not working
+- Remove widget from parent upon dispose
+- Remove listeners upon widget dispose
+
 ## 0.7.0
 
 - Hello, Table! Sample
@@ -127,3 +134,4 @@
 
 - Initial support for webifying Glimmer SWT apps
 - Support for Shell and Label widgets (text property only).
+- Hello, World! sample support

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Opal 0.7.0 (Pure Ruby Web GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Opal 0.7.1 (Pure Ruby Web GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-opal.svg)](http://badge.fury.io/rb/glimmer-dsl-opal)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -8,11 +8,11 @@
 
 Use in one of two ways:
 - **Direct:** build the GUI of web apps with the same friendly desktop GUI Ruby syntax as [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt), thus requiring a lot less code than web technologies that is in pure Ruby and avoiding opaque web concepts like 'render' and 'reactive'. No HTML/JS/CSS skills are even required. Web designers may be involved with CSS styling only if needed.
-- **Adapter:** Auto-webify [Glimmer](https://github.com/AndyObtiva/glimmer) desktop apps (i.e. apps built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt)) via [Opal](https://opalrb.com/) on [Rails](https://rubyonrails.org/) without changing a line of code. Apps may then be custom-styled by web designers for the web with standard CSS.
+- **Adapter:** auto-webify [Glimmer](https://github.com/AndyObtiva/glimmer) desktop apps (i.e. apps built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt)) via [Opal](https://opalrb.com/) on [Rails](https://rubyonrails.org/) without changing a line of code. Just insert them as a single require statement in a Rails app, and BOOM! They're running on the web! Apps may then optionally be custom-styled for the web by web designers with standard CSS if needed.
 
 Glimmer DSL for Opal successfully reuses the entire [Glimmer](https://github.com/AndyObtiva/glimmer) core DSL engine in [Opal Ruby](https://opalrb.com/) inside a web browser, and as such inherits the full range of powerful Glimmer desktop [data-binding](https://github.com/AndyObtiva/glimmer#data-binding) capabilities for the web.
 
-NOTE: Alpha Version 0.7.0 only supports bare-minimum capabilities for the following [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) [samples](https://github.com/AndyObtiva/glimmer#samples):
+NOTE: Alpha Version 0.7.1 only supports bare-minimum capabilities for the following [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) [samples](https://github.com/AndyObtiva/glimmer#samples):
 
 Hello:
 
@@ -49,16 +49,6 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS (Cascading Style Sheets)
 
-## Background
-
-The original idea behind Glimmer DSL for Opal was that you start by having a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) desktop app that communicates with a Rails API for any web/cloud concerns. The GUI DSL is very simple in Glimmer DSL for SWT. Once the app is built. You simply embed it in a Rails app as a one line require statement after adding the Glimmer DSL for Opal gem, and BOOM, it just works on the web inside a web browser with the same server/client communication you had in the desktop app (I am working on adding minimal support for net/http in Opal so that desktop apps that use it continue to work in a web browser).
-
-Part of the idea is that web browsers just render GUI widgets similar to those of a desktop app (after all a web browser is a desktop app), so whether you run your GUI on the desktop or on the web should just be a low-level concern, hopefully automated completely with Glimmer DSL for Opal.
-
-Last but not least, you would likely want some special branding on the web, so you can push that off to a web designer who would be more than happy to do the web graphic design and customize the look and feel with pure CSS (no need for programming with Ruby or JavaScript). This enables a clean separation of concerns and distribution of tasks among developers and designers, let alone saving effort on the web GUI by reusing the desktop GUI as a base right off the bat.
-
-Alternatively, web developers may directly use [Glimmer DSL for Opal](https://rubygems.org/gems/glimmer-dsl-opal) to build the GUI of web apps since it is as simple as desktop development, thus requiring a lot less code that is in pure Ruby only (as demonstrated in examples below) and avoiding opaque web concepts like 'render' and 'reactive' due to treating GUI as persistent just like desktop apps do. No HTML/JS/CSS skills are even required. Still, web designers may be involved with CSS only if needed, thanks to the clean semantic markup [Glimmer DSL for Opal](https://rubygems.org/gems/glimmer-dsl-opal) produces.
-
 ## Supported Glimmer DSL Keywords
 
 The following keywords from [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) have partial support in Opal:
@@ -99,6 +89,16 @@ Event loop:
 - `display`
 - `async_exec`
 
+## Background
+
+The original idea behind Glimmer DSL for Opal was that you start by having a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) desktop app that communicates with a Rails API for any web/cloud concerns. The pure Ruby [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) is very simple, so it is more productive to build GUI in it since it does not go through a server/client request/response cycle and can be iterated on locally with a much shorter feedback cycle. Once the GUI and the rest of the app is built. You simply embed it in a Rails app as a one line require statement after adding the Glimmer DSL for Opal gem, and BOOM, it just works on the web inside a web browser with the same server/client communication you had in the desktop app (I am working on adding minimal support for net/http in Opal so that desktop apps that use it continue to work in a web browser. Until then, just use [Opal-jQuery](https://github.com/opal/opal-jquery) http support). That way, you get two apps for one: desktop and web.
+
+Part of the idea is that web browsers just render GUI widgets similar to those of a desktop app (after all a web browser is a desktop app), so whether you run your GUI on the desktop or on the web should just be a low-level concern, hopefully automated completely with Glimmer DSL for Opal.
+
+Last but not least, you would likely want some special branding on the web, so you can push that off to a web designer who would be more than happy to do the web graphic design and customize the look and feel with pure CSS (no need for programming with Ruby or JavaScript). This enables a clean separation of concerns and distribution of tasks among developers and designers, let alone saving effort on the web GUI by reusing the desktop GUI as a base right off the bat.
+
+Alternatively, web developers may directly use [Glimmer DSL for Opal](https://rubygems.org/gems/glimmer-dsl-opal) to build the GUI of web apps since it is as simple as desktop development, thus requiring a lot less code that is in pure Ruby only (as demonstrated in examples below) and avoiding opaque web concepts like 'render' and 'reactive' due to treating GUI as persistent just like desktop apps do. No HTML/JS/CSS skills are even required. Still, web designers may be involved with CSS only if needed, thanks to the clean semantic markup [Glimmer DSL for Opal](https://rubygems.org/gems/glimmer-dsl-opal) automatically produces.
+
 ## Pre-requisites
 
 - Rails 5: [https://github.com/rails/rails/tree/5-2-stable](https://github.com/rails/rails/tree/5-2-stable)
@@ -133,7 +133,7 @@ Add the following to `Gemfile`:
 gem 'opal-rails', '~> 1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.7.0'
+gem 'glimmer-dsl-opal', '~> 0.7.1'
 gem 'glimmer-dsl-xml', '~> 1.1.0', require: false
 gem 'glimmer-dsl-css', '~> 1.1.0', require: false
 
@@ -170,6 +170,8 @@ Edit `app/views/layouts/application.html.erb` and add the following below other
 <%= stylesheet_link_tag    'glimmer/glimmer', media: 'all', 'data-turbolinks-track': 'reload' %>
 ```
 
+Clear the file `app/views/welcomes/index.html.erb` from any content.
+
 Open a `Document.ready?` block and add inside it Glimmer GUI DSL code or a require statement for one of the samples below.
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/glimmer-dsl-opal.rb

@@ -1,3 +1,24 @@
+# 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 'opal'
 
 GLIMMER_DSL_OPAL_ROOT = File.expand_path('../..', __FILE__)
@@ -45,6 +66,7 @@ if RUBY_ENGINE == 'opal'
   require 'glimmer-dsl-xml'
   require 'glimmer-dsl-css'
   Element.alias_native :replace_with, :replaceWith
+  Element.alias_native :select
   
 #   Glimmer::Config.loop_max_count = 20
   
@@ -54,6 +76,42 @@ if RUBY_ENGINE == 'opal'
     result ||= method == '<<'
     result ||= method == 'handle'
   end
+  
+  class OS
+    class << self
+      def windows?
+        # No Op in Opal
+      end
+      
+      def mac?
+        # No Op in Opal
+      end
+      
+      def linux?
+        # No Op in Opal
+      end
+    end
+  end
+  
+  class File
+    class << self
+      def read(*args, &block)
+        # TODO implement via asset downloads in the future
+        # No Op in Opal
+      end
+    end
+  end
+  
+  class Display
+    class << self
+      def setAppName(app_name)
+        # No Op in Opal
+      end
+      def setAppVersion(version)
+        # No Op in Opal
+      end
+    end
+  end
 else
   require_relative 'glimmer/engine'
 end

data/lib/glimmer-dsl-opal/ext/date.rb

@@ -45,7 +45,7 @@ class Time
     alias new_original new
     def new(*args)
       if args.size >= 7
-        puts "Dropped timezone #{args[6]} from Time.new(#{args.map(&:to_s)}) constructor arguments since Opal does not support it!"
+        Glimmer::Config.logger.debug "Dropped timezone #{args[6]} from Time.new(#{args.map(&:to_s)}) constructor arguments since Opal does not support it!"
         args = args[0...6]
       end
       new_original(*args)

data/lib/glimmer-dsl-opal/samples/hello/hello_table.rb

@@ -218,17 +218,17 @@ class HelloTable
         table_column {
           text 'Ballpark'
           width 180
-#           editor :none
+          editor :none
         }
         table_column {
           text 'Home Team'
           width 150
-#           editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
+          editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
         }
         table_column {
           text 'Away Team'
           width 150
-#           editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
+          editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
         }
         table_column {
           text 'Promotion'

data/lib/glimmer-dsl-swt.rb

@@ -1,37 +1,22 @@
-class OS
-  class << self
-    def windows?
-      # No Op in Opal
-    end
-    
-    def mac?
-      # No Op in Opal
-    end
-    
-    def linux?
-      # No Op in Opal
-    end
-  end
-end
-
-class File
-  class << self
-    def read(*args, &block)
-      # TODO implement via asset downloads in the future
-      # No Op in Opal
-    end
-  end
-end
-
-class Display
-  class << self
-    def setAppName(app_name)
-      # No Op in Opal
-    end
-    def setAppVersion(version)
-      # No Op in Opal
-    end
-  end
-end
+# 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-dsl-opal'

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -35,7 +35,7 @@ module Glimmer
         model_cells = new_model_collection.to_a.map {|m| @table.cells_for(m)}
         return if table_cells == model_cells
         if new_model_collection and new_model_collection.is_a?(Array)
-#           @table_items_observer_registration&.unobserve
+#           @table_items_observer_registration&.unobserve # TODO re-enable
           @table_items_observer_registration = observe(new_model_collection, @column_properties)
           add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
@@ -45,8 +45,10 @@ module Glimmer
       end
       
       def populate_table(model_collection, parent, column_properties)
-        return if model_collection&.sort_by(&:hash) == @last_populated_model_collection&.sort_by(&:hash)
+        @skip_populate_table = model_collection&.sort_by(&:hash).map {|m| @table.column_properties.map {|p| m.send(p)}} == @last_populated_model_collection_properties
+        return if @skip_populate_table
         @last_populated_model_collection = model_collection
+        @last_populated_model_collection_properties = model_collection&.sort_by(&:hash).map {|m| @table.column_properties.map {|p| m.send(p)}}
         # TODO improve performance
         selected_table_item_models = parent.selection.map(&:get_data)
         old_items = parent.items

data/lib/glimmer/dsl/opal/widget_expression.rb

@@ -20,8 +20,12 @@ module Glimmer
         end
 
         def add_content(parent, &block)
-          super(parent, &block)
-          parent.post_add_content
+          if parent.rendered?
+            super(parent, &block)
+            parent.post_add_content
+          else
+            parent.add_content_on_render(&block)
+          end
         end
       end
     end

data/lib/glimmer/swt/composite_proxy.rb

@@ -8,7 +8,11 @@ module Glimmer
       
       def initialize(parent, args, block)
         super(parent, args, block)
-        @layout = GridLayoutProxy.new(self, [])
+        @layout = default_layout
+      end
+      
+      def default_layout
+        GridLayoutProxy.new(self, [])
       end
       
       def dom

data/lib/glimmer/swt/control_editor.rb

@@ -0,0 +1,53 @@
+# 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.
+
+module Glimmer
+  module SWT
+    # Emulates SWT's native org.eclipse.swt.custom.ControlEditor
+    class ControlEditor
+      ATTRIBUTES = [:grabHorizontal, :grabVertical, :horizontalAlignment, :verticalAlignment, :minimumWidth, :minimumHeight]
+      attr_accessor *ATTRIBUTES
+      ATTRIBUTES.each do |attribute|
+        alias_method attribute.underscore, attribute
+        alias_method "#{attribute.underscore}=", "#{attribute}="
+      end
+      
+      # TODO consider supporting a java_attr_accessor to get around having to generate all the aliases manually
+      attr_accessor :editor
+      alias getEditor editor
+      alias get_editor editor
+      alias setEditor editor=
+      alias set_editor editor=
+      
+      # TODO implement `#layout` method if needed
+      
+      attr_reader :composite
+      
+      def initialize(composite)
+        @composite = composite
+      end
+      
+      # TODO implement showing editor for composite or canvas
+#       def editor=(widget)
+#       end
+    end
+  end
+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/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', '90%') # just a good enough approximation
+        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
 

data/lib/glimmer/swt/table_proxy.rb

@@ -1,20 +1,242 @@
+# 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.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.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.minimumHeight = 25
+                date(*args) {
+                  date_time 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
+                  }
+                }
+              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.minimumHeight = 25
+                date_drop_down(*args) {
+                  date_time 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
+                  }
+                }
+              end,
+            },
+            time: {
+              widget_value_property: :date_time,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                time(*args) {
+                  date_time 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
+                  }
+                }
+              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.minimumHeight = 20
         if editable?
           on_mouse_up { |event|
             edit_table_item(event.table_item, event.column_index)
@@ -26,10 +248,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 +274,10 @@ module Glimmer
         @initially_sorted = true
       end
       
+      def default_layout
+        nil
+      end
+      
       def get_data(key=nil)
         data
       end
@@ -97,10 +337,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
@@ -223,9 +459,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].flatten.compact
+        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
@@ -337,7 +682,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) {

data/lib/glimmer/swt/widget_proxy.rb

@@ -29,7 +29,10 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered
+      alias isDisposed disposed?
+      alias is_disposed disposed?
+      alias rendered? rendered
       
       class << self
         # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
@@ -103,6 +106,7 @@ module Glimmer
         @block = block
         @children = Set.new # TODO consider moving to composite
         @enabled = true
+        @data = {}
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self)]&.call(self)
         @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
       end
@@ -113,17 +117,52 @@ module Glimmer
         child.render
       end
       
+      # Executes for the parent of a child that just got disposed
+      def post_dispose_child(child)
+        @children&.delete(child)
+      end
+      
       # Executes at the closing of a parent widget curly braces after all children/properties have been added/set
       def post_add_content
         # No Op by default
       end
       
+      def set_data(key=nil, value)
+        @data[key] = value
+      end
+      alias setData set_data
+      alias data= set_data
+      
+      def get_data(key=nil)
+        @data[key]
+      end
+      alias getData get_data
+      alias data get_data
+      
       def css_classes
         dom_element.attr('class').to_s.split
       end
       
       def dispose
+        remove_all_listeners
         Document.find(path).remove
+        parent&.post_dispose_child(self)
+        # TODO fire on_widget_disposed listener
+        @disposed = true
+      end
+      
+      def remove_all_listeners
+        observation_request_to_event_mapping.keys.each do |keyword|
+          [observation_request_to_event_mapping[keyword]].flatten.each do |mapping|
+            @observation_requests[keyword].to_a.each do |event_listener|
+              event = mapping[:event]
+              event_handler = mapping[:event_handler]
+              event_element_css_selector = mapping[:event_element_css_selector]
+              the_listener_dom_element = event_element_css_selector ? Element[event_element_css_selector] : listener_dom_element
+              the_listener_dom_element.off(event)
+            end
+          end
+        end
       end
       
       def path
@@ -172,12 +211,17 @@ module Glimmer
         @parent.path
       end
 
-      def render
+      def parent_dom_element
+        Document.find(parent_path)
+      end
+      
+      def render(custom_parent_dom_element = nil)
+        the_parent_dom_element = custom_parent_dom_element || parent_dom_element
         old_element = dom_element
         brand_new = @dom.nil? || old_element.empty?
-        build_dom
+        build_dom(!custom_parent_dom_element) # TODO handle custom parent layout by passing parent instead of parent dom element
         if brand_new
-          Document.find(parent_path).append(@dom)
+          the_parent_dom_element.append(@dom)
         else
           old_element.replace_with(@dom)
         end
@@ -190,13 +234,29 @@ module Glimmer
         children.each do |child|
           child.render
         end
+        @rendered = true
+        content_on_render_blocks.each { |content_block| content(&content_block) }
       end
       alias redraw render
       
-      def build_dom
+      def content_on_render_blocks
+        @content_on_render_blocks ||= []
+      end
+      
+      def add_content_on_render(&content_block)
+        if rendered?
+          content_block.call
+        else
+          content_on_render_blocks << content_block
+        end
+      end
+      
+      def build_dom(layout=true)
+        # TODO consider passing parent element instead and having table item include a table cell widget only for opal
         @dom = nil
         @dom = dom
         @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout
+        @dom
       end
       
       def content(&block)
@@ -271,10 +331,6 @@ module Glimmer
         element
       end
       
-      def parent_dom_element
-        Document.find(parent_path)
-      end
-      
       def listener_path
         path
       end
@@ -334,6 +390,14 @@ module Glimmer
         super(attribute_name, *args) # PropertyOwner
       end
       
+      def method_missing(method, *args, &block)
+        if method.to_s.start_with?('on_')
+          handle_observation_request(method, &block)
+        else
+          super(method, *args, &block)
+        end
+      end
+      
       def apply_property_type_converters(attribute_name, args)
         if args.count == 1
           value = args.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -311,6 +311,7 @@ files:
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/combo_proxy.rb
 - lib/glimmer/swt/composite_proxy.rb
+- lib/glimmer/swt/control_editor.rb
 - lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/radio_group.rb
 - lib/glimmer/swt/date_time_proxy.rb
@@ -338,6 +339,7 @@ files:
 - lib/glimmer/swt/tab_folder_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
 - lib/glimmer/swt/table_column_proxy.rb
+- lib/glimmer/swt/table_editor.rb
 - lib/glimmer/swt/table_item_proxy.rb
 - lib/glimmer/swt/table_proxy.rb
 - lib/glimmer/swt/text_proxy.rb