glimmer-dsl-opal 0.7.1 → 0.8.0

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/dsl/opal/custom_widget_expression.rb

@@ -42,6 +42,12 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
+          begin
+            require_path = LocalStorage[keyword]
+            require(require_path) if require_path
+          rescue => e
+            Glimmer::Config.logger.debug e.message
+          end
           custom_widget_class = UI::CustomWidget.for(keyword)
           # TODO clean code by extracting methods into CustomShell
           if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)

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

@@ -26,6 +26,8 @@ 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'
+require 'glimmer/dsl/opal/menu_expression'
+# require 'glimmer/dsl/opal/menu_bar_expression'
 
 module Glimmer
   module DSL

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

@@ -0,0 +1,54 @@
+# 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'
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/menu_proxy'
+
+# TODO implement for Opal
+
+module Glimmer
+  module DSL
+    module SWT
+      class MenuBarExpression < StaticExpression
+        include ParentExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          initial_condition = (keyword == 'menu_bar')
+          if initial_condition
+            if parent.swt_widget.is_a?(Shell)
+              return true
+            else
+              raise Glimmer::Error, "menu_bar may only be nested under a shell!"
+            end
+          end
+          false
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          args = args.unshift(:bar)
+          Glimmer::SWT::MenuProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# 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'
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/menu_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class MenuExpression < StaticExpression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          initial_condition = (keyword == 'menu')
+          if initial_condition
+            if parent.is_a?(Glimmer::SWT::WidgetProxy)
+              return true
+            else
+              raise Glimmer::Error, "menu may only be nested under a widget (like shell or another menu)!"
+            end
+          end
+          false
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::MenuProxy.new(parent, args)
+        end
+        
+        def add_content(parent, &block)
+          super(parent, &block)
+          parent.post_add_content
+        end
+        
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -7,6 +7,7 @@ module Glimmer
     module Opal
       class WidgetExpression < Expression
         include ParentExpression
+        
         EXCLUDED_KEYWORDS = %w[shell display]
   
         def can_interpret?(parent, keyword, *args, &block)
@@ -18,9 +19,9 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           Glimmer::SWT::WidgetProxy.for(keyword, parent, args, block)
         end
-
+        
         def add_content(parent, &block)
-          if parent.rendered?
+          if parent.rendered? || parent.skip_content_on_render_blocks?
             super(parent, &block)
             parent.post_add_content
           else

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

@@ -20,10 +20,10 @@ module Glimmer
 #           Glimmer::Config.logger.debug {"can add listener? #{result}"}
 #           raise Glimmer::Error, "Invalid listener keyword: #{keyword}" unless result
           true
-        end        
+        end
 
         def interpret(parent, keyword, *args, &block)
-          parent.handle_observation_request(keyword, &block)
+          parent.handle_observation_request(keyword, block)
         end
       end
     end

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/custom/checkbox_group.rb

@@ -78,7 +78,7 @@ module Glimmer
           checkboxes.first&.can_handle_observation_request?(observation_request) || super(observation_request)
         end
         
-        def handle_observation_request(observation_request, &block)
+        def handle_observation_request(observation_request, block)
           observation_requests << [observation_request, block]
           delegate_observation_request_to_checkboxes(observation_request, &block)
           super
@@ -88,7 +88,7 @@ module Glimmer
           if observation_request != 'on_widget_disposed'
             checkboxes.count.times do |index|
               checkbox = checkboxes[index]
-              checkbox.handle_observation_request(observation_request, &block) if checkbox.can_handle_observation_request?(observation_request)
+              checkbox.handle_observation_request(observation_request, block) if checkbox.can_handle_observation_request?(observation_request)
             end
           end
         end

data/lib/glimmer/swt/custom/radio_group.rb

@@ -81,7 +81,7 @@ module Glimmer
           radios.first&.can_handle_observation_request?(observation_request) || super(observation_request)
         end
         
-        def handle_observation_request(observation_request, &block)
+        def handle_observation_request(observation_request, block)
           observation_requests << [observation_request, block]
           delegate_observation_request_to_radios(observation_request, &block)
           super
@@ -91,7 +91,7 @@ module Glimmer
           if observation_request != 'on_widget_disposed'
             radios.count.times do |index|
             radio = radios[index]
-            radio.handle_observation_request(observation_request, &block) if radio.can_handle_observation_request?(observation_request)
+            radio.handle_observation_request(observation_request, block) if radio.can_handle_observation_request?(observation_request)
             end
           end
         end

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,68 @@ module Glimmer
         {
           'on_widget_selected' => [
             {
-              event: 'change'
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  if calendar? || date? || (time? && @timepicker_done)
+                    @timepicker_done = false if time?
+                    event_listener.call(event)
+                  end
+                }
+              }
             },
           ],
+          'on_focus_lost' => [
+            {
+              event: 'blur',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  # TODO support blur event for date?
+                  if time? && @timepicker_done
+                    @timepicker_done = false if time?
+                    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/event_listener_proxy.rb

@@ -1,18 +1,28 @@
 module Glimmer
   module SWT
     class EventListenerProxy
-      attr_reader :element_proxy, :event, :selector, :delegate
+      attr_reader :element_proxy, :event, :dom_element, :selector, :listener, :original_event_listener
 
-      def initialize(element_proxy:, event:, selector:, delegate:)
+      def initialize(element_proxy:, event:, dom_element:, selector:, listener:)
         @element_proxy = element_proxy
         @event = event
+        @dom_element = dom_element
         @selector = selector
-        @delegate = delegate
+        @listener = listener
+        @original_event_listener = original_event_listener
       end
       
+      def register
+        @dom_element.on(@event, @delegate)
+      end
+      alias observe register
+      alias reregister register
+      
       def unregister
-        $document.off(@delegate)
+        @dom_element.off(@event, @delegate)
       end
+      alias unobserve unregister
+      alias deregister unregister
     end
   end
 end

data/lib/glimmer/swt/font_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
@@ -68,7 +68,7 @@ module Glimmer
       private
 
       def detect_invalid_font_property(font_properties)
-        [font_properties[:style]].flatten.select do |style|
+        font_properties[:style].to_collection(false).select do |style|
           style.is_a?(Symbol) || style.is_a?(String)
         end.each do |style|
           raise Error, style.to_s + ERROR_INVALID_FONT_STYLE if !FONT_STYLES.include?(style.to_sym)

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -7,18 +7,20 @@ module Glimmer
         .grid-layout {
           display: grid;
           grid-template-rows: min-content;
-          justify-content: start;
           place-content: start;
-          align-items: stretch;      
+          align-items: stretch;
         }
       CSS
+      
       attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height
     
       def initialize(parent, args)
         super(parent, args)
         self.horizontal_spacing = 10
         self.vertical_spacing = 10
-        self.num_columns = @args.first || 1        
+        self.margin_width = 15
+        self.margin_height = 15
+        self.num_columns = @args.first || 1
         reapply
       end
 
@@ -30,7 +32,7 @@ module Glimmer
       end
       
       def make_columns_equal_width=(equal_width)
-        @make_columns_equal_width = equal_width        
+        @make_columns_equal_width = equal_width
 #         @parent.add_css_class('make_columns_equal_width') if @make_columns_equal_width
         reapply
       end
@@ -50,14 +52,18 @@ module Glimmer
       def margin_width=(pixels)
         @margin_width = pixels
         # Using padding for width since margin-right isn't getting respected with width 100%
-        @parent.dom_element.css('padding-left', @margin_width)
-        @parent.dom_element.css('padding-right', @margin_width)
+        effective_margin_width = @margin_width
+        effective_margin_width += 6 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-left', effective_margin_width)
+        @parent.dom_element.css('padding-right', effective_margin_width)
       end
       
       def margin_height=(pixels)
         @margin_height = pixels
-        @parent.dom_element.css('padding-top', @margin_height)
-        @parent.dom_element.css('padding-bottom', @margin_height)
+        effective_margin_height = @margin_height
+        effective_margin_height += 9 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-top', effective_margin_height)
+        @parent.dom_element.css('padding-bottom', effective_margin_height)
       end
             
       def reapply
@@ -68,15 +74,18 @@ module Glimmer
           grid-column-gap: #{@horizontal_spacing}px;
         CSS
         if @parent.css_classes.include?('grid-layout')
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|          
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
             @parent.dom_element.css(key, value) unless key.nil?
           end
+          if @parent.is_a?(GroupProxy)
+            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
+          end
         else
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|          
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
             @parent.dom_element.css(key, 'initial') unless key.nil?
-          end        
+          end
         end
-      end      
+      end
     end
   end
 end