glimmer-dsl-opal 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf10a8e6a840bef3b7a757f55dec62651a334bce49f52d2ebac77ef6d68d0a3
-  data.tar.gz: 02c7196499a96d53a3cc00d761af4cda2c6baa90a7d3587faee4d67b6d0e2615
+  metadata.gz: a69a60c500b662de0e458896e7da698a769ed5823c924d591825d3bfd5845605
+  data.tar.gz: 223e76c5d758d5caecfa9843a491acb23302f9c1f1b3cf592af830bfefa4c114
 SHA512:
-  metadata.gz: 8dab1f9539fa2be9a6ae67e485011ebb3ab2f3322a35f3d266e2a1bb1b64bc408ffb47f4e3ddd3f67b103b21c2ce68de154b4bfd77736f8bf12a18b0dc611161
-  data.tar.gz: 9651ec109a222fd805ef90e82c1898329648399a92c1008ac884b69b3e39bca3d119769169f52ae913fe8e523c72fcafdf0c82f6f066e80255e208414f11f5e6
+  metadata.gz: 79b96f5af0774f9bf5e508af1a67aa6a80cb061f818b295b178dd01e65561003fb573b394f5c21fc03440cfb2f834f95260ae03e5558fb1c24ac9261520fa275
+  data.tar.gz: c9c643cd2043e1a62db4f7487f2c2a7a447b09ebc7f33d8d255c1cb6daf2ed78b19aab3be25f1efef7408df02ca61f757f455b69552b9ec4f8ac9c7e35b97291

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.10.1
+
+- Delaying shell rendering till `#open` method is called as per the right expectation
+- When nesting dialogs on top of each other, disable all previously opened ones leaving only the top-most dialog active
+
 ## 0.10.0
 
 - Hello, Dialog! Sample

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Opal 0.10.0 (Pure Ruby Web GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Opal 0.10.1 (Pure Ruby Web GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-opal.svg)](http://badge.fury.io/rb/glimmer-dsl-opal)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -141,7 +141,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.10.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.10.1 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -151,7 +151,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 
 ## Table of Contents
 
-- [Glimmer DSL for Opal 0.10.0 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0100-pure-ruby-web-gui)
+- [Glimmer DSL for Opal 0.10.1 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0101-pure-ruby-web-gui)
   - [Principles](#principles)
   - [Background](#background)
   - [Pre-requisites](#pre-requisites)
@@ -249,7 +249,7 @@ Add the following to `Gemfile`:
 gem 'opal-rails', '~> 1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.10.0'
+gem 'glimmer-dsl-opal', '~> 0.10.1'
 gem 'glimmer-dsl-xml', '~> 1.1.0', require: false
 gem 'glimmer-dsl-css', '~> 1.1.0', require: false
 
@@ -2547,8 +2547,63 @@ require 'glimmer-dsl-opal/samples/hello/hello_dialog'
 Or add the Glimmer code directly if you prefer to play around with it:
 
 ```ruby
+include Glimmer
 
+shell {
+  row_layout :vertical
+  
+  text 'Hello, Dialog!'
+  
+  7.times { |n|
+    dialog_number = n + 1
+    
+    button {
+      layout_data {
+        width 200
+        height 50
+      }
+      text "Dialog #{dialog_number}"
+      
+      on_widget_selected {
+        dialog { |dialog_proxy|
+          row_layout(:vertical) {
+            center true
+          }
+          
+          text "Dialog #{dialog_number}"
+          
+          label {
+            text "Given `dialog` is modal, you cannot interact with the main window till the dialog is closed."
+          }
+          composite {
+            row_layout {
+              margin_height 0
+              margin_top 0
+              margin_bottom 0
+            }
 
+            label {
+              text "Unlike `message_box`, `dialog` can contain arbitrary widgets:"
+            }
+            radio {
+              text 'Radio'
+            }
+            checkbox {
+              text 'Checkbox'
+            }
+          }
+          button {
+            text 'Close'
+            
+            on_widget_selected {
+              dialog_proxy.close
+            }
+          }
+        }.open
+      }
+    }
+  }
+}.open
 ```
 
 Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.10.1

data/lib/glimmer-dsl-opal/ext/glimmer/dsl/engine.rb

@@ -22,6 +22,7 @@
 require 'glimmer/swt/latest_shell_proxy'
 require 'glimmer/swt/latest_message_box_proxy'
 require 'glimmer/swt/latest_dialog_proxy'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -35,7 +36,9 @@ module Glimmer
             end
           end
           if ['shell', 'message_box', 'dialog'].include?(keyword) && Glimmer::SWT::DisplayProxy.instance.shells.empty?
-            Document.ready?(&work)
+            Document.ready? do
+              Glimmer::SWT::DisplayProxy.instance.async_exec(&work)
+            end
             Glimmer::SWT.const_get("Latest#{keyword.camelcase(:upper)}Proxy").new
           else
             work.call

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

@@ -11,7 +11,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          parent = args.delete_at(0)
+          parent = args.delete_at(0) if !textual?(args.first)
           Glimmer::SWT::MessageBoxProxy.new(parent, args)
         end
       end

data/lib/glimmer/swt/composite_proxy.rb

@@ -4,8 +4,6 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class CompositeProxy < WidgetProxy
-      attr_reader :layout
-      
       def initialize(parent, args, block)
         super(parent, args, block)
         @layout = default_layout
@@ -27,7 +25,23 @@ module Glimmer
       def layout=(the_layout)
         @layout = the_layout
       end
+      alias set_layout layout=
+      alias setLayout layout=
+      
+      def get_layout
+        @layout
+      end
+      alias getLayout get_layout #TODO consider pregenerating these aliases with an easy method in the future
+
+      def pack(*args)
+        # No Op (just a shim) TODO consider if it should be implemented
+      end
       
+      def layout​(changed = nil, all = nil)
+        # TODO implement layout(changed = nil, all = nil) just as per SWT API
+        @layout&.layout(self, changed)
+      end
+            
     end
     
   end

data/lib/glimmer/swt/dialog_proxy.rb

@@ -63,7 +63,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
@@ -71,6 +71,7 @@ module Glimmer
 #         on_widget_selected {
 #           hide
 #         }
+        DisplayProxy.instance.opened_dialogs.last&.suspend_event_handling
         DisplayProxy.instance.dialogs << self
         @parent.post_initialize_child(self)
       end
@@ -84,35 +85,39 @@ module Glimmer
         end
       end
     
+      def open?
+        @open
+      end
+      
       def open
-        unless @init
-          dom_element.remove_class('hide')
-          dom_element.dialog({'auto_open' => false})
-          @init = true
-          dom_element.dialog('option', 'appendTo', parent.path)
-          dom_element.dialog('option', 'modal', true) # NOTE: Not Working! Doing manually below by relying on overlay in ShellProxy.
-          if DisplayProxy.instance.dialogs.size == 1 # only add for first dialog open
-            Element['.dialog-overlay'].remove_class('hide')
-          end
-          dom_element.dialog('option', 'closeOnEscape', true)
-          dom_element.dialog('option', 'draggable', true)
-          dom_element.dialog('option', 'width', 'auto')
-          dom_element.dialog('option', 'minHeight', 'none')
-          dom_element.on('dialogclose') do
-            unless @hiding
-              close
-            else
-              @hiding = false
+        owned_proc = Glimmer::Util::ProcTracker.new(owner: self) {
+          shell.open(async: false) unless shell.open?
+          unless @init
+            dom_element.remove_class('hide')
+            dom_element.dialog('auto_open' => false)
+            @init = true
+            dom_element.dialog('option', 'appendTo', parent.path)
+            dom_element.dialog('option', 'modal', true) # NOTE: Not Working! Doing manually below by relying on overlay in ShellProxy.
+            unless DisplayProxy.instance.dialogs.any?(&:open?) # only add for first dialog open
+              Element['.dialog-overlay'].remove_class('hide')
             end
+            dom_element.dialog('option', 'closeOnEscape', true)
+            dom_element.dialog('option', 'draggable', true)
+            dom_element.dialog('option', 'width', 'auto')
+            dom_element.dialog('option', 'minHeight', 'none')
+            dom_element.on('dialogclose') do
+              unless @hiding
+                close
+              else
+                @hiding = false
+              end
+            end
+          else
+            dom_element.dialog('open')
           end
-        else
-          dom_element.dialog('open')
-        end
-        @open = true
-      end
-      
-      def open?
-        @open
+          @open = true
+        }
+        DisplayProxy.instance.async_exec(owned_proc)
       end
       
       def hide
@@ -128,7 +133,10 @@ module Glimmer
         @open = false
         @init = false
         Element['.dialog-overlay'].add_class('hide') unless DisplayProxy.instance.dialogs.any?(&:open?)
+        parent.children.delete(self)
+        shell.close if shell.children.empty?
         DisplayProxy.instance.dialogs.delete(self)
+        DisplayProxy.instance.opened_dialogs.last&.resume_event_handling
       end
       
       
@@ -144,6 +152,16 @@ module Glimmer
         end
       end
       
+      def suspend_event_handling
+        super
+        Element["[aria-describedby=#{id}]"].css('z-index', 9)
+      end
+      
+      def resume_event_handling
+        super
+        Element["[aria-describedby=#{id}]"].css('z-index', 100)
+      end
+      
 #       def selector
 #         super + ' .close'
 #       end
@@ -162,7 +180,7 @@ module Glimmer
  
       def dom
         @dom ||= html {
-          div(id: id, class: "#{name} hide", title: text) {
+          div(id: id, class: "#{name} modal hide", title: text) {
           }
         }.to_s
       end

data/lib/glimmer/swt/display_proxy.rb

@@ -1,3 +1,5 @@
+require 'glimmer/swt/widget_proxy'
+
 module Glimmer
   module SWT
     class DisplayProxy < WidgetProxy
@@ -36,20 +38,43 @@ module Glimmer
         @dialogs ||= []
       end
       
+      def modals
+        message_boxes + dialogs
+      end
+      
+      def message_box_open?
+        message_boxes.any?(&:open?)
+      end
+      
+      def dialog_open?
+        dialogs.any?(&:open?)
+      end
+      
+      def opened_dialogs
+        dialogs.select(&:open?)
+      end
+      
+      def modal_open?
+        message_box_open? or dialog_open?
+      end
+      
       def render
         # No rendering as body is rendered as part of ShellProxy.. this class only serves as an SWT Display utility
       end
       
-      def async_exec(&block)
+      def async_exec(proc_tracker = nil, &block)
+        block = proc_tracker unless proc_tracker.nil?
+        can_open_modal = !modal_open?
+        return block.call if !can_open_modal && dialog_open? && block.respond_to?(:owner) && !block.owner.nil? && block.owner.is_a?(DialogProxy) && opened_dialogs.last == WidgetProxy.widget_handling_listener&.dialog_ancestor
+        return block.call if !can_open_modal && block.respond_to?(:owner) && !block.owner.nil? && block.owner.is_a?(MessageBoxProxy)
         executer = lambda do
-          if Document.find('.modal').to_a.empty?
+          if !modal_open?
             block.call
           else
-            sleep(0.05)
-            Async::Task.new(&executer)
+            Async::Task.new(delay: 100, &executer)
           end
         end
-        Async::Task.new(&executer)
+        Async::Task.new(delay: 1, &executer)
       end
       # sync_exec kept for API compatibility reasons
       alias sync_exec async_exec

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -14,39 +14,29 @@ module Glimmer
       
       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.margin_width = 15
-        self.margin_height = 15
-        self.num_columns = @args.first || 1
-        reapply
-      end
-
       def num_columns=(columns)
         @num_columns = columns
         # TODO do the following instead of reapply
 #         @parent.add_css_class("num-columns-#{@num_columns}")
-        reapply
+        # reinitialize # TODO reimplement without using reinitialize
       end
       
       def 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
+        # reinitialize # TODO reimplement without using reinitialize
       end
       
       def horizontal_spacing=(spacing)
         @horizontal_spacing = spacing
 #         @parent.add_css_class("horizontal-spacing-#{@horizontal_spacing}")
-        reapply
+        # reinitialize # TODO reimplement without using reinitialize
       end
 
       def vertical_spacing=(spacing)
         @vertical_spacing = spacing
 #         @parent.add_css_class("vertical-spacing-#{@vertical_spacing}")
-        reapply
+        # reinitialize # TODO reimplement without using reinitialize
       end
       
       def margin_width=(pixels)
@@ -66,8 +56,13 @@ module Glimmer
         @parent.dom_element.css('padding-bottom', effective_margin_height)
       end
             
-      def reapply
-        # TODO get rid of this method
+      def initialize(parent, args)
+        super(parent, args)
+        self.horizontal_spacing = 10
+        self.vertical_spacing = 10
+        self.margin_width = 15
+        self.margin_height = 15
+        self.num_columns = @args.first || 1
         layout_css = <<~CSS
           grid-template-columns: #{'auto ' * @num_columns.to_i};
           grid-row-gap: #{@vertical_spacing}px;

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

@@ -31,29 +31,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;
@@ -81,13 +81,14 @@ module Glimmer
         @enabled = true
         on_widget_selected {
           hide
+          @open = false
         }
         DisplayProxy.instance.message_boxes << self
       end
       
       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,11 +97,20 @@ 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) {
+          parent.post_initialize_child(self)
+          @open = true
+        }
+        DisplayProxy.instance.async_exec(owned_proc)
       end
       
       def hide
@@ -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

@@ -43,12 +43,10 @@ module Glimmer
       CSS
     
       attr_reader :type, :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
+        @type = args.first || :horizontal
         self.pack = true
         @parent.dom_element.add_class('row-layout')
         @parent.dom_element.add_class(horizontal? ? 'row-layout-horizontal' : 'row-layout-vertical')

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

@@ -77,15 +77,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 +105,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 +140,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 +198,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 +254,7 @@ module Glimmer
       alias setFocus set_focus
       
       def parent_path
-        @parent.path
+        @parent&.path
       end
 
       def parent_dom_element
@@ -287,7 +304,7 @@ 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
       
@@ -633,6 +650,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 +691,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

data/lib/glimmer/ui/custom_shell.rb

@@ -56,7 +56,7 @@ module Glimmer
       
       def initialize(parent, args, options, &content)
         super(parent, args, options, &content)
-        raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(Glimmer::SWT::ShellProxy) || body_root.is_a?(Glimmer::UI::CustomShell) || body_root.is_a?(Glimmer::SWT::LatestShellProxy)
+        raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(Glimmer::SWT::ShellProxy) || body_root.is_a?(Glimmer::UI::CustomShell)
       end
 
       # Classes may override

data/lib/glimmer/util/proc_tracker.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -24,16 +24,25 @@ require 'delegate'
 module Glimmer
   module Util
     class ProcTracker < DelegateClass(Proc)
-      def initialize(proc)
-        super(proc)
+      attr_reader :owner
+      
+      def initialize(proc = nil, owner: nil, &block)
+        super(proc || block)
+        @owner = owner
       end
+      
       def call(*args)
         __getobj__.call(*args)
         @called = true
       end
+      
       def called?
         !!@called
       end
+      
+      def respond_to?(method, *args, &block)
+        %w[owner called?].include?(method.to_s) || super(method, *args, &block)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer