glimmer-dsl-opal 0.10.0 → 0.12.0

data/lib/glimmer/swt/latest_dialog_proxy.rb

@@ -31,7 +31,9 @@ module Glimmer
       
       def open
         Document.ready? do
-          DisplayProxy.instance.dialogs.last&.open
+          DisplayProxy.instance.async_exec {
+            DisplayProxy.instance.dialogs.last&.open
+          }
         end
       end
 

data/lib/glimmer/swt/latest_message_box_proxy.rb

@@ -31,7 +31,9 @@ module Glimmer
       
       def open
         Document.ready? do
-          DisplayProxy.instance.message_boxes.last&.open
+          DisplayProxy.instance.async_exec {
+            DisplayProxy.instance.message_boxes.last&.open
+          }
         end
       end
 

data/lib/glimmer/swt/latest_shell_proxy.rb

@@ -19,9 +19,11 @@
 # 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/swt/shell_proxy'
+
 module Glimmer
   module SWT
-    class LatestShellProxy #< ShellProxy
+    class LatestShellProxy < ShellProxy
       def initialize(parent, args, block)
         # No Op
       end
@@ -40,7 +42,9 @@ module Glimmer
       
       def open
         Document.ready? do
-          latest_shell&.open
+          DisplayProxy.instance.async_exec {
+            latest_shell&.open
+          }
         end
       end
       

data/lib/glimmer/swt/layout_proxy.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2021 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/swt/property_owner'
 
 module Glimmer
@@ -13,9 +34,8 @@ module Glimmer
         end
         
         def layout_class(keyword)
-          class_name_alternative = keyword.camelcase(:upper)
-          class_name_main = "#{class_name_alternative}Proxy"
-          a_layout_class = Glimmer::SWT.const_get(class_name_main.to_sym) rescue Glimmer::SWT.const_get(class_name_alternative.to_sym)
+          class_name_main = "#{keyword.camelcase(:upper)}Proxy"
+          a_layout_class = Glimmer::SWT.const_get(class_name_main.to_sym)
           a_layout_class if a_layout_class.ancestors.include?(Glimmer::SWT::LayoutProxy)
         rescue => e
           Glimmer::Config.logger.debug "Layout #{keyword} was not found!"
@@ -31,29 +51,32 @@ module Glimmer
         
       def initialize(parent, args)
         @parent = parent
+        @args = args
         @parent = parent.body_root if @parent.is_a?(Glimmer::UI::CustomWidget)
         @parent.css_classes.each do |css_class|
           @parent.remove_css_class(css_class) if css_class.include?('layout')
         end
-        @args = args
         @parent.add_css_class(css_class)
         @parent.layout = self
         self.margin_width = 15 if respond_to?(:margin_width=)
         self.margin_height = 15 if respond_to?(:margin_height=)
       end
-
-      def css_class
-        self.class.name.split('::').last.underscore.sub(/_proxy$/, '').gsub('_', '-')
+              
+      def layout​(composite = nil, flush_cache = false)
+        # TODO implement def layout​(composite = nil, flush_cache = false) as per SWT API
+        composite ||= @parent
+        initialize(composite, @args)
       end
       
-      def reapply
-        # subclasses can override this
+      def css_class
+        self.class.name.split('::').last.underscore.sub(/_proxy$/, '').gsub('_', '-')
       end
       
       # Decorates widget dom. Subclasses may override. Returns widget dom by default.
       def dom(widget_dom)
         widget_dom
       end
+      
     end
   end
 end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -26,7 +26,7 @@ module Glimmer
   module SWT
     class MessageBoxProxy < WidgetProxy
       STYLE = <<~CSS
-        .modal {
+        .message-box {
           position: fixed;
           z-index: 1000;
           padding-top: 100px;
@@ -39,15 +39,15 @@ module Glimmer
           background-color: rgba(0,0,0,0.4);
           text-align: center;
         }
-        .modal-content .text {
+        .message-box-content .text {
           background: rgb(80, 116, 211);
           color: white;
           padding: 5px;
         }
-        .modal-content .message {
+        .message-box-content .message {
           padding: 20px;
         }
-        .modal-content {
+        .message-box-content {
           background-color: #fefefe;
           padding-bottom: 15px;
           border: 1px solid #888;
@@ -74,7 +74,7 @@ module Glimmer
         i = 0
         @parent = parent
         @parent = nil if parent.is_a?(LatestShellProxy)
-        @parent ||= DisplayProxy.instance.shells.last || ShellProxy.new([])
+        @parent ||= DisplayProxy.instance.shells.detect(&:open?) || ShellProxy.new([])
         @args = args
         @block = block
         @children = Set.new
@@ -87,7 +87,7 @@ module Glimmer
       
       def text=(txt)
         @text = txt
-        dom_element.find('.modal-content .text').html(@text)
+        dom_element.find('.message-box-content .text').html(@text)
       end
     
       def html_message
@@ -96,19 +96,29 @@ module Glimmer
       
       def message=(msg)
         @message = msg
-        dom_element.find('.modal-content .message').html(html_message)
+        dom_element.find('.message-box-content .message').html(html_message)
+      end
+      
+      def open?
+        @open
       end
       
       def open
-        parent.post_initialize_child(self)
+        shell.open(async: false) unless shell.open?
+        owned_proc = Glimmer::Util::ProcTracker.new(owner: self, invoked_from: :open) {
+          parent.post_initialize_child(self)
+          @open = true
+        }
+        DisplayProxy.instance.async_exec(owned_proc)
       end
       
       def hide
         dom_element.remove
+        @open = false
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::MessageBoxExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::MessageBoxExpression.new, 'message_box', *@args, &block)
       end
       
       def selector
@@ -130,7 +140,7 @@ module Glimmer
       def dom
         @dom ||= html {
           div(id: id, class: "modal #{name}") {
-            div(class: 'modal-content') {
+            div(class: 'message-box-content') {
               header(class: 'text') {
                 "#{text}&nbsp;" # ensure title area occuppied when there is no text by adding non-breaking space (&nbsp;)
               }

data/lib/glimmer/swt/row_layout_proxy.rb

@@ -42,15 +42,17 @@ module Glimmer
         }
       CSS
     
-      attr_reader :type, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
-    
+      attr_reader :type, :fill, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
+        
       def initialize(parent, args)
         super(parent, args)
-        @type = @args.first || :horizontal
-        @marign_width = 15
-        @margin_height = 15
-        self.pack = true
         @parent.dom_element.add_class('row-layout')
+        self.type = args.first || :horizontal
+        self.pack = true
+      end
+      
+      def type=(value)
+        @type = value
         @parent.dom_element.add_class(horizontal? ? 'row-layout-horizontal' : 'row-layout-vertical')
       end
       
@@ -77,6 +79,11 @@ module Glimmer
         end
       end
       
+      def fill=(value)
+        # TODO verify this is a correct implementation and interpretation of RowLayout in SWT
+        self.pack(!value)
+      end
+      
       def center=(center_value)
         @center = center_value
         # Using padding for width since margin-right isn't getting respected with width 100%

data/lib/glimmer/swt/shell_proxy.rb

@@ -47,9 +47,7 @@ module Glimmer
       def initialize(args)
         @args = args
         @children = []
-        # TODO consider the implication of emptying the body
-        Document.find('body').empty unless ENV['RUBY_ENV'] == 'test'
-        render
+        render # TODO attach to specific element
         @layout = FillLayoutProxy.new(self, [])
         @layout.margin_width = 0
         @layout.margin_height = 0
@@ -95,7 +93,7 @@ module Glimmer
       def dom
         i = 0
         body_id = id
-        body_class = ([name] + css_classes.to_a).join(' ')
+        body_class = ([name, 'hide'] + css_classes.to_a).join(' ')
         @dom ||= html {
           div(id: body_id, class: body_class) {
             # TODO consider supporting the idea of dynamic CSS building on close of shell that adds only as much CSS as needed for widgets that were mentioned
@@ -115,10 +113,34 @@ module Glimmer
         }.to_s
       end
       
-      def open
-        # TODO consider the idea of delaying rendering till the open method
-        # TODO make it start as hidden and show shell upon open
-#         DisplayProxy.instance.shells << self
+      def open(async: true)
+        work = lambda do
+          unless @open
+            DisplayProxy.instance.shells.select(&:open?).reject {|s| s == self}.map(&:hide)
+            dom_element.remove_class('hide')
+            @open = true
+          end
+        end
+        if async
+          DisplayProxy.instance.async_exec(&work)
+        else
+          work.call
+        end
+      end
+      
+      def hide
+        dom_element.add_class('hide')
+        @open = false
+      end
+      
+      def close
+        DisplayProxy.instance.shells.delete(self)
+        dom_element.remove
+        @open = false
+      end
+      
+      def open?
+        @open
       end
     end
   end

data/lib/glimmer/swt/table_proxy.rb

@@ -257,9 +257,7 @@ module Glimmer
         @table_editor.minimumWidth = 90
         @table_editor.minimumHeight = 20
         if editable?
-          on_mouse_up { |event|
-            edit_table_item(event.table_item, event.column_index)
-          }
+          add_editable_event_listener
         end
       end
       
@@ -311,6 +309,24 @@ module Glimmer
       end
       alias editable editable?
       
+      def editable=(value)
+        if value
+          args.push(:editable)
+          dom_element.addClass('editable')
+          add_editable_event_listener
+        else
+          args.delete(:editable)
+          dom_element.removeClass('editable')
+          @editable_on_mouse_up_event_listener.deregister # TODO see why table event listener deregistration is not working
+        end
+      end
+      
+      def add_editable_event_listener
+        @editable_on_mouse_up_event_listener = on_mouse_up { |event|
+          edit_table_item(event.table_item, event.column_index) if editable?
+        }
+      end
+      
       def selection
         @selection.to_a
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -46,9 +46,8 @@ module Glimmer
         end
         
         def widget_class(keyword)
-          class_name_alternative = keyword.camelcase(:upper)
-          class_name_main = "#{class_name_alternative}Proxy"
-          Glimmer::SWT.const_get(class_name_main.to_sym) rescue Glimmer::SWT.const_get(class_name_alternative.to_sym)
+          class_name_main = "#{keyword.camelcase(:upper)}Proxy"
+          Glimmer::SWT.const_get(class_name_main.to_sym)
         rescue => e
           puts "Widget #{keyword} was not found!"
           nil
@@ -77,15 +76,20 @@ module Glimmer
         def underscored_widget_name(widget_proxy)
           widget_proxy.class.name.split(/::|\./).last.sub(/Proxy$/, '').underscore
         end
+        
+        def widget_handling_listener
+          @@widget_handling_listener
+        end
       end
       
       DEFAULT_INITIALIZERS = {
+        # TODO remove if built in class initializer is taking care of this
         composite: lambda do |composite_proxy|
-          if composite_proxy.layout.nil?
-            layout = GridLayoutProxy.new(composite_proxy, [])
-            composite_proxy.layout = layout
-            layout.margin_width = 15
-            layout.margin_height = 15
+          if composite_proxy.get_layout.nil?
+            the_layout = GridLayoutProxy.new(composite_proxy, [])
+            composite_proxy.layout = the_layout
+            the_layout.margin_width = 15
+            the_layout.margin_height = 15
           end
         end,
 #         scrolled_composite: lambda do |scrolled_composite|
@@ -100,7 +104,7 @@ module Glimmer
           table_column_proxy.width = 80
         end,
 #         group: lambda do |group_proxy|
-#           group_proxy.layout = GridLayoutProxy.new(group_proxy, []) if group.layout.nil?
+#           group_proxy.layout = GridLayoutProxy.new(group_proxy, []) if group.get_layout.nil?
 #         end,
       }
       
@@ -135,8 +139,8 @@ module Glimmer
               dom_element.css('position', 'relative')
               menu&.render
               menu.dom_element.css('position', 'absolute')
-              menu.dom_element.css('left', mouse_event.x - parent.layout&.margin_width.to_i) # TODO - parent.layout&.margin_left.to_i)
-              menu.dom_element.css('top', mouse_event.y - parent.layout&.margin_height.to_i - 5) # TODO - parent.layout&.margin_top.to_i)
+              menu.dom_element.css('left', mouse_event.x - parent.get_layout&.margin_width.to_i) # TODO - parent.get_layout&.margin_left.to_i)
+              menu.dom_element.css('top', mouse_event.y - parent.get_layout&.margin_height.to_i - 5) # TODO - parent.get_layout&.margin_top.to_i)
               @menu_requested = false
             end
           }
@@ -193,12 +197,24 @@ module Glimmer
         'div'
       end
       
-      def pack(*args)
-        # No Op (just a shim) TODO consider if it should be implemented
+      def shell
+        current_widget = self
+        current_widget = current_widget.parent until current_widget.parent.nil?
+        current_widget
+      end
+
+      def parents
+        parents_array = []
+        current_widget = self
+        until current_widget.parent.nil?
+          current_widget = current_widget.parent
+          parents_array << current_widget
+        end
+        parents_array
       end
 
-      def layout(*args)
-        # No Op (just a shim) TODO consider if it should be implemented
+      def dialog_ancestor
+        parents.detect {|p| p.is_a?(DialogProxy)}
       end
 
       def enabled=(value)
@@ -237,7 +253,7 @@ module Glimmer
       alias setFocus set_focus
       
       def parent_path
-        @parent.path
+        @parent&.path
       end
 
       def parent_dom_element
@@ -287,12 +303,12 @@ module Glimmer
         # TODO consider passing parent element instead and having table item include a table cell widget only for opal
         @dom = nil
         @dom = dom
-        @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout
+        @dom = @parent.get_layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.get_layout
         @dom
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::WidgetExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::WidgetExpression.new, self.class.underscored_widget_name(self), &block)
       end
       
       # Subclasses must override with their own mappings
@@ -633,6 +649,18 @@ module Glimmer
         @event_listener_proxies ||= []
       end
       
+      def suspend_event_handling
+        @event_handling_suspended = true
+      end
+      
+      def resume_event_handling
+        @event_handling_suspended = false
+      end
+      
+      def event_handling_suspended?
+        @event_handling_suspended
+      end
+      
       def can_handle_observation_request?(observation_request)
         # TODO sort this out for Opal
         observation_request = observation_request.to_s
@@ -662,7 +690,10 @@ module Glimmer
             # TODO look into the issue with using async::task.new here. maybe put it in event listener (like not being able to call preventDefault or return false successfully )
             # maybe consider pushing inside the widget classes instead where needed only or implement universal doit support correctly to bypass this issue
 #             Async::Task.new do
-              event_listener.call(event)
+            @@widget_handling_listener = self
+            # TODO also make sure to disable all widgets for suspension
+            event_listener.call(event) unless dialog_ancestor&.event_handling_suspended?
+            @widget_handling_listener = nil
 #             end
           end
           the_listener_dom_element = event_element_css_selector ? Element[event_element_css_selector] : listener_dom_element