glimmer-dsl-opal 0.6.0 → 0.7.3

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

@@ -12,26 +12,32 @@ module Glimmer
       include DataBinding::Observer
 
       def initialize(parent, model_binding, column_properties)
-        @last_model_collection = nil
+        @last_populated_model_collection = nil
         @table = parent
         @model_binding = model_binding
         @column_properties = column_properties
-        if @table.respond_to?(:column_properties=)
-          @table.column_properties = @column_properties
-        ##else # assume custom widget
-        ##  @table.body_root.column_properties = @column_properties
-        end
-        call(@model_binding.evaluate_property)
-        model = model_binding.base_model
-        observe(model, model_binding.property_name_expression)
+        @table.data = @model_binding
         ##@table.on_widget_disposed do |dispose_event| # doesn't seem needed within Opal
         ##  unregister_all_observables
         ##end
+        if @table.respond_to?(:column_properties=)
+          @table.column_properties = @column_properties
+        else # assume custom widget
+         @table.body_root.column_properties = @column_properties
+        end
+        @table_observer_registration = observe(model_binding)
+        call
       end
 
       def call(new_model_collection=nil)
+        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
+        table_cells = @table.items.map {|item| @table.column_properties.size.times.map {|i| item.get_text(i)} }
+        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)
-          observe(new_model_collection, @column_properties)
+          @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
         end
         populate_table(@model_collection, @table, @column_properties)
@@ -39,8 +45,10 @@ module Glimmer
       end
       
       def populate_table(model_collection, parent, column_properties)
-        return if model_collection&.sort_by(&:hash) == @last_model_collection&.sort_by(&:hash)
-        @last_model_collection = model_collection
+        @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
@@ -54,17 +62,22 @@ 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) }
-        selected_table_items = [parent.items.first] if selected_table_items.empty? && !parent.items.empty?
-        parent.selection = selected_table_items unless selected_table_items.empty?
+        parent.selection = parent.search {|item| selected_table_item_models.include?(item.get_data) }
         parent.redraw
       end
       
       def sort_table(model_collection, parent, column_properties)
-        return if model_collection == @last_model_collection
-        parent.items = parent.items.sort_by { |item| model_collection.index(item.get_data) }
-        @last_model_collection = model_collection
-      end      
+        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.
+          parent.items = parent.items.sort_by { |item| model_collection.index(item.get_data) }
+          @last_sorted_model_collection = @last_populated_model_collection = model_collection
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,41 @@
+# Copyright (c) 2007-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/expression'
+
+module Glimmer
+  module DSL
+    module Opal
+      class BlockPropertyExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          block_given? and
+            args.size == 0 and
+            parent.respond_to?("#{keyword}_block=")
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          parent.send("#{keyword}_block=", block)
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -44,7 +44,7 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           custom_widget_class = UI::CustomWidget.for(keyword)
           # TODO clean code by extracting methods into CustomShell
-          if !Glimmer::UI::CustomShell.requested? && custom_widget_class.ancestors.include?(Glimmer::UI::CustomShell)
+          if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)
             if Glimmer::SWT::DisplayProxy.instance.shells.empty?
               custom_widget_class.new(parent, *args, {}, &block)
             else

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

@@ -25,6 +25,7 @@ require 'glimmer/dsl/opal/custom_widget_expression'
 require 'glimmer/dsl/opal/swt_expression'
 require 'glimmer/dsl/opal/radio_group_selection_data_binding_expression'
 require 'glimmer/dsl/opal/checkbox_group_selection_data_binding_expression'
+require 'glimmer/dsl/opal/block_property_expression'
 
 module Glimmer
   module DSL
@@ -42,6 +43,7 @@ module Glimmer
          data_binding
          font
          layout
+         block_property
          property
          widget
        ]

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

@@ -16,12 +16,16 @@ module Glimmer
         end
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::WidgetProxy.for(keyword, parent, args)
+          Glimmer::SWT::WidgetProxy.for(keyword, parent, args, block)
         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/engine.rb

@@ -3,7 +3,7 @@ module Glimmer
     isolate_namespace Glimmer
 
     initializer "glimmer.assets.precompile" do |app|
-      app.config.assets.precompile += %w( glimmer.css jquery-ui.css jquery-ui.structure.css jquery-ui.theme.css jquery.ui.timepicker.css )
+      app.config.assets.precompile += %w( glimmer/glimmer.css )
     end
   end
 end

data/lib/glimmer/swt/button_proxy.rb

@@ -6,13 +6,13 @@ module Glimmer
   module SWT
     class ButtonProxy < WidgetProxy
       class << self
-        def create(keyword, parent, args)
+        def create(keyword, parent, args, block)
           if args.to_a.include?(:radio)
-            RadioProxy.new(parent, args)
+            RadioProxy.new(parent, args, block)
           elsif args.to_a.include?(:check)
-            CheckboxProxy.new(parent, args)
+            CheckboxProxy.new(parent, args, block)
           else
-            new(parent, args)
+            new(parent, args, block)
           end
         end
       end
@@ -44,7 +44,7 @@ module Glimmer
         input_disabled = @enabled ? {} : {'disabled': 'disabled'}
         input_args = input_args.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 27px; min-height: 27px;').merge(input_disabled)) {
+          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 32px; min-height: 32px;').merge(input_disabled)) {
             input_text.to_s == '' ? '&nbsp;' : input_text
           }
         }.to_s

data/lib/glimmer/swt/color_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -28,44 +28,44 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class ColorProxy
       SWT_COLOR_TRANSLATION = {
-        "widget_foreground"                   => [0, 0, 0], 
-        "blue"                                => [0, 0, 255], 
-        "widget_dark_shadow"                  => [0, 0, 0], 
-        "title_foreground"                    => [0, 0, 0], 
-        "yellow"                              => [255, 255, 0], 
-        "widget_highlight_shadow"             => [255, 255, 255], 
-        "dark_cyan"                           => [0, 128, 128], 
-        "list_foreground"                     => [0, 0, 0], 
-        "dark_blue"                           => [0, 0, 128], 
-        "dark_yellow"                         => [128, 128, 0], 
-        "cyan"                                => [0, 255, 255], 
-        "info_background"                     => [236, 235, 236], 
-        "link_foreground"                     => [0, 104, 218], 
-        "title_inactive_foreground"           => [0, 0, 0], 
-        "title_background_gradient"           => [179, 215, 255], 
-        "red"                                 => [255, 0, 0], 
-        "title_inactive_background_gradient"  => [220, 220, 220], 
-        "transparent"                         => [255, 255, 255], 
-        "widget_light_shadow"                 => [232, 232, 232], 
-        "dark_magenta"                        => [128, 0, 128], 
-        "white"                               => [255, 255, 255], 
-        "list_selection"                      => [179, 215, 255], 
-        "gray"                                => [192, 192, 192], 
-        "widget_border"                       => [0, 0, 0], 
-        "widget_background"                   => [236, 236, 236], 
-        "info_foreground"                     => [0, 0, 0], 
-        "title_inactive_background"           => [220, 220, 220], 
-        "widget_disabled_foreground"          => [220, 220, 220], 
-        "list_background"                     => [255, 255, 255], 
-        "magenta"                             => [255, 0, 255], 
-        "title_background"                    => [0, 99, 225], 
-        "text_disabled_background"            => [255, 255, 255], 
-        "black"                               => [0, 0, 0], 
-        "dark_gray"                           => [128, 128, 128], 
-        "list_selection_text"                 => [0, 0, 0], 
-        "dark_red"                            => [128, 0, 0], 
-        "widget_normal_shadow"                => [159, 159, 159], 
-        "dark_green"                          => [0, 128, 0], 
+        "widget_foreground"                   => [0, 0, 0],
+        "blue"                                => [0, 0, 255],
+        "widget_dark_shadow"                  => [0, 0, 0],
+        "title_foreground"                    => [0, 0, 0],
+        "yellow"                              => [255, 255, 0],
+        "widget_highlight_shadow"             => [255, 255, 255],
+        "dark_cyan"                           => [0, 128, 128],
+        "list_foreground"                     => [0, 0, 0],
+        "dark_blue"                           => [0, 0, 128],
+        "dark_yellow"                         => [128, 128, 0],
+        "cyan"                                => [0, 255, 255],
+        "info_background"                     => [236, 235, 236],
+        "link_foreground"                     => [0, 104, 218],
+        "title_inactive_foreground"           => [0, 0, 0],
+        "title_background_gradient"           => [179, 215, 255],
+        "red"                                 => [255, 0, 0],
+        "title_inactive_background_gradient"  => [220, 220, 220],
+        "transparent"                         => [255, 255, 255],
+        "widget_light_shadow"                 => [232, 232, 232],
+        "dark_magenta"                        => [128, 0, 128],
+        "white"                               => [255, 255, 255],
+        "list_selection"                      => [179, 215, 255],
+        "gray"                                => [192, 192, 192],
+        "widget_border"                       => [0, 0, 0],
+        "widget_background"                   => [236, 236, 236],
+        "info_foreground"                     => [0, 0, 0],
+        "title_inactive_background"           => [220, 220, 220],
+        "widget_disabled_foreground"          => [220, 220, 220],
+        "list_background"                     => [255, 255, 255],
+        "magenta"                             => [255, 0, 255],
+        "title_background"                    => [0, 99, 225],
+        "text_disabled_background"            => [255, 255, 255],
+        "black"                               => [0, 0, 0],
+        "dark_gray"                           => [128, 128, 128],
+        "list_selection_text"                 => [0, 0, 0],
+        "dark_red"                            => [128, 0, 0],
+        "widget_normal_shadow"                => [159, 159, 159],
+        "dark_green"                          => [0, 128, 0],
         "green"                               => [0, 255, 0]
       }
     
@@ -87,19 +87,19 @@ module Glimmer
       # rgba is 4 arguments representing Red, Green, Blue, and Alpha numeric values
       #
       def initialize(*args)
-        @args = args        
+        @args = args
         case @args.size
         when 1
           @alpha = nil
-          if @args.first.is_a?(String) || @args.first.is_a?(Symbol)              
-            standard_color = @args.first.to_s.downcase.sub('COLOR_', '')             
+          if @args.first.is_a?(String) || @args.first.is_a?(Symbol)
+            standard_color = @args.first.to_s.downcase.sub('COLOR_', '')
             @red, @green, @blue = SWT_COLOR_TRANSLATION[standard_color]
           else
             @red, @green, @blue = [0, 0, 0]
           end
         when 3..4
           @red, @green, @blue, @alpha = @args
-        end        
+        end
       end
       
       def to_css

data/lib/glimmer/swt/combo_proxy.rb

@@ -7,8 +7,8 @@ module Glimmer
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @items = []
       end
       
@@ -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