glimmer-dsl-opal 0.0.5 → 0.1.0

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

@@ -0,0 +1,29 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/table_items_binding'
+require 'glimmer/swt/table_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      #Depends on BindCommandHandler and TableColumnPropertiesDataBindingCommandHandler
+      class TableItemsDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == "items" and
+            block.nil? and
+            parent.is_a?(Glimmer::SWT::TableProxy) and
+            args.size == 2 and
+            args[0].is_a?(DataBinding::ModelBinding) and
+            args[0].evaluate_property.is_a?(Array) and
+            args[1].is_a?(Array)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          model_binding = args[0]
+          column_properties = args[1]
+          DataBinding::TableItemsBinding.new(parent, model_binding, column_properties)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class WidgetExpression < Expression
+        include ParentExpression
+        EXCLUDED_KEYWORDS = %w[shell display]
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          !EXCLUDED_KEYWORDS.include?(keyword) and
+            parent.is_a?(Glimmer::SWT::WidgetProxy) 
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::WidgetProxy.for(keyword, parent, args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/opal/display_proxy.rb

@@ -0,0 +1,23 @@
+module Glimmer
+  module Opal
+    class DisplayProxy
+      class << self
+        def instance
+          @instance ||= new
+        end
+      end
+      
+      def async_exec(&block)
+        executer = lambda do
+          if Document.find('.modal').to_a.empty?
+            block.call
+          else
+            sleep(0.05)
+            Async::Task.new(&executer)
+          end
+        end
+        Async::Task.new(&executer)
+      end
+    end
+  end
+end

data/lib/glimmer/opal/element_proxy.rb

@@ -1,25 +1,54 @@
-require 'glimmer/opal/property_owner'
+require 'glimmer/swt/property_owner'
 
 module Glimmer
   module Opal
     class ElementProxy
       include Glimmer
-      include PropertyOwner
-      attr_reader :parent, :args, :css_classes, :style
+      include Glimmer::SWT::PropertyOwner
+      attr_reader :parent, :args, :css_classes, :css, :children, :enabled
+      
+      class << self
+        def next_id_number_for(name)
+          @max_id_numbers[name] = max_id_number_for(name) + 1
+        end
+        
+        def max_id_number_for(name)
+          @max_id_numbers[name] = max_id_numbers[name] || 0
+        end
+        
+        def max_id_numbers
+          @max_id_numbers ||= reset_max_id_numbers!
+        end
+        
+        def reset_max_id_numbers!
+          @max_id_numbers = {}
+        end
+      end
       
       def initialize(parent, args)
         @parent = parent
         @args = args
-        @children = []
-        @parent.add_child(self)
+        @children = Set.new
         @css_classes = Set.new
+        @css = ''
+        @enabled = true
+        @parent.add_child(self)
+      end
+      
+      def dispose
+        dom.remove
       end
 
       def add_child(child)
-        return if @children.include?(child)
+#         return if @children.include?(child) # TODO consider adding an option to enable this if needed to prevent dom repetition        
         @children << child
         dom << child.dom
       end
+      
+      def enabled=(value)
+        @enabled = value
+        redraw
+      end
 
       def redraw
         if @dom
@@ -29,6 +58,9 @@ module Glimmer
         else
           dom
         end
+        @children.each do |child|          
+          child.redraw
+        end
       end
       
       # Subclasses must override with their own mappings
@@ -41,9 +73,14 @@ module Glimmer
       end
       
       def id
-        "#{name}-#{hash}"
+        @id ||= "#{name}-#{ElementProxy.next_id_number_for(name)}"
       end
-      
+            
+      # Sets id explicitly. Useful in cases of wanting to maintain a stable id
+      def id=(value)
+        @id = value
+      end
+            
       # Subclasses can override with their own selector
       def selector
         "#{name}##{id}"
@@ -74,10 +111,8 @@ module Glimmer
         redraw
       end
       
-      # TODO rename to avoid conflict with SWT Style verbiage
-      
-      def style=(css)
-        @style = css
+      def css=(css)
+        @css = css
         redraw
       end
       
@@ -185,7 +220,7 @@ module Glimmer
 #           },
           InputProxy => {
             :text => lambda do |observer|
-              on_modify_text { |modify_event|                
+              on_modify_text { |modify_event|
                 observer.call(text)
               }
             end,

data/lib/glimmer/swt/browser_proxy.rb

@@ -0,0 +1,27 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class BrowserProxy < WidgetProxy
+      attr_reader :url
+      
+      def url=(value)
+        @url = value
+        redraw
+      end
+    
+      def element
+        'iframe'
+      end
+    
+      def dom
+        iframe_id = id
+        iframe_url = url
+        @dom ||= html {
+          iframe(id: iframe_id, class: name, src: iframe_url, frameBorder: 0) {
+          }
+        }.to_s
+      end      
+    end
+  end
+end

data/lib/glimmer/swt/button_proxy.rb

@@ -0,0 +1,40 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ButtonProxy < WidgetProxy
+      attr_reader :text
+      
+      def text=(value)
+        @text = value
+        redraw
+      end
+      
+      def element
+        'button'
+      end
+
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => {
+            event: 'click'
+          }, 
+        }
+      end
+      
+      def dom
+        input_text = @text
+        input_id = id
+        input_style = css
+        input_args = {}
+        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;').merge(input_disabled)) {
+            input_text.to_s == '' ? '&nbsp;' : input_text
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/{opal/select_proxy.rb → swt/combo_proxy.rb}

@@ -1,10 +1,9 @@
 require 'glimmer/data_binding/observable_element'
-require 'glimmer/opal/event_listener_proxy'
-require 'glimmer/opal/element_proxy'
+require 'glimmer/swt/widget_proxy'
 
 module Glimmer
-  module Opal
-    class SelectProxy < ElementProxy
+  module SWT
+    class ComboProxy < WidgetProxy
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
       
@@ -13,9 +12,13 @@ module Glimmer
         @items = []
       end
       
+      def element
+        'select'
+      end
+      
       def text=(value)
         @text = value
-        redraw
+        Document.find(path).value = value
       end
       
       def items=(the_items)
@@ -23,12 +26,12 @@ module Glimmer
         redraw
       end
 
-      def observation_request_to_event_mapping
+      def observation_request_to_event_mapping      
         {
           'on_widget_selected' => {
             event: 'change',
             event_handler: -> (event_listener) {
-              -> (event) {
+              -> (event) {                
                 @text = event.target.value
                 event_listener.call(event)              
               }
@@ -41,9 +44,10 @@ module Glimmer
         select_text = @text        
         items = @items
         select_id = id
-        select_style = style
-        @dom ||= DOM {
-          select(id: select_id, style: select_style) {
+        select_style = css
+        select_class = name
+        @dom ||= html {
+          select(id: select_id, class: select_class, style: select_style) {
             items.to_a.each do |item|
               option_hash = {value: item}
               option_hash[:selected] = 'selected' if select_text == item
@@ -52,7 +56,7 @@ module Glimmer
               } 
             end
           }
-        }
+        }.to_s
       end
     end
   end

data/lib/glimmer/swt/composite_proxy.rb

@@ -0,0 +1,31 @@
+require 'glimmer/swt/grid_layout_proxy'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class CompositeProxy < WidgetProxy
+      attr_reader :layout
+      
+      def initialize(parent, args)
+        super(parent, args)
+        @layout = GridLayoutProxy.new(self, [])
+      end
+      
+      def redraw
+        super()
+        @children.each do |child|
+          add_child(child) # TODO think of impact of this on performance, and of other alternatives
+        end
+      end
+      
+      def dom
+        div_id = id
+        div_style = css
+        div_class = "#{name} grid-layout"
+        @dom ||= html {
+          div(id: div_id, class: div_class, style: div_style)
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/{opal → swt}/event_listener_proxy.rb

@@ -1,5 +1,5 @@
 module Glimmer
-  module Opal
+  module SWT
     class EventListenerProxy
       attr_reader :element_proxy, :event, :selector, :delegate
 

data/lib/glimmer/{opal → swt}/grid_layout_proxy.rb

@@ -1,16 +1,15 @@
-require 'glimmer/opal/property_owner'
+require 'glimmer/swt/layout_proxy'
 
 module Glimmer
-  module Opal
-    class GridLayoutProxy
-      include PropertyOwner
-      attr_reader :parent, :args, :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing
+  module SWT
+    class GridLayoutProxy < LayoutProxy
+      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing
     
       def initialize(parent, args)
-        @parent = parent
-        @args = args
-        @parent.add_css_class('grid-layout')
+        super(parent, args)
+        @horizontal_spacing = 10
         @vertical_spacing = 10
+        @num_columns = @args.first || 1        
         reapply
       end
 
@@ -37,16 +36,6 @@ module Glimmer
 #         @parent.add_css_class("vertical-spacing-#{@vertical_spacing}")
         reapply
       end
-      
-      def reapply
-        @parent.style = <<~CSS
-          display: grid;
-          grid-template-columns: #{'auto ' * @num_columns.to_i};
-          grid-row-gap: #{@vertical_spacing}px;
-          grid-column-gap: #{@horizontal_spacing}px;
-          justify-content: start;
-        CSS
-      end
     end
   end
 end

data/lib/glimmer/swt/label_proxy.rb

@@ -0,0 +1,30 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class LabelProxy < WidgetProxy
+      attr_reader :text
+
+      def text=(value)
+        @text = value
+        redraw
+      end
+      
+      def element
+        'label'
+      end
+      
+      def dom
+        label_text = @text
+        label_id = id
+        label_style = css
+        label_class = name
+        @dom ||= html {
+          label(id: label_id, style: label_style, class: label_class) {
+            label_text
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -0,0 +1,52 @@
+require 'glimmer/swt/property_owner'
+
+module Glimmer
+  module SWT
+    class LayoutDataProxy
+      include Glimmer::SWT::PropertyOwner
+      attr_reader :parent, 
+                  :args, 
+                  :horizontal_alignment, 
+                  :vertical_alignment, 
+                  :grab_excess_horizontal_space,
+                  :grab_excess_vertical_space,
+                  :height_hint
+    
+      def initialize(parent, args)
+        @parent = parent
+        @args = args
+        reapply
+      end
+
+      def height_hint=(height_hint)
+        @height_hint = height_hint
+        reapply
+      end
+
+      def horizontal_alignment=(horizontal_alignment)
+        @horizontal_alignment = horizontal_alignment
+        reapply
+      end
+      
+      def vertical_alignment=(vertical_alignment)
+        @vertical_alignment = vertical_alignment
+        reapply
+      end
+      
+      def grab_excess_horizontal_space=(grab_excess_horizontal_space)
+        @grab_excess_horizontal_space = grab_excess_horizontal_space
+        reapply
+      end
+
+      def grab_excess_vertical_space=(grab_excess_vertical_space)
+        @grab_excess_vertical_space = grab_excess_vertical_space
+        reapply
+      end
+
+      def reapply
+#         @parent.css = <<~CSS
+#         CSS
+      end
+    end
+  end
+end