glimmer-dsl-opal 0.7.3 → 0.9.1

data/lib/glimmer-dsl-opal/samples/hello/hello_pop_up_context_menu.rb

@@ -0,0 +1,84 @@
+# 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.
+
+include Glimmer
+
+shell {
+  grid_layout {
+    margin_width 0
+    margin_height 0
+  }
+  
+  text 'Hello, Pop Up Context Menu!'
+  
+  label {
+    text "Right-Click on the Text to\nPop Up a Context Menu"
+    font height: 50
+    
+    menu {
+      menu {
+        text '&History'
+        menu {
+          text '&Recent'
+          menu_item {
+            text 'File 1'
+            on_widget_selected {
+              message_box {
+                text 'File 1'
+                message 'File 1 Contents'
+              }.open
+            }
+          }
+          menu_item {
+            text 'File 2'
+            on_widget_selected {
+              message_box {
+                text 'File 2'
+                message 'File 2 Contents'
+              }.open
+            }
+          }
+        }
+        menu {
+          text '&Archived'
+          menu_item {
+            text 'File 3'
+            on_widget_selected {
+              message_box {
+                text 'File 3'
+                message 'File 3 Contents'
+              }.open
+            }
+          }
+          menu_item {
+            text 'File 4'
+            on_widget_selected {
+              message_box {
+                text 'File 4'
+                message 'File 4 Contents'
+              }.open
+            }
+          }
+        }
+      }
+    }
+  }
+}.open

data/lib/glimmer-dsl-opal/samples/hello/hello_world.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

data/lib/glimmer/config/opal_logger.rb

@@ -0,0 +1,16 @@
+module Glimmer
+  module Config
+    class OpalLogger < Logger
+      alias add_without_opal_logger add
+      def add(severity, message = nil, progname = nil, &block)
+        original_logdev = @pipe
+        if severity == ERROR
+          @pipe = $stderr
+        else
+          @pipe = original_logdev
+        end
+        add_without_opal_logger(severity, message, progname, &block)
+      end
+    end
+  end
+end

data/lib/glimmer/data_binding/observable_element.rb

@@ -4,7 +4,7 @@ module Glimmer
       def method_missing(method, *args, &block)
         method_name = method.to_s
         if method_name.start_with?('on_')
-          handle_observation_request(method_name, &block)
+          handle_observation_request(method_name, block)
         else
           super
         end

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/shell_expression.rb

@@ -27,10 +27,6 @@ module Glimmer
           end
         end
         
-        def add_content(parent, &content)
-          content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy)
-        end
-
         def add_content(parent, &block)
           super(parent, &block)
           parent.post_add_content

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/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

@@ -114,7 +114,7 @@ module Glimmer
               event: 'change',
               event_handler: -> (event_listener) {
                 -> (event) {
-                  if date? || (time? && @timepicker_done)
+                  if calendar? || date? || (time? && @timepicker_done)
                     @timepicker_done = false if time?
                     event_listener.call(event)
                   end

data/lib/glimmer/swt/display_proxy.rb

@@ -28,6 +28,11 @@ module Glimmer
         @shells ||= []
       end
       
+      def message_boxes
+        @message_boxes ||= []
+      end
+      alias message_boxs message_boxes # alias for automating processing as plural from keyword by adding s only
+      
       def render
         # No rendering as body is rendered as part of ShellProxy.. this class only serves as an SWT Display utility
       end
@@ -74,10 +79,6 @@ module Glimmer
           ]
         }
       end
-      
-      def shells
-        @shells ||= []
-      end
     end
   end
 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/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