glimmer-dsl-opal 0.26.3 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cabde097ac994643d49e0af9b78fc1bbc7b2eb15857deb8741c557f4e676a4da
-  data.tar.gz: a198b93dc21bc2ea93e8542a84bbb83919be9ad0d63355f27dcf1fe4991b682c
+  metadata.gz: 885895f5a47d453757426eb0b05e0b413972ef5b11f5c9045c8df92c4c1cd03d
+  data.tar.gz: a33b454cd1229e8b6d640d31f55379875fdde969b3634ef85e524496b277117f
 SHA512:
-  metadata.gz: b77f3a496e6dd8e8afea59185ba46306b07e9cb0e4fb5e41b97151886292ab1735008e5a58f08251874e25ede8b781f819498f2ef0c84ba4f357f8c13b7c2c0a
-  data.tar.gz: bc9646367d1cd6476f60edf98cf2a94ff24dd6bff14756b3bcbc1365e79a3cb22869c626bc897f94784c59e3cffe30fe5c5e8fe90915a23fc042d3b4f836ffae
+  metadata.gz: dad2612713d1ebcc95cc08fc0bdaddbb45a9f07032af5e583da857adba54327752f853d8f28bfd76d545c7271e9be86e825d42d600c798775328864e8d651927
+  data.tar.gz: 037c3e6f77c68a8edf343b3323b543f708adf5f41dffb03944148670ac46aa786cafbecb12675c24a5d4c5e3242ff2929886214d6ea43d9017de588ddc5db486

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.27.0
+
+- Hello, Text!
+- Support unbordered `text` widget if SWT style `:none` was passed
+- Support `:center`, `:left`, `:right` SWT styles for `text` widget
+- Support `:read_only` SWT style for `text` widget
+- Support `text` widget `on_verify_text` `event.doit = false` cancellation feature
+
 ## 0.26.3
 
 - Support key_event.key_location in all key capturing widgets, not just display

data/README.md

@@ -145,7 +145,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.26.3 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.27.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))
 
 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)
@@ -269,7 +269,7 @@ gem 'opal', '1.0.5'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.4.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.26.3'
+gem 'glimmer-dsl-opal', '~> 0.27.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 

data/VERSION

@@ -1 +1 @@
-0.26.3
+0.27.0

data/lib/glimmer/swt/c_tab_folder_proxy.rb

@@ -28,7 +28,7 @@ module Glimmer
       attr_reader :closeable_children
         
       def initialize(parent, args, block)
-        @closeable_children = args.detect { |arg| SWTProxy[:close] == SWTProxy[arg] }
+        @closeable_children = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:close] }
         super(parent, args, block)
       end
           

data/lib/glimmer/swt/text_proxy.rb

@@ -3,7 +3,26 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class TextProxy < WidgetProxy
-      attr_reader :text
+      attr_reader :text, :border, :left, :center, :right, :read_only, :wrap, :multi
+      alias border? border
+      alias left? left
+      alias center? center
+      alias right? right
+      alias read_only? read_only
+      alias wrap? wrap
+      alias multi? multi
+      
+      def initialize(parent, args, block)
+        args << :border if args.empty?
+        @border = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:border] }
+        @left = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:left] }
+        @center = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:center] }
+        @right = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:right] }
+        @read_only = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:read_only] }
+        @wrap = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:wrap] }
+        @multi = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:multi] }
+        super(parent, args, block)
+      end
 
       def text=(value)
         @text = value
@@ -11,43 +30,86 @@ module Glimmer
       end
       
       def element
-        'input'
+        @wrap || @multi ? 'textarea' : 'input'
       end
       
       def observation_request_to_event_mapping
+        myself = self
         {
-          'on_modify_text' => {
-            event: 'keyup',
-            event_handler: -> (event_listener) {
-              -> (event) {
-                # TODO consider unifying this event handler with on_key_pressed by relying on its result instead of hooking another keyup event
-                # TODO add all attributes for on_modify_text modify event
-                if @last_key_pressed_event.nil? || @last_key_pressed_event.doit
+          'on_verify_text' => [
+            {
+              event: 'beforeinput',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  event.define_singleton_method(:widget) {myself}
+                  event.define_singleton_method(:text) {`#{event.to_n}.originalEvent.data` || ''}
+                  selection_start = `#{event.target}[0].selectionStart`
+                  selection_end = `#{event.target}[0].selectionEnd`
+                  if `#{event.to_n}.originalEvent.inputType` == 'deleteContentBackward' && selection_start == selection_end
+                    selection_start -= 1
+                    selection_start = 0 if selection_start < 0
+                  end
+                  event.define_singleton_method(:start) do
+                    selection_start
+                  end
+                  event.define_singleton_method(:end) {selection_end}
+                  doit = true
+                  event.define_singleton_method(:doit=) do |value|
+                    doit = value
+                  end
+                  event.define_singleton_method(:doit) { doit }
+                  event_listener.call(event)
+                  
+                  if !doit
+                    `#{event.to_n}.originalEvent.returnValue = false`
+                  end
+                  
+                  doit
+                }
+              }
+            },
+            {
+              event: 'input',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  event.define_singleton_method(:widget) {myself}
+                  @text = event.target.value
+                }
+              }
+            }
+          ],
+          'on_modify_text' => [
+            {
+              event: 'input',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  # TODO add all attributes for on_modify_text modify event
+                  event.define_singleton_method(:widget) {myself}
                   @text = event.target.value
                   event_listener.call(event)
-                else
-                  # TODO Fix doit false, it's not stopping input
-                  event.prevent
-                  event.prevent_default
-                  event.stop_propagation
-                  event.stop_immediate_propagation
-                end
+                }
               }
             }
-          },
+          ],
         }
       end
       
       def dom
         text_text = @text
         text_id = id
-        text_style = css
+        text_style = 'min-width: 27px; '
+        text_style += 'border: none; ' if !@border
+        text_style += 'text-align: left; ' if @left
+        text_style += 'text-align: center; ' if @center
+        text_style += 'text-align: right; ' if @right
         text_class = name
-        options = {type: 'text', id: text_id, style: text_style, class: text_class, value: text_text, style: 'min-width: 27px;'}
+        options = {type: 'text', id: text_id, style: text_style, class: text_class, value: text_text}
         options = options.merge('disabled': 'disabled') unless @enabled
+        options = options.merge('readonly': 'readonly') if @read_only
+        options = options.merge('contenteditable': 'true')
         options = options.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          input(options)
+          send(element, options)
         }.to_s
       end
     end

data/lib/glimmer/swt/widget_proxy.rb

@@ -158,7 +158,7 @@ module Glimmer
         @block = block
         # TODO consider changing children to an array (why is it a Set if order matters?)
         @children = Set.new # TODO consider moving to composite
-        @enabled = true
+        @enabled = true if @enabled.nil?
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self).to_s.to_sym]&.call(self)
         @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
       end
@@ -616,6 +616,7 @@ module Glimmer
                     JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || event.which
                   }
                   event.define_singleton_method(:key_code, &event.method(:keyCode))
+                  event.define_singleton_method(:widget) {myself}
                   event.define_singleton_method(:character) {event.which.chr}
                   event.define_singleton_method(:stateMask) do
                     state_mask = 0
@@ -658,6 +659,7 @@ module Glimmer
                     JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || event.which
                   }
                   event.define_singleton_method(:key_code, &event.method(:keyCode))
+                  event.define_singleton_method(:widget) {myself}
                   event.define_singleton_method(:character) {event.which.chr}
                   event.define_singleton_method(:stateMask) do
                     state_mask = 0

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

@@ -0,0 +1,149 @@
+# 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.
+
+class HelloText
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :default, :no_border, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
+  
+  before_body do
+    self.default = 'default is :border style'
+    self.no_border = 'no border'
+    self.center = 'centered'
+    self.left = 'left-aligned'
+    self.right = 'right-aligned'
+    self.password = 'password'
+    self.telephone = '555-555-5555'
+    self.read_only = 'Telephone area code is 555'
+    self.wrap = 'wraps if text content is too long like this example'
+    self.multi = "multi-line enables hitting enter,\nbut works like wrap on the web"
+  end
+  
+  body {
+    shell {
+      grid_layout 2, false
+      
+      text 'Hello, Text!'
+      minimum_size 350, 100
+      
+      label {
+        text 'text'
+      }
+      text { # includes :border style by default
+        layout_data :fill, :center, true, false
+        text <=> [self, :default]
+      }
+
+      label {
+        text 'text(:none)'
+      }
+      text(:none) { # no border
+        layout_data :fill, :center, true, false
+        text <=> [self, :no_border]
+      }
+
+      label {
+        text 'text(:center, :border)'
+      }
+      text(:center, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :center]
+      }
+
+      label {
+        text 'text(:left, :border)'
+      }
+      text(:left, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :left]
+      }
+
+      label {
+        text 'text(:right, :border)'
+      }
+      text(:right, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :right]
+      }
+
+      label {
+        text 'text(:password, :border)'
+      }
+      text(:password, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :password]
+      }
+
+      label {
+        text 'text(:read_only, :border)'
+      }
+      text(:read_only, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :read_only]
+      }
+      
+      label {
+        text 'text with event handlers'
+      }
+      text {
+        layout_data :fill, :center, true, false
+        text <=> [self, :telephone]
+        
+        # this event kicks in just after the user typed and before modifying the text attribute value
+        on_verify_text do |verify_event|
+          new_text = verify_event.widget.text.clone
+          # new_text[verify_event.start...verify_event.end] = verify_event.text # Opal does not allow string mutation like JRuby in Glimmer DSL for SWT
+          new_text = "#{new_text[0...verify_event.start]}#{verify_event.text}#{new_text[verify_event.end..-1]}"
+          verify_event.doit = telephone?(new_text)
+        end
+        
+        # this event kicks in just after the text widget is verified and modified
+        on_modify_text do |modify_event|
+          self.read_only = "Telephone area code is #{modify_event.widget.text.gsub(/[^0-9]/, '')[0...3]}"
+        end
+      }
+      
+      label {
+        text 'text(:wrap, :border)'
+      }
+      text(:wrap, :border) {
+        layout_data(:fill, :center, true, false) {
+          width_hint 100
+        }
+        text <=> [self, :wrap]
+      }
+
+      label {
+        text 'text(:multi, :border)'
+      }
+      text(:multi, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :multi]
+      }
+    }
+  }
+  
+  def telephone?(text)
+    !!text.match(/^\d{0,3}[-.\/]?\d{0,3}[-.\/]?\d{0,4}$/)
+  end
+end
+
+HelloText.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.27.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -328,6 +328,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_tab.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table/baseball_park.png
+- lib/glimmer-dsl-opal/samples/hello/hello_text.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_world.rb
 - lib/glimmer-dsl-opal/samples/hello/images/denmark.png
 - lib/glimmer-dsl-opal/samples/hello/images/finland.png