glimmer-dsl-opal 0.25.4 → 0.26.3

data/lib/glimmer/swt/spinner_proxy.rb

@@ -153,45 +153,6 @@ module Glimmer
               }
             }
           },
-          'on_key_pressed' => {
-            event: 'keydown',
-            event_handler: -> (event_listener) {
-              -> (event) {
-                @last_key_pressed_event = event
-                self.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/table_item_proxy.rb

@@ -59,26 +59,6 @@ module Glimmer
         @text_array ||= []
       end
 
-      def get_data(key = nil)
-        if key.nil?
-          @data
-        else
-          data_hash[key]
-        end
-      end
-      
-      def set_data(key = nil, data_value)
-        if key.nil?
-          @data = data_value
-        else
-          data_hash[key] = data_value
-        end
-      end
-      
-      def data_hash
-        @data_hash ||= {}
-      end
-      
       def parent_path
         parent.items_path
       end

data/lib/glimmer/swt/table_proxy.rb

@@ -61,6 +61,10 @@ module Glimmer
                   on_focus_lost {
                     table_proxy.finish_edit!
                   }
+                  on_modify_text do |event|
+                    # No Op, just record @text changes on key up
+                    # TODO find a better solution than this in the future
+                  end
                   on_key_pressed { |key_event|
                     if key_event.keyCode == swt(:cr)
                       table_proxy.finish_edit!

data/lib/glimmer/swt/text_proxy.rb

@@ -21,6 +21,7 @@ module Glimmer
             event_handler: -> (event_listener) {
               -> (event) {
                 # TODO consider unifying this event handler with on_key_pressed by relying on its result instead of hooking another keyup event
+                # TODO add all attributes for on_modify_text modify event
                 if @last_key_pressed_event.nil? || @last_key_pressed_event.doit
                   @text = event.target.value
                   event_listener.call(event)
@@ -34,45 +35,6 @@ module Glimmer
               }
             }
           },
-          '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/widget_proxy.rb

@@ -31,6 +31,25 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
+      Event = Struct.new(:widget, keyword_init: true)
+    
+      JS_KEY_CODE_TO_SWT_KEY_CODE_MAP = {
+        16 => SWTProxy[:shift],
+        17 => SWTProxy[:ctrl],
+        18 => SWTProxy[:alt],
+        37 => SWTProxy[:arrow_left],
+        38 => SWTProxy[:arrow_up],
+        39 => SWTProxy[:arrow_right],
+        40 => SWTProxy[:arrow_down],
+      }
+      
+      JS_LOCATION_TO_SWT_KEY_LOCATION_MAP = {
+        0 => SWTProxy[:none],
+        1 => SWTProxy[:left],
+        2 => SWTProxy[:right],
+        3 => SWTProxy[:keypad],
+      }
+            
       SWT_CURSOR_TO_CSS_CURSOR_MAP = {
         wait: 'wait',
         sizenwse: 'nwse-resize',
@@ -140,7 +159,6 @@ module Glimmer
         # TODO consider changing children to an array (why is it a Set if order matters?)
         @children = Set.new # TODO consider moving to composite
         @enabled = true
-        @data = {}
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self).to_s.to_sym]&.call(self)
         @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
       end
@@ -172,18 +190,30 @@ module Glimmer
         end
       end
       
-      def set_data(key=nil, value)
-        @data[key] = value
+      def set_data(key = nil, value)
+        if key.nil?
+          @data = value
+        else
+          swt_data[key] = value
+        end
       end
       alias setData set_data
       alias data= set_data
       
-      def get_data(key=nil)
-        @data[key]
+      def get_data(key = nil)
+        if key.nil?
+          @data
+        else
+          swt_data[key]
+        end
       end
       alias getData get_data
       alias data get_data
       
+      def swt_data
+        @swt_data ||= {}
+      end
+      
       def css_classes
         dom_element.attr('class').to_s.split
       end
@@ -192,9 +222,9 @@ module Glimmer
         remove_all_listeners
         Document.find(path).remove
         parent&.post_dispose_child(self)
-        # TODO fire on_widget_disposed listener
 #         children.each(:dispose) # TODO enable this safely
         @disposed = true
+        listeners_for('widget_disposed').each {|listener| listener.call(Event.new(widget: self))}
       end
       
       def remove_all_listeners
@@ -360,7 +390,6 @@ module Glimmer
         mouse_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(:widget) {myself}
             event.define_singleton_method(:button, &event.method(:which))
             event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
@@ -388,7 +417,6 @@ module Glimmer
         mouse_move_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(:widget) {myself}
             event.define_singleton_method(:button, &event.method(:which))
             event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
@@ -413,7 +441,6 @@ module Glimmer
         context_menu_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(:widget) {myself}
             event.define_singleton_method(:button, &event.method(:which))
             event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
@@ -494,10 +521,15 @@ module Glimmer
             event: 'keypress',
             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(:widget) {myself}
-                event.define_singleton_method(:keyCode) {event.which}
+                event.define_singleton_method(:keyLocation) do
+                  location = `#{event.to_n}.originalEvent.location`
+                  JS_LOCATION_TO_SWT_KEY_LOCATION_MAP[location] || location
+                end
+                event.define_singleton_method(:key_location, &event.method(:keyLocation))
+                event.define_singleton_method(:keyCode) {
+                  JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || 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
@@ -528,50 +560,18 @@ module Glimmer
               }
             }          },
           'on_key_released' => {
-            event: 'keydown',
+            event: 'keyup',
             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(:widget) {myself}
-                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
+                event.define_singleton_method(:keyLocation) do
+                  location = `#{event.to_n}.originalEvent.location`
+                  JS_LOCATION_TO_SWT_KEY_LOCATION_MAP[location] || location
                 end
-                
-                doit
-              }
-            }          },
-          'on_swt_keydown' => {
-            event: 'keypress',
-            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(:key_location, &event.method(:keyLocation))
                 event.define_singleton_method(:widget) {myself}
-                event.define_singleton_method(:keyCode) {event.which}
+                event.define_singleton_method(:keyCode) {
+                  JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || 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
@@ -600,15 +600,106 @@ module Glimmer
                 
                 doit
               }
-            }          },
+            }
+          },
+          'on_swt_keydown' => [
+            {
+              event: 'keypress',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  event.define_singleton_method(:keyLocation) do
+                    location = `#{event.to_n}.originalEvent.location`
+                    JS_LOCATION_TO_SWT_KEY_LOCATION_MAP[location] || location
+                  end
+                  event.define_singleton_method(:key_location, &event.method(:keyLocation))
+                  event.define_singleton_method(:keyCode) {
+                    JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || 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
+                }
+              }
+            },
+            {
+              event: 'keydown',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  event.define_singleton_method(:keyLocation) do
+                    location = `#{event.to_n}.originalEvent.location`
+                    JS_LOCATION_TO_SWT_KEY_LOCATION_MAP[location] || location
+                  end
+                  event.define_singleton_method(:key_location, &event.method(:keyLocation))
+                  event.define_singleton_method(:keyCode) {
+                    JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || 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) if event.which != 13 && (event.which == 127 || event.which <= 40)
+                  
+                    # 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
+                }
+              }
+            }
+          ],
           'on_swt_keyup' => {
-            event: 'keydown',
+            event: 'keyup',
             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(:keyLocation) do
+                  location = `#{event.to_n}.originalEvent.location`
+                  JS_LOCATION_TO_SWT_KEY_LOCATION_MAP[location] || location
+                end
+                event.define_singleton_method(:key_location, &event.method(:keyLocation))
                 event.define_singleton_method(:widget) {myself}
-                event.define_singleton_method(:keyCode) {event.which}
+                event.define_singleton_method(:keyCode) {
+                  JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || 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
@@ -733,6 +824,14 @@ module Glimmer
         @event_handling_suspended
       end
       
+      def listeners
+        @listeners ||= {}
+      end
+      
+      def listeners_for(listener_event)
+        listeners[listener_event.to_s] ||= []
+      end
+      
       def can_handle_observation_request?(observation_request)
         # TODO sort this out for Opal
         observation_request = observation_request.to_s
@@ -747,6 +846,15 @@ module Glimmer
       end
       
       def handle_observation_request(keyword, original_event_listener)
+        case keyword
+        when 'on_widget_disposed'
+          listeners_for(keyword.sub(/^on_/, '')) << original_event_listener.to_proc
+        else
+          handle_javascript_observation_request(keyword, original_event_listener)
+        end
+      end
+      
+      def handle_javascript_observation_request(keyword, original_event_listener)
         return unless effective_observation_request_to_event_mapping.keys.include?(keyword)
         event = nil
         delegate = nil
@@ -886,6 +994,18 @@ module Glimmer
 #               }
 #             end,
 #           },
+          MenuItemProxy => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                # TODO look into validity of this and perhaps move toggle logic to MenuItemProxy
+                if check?
+                  observer.call(!selection)
+                else
+                  observer.call(selection)
+                end
+              }
+            end
+          },
           ScaleProxy => {
             :selection => lambda do |observer|
               on_widget_selected { |selection_event|
@@ -1021,7 +1141,6 @@ require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/c_combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
-require 'glimmer/swt/dialog_proxy'
 require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'