atome 0.5.7.1.8 → 0.5.7.3.1

data/lib/renderers/html/html.rb

@@ -219,7 +219,6 @@ class HTML
       particles_from_style[key.to_sym] = value if key && value
     end
 
-
     particles_found = particles_found.merge(particles_from_style)
     current_atome = grab(@id)
     usr_bloc.call(particles_found)
@@ -735,7 +734,7 @@ class HTML
   end
 
   def drag_remove(option)
-
+    @draggable = nil
     interact = JS.eval("return interact('##{@id}')")
 
     case option
@@ -745,8 +744,9 @@ class HTML
       @drag_end = ''
     when :move
       interact.draggable(false)
-      interact.unset
+      # interact.unset
       @drag_move = nil
+
     when :locked
       @drag_locked = ''
     when :restrict
@@ -759,7 +759,7 @@ class HTML
       @drag_restrict = ''
       @drag_move = nil
       interact.draggable(false)
-      interact.unset
+      # interact.unset
     end
 
   end
@@ -772,7 +772,7 @@ class HTML
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @drag_start.call(event) if @drag_start.is_a?(Proc)
+      @drag_start.call(event) if event_validation(@drag_start)
     end
   end
 
@@ -784,38 +784,43 @@ class HTML
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @drag_end.call(event) if @drag_end.is_a?(Proc)
+      @drag_end.call(event) if event_validation(@drag_end)
     end
   end
 
   def drag_move(_option)
-
+    # the condition below prevent drag accumulation
     interact = JS.eval("return interact('##{@id}')")
-    # interact.draggable(false)
 
-    interact.draggable({
-                         drag: true,
-                         inertia: { resistance: 12,
-                                    minSpeed: 200,
-                                    endSpeed: 100 },
-                       })
+    unless @draggable
+      interact.draggable({
+                           drag: true,
+                           inertia: { resistance: 12,
+                                      minSpeed: 200,
+                                      endSpeed: 100 },
+                         })
+      @drag_move = @original_atome.instance_variable_get('@drag_code')[:move]
+      unless @first_drag
+        interact.on('dragmove') do |native_event|
+          # the use of Native is only for Opal (look at lib/platform_specific/atome_wasm_extensions.rb for more infos)
+          event = Native(native_event)
+          # we use .call instead of instance_eval because instance_eval bring the current object as context
+          # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+          # group etc..
+          @drag_move.call(event) if event_validation(@drag_move)
+          Universe.allow_tool_operations = false
+          dx = event[:dx]
+          dy = event[:dy]
+          x = (@original_atome.left || 0) + dx.to_f
+          y = (@original_atome.top || 0) + dy.to_f
+          @original_atome.left(x)
+          @original_atome.top(y)
+        end
 
-    @drag_move = @original_atome.instance_variable_get('@drag_code')[:move]
-    interact.on('dragmove') do |native_event|
-      # the use of Native is only for Opal (look at lib/platform_specific/atome_wasm_extensions.rb for more infos)
-      event = Native(native_event)
-      # we use .call instead of instance_eval because instance_eval bring the current object as context
-      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-      # group etc..
-      @drag_move.call(event) if @drag_move.is_a?(Proc)
-      Universe.allow_tool_operations = false
-      dx = event[:dx]
-      dy = event[:dy]
-      x = (@original_atome.left || 0) + dx.to_f
-      y = (@original_atome.top || 0) + dy.to_f
-      @original_atome.left(x)
-      @original_atome.top(y)
+      end
     end
+    @first_drag = true
+    @draggable = true
   end
 
   def drag_restrict(option)
@@ -866,7 +871,7 @@ class HTML
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @drag_move.call(event) if @drag_move.is_a?(Proc)
+      @drag_move.call(event) if event_validation(@drag_move)
       dx = event[:dx]
       dy = event[:dy]
       x = (@original_atome.left || 0) + dx.to_f
@@ -893,7 +898,7 @@ class HTML
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @drag_lock.call(event) if @drag_lock.is_a?(Proc)
+      @drag_lock.call(event) if event_validation(@drag_lock)
     end
   end
 
@@ -904,7 +909,7 @@ class HTML
     # we use .call instead of instance_eval because instance_eval bring the current object as context
     # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
     # group etc..
-    bloc.call({ source: draggable_element, destination: dropzone_element }) if bloc.is_a?(Proc)
+    bloc.call({ source: draggable_element, destination: dropzone_element }) if event_validation(bloc)
   end
 
   def drop_activate(_option)
@@ -915,7 +920,7 @@ class HTML
                         accept: nil, # Accept any element
                         overlap: 0.75,
                         ondropactivate: lambda do |native_event|
-                          drop_action(native_event, @drop_activate)
+                          drop_action(native_event, @drop_activate) if event_validation(@drop_activate)
                         end
                       })
   end
@@ -928,7 +933,7 @@ class HTML
                         # overlap: 0.75,
                         # FIXME : remove because os an opal bug since 1.8 reactivate when opal will be debbuged
                         ondropdeactivate: lambda do |native_event|
-                          drop_action(native_event, @drop_deactivate)
+                          drop_action(native_event, @drop_deactivate) if event_validation(@drop_deactivate)
                         end
                       })
   end
@@ -941,7 +946,7 @@ class HTML
                         overlap: 0.75,
                         # FIXME : remove because os an opal bug since 1.8 reactivate when opal will be debbuged
                         ondrop: lambda do |native_event|
-                          drop_action(native_event, @drop_dropped)
+                          drop_action(native_event, @drop_dropped) if event_validation(@drop_dropped)
                         end
                       })
   end
@@ -956,7 +961,7 @@ class HTML
                         overlap: 0.001,
                         # FIXME : remove because os an opal bug since 1.8 reactivate when opal will be debbuged
                         ondragenter: lambda do |native_event|
-                          drop_action(native_event, @drop_enter)
+                          drop_action(native_event, @drop_enter) if event_validation(@drop_enter)
                         end
                       })
   end
@@ -970,7 +975,7 @@ class HTML
                         # overlap: 0.75,
                         # FIXME : remove because os an opal bug since 1.8 reactivate when opal will be debbuged
                         ondragleave: lambda do |native_event|
-                          drop_action(native_event, @drop_leave)
+                          drop_action(native_event, @drop_leave) if event_validation(@drop_enter)
                         end
                       })
 
@@ -990,8 +995,8 @@ class HTML
       @drop_leave = ''
     else
       # to remove all interact event ( touch, drag, scale, ... uncomment below)
-      interact = JS.eval("return interact('##{@id}')")
-      interact.unset
+      # interact = JS.eval("return interact('##{@id}')")
+      # interact.unset
       @drop_activate = ''
       @drop_deactivate = ''
       @drop_dropped = ''
@@ -1025,7 +1030,7 @@ class HTML
                                # we use .call instead of instance_eval because instance_eval bring the current object as context
                                # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
                                # group etc..
-                               @resize.call(event) if @resize.is_a?(Proc)
+                               @resize.call(event) if event_validation(@resize)
                                x = (@element[:offsetLeft].to_i || 0)
                                y = (@element[:offsetTop].to_i || 0)
                                width = event[:rect][:width]
@@ -1055,7 +1060,7 @@ class HTML
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @overflow.call({ left: scroll_left, top: scroll_top }) if @overflow.is_a?(Proc)
+      @overflow.call({ left: scroll_left, top: scroll_top }) if event_validation(@overflow)
     end)
   end
 
@@ -1064,12 +1069,11 @@ class HTML
     @over_over = @original_atome.over_code[:over]
     interact.on('mouseover') do |native_event|
       JS.global[:myRubyMouseOverCallback] = Proc.new { @original_atome.over_code[:over].call }
-      JS.eval("document.querySelector('##{@id}').addEventListener('mouseleave', myRubyMouseOverCallback);")
       event = Native(native_event)
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @over_over.call(event) if @over_over.is_a?(Proc)
+      @over_over.call(event) if event_validation(@over_over)
     end
   end
 
@@ -1081,21 +1085,23 @@ class HTML
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @over_enter.call(event) if @over_enter.is_a?(Proc)
+      @over_enter.call(event) if event_validation(@over_enter)
     end
     @element.addEventListener('mouseenter', @over_enter_callback)
 
   end
 
   def over_leave(_option)
+
     @over_leave = @original_atome.instance_variable_get('@over_code')[:leave]
     return unless @over_leave
 
     @over_leave_callback = lambda do |event|
+
       # we use .call instead of instance_eval because instance_eval bring the current object as context
       # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      @over_leave.call(event) if @over_leave.is_a?(Proc)
+      @over_leave.call(event) if event_validation(@over_leave)
     end
     @element.addEventListener('mouseleave', @over_leave_callback)
 
@@ -1133,71 +1139,78 @@ class HTML
 
   def touch_down(_option)
     @element[:style][:cursor] = 'pointer'
-
     @touch_down = @original_atome.instance_variable_get('@touch_code')[:down]
     interact = JS.eval("return interact('##{@id}')")
-    unless @touch_removed[:down]
-      interact.on('down') do |native_event|
-        event = Native(native_event)
-        # we use .call instead of instance_eval because instance_eval bring the current object as context
-        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-        # group etc..
-        # unless Universe.edit_mode == true
-        # @touch_down.call(event) if @touch_down.is_a?(Proc)  && (!Universe.edit_mode || @original_atome.tag[:system])
-        @touch_down.call(event) if event_validation(@touch_down)
-        # end
-      end
+    # unless @touch_removed[:down]
+    interact.on('down') do |native_event|
+      event = Native(native_event)
+      # we use .call instead of instance_eval because instance_eval bring the current object as context
+      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+      # group etc..
+      # @touch_down.call(event) if @touch_down.is_a?(Proc)  && (!Universe.edit_mode || @original_atome.tag[:system])
+      @touch_down.call(event) if event_validation(@touch_down)
+      # end
+      # end
     end
   end
 
   def touch_tap(_option)
     @element[:style][:cursor] = 'pointer'
     interact = JS.eval("return interact('##{@id}')")
-    touch_tap = @original_atome.instance_variable_get('@touch_code')[:tap]
+    @touch_tap = @original_atome.instance_variable_get('@touch_code')[:tap]
     # unless @touch_removed[:tap]
     interact.on('tap') do |native_event|
+
       event = Native(native_event)
       # we use .call instead of instance_eval because instance_eval bring the current object as context
-      # and it's lead to a problem of context and force the use of grab(:view) when using atome method such as shape ,
+      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
       # group etc..
-      # @touch_tap.call(event) if @touch_tap.is_a?(Proc) && !Universe.edit_mode || !@original_atome.tag[:system]
-      touch_tap.call(event) if event_validation(touch_tap)
+      # @touch_up.call(event) if @touch_up.is_a?(Proc) && (!Universe.edit_mode || @original_atome.tag[:system])
+      # event = Native(native_event)
+      # ########## old code :
+      @touch_tap.call(event) if event_validation(@touch_tap)
+      # ########## new code:
+      # proc_content = @touch_tap.call(event) if event_validation(@touch_tap)
+      # if proc_content.instance_of? Hash
+      #   proc_content.each do |k, v|
+      #     @original_atome.send(k, v)
+      #   end
+      # end
     end
     # end
-
   end
 
   def touch_up(_option)
     @element[:style][:cursor] = 'pointer'
     interact = JS.eval("return interact('##{@id}')")
     @touch_up = @original_atome.instance_variable_get('@touch_code')[:up]
-    unless @touch_removed[:up]
-      interact.on('up') do |native_event|
-        event = Native(native_event)
-        # we use .call instead of instance_eval because instance_eval bring the current object as context
-        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-        # group etc..
-        # @touch_up.call(event) if @touch_up.is_a?(Proc) && (!Universe.edit_mode || @original_atome.tag[:system])
-        @touch_up.call(event) if event_validation(@touch_up)
-      end
-
+    # unless @touch_removed[:up]
+    interact.on('up') do |native_event|
+      event = Native(native_event)
+      # we use .call instead of instance_eval because instance_eval bring the current object as context
+      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+      # group etc..
+      # @touch_up.call(event) if @touch_up.is_a?(Proc) && (!Universe.edit_mode || @original_atome.tag[:system])
+      @touch_up.call(event) if event_validation(@touch_up)
     end
+
+    # end
   end
 
   def touch_double(_option)
     @element[:style][:cursor] = 'pointer'
     interact = JS.eval("return interact('##{@id}')")
     @touch_double = @original_atome.instance_variable_get('@touch_code')[:double]
-    unless @touch_removed[:double]
-      interact.on('doubletap') do |native_event|
-        event = Native(native_event)
-        # we use .call instead of instance_eval because instance_eval bring the current object as context
-        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-        # group etc..
-        # @touch_double.call(event) if @touch_double.is_a?(Proc) && (!Universe.edit_mode || @original_atome.tag[:system])
-        @touch_double.call(event) if event_validation(@touch_double)
+    # unless @touch_removed[:double]
+    interact.on('doubletap') do |native_event|
+      event = Native(native_event)
+      # we use .call instead of instance_eval because instance_eval bring the current object as context
+      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+      # group etc..
+      # @touch_double.call(event) if @touch_double.is_a?(Proc) && (!Universe.edit_mode || @original_atome.tag[:system])
+      @touch_double.call(event) if event_validation(@touch_double)
 
-      end
+      # end
     end
 
   end
@@ -1206,18 +1219,18 @@ class HTML
     @element[:style][:cursor] = 'pointer'
     @touch_long = @original_atome.instance_variable_get('@touch_code')[:long]
     interact = JS.eval("return interact('##{@id}')")
-    unless @touch_removed[:long]
-      interact.on('hold') do |native_event|
-        event = Native(native_event)
-        # we use .call instead of instance_eval because instance_eval bring the current object as context
-        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-        # group etc..
-        @touch_long.call(event) if event_validation(@touch_long)
-        # @touch_long.call(event) if @touch_long.is_a?(Proc) && (!Universe.edit_mode || @original_atome.tag[:system])
-        # @touch_double.call(event) if event_validation(@touch_double)
+    # unless @touch_removed[:long]
+    interact.on('hold') do |native_event|
+      event = Native(native_event)
+      # we use .call instead of instance_eval because instance_eval bring the current object as context
+      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+      # group etc..
+      @touch_long.call(event) if event_validation(@touch_long)
+      # @touch_long.call(event) if @touch_long.is_a?(Proc) && (!Universe.edit_mode || @original_atome.tag[:system])
+      # @touch_double.call(event) if event_validation(@touch_double)
 
-      end
     end
+    # end
   end
 
   def touch_remove(option)
@@ -1235,27 +1248,20 @@ class HTML
     when :tap
       @touch_removed[:tap] = true
       @touch_tap = ''
+      @touch_removed[:touch] = true
+      @touch_touch = ''
+    when :touch
+      @touch_removed[:tap] = true
+      @touch_tap = ''
+      @touch_removed[:touch] = true
+      @touch_touch = ''
     when :up
       @touch_removed[:up] = true
       @touch_up = ''
     else
-      interact = JS.eval("return interact('##{@id}')")
-      interact.unset
-      # @original_atome.instance_variable_set('@touch_code')
-      @original_atome.instance_variable_set('@touch_code', nil)
-      # @touch_removed[:double] = true
-      # @touch_removed[:down] = true
-      # @touch_removed[:long] = true
-      # @touch_removed[:tap] = true
-      # @touch_removed[:up] = true
-      # @touch_double = ''
-      # @touch_down = ''
-      # @touch_long = ''
-      # @touch_tap = ''
-      # @touch_up = ''
-      # to remove all interact event ( touch, drag, scale, ... uncomment below)
       # interact = JS.eval("return interact('##{@id}')")
       # interact.unset
+      @original_atome.instance_variable_set('@touch_code', nil)
     end
 
   end
@@ -1303,14 +1309,13 @@ class HTML
     end
   end
 
-
   # animation below
   def animate(animation_properties)
-    prop= animation_properties[:particle]
-    command = <<~JS 
+    prop = animation_properties[:particle]
+    command = <<~JS
                 var target_div = document.getElementById('#{@id}');
                 window.currentAnimation = popmotion.animate({
-                  from: #{animation_properties[ :from]},
+                  from: #{animation_properties[:from]},
                   to: #{animation_properties[:to]},
                   duration: #{animation_properties[:duration]},
                   onUpdate: function(v) {
@@ -1326,8 +1331,6 @@ class HTML
     JS.eval(command)
   end
 
-
-
   def stop_animation
     JS.eval('if (window.currentAnimation) window.currentAnimation.stop();')
   end

data/vendor/assets/application/examples/delete.rb

@@ -4,6 +4,7 @@ b = box()
 b.text('click me')
 orange=''
 b.touch(true) do
+
   c = grab(:view).circle({id: :circling, left: 222, color: :orange, blur: 1.9 })
   orange=c.box({id: :boxing,color: {id: :orange_col, red: 1, blue: 0.2 }, width: 33, height: 33, left: 123})
   orange.shadow({
@@ -23,10 +24,14 @@ b.touch(true) do
     end
   end
 
-  c.touch(true) do
-    c.delete({ recursive: true })
+  c.touch(:down) do
+    puts '1?'
+    grab(:circling).delete({ recursive: true }) if grab(:circling)
   end
   # alert orange.apply
+  wait 4 do
+    grab(:circling).delete({ recursive: true })if grab(:circling)
+  end
 end
 
 

data/vendor/assets/application/examples/drag.rb

@@ -1,4 +1,5 @@
 #  frozen_string_literal: true
+
 a=box({width: 666, height: 777, color: :orange})
 b = box({ left: 666, color: :blue, smooth: 6, id: :the_box2, depth: 1 , top: 66})
 cc=circle({color: :red, left: 0, top: 0})
@@ -16,8 +17,6 @@ b.drag(:stop) do
   clone.delete(true)
 end
 
-
-
 b.drag(:locked) do |event|
   dx = event[:dx]
   dy = event[:dy]
@@ -29,7 +28,6 @@ b.drag(:locked) do |event|
   puts "y: #{y}"
 end
 cc.drag({ restrict: {max:{ left: 240, top: 190}} }) do |event|
-
 end
 
 

data/vendor/assets/application/examples/remove.rb

@@ -1,60 +1,70 @@
 # frozen_string_literal: true
 
-b = box({ top: 166 , id: :the_box, left: 333})
-b.color({id: :new_col, red: 1})
-b.color({id: :other_col,  green: 1})
-# b.paint({gradient: [:other_col, :new_col]})
-color({id: :last_col,  green: 0.3, blue: 0.5})
-color({id: :last_col2,  red: 1, blue: 0.5})
+b = box({ top: 166, id: :the_box, left: 333 })
+b.color({ id: :new_col, red: 1 })
 
-b.shadow({
-           id: :s1,
-           # affect: [:the_circle],
-           left: 9, top: 3, blur: 9,
-           invert: false,
-           red: 0, green: 0, blue: 0, alpha: 1
-         })
-
-
-wait 1 do
-  b.remove(:other_col)
-  wait 1 do
-    b.remove(:new_col)
-    wait 1 do
-      b.remove(:box_color)
-
-      wait 1 do
-        b.apply(:last_col)
-        wait 1 do
-          b.apply(:last_col2)
-          b.remove(:s1)
-        end
-      end
-    end
-  end
-end
 b.touch(true) do
-  b.shadow({
-             id: :s1,
-             # affect: [:the_circle],
-             left: 9, top: 3, blur: 9,
-             invert: false,
-             red: 0, green: 0, blue: 0, alpha: 1
-           })
+  # alert b.color
+  b.remove(:box_color)
 
-  puts "before => #{b.apply}"
-  b.remove({all: :color})
-  puts "after => #{b.apply}"
+  # alert b.color
   wait 1 do
-    b.paint({id: :the_gradient_1,gradient: [:box_color, :circle_color]})
-    b.paint({id: :the_gradient,gradient: [:other_col, :new_col]})
-    wait 1 do
-      b.remove(:the_gradient)
-      wait 1 do
-        b.remove(all: :shadow)
-        b.color(:cyan)
-      end
-    end
+    grab('box_color').red(1)
   end
 end
-
+# b.color({id: :other_col,  green: 1})
+# # b.paint({gradient: [:other_col, :new_col]})
+# color({id: :last_col,  green: 0.3, blue: 0.5})
+# color({id: :last_col2,  red: 1, blue: 0.5})
+#
+# b.shadow({
+#            id: :s1,
+#            # affect: [:the_circle],
+#            left: 9, top: 3, blur: 9,
+#            invert: false,
+#            red: 0, green: 0, blue: 0, alpha: 1
+#          })
+#
+#
+# wait 1 do
+#   b.remove(:other_col)
+#   wait 1 do
+#     b.remove(:new_col)
+#     wait 1 do
+#       b.remove(:box_color)
+#
+#       wait 1 do
+#         b.apply(:last_col)
+#         wait 1 do
+#           b.apply(:last_col2)
+#           b.remove(:s1)
+#         end
+#       end
+#     end
+#   end
+# end
+# b.touch(true) do
+#   b.shadow({
+#              id: :s1,
+#              # affect: [:the_circle],
+#              left: 9, top: 3, blur: 9,
+#              invert: false,
+#              red: 0, green: 0, blue: 0, alpha: 1
+#            })
+#
+#   puts "before => #{b.apply}"
+#   b.remove({all: :color})
+#   puts "after => #{b.apply}"
+#   wait 1 do
+#     b.paint({id: :the_gradient_1,gradient: [:box_color, :circle_color]})
+#     b.paint({id: :the_gradient,gradient: [:other_col, :new_col]})
+#     wait 1 do
+#       b.remove(:the_gradient)
+#       wait 1 do
+#         b.remove(all: :shadow)
+#         b.color(:cyan)
+#       end
+#     end
+#   end
+# end
+#