glimmer-dsl-opal 0.3.0 → 0.6.1

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -0,0 +1,20 @@
+require 'glimmer/swt/grid_layout_proxy'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ScrolledCompositeProxy < CompositeProxy
+      STYLE = <<~CSS
+        .scrolled-composite {
+        }
+      CSS
+      
+      # TODO set overflow-y and overflow-x based on :v_scroll and :h_scroll styles.... though consider also that it might not be needed in web browsers where scrollbars are always present
+      #  height: 100px;
+      #  overflow-y: auto;       
+      
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -1,4 +1,5 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/point'
 
 module Glimmer
@@ -53,7 +54,7 @@ module Glimmer
           .selected, .tabs .tab.selected {
             background: rgb(80, 116, 211);
             color: white;
-          }          
+          }
         CSS
       end
             
@@ -121,11 +122,11 @@ module Glimmer
           /* Create an selected/current tablink class */
           .tabs .tab.selected {
             background-color: #ccc;
-          }              
+          }
           /* Change background color of buttons on hover */
           .tabs .tab:hover {
             background-color: #ddd;
-          }              
+          }
           /* Style the tab content */
           .tab-item {
             padding: 6px 12px;
@@ -189,14 +190,14 @@ module Glimmer
       end
       
       def style_dom_table_css
-        <<~CSS        
+        <<~CSS
           table {
             border-spacing: 0;
           }
             
           table tr th,td {
             cursor: default;
-          }   
+          }
         CSS
       end
       
@@ -217,14 +218,14 @@ module Glimmer
             }
             style(class: 'tab-style') {
               style_dom_tab_css
-            }            
+            }
 #             style(class: 'tab-item-style') {
 #               style_dom_tab_item_css
-#             }        
+#             }
 #             style(class: 'modal-style') {
 #               style_dom_modal_css
-#             }        
-            style(class: 'table-style') {            
+#             }
+            style(class: 'table-style') {
               style_dom_table_css
             }
             style(class: 'fill-layout-style') {
@@ -233,6 +234,18 @@ module Glimmer
             style(class: 'row-layout-style') {
               Glimmer::SWT::RowLayoutProxy::STYLE
             }
+            style(class: 'grid-layout-style') {
+              Glimmer::SWT::GridLayoutProxy::STYLE
+            }
+            style(class: 'checkbox-style') {
+              Glimmer::SWT::CheckboxProxy::STYLE
+            }
+            style(class: 'radio-style') {
+              Glimmer::SWT::RadioProxy::STYLE
+            }
+            style(class: 'scrolled-composite-style') {
+              Glimmer::SWT::ScrolledCompositeProxy::STYLE
+            }
           }
         }.to_s
       end
@@ -240,6 +253,7 @@ module Glimmer
       def open
         # TODO consider the idea of delaying rendering till the open method
         # TODO make it start as hidden and show shell upon open
+        Glimmer::SWT::DisplayProxy.instance.shells << self
       end
     end
   end

data/lib/glimmer/swt/styled_text_proxy.rb

@@ -0,0 +1,44 @@
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/text_proxy'
+require 'glimmer/swt/swt_proxy'
+
+module Glimmer
+  module SWT
+    class StyledTextProxy < TextProxy
+      attr_reader :alignment, :right_margin, :editable, :caret
+      
+      def alignment=(value)
+        @alignment = %w[left center right].detect {|alignment_value| SWTProxy[alignment_value] == value}
+        dom_element.css('text-align', @alignment)
+      end
+      
+      def right_margin=(value)
+        @right_margin = value.to_i
+        dom_element.css('padding-right', @right_margin)
+      end
+      
+      def editable=(value)
+        @editable = value
+        if !@editable
+          dom_element.attr('disabled', true)
+          dom_element.css('background', :white)
+          dom_element.css('border', 'solid 1px rgb(118, 118, 118)')
+          dom_element.css('border-radius', '3px')
+          # :hover {
+          #     border-color: rgb(80, 80, 80);
+          # }        
+        else
+          dom_element.prop('disabled', false)
+          dom_element.css('background', nil)
+          dom_element.css('border', nil)
+          dom_element.css('border-radius', nil)
+        end
+      end
+      
+      def caret=(value)
+        @caret = value
+        # TODO implement (not needed for disabling caret though)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -2,17 +2,17 @@ require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
-    class TabFolderProxy < WidgetProxy      
+    class TabFolderProxy < WidgetProxy
       attr_reader :tabs
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @tabs = []
       end
       
-      def add_child(child)
+      def post_initialize_child(child)
         unless @children.include?(child)
-          @children << child 
+          @children << child
           tabs_dom_element.append(child.tab_dom)
           child.render
         end

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -4,10 +4,10 @@ module Glimmer
   module SWT
     class TabItemProxy < CompositeProxy
       include Glimmer
-      attr_reader :text, :content_visible      
+      attr_reader :text, :content_visible
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         content {
           on_widget_selected {
             @parent.hide_all_tab_content
@@ -35,7 +35,7 @@ module Glimmer
     
       def selector
         super + '-tab'
-      end      
+      end
       
       def observation_request_to_event_mapping
         {
@@ -47,7 +47,7 @@ module Glimmer
       
       def listener_path
         tab_path
-      end      
+      end
       
       def tab_path
         "#{parent.tabs_path} > ##{tab_id}"
@@ -72,13 +72,13 @@ module Glimmer
       
       # This contains the tab content
       def dom
-        tab_item_id = id        
+        tab_item_id = id
         tab_item_class_string = [name, 'hide'].join(' ')
         @dom ||= html {
           div(id: tab_item_id, class: tab_item_class_string) {
           }
         }.to_s
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/table_item_proxy.rb

@@ -5,8 +5,8 @@ module Glimmer
     class TableItemProxy < WidgetProxy
       attr_reader :data
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         on_widget_selected { |event|
           parent.select(parent.index_of(self), event.meta?)
         }
@@ -70,11 +70,11 @@ module Glimmer
             redraw
           end
         end
-        table_item_edit_cancel_handler = lambda do |event|           
+        table_item_edit_cancel_handler = lambda do |event|
           Async::Task.new do
             table_item_edit_handler.call(event, true)
           end
-        end   
+        end
         table_item_edit_key_handler = lambda do |event|
           Async::Task.new do
             if event.key_code == 13
@@ -91,7 +91,7 @@ module Glimmer
             Async::Task.new do
               table_item_input.focus
               table_item_input.on('keyup', &table_item_edit_key_handler)
-              table_item_input.on('focusout', &table_item_edit_cancel_handler)                
+              table_item_input.on('focusout', &table_item_edit_cancel_handler)
             end
           end
         end
@@ -132,7 +132,7 @@ module Glimmer
           tr(id: table_item_id, style: table_item_id_style, class: table_item_css_classes.to_a.join(' ')) {
             table_item_text_array.each_with_index do |table_item_text, column_index|
               td('data-column-index' => column_index) {
-                if @edit_column_index == column_index                  
+                if @edit_column_index == column_index
                   input(type: 'text', value: table_item_text, style: "max-width: #{table_item_max_width - 11}px;")
                 else
                   table_item_text

data/lib/glimmer/swt/table_proxy.rb

@@ -8,19 +8,19 @@ module Glimmer
       attr_accessor :column_properties
       alias items children
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @columns = []
         @children = []
         @selection = []
       end
       
       # Only table_columns may be added as children
-      def add_child(child)
+      def post_initialize_child(child)
         if child.is_a?(TableColumnProxy)
           @columns << child
         else
-          @children << child        
+          @children << child
         end
         child.redraw
       end
@@ -36,14 +36,14 @@ module Glimmer
         changed.each(&:redraw)
       end
             
-      def items=(new_items)        
+      def items=(new_items)
         @children = new_items
         redraw
       end
       
       def search(&condition)
         items.select {|item| condition.nil? || condition.call(item)}
-      end      
+      end
       
       def index_of(item)
         items.index(item)
@@ -84,9 +84,9 @@ 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)
           }
-        } 
+        }
 
         {
           'on_mouse_down' => {
@@ -102,7 +102,7 @@ module Glimmer
       
       def redraw
         super()
-        @columns.to_a.each(&:redraw)  
+        @columns.to_a.each(&:redraw)
       end
       
       def element
@@ -125,7 +125,7 @@ module Glimmer
         Document.find(items_path)
       end
       
-      def columns_dom        
+      def columns_dom
         tr {
         }
       end
@@ -134,9 +134,9 @@ module Glimmer
         thead {
           columns_dom
         }
-      end            
+      end
       
-      def items_dom        
+      def items_dom
         tbody {
         }
       end

data/lib/glimmer/swt/text_proxy.rb

@@ -21,12 +21,12 @@ module Glimmer
             event_handler: -> (event_listener) {
               -> (event) {
                 @text = event.target.value
-                event_listener.call(event)              
+                event_listener.call(event)
               }
             }
           }
         }
-      end      
+      end
       
       def dom
         text_text = @text

data/lib/glimmer/swt/widget_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
@@ -29,13 +29,13 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus
       
       class << self
         # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
-        def for(keyword, parent, args)
+        def for(keyword, parent, args, block)
           the_widget_class = widget_class(keyword)
-          the_widget_class.new(parent, args)
+          the_widget_class.respond_to?(:create) ? the_widget_class.create(keyword, parent, args, block) : the_widget_class.new(parent, args, block)
         end
         
         def widget_class(keyword)
@@ -69,7 +69,7 @@ module Glimmer
         
         def underscored_widget_name(widget_proxy)
           widget_proxy.class.name.split(/::|\./).last.sub(/Proxy$/, '').underscore
-        end        
+        end
       end
       
       DEFAULT_INITIALIZERS = {
@@ -95,27 +95,39 @@ module Glimmer
 #         "group" => lambda do |group_proxy|
 #           group_proxy.layout = GridLayoutProxy.new(group_proxy, []) if group.layout.nil?
 #         end,
-      }      
+      }
       
-      def initialize(parent, args)
-        @parent = parent        
+      def initialize(parent, args, block)
+        @parent = parent
         @args = args
+        @block = block
         @children = Set.new # TODO consider moving to composite
         @enabled = true
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self)]&.call(self)
-        @parent.add_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology        
+        @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
+      end
+      
+      # Executes for the parent of a child that just got added
+      def post_initialize_child(child)
+        @children << child
+        child.render
+      end
+      
+      # Executes at the closing of a parent widget curly braces after all children/properties have been added/set
+      def post_add_content
+        # No Op by default
       end
       
       def css_classes
         dom_element.attr('class').to_s.split
-      end      
+      end
       
       def dispose
         Document.find(path).remove
       end
       
       def path
-        "#{parent_path} > #{element}##{id}.#{name}"
+        "#{parent_path} #{element}##{id}.#{name}"
       end
 
       # Root element representing widget. Must be overridden by subclasses if different from div
@@ -123,11 +135,6 @@ module Glimmer
         'div'
       end
 
-      def add_child(child)
-        @children << child
-        child.render
-      end
-      
       def enabled=(value)
         @enabled = value
         dom_element.prop('disabled', !@enabled)
@@ -151,6 +158,16 @@ module Glimmer
         dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
+      def focus=(value)
+        @focus = value
+        dom_element.focus # TODO consider if a delay or async_exec is needed here
+      end
+      
+      def set_focus
+        self.focus = true
+      end
+      alias setFocus set_focus
+      
       def parent_path
         @parent.path
       end
@@ -172,14 +189,14 @@ module Glimmer
         end
         children.each do |child|
           child.render
-        end        
+        end
       end
       alias redraw render
       
       def build_dom
         @dom = nil
         @dom = dom
-        @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout        
+        @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout
       end
       
       def content(&block)
@@ -234,9 +251,12 @@ module Glimmer
       end
       
       def dom_element
+        # TODO consider making this pick an element in relation to its parent, allowing unhooked dom elements to be built if needed (unhooked to the visible page dom)
         Document.find(path)
       end
       
+      # TODO consider adding a default #dom method implementation for the common case, automatically relying on #element and other methods to build the dom html
+      
       def style_element
         style_element_id = "#{id}-style"
         style_element_selector = "style##{style_element_id}"
@@ -259,7 +279,11 @@ module Glimmer
         path
       end
       
-      def can_handle_observation_request?(observation_request)        
+      def listener_dom_element
+        Document.find(listener_path)
+      end
+      
+      def can_handle_observation_request?(observation_request)
         # TODO sort this out for Opal
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
@@ -270,7 +294,7 @@ module Glimmer
 #           can_add_listener?(event) || can_handle_drag_observation_request?(observation_request) || can_handle_drop_observation_request?(observation_request)
           true # TODO filter by valid listeners only in the future
         end
-      end      
+      end
       
       def handle_observation_request(keyword, &event_listener)
         return unless observation_request_to_event_mapping.keys.include?(keyword)
@@ -282,16 +306,23 @@ module Glimmer
           @observation_requests[keyword] << event_listener
           event = mapping[:event]
           event_handler = mapping[:event_handler]
+          event_element_css_selector = mapping[:event_element_css_selector]
           potential_event_listener = event_handler&.call(event_listener)
           event_listener = potential_event_listener || event_listener
-          delegate = Document.find(listener_path).on(event, &event_listener)
+          async_event_listener = lambda do |event|
+            Async::Task.new do
+              event_listener.call(event)
+            end
+          end
+          the_listener_dom_element = event_element_css_selector ? Element[event_element_css_selector] : listener_dom_element
+          delegate = the_listener_dom_element.on(event, &async_event_listener)
         end
         # TODO update code below for new WidgetProxy API
         EventListenerProxy.new(element_proxy: self, event: event, selector: selector, delegate: delegate)
       end
       
       def add_observer(observer, property_name)
-        property_listener_installers = self.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
+        property_listener_installers = self.class&.ancestors&.to_a.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
         widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
         widget_listener_installers.to_a.each do |widget_listener_installer|
           widget_listener_installer.call(observer)
@@ -352,9 +383,6 @@ module Glimmer
 #             else
 #               value
 #             end
-#           end,
-#           :items => lambda do |value|
-#             value.to_java :string
 #           end,
           :text => lambda do |value|
 #             if swt_widget.is_a?(Browser)
@@ -366,8 +394,8 @@ module Glimmer
 #           :visible => lambda do |value|
 #             !!value
 #           end,
-        }      
-      end      
+        }
+      end
       
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
@@ -446,13 +474,20 @@ module Glimmer
 #               }
 #             end,
 #           },
-#           Button => { #radio?
-#             :selection => lambda do |observer|
-#               on_widget_selected { |selection_event|
-#                 observer.call(getSelection)
-#               }
-#             end
-#           },
+          DateTimeProxy => {
+            :date_time => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(date_time)
+              }
+            end
+          },
+          RadioProxy => { #radio?
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
 #           Java::OrgEclipseSwtWidgets::MenuItem => {
 #             :selection => lambda do |observer|
 #               on_widget_selected { |selection_event|
@@ -477,14 +512,22 @@ end
 require 'glimmer/swt/browser_proxy'
 require 'glimmer/swt/button_proxy'
 require 'glimmer/swt/combo_proxy'
+require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/date_time_proxy'
+require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'
 require 'glimmer/swt/list_proxy'
+require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/tab_folder_proxy'
 require 'glimmer/swt/tab_item_proxy'
 require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/table_item_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/text_proxy'
+require 'glimmer/swt/radio_proxy'
+require 'glimmer/swt/scrolled_composite_proxy'
+require 'glimmer/swt/styled_text_proxy'
 
 require 'glimmer/dsl/opal/widget_expression'