glimmer-dsl-opal 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e81c8aae870295468f5c0e573da962daa58837efda4742c9855313ae29f42a
-  data.tar.gz: 40df246c27977d3fa862a452cdfb2dd99ad0b506374408c69e25666b3fc7fa50
+  metadata.gz: 8a9e35ef70d7e6aae911e0b4be468617f0efd5c5ee2b31ad9b6aef191b52681f
+  data.tar.gz: 3a7624376ee038d5419b993911d6f0ec59f94780425c10306f5c7928572ad4de
 SHA512:
-  metadata.gz: c46c3bdfcc129557ac54640d2d905cb7495f010ff1b81422c5b55529a01ecb67c698b4724029b62b9cbc6bcb46727763185ba1b4469c0355259d16acd1f228f1
-  data.tar.gz: 803c487121b4092f024fabca666e359fcdfeca87482b95a391e6b857b19dca28f46a845fc46e6c189e73254c1aa3a1f53d8cbe51c113f425be5019544a353913
+  metadata.gz: 8a98ce6e0b97501d3f78b5e589ada5e65d31c94d75ddcfa7e7f1abee3aa15e03bd51d7c3167f395778b458fd1a55e6fb630704aae33ea7ef633d1a7e603f952a
+  data.tar.gz: 9c602827b6d2da600ac68ad77b2f9d5faa01f29f9b7f0a0b843878950579836de0f2eb1f35a6e7d8681b63dc14afc429cdd0c0420d01a561683b600d13e07e4a

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 0.7.2
+
+- `date_drop_down` `table_column` `editor`
+- `date` `table_column` `editor`
+- `time` `table_column` `editor`
+- Implement `on_focus_gained`, `on_focus_lost` universally on all widgets
+- Add support for Struct keyword_init to Opal
+- Fix issue with hello_table button/combo not being centered (yet stretched)
+- Fix issue with table item selection for booking not working after editing has been added
+- Fix escape keyboard event handling for combo table editor
+
 ## 0.7.1
 
 - Combo table editor (enabled in Hello, Table! sample)

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.1 (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.2 (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)
 
@@ -12,7 +12,53 @@ Use in one of two ways:
 
 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.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):
+#### Tic Tac Toe Sample
+
+Add the following require statement to `app/assets/javascripts/application.rb` in a [Glimmer setup](#setup) Rails app:
+
+```ruby
+require 'glimmer-dsl-opal/samples/elaborate/tic_tac_toe'
+```
+
+Glimmer GUI code from [glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb](glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb):
+
+```ruby
+# ...
+    @shell = shell {
+      text "Tic-Tac-Toe"
+      minimum_size 150, 178
+      composite {
+        grid_layout 3, true
+        (1..3).each { |row|
+          (1..3).each { |column|
+            button {
+              layout_data :fill, :fill, true, true
+              text        bind(@tic_tac_toe_board[row, column], :sign)
+              enabled     bind(@tic_tac_toe_board[row, column], :empty)
+              font        style: :bold, height: 20
+              on_widget_selected {
+                @tic_tac_toe_board.mark(row, column)
+              }
+            }
+          }
+        }
+      }
+    }
+# ...
+```
+Tic Tac Toe on the web (using the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem):
+
+![Glimmer DSL for Opal Tic Tac Toe](images/glimmer-dsl-opal-tic-tac-toe.png)
+![Glimmer DSL for Opal Tic Tac Toe In Progress](images/glimmer-dsl-opal-tic-tac-toe-in-progress.png)
+![Glimmer DSL for Opal Tic Tac Toe Game Over](images/glimmer-dsl-opal-tic-tac-toe-game-over.png)
+
+Tic Tac Toe on the desktop with the same exact code (using the [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Tic Tac Toe](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe.png)
+![Glimmer DSL for SWT Tic Tac Toe In Progress](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe-in-progress.png)
+![Glimmer DSL for SWT Tic Tac Toe Game Over](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe-game-over.png)
+
+NOTE: Alpha Version 0.7.2 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:
 
@@ -133,7 +179,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.1'
+gem 'glimmer-dsl-opal', '~> 0.7.2'
 gem 'glimmer-dsl-xml', '~> 1.1.0', require: false
 gem 'glimmer-dsl-css', '~> 1.1.0', require: false
 
@@ -172,7 +218,7 @@ Edit `app/views/layouts/application.html.erb` and add the following below other
 
 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.
+Open `app/assets/javascripts/application.rb`, add a `Document.ready?` block, and add inside it Glimmer GUI DSL code or a require statement for one of the samples below.
 
 ```ruby
 Document.ready? do

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/display.rb

@@ -0,0 +1,31 @@
+# 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.
+
+class Display
+  class << self
+    def setAppName(app_name)
+      # No Op in Opal
+    end
+    def setAppVersion(version)
+      # No Op in Opal
+    end
+  end
+end

data/lib/file.rb

@@ -0,0 +1,29 @@
+# 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.
+
+class File
+  class << self
+    def read(*args, &block)
+      # TODO implement via asset downloads in the future
+      # No Op in Opal
+    end
+  end
+end

data/lib/glimmer-dsl-opal.rb

@@ -45,8 +45,10 @@ if RUBY_ENGINE == 'opal'
 #   require 'glimmer-dsl-opal/vendor/jquery-ui/jquery-ui.structure.min.css'
 #   require 'glimmer-dsl-opal/vendor/jquery-ui/jquery-ui.theme.min.css'
   require 'opal-jquery'
-  require 'glimmer'
+ 
   require 'facets/hash/symbolize_keys'
+  require 'glimmer-dsl-opal/ext/struct'
+  require 'glimmer'
   require 'glimmer-dsl-opal/ext/exception'
   require 'glimmer-dsl-opal/ext/date'
   require 'uri'
@@ -77,41 +79,6 @@ if RUBY_ENGINE == 'opal'
     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/struct.rb

@@ -0,0 +1,37 @@
+# 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.
+
+class Struct
+  class << self
+    alias new_original new
+    def new(*args, &block)
+      new_original(*args, &block).tap do |struct_class|
+        if args.size >= 2 && args.last.is_a?(Hash) && args.last[:keyword_init]
+          struct_class.define_method(:initialize) do |struct_class_keyword_args|
+            struct_class_keyword_args.each do |attribute, value|
+              send("#{attribute}=", value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -207,13 +207,13 @@ class HelloTable
           text 'Game Date'
           width 150
           sort_property :date # ensure sorting by real date value (not `game_date` string specified in items below)
-#           editor :date_drop_down, property: :date_time
+          editor :date_drop_down, property: :date_time
         }
         table_column {
           text 'Game Time'
           width 150
           sort_property :time # ensure sorting by real time value (not `game_time` string specified in items below)
-#           editor :time, property: :date_time
+          editor :time, property: :date_time
         }
         table_column {
           text 'Ballpark'

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 # TODO re-enable
+          @table_items_observer_registration&.unobserve
           @table_items_observer_registration = observe(new_model_collection, @column_properties)
           add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
@@ -62,8 +62,7 @@ module Glimmer
           table_item.set_data(model)
           table_item.id = old_item_ids_per_model[model.hash] if old_item_ids_per_model[model.hash]
         end
-        selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
-        parent.selection = selected_table_items
+        parent.selection = parent.search {|item| selected_table_item_models.include?(item.get_data) }
         parent.redraw
       end
       
@@ -71,6 +70,7 @@ module Glimmer
         return if model_collection == @last_sorted_model_collection
         if model_collection == @last_populated_model_collection
           # Reapply the last table sort. The model collection has just been populated since it diverged from what it was before
+          # TODO optimize in the future by sorting elements in DOM directly
           parent.sort!
         else
           # The model collection was sorted by the model, but beyond sorting, it did not change from the last populated model collection.

data/lib/glimmer/swt/combo_proxy.rb

@@ -45,7 +45,46 @@ module Glimmer
                 event_listener.call(event)
               }
             }
-          }
+          },
+          'on_key_pressed' => {
+            event: 'keydown',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                @last_key_pressed_event = event
+                @text = event.target.value
+                # TODO generalize this solution to all widgets that support key presses
+                # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:keyCode) {event.which}
+                event.define_singleton_method(:key_code, &event.method(:keyCode))
+                event.define_singleton_method(:character) {event.which.chr}
+                event.define_singleton_method(:stateMask) do
+                  state_mask = 0
+                  state_mask |= SWTProxy[:alt] if event.alt_key
+                  state_mask |= SWTProxy[:ctrl] if event.ctrl_key
+                  state_mask |= SWTProxy[:shift] if event.shift_key
+                  state_mask |= SWTProxy[:command] if event.meta_key
+                  state_mask
+                end
+                event.define_singleton_method(:state_mask, &event.method(:stateMask))
+                doit = true
+                event.define_singleton_method(:doit=) do |value|
+                  doit = value
+                end
+                event.define_singleton_method(:doit) { doit }
+                event_listener.call(event)
+                
+                  # TODO Fix doit false, it's not stopping input
+                unless doit
+                  event.prevent
+                  event.prevent_default
+                  event.stop_propagation
+                  event.stop_immediate_propagation
+                end
+                
+                doit
+              }
+            }
+          },
         }
       end
       

data/lib/glimmer/swt/control_editor.rb

@@ -23,8 +23,9 @@ module Glimmer
   module SWT
     # Emulates SWT's native org.eclipse.swt.custom.ControlEditor
     class ControlEditor
+      # TODO implement behavior for all these attributes
       ATTRIBUTES = [:grabHorizontal, :grabVertical, :horizontalAlignment, :verticalAlignment, :minimumWidth, :minimumHeight]
-      attr_accessor *ATTRIBUTES
+      attr_accessor(*ATTRIBUTES)
       ATTRIBUTES.each do |attribute|
         alias_method attribute.underscore, attribute
         alias_method "#{attribute.underscore}=", "#{attribute}="

data/lib/glimmer/swt/date_time_proxy.rb

@@ -31,7 +31,13 @@ module Glimmer
             showPeriod: true,
             showLeadingZero: true,
             showOn: 'both',
+            showNowButton: true,
+            showCloseButton: true,
             button: "##{time_button_id}",
+            onClose: ->(v) {
+              @timepicker_done = true
+              dom_element.trigger('change')
+            },
           })
         else
           options = {}
@@ -105,9 +111,67 @@ module Glimmer
         {
           'on_widget_selected' => [
             {
-              event: 'change'
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  if @timepicker_done
+                    @timepicker_done = false
+                    event_listener.call(event)
+                  end
+                }
+              }
             },
           ],
+          'on_focus_lost' => [
+            {
+              event: 'blur',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  if @timepicker_done
+                    @timepicker_done = false
+                    event_listener.call(event)
+                  end
+                }
+              }
+            },
+          ],
+          'on_key_pressed' => {
+            event: 'keydown',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                # TODO generalize this solution to all widgets that support key presses
+                # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:keyCode) {event.which}
+                event.define_singleton_method(:key_code, &event.method(:keyCode))
+                event.define_singleton_method(:character) {event.which.chr}
+                event.define_singleton_method(:stateMask) do
+                  state_mask = 0
+                  state_mask |= SWTProxy[:alt] if event.alt_key
+                  state_mask |= SWTProxy[:ctrl] if event.ctrl_key
+                  state_mask |= SWTProxy[:shift] if event.shift_key
+                  state_mask |= SWTProxy[:command] if event.meta_key
+                  state_mask
+                end
+                event.define_singleton_method(:state_mask, &event.method(:stateMask))
+                doit = true
+                event.define_singleton_method(:doit=) do |value|
+                  doit = value
+                end
+                event.define_singleton_method(:doit) { doit }
+                event_listener.call(event)
+                
+                  # TODO Fix doit false, it's not stopping input
+                unless doit
+                  event.prevent
+                  event.prevent_default
+                  event.stop_propagation
+                  event.stop_immediate_propagation
+                end
+                
+                doit
+              }
+            }
+          },
         }
       end
       

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,
@@ -48,6 +49,8 @@ module Glimmer
           @parent.dom_element.css('width', '100%') if width_hint.nil?
         else
           @parent.dom_element.css('text-align', @horizontal_alignment)
+          @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,13 +88,13 @@ 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('width', "100%") if @grab_excess_horizontal_space && @horizontal_alignment == 'fill' && width_hint.nil?
 #         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?
+        @parent.dom_element.css('height', "100%") if @grab_excess_vertical_space && @vertical_alignment == 'fill' && height_hint.nil?
         # TODO
 #         reapply
       end

data/lib/glimmer/swt/table_column_proxy.rb

@@ -75,7 +75,7 @@ module Glimmer
       end
       
       # Sets editor (e.g. combo)
-      def editor=(args)
+      def editor=(*args)
         @editor = args
       end
       

data/lib/glimmer/swt/table_editor.rb

@@ -37,7 +37,7 @@ module Glimmer
         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('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

data/lib/glimmer/swt/table_item_proxy.rb

@@ -139,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

@@ -43,6 +43,7 @@ module Glimmer
             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)
@@ -66,6 +67,7 @@ module Glimmer
               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")
@@ -118,10 +120,14 @@ module Glimmer
               widget_value_property: :date_time,
               editor_gui: lambda do |args, model, property, table_proxy|
                 first_time = true
-                table_proxy.table_editor.minimumHeight = 25
+                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_focus_lost {
                     table_proxy.finish_edit!
                   }
@@ -139,10 +145,14 @@ module Glimmer
               widget_value_property: :date_time,
               editor_gui: lambda do |args, model, property, table_proxy|
                 first_time = true
-                table_proxy.table_editor.minimumHeight = 25
+                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_focus_lost {
                     table_proxy.finish_edit!
                   }
@@ -160,10 +170,14 @@ module Glimmer
               widget_value_property: :date_time,
               editor_gui: lambda do |args, model, property, table_proxy|
                 first_time = true
-                table_proxy.table_editor.minimumHeight = 25
+                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!
                   }
@@ -236,6 +250,7 @@ module Glimmer
         @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|
@@ -300,11 +315,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
       
@@ -604,7 +620,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?
           }
         }
 
@@ -619,7 +636,8 @@ module Glimmer
           },
           'on_widget_selected' => {
             event: 'mouseup',
-          }
+            event_handler: mouse_handler,
+          },
         }
       end
       

data/lib/glimmer/swt/text_proxy.rb

@@ -72,7 +72,7 @@ module Glimmer
                 doit
               }
             }
-          }
+          },
         }
       end
       

data/lib/glimmer/swt/widget_proxy.rb

@@ -152,9 +152,9 @@ module Glimmer
       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|
+        effective_observation_request_to_event_mapping.keys.each do |keyword|
+          [effective_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]
@@ -225,9 +225,9 @@ module Glimmer
         else
           old_element.replace_with(@dom)
         end
-        @observation_requests&.clone&.each do |keyword, event_listener_set|
+        observation_requests&.clone&.each do |keyword, event_listener_set|
           event_listener_set.each do |event_listener|
-            @observation_requests[keyword].delete(event_listener)
+            observation_requests[keyword].delete(event_listener) # TODO look into the implications of this and if it's needed.
             handle_observation_request(keyword, &event_listener)
           end
         end
@@ -268,6 +268,21 @@ module Glimmer
         {}
       end
       
+      def effective_observation_request_to_event_mapping
+        default_observation_request_to_event_mapping.merge(observation_request_to_event_mapping)
+      end
+      
+      def default_observation_request_to_event_mapping
+        {
+          'on_focus_gained' => {
+            event: 'focus',
+          },
+          'on_focus_lost' => {
+            event: 'blur',
+          },
+        }
+      end
+      
       def name
         self.class.name.split('::').last.underscore.sub(/_proxy$/, '').gsub('_', '-')
       end
@@ -352,14 +367,17 @@ module Glimmer
         end
       end
       
-      def handle_observation_request(keyword, &event_listener)
-        return unless observation_request_to_event_mapping.keys.include?(keyword)
+      def observation_requests
         @observation_requests ||= {}
-        @observation_requests[keyword] ||= Set.new
+      end
+      
+      def handle_observation_request(keyword, &event_listener)
+        return unless effective_observation_request_to_event_mapping.keys.include?(keyword)
         event = nil
         delegate = nil
-        [observation_request_to_event_mapping[keyword]].flatten.each do |mapping|
-          @observation_requests[keyword] << event_listener
+        [effective_observation_request_to_event_mapping[keyword]].flatten.each do |mapping|
+          observation_requests[keyword] ||= Set.new
+          observation_requests[keyword] << event_listener
           event = mapping[:event]
           event_handler = mapping[:event_handler]
           event_element_css_selector = mapping[:event_element_css_selector]
@@ -555,11 +573,7 @@ module Glimmer
           TableProxy => {
             :selection => lambda do |observer|
               on_widget_selected { |selection_event|
-                if has_style?(:multi)
-                  observer.call(selection.map(&:get_data))
-                else
-                  observer.call(selection.first&.get_data)
-                end
+                observer.call(selection_event.table_item.get_data)  # TODO ensure selection doesn't conflict with editing
               }
             end,
           },

data/lib/os.rb

@@ -0,0 +1,36 @@
+# 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.
+
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -222,9 +222,12 @@ files:
 - app/assets/stylesheets/glimmer/jquery-ui.structure.css
 - app/assets/stylesheets/glimmer/jquery-ui.theme.css
 - app/assets/stylesheets/glimmer/jquery.ui.timepicker.css
+- lib/display.rb
+- lib/file.rb
 - lib/glimmer-dsl-opal.rb
 - lib/glimmer-dsl-opal/ext/date.rb
 - lib/glimmer-dsl-opal/ext/exception.rb
+- lib/glimmer-dsl-opal/ext/struct.rb
 - lib/glimmer-dsl-opal/samples/elaborate/contact_manager.rb
 - lib/glimmer-dsl-opal/samples/elaborate/contact_manager/contact.rb
 - lib/glimmer-dsl-opal/samples/elaborate/contact_manager/contact_manager_presenter.rb
@@ -348,6 +351,7 @@ files:
 - lib/glimmer/ui/custom_widget.rb
 - lib/glimmer/util/proc_tracker.rb
 - lib/net/http.rb
+- lib/os.rb
 - lib/uri.rb
 homepage: http://github.com/AndyObtiva/glimmer-dsl-opal
 licenses: