atome 0.5.7.4.2 → 0.5.7.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c766c7eb85bcd7a3de7dda8058e641e6353e4be8f0813326c4626affd3254e1
-  data.tar.gz: '079339808511cf96b9e393897a9c58e35d7b4ad964916f8392dc9e636fa65b52'
+  metadata.gz: 9b3bf5cffbab20505060476da1e5f3938270c7a612d6961828860c3fd2682797
+  data.tar.gz: 6b143b8651c8db90424383494ed5b5ce1d3a211381b42404eb97bfd846a872b9
 SHA512:
-  metadata.gz: 778782a81a4f6b55e11afd04e0d4c16506156eda4861a3bb615c326ce1b4d0949229b9740afbc31c291a77de97957e084b516dd3cd560c42ada9e3f6e25bcaea
-  data.tar.gz: 34f16f5b2446434aedc38490ad0726d9170d8d191109e6e2671f05ff88e5269005657b849190aa88c926a1fd1ce1952626cc3fd5e7e4c5657cede5d0e897a670
+  metadata.gz: 9e9d0eebf35dfde29462e19885d4bcb1eccb285eeb0e808381171028e94967d17e9f21c130053b34d31fdc59143c80808a28cf102520cc5cfb14e7c569961d33
+  data.tar.gz: bf0e01e0a8f0ea7ae821b896fb78e807f4d00848b452f827ebd3d0fb1a07b08b9542b02a87b0c498569f002edc4fca1cdab297c91fd57f974bdb1a4daa4cc119

data/lib/atome/extensions/atome.rb

@@ -69,6 +69,17 @@ end
 class Object
   include ObjectExtension
 
+
+  def remove_key_pair_but(hash, keys_to_keep)
+    hash.dup.delete_if do |key, value|
+      key.is_a?(Integer) && key.even? && !keys_to_keep.include?(key)
+    end.reject { |key, value| keys_to_keep.include?(key) }
+  end
+
+  def filter_keys_to_keep(hash, keys_to_keep)
+    hash.select { |key, value| keys_to_keep.include?(key) }
+  end
+
   def deep_copy(obj)
     # utility for buttons
     case obj
@@ -768,4 +779,6 @@ class CssProxy
     parsed = JSON.parse(msg)
     bloc.call(parsed)
   end
+
+
 end

data/lib/atome/version.rb

@@ -3,5 +3,5 @@
 #  return atome version
 
 class Atome
-  VERSION = '0.5.7.4.2'
+  VERSION = '0.5.7.4.3'
 end

data/lib/molecules/intuition/utilities.rb

@@ -20,6 +20,18 @@ class Atome
     end
   end
 
+  def reorder_blocs
+    @prev_bloc_height = 0
+    fasten.each do |bloc_f|
+      potential_bloc = grab(bloc_f)
+      spacing = potential_bloc.spacing
+      if potential_bloc.role && potential_bloc.role.include?(:block)
+        potential_bloc.top(spacing + @prev_bloc_height)
+        @prev_bloc_height = @prev_bloc_height + potential_bloc.height + spacing
+      end
+    end
+  end
+
   def remove_menu_item(item_to_remove)
     grab(item_to_remove).delete(recursive: true)
     reorder_menu
@@ -493,6 +505,8 @@ new(molecule: :application) do |params, &bloc|
 
   menu = buttons({
                    id: "#{id_f}_menu",
+                   # left: 66,
+                   depth: 9999,
                    attach: id_f,
                    inactive: { text: { color: :gray }, width: 66, height: 12, spacing: 3, disposition: :horizontal,
                                color: :orange, margin: { left: 33, top: 12 } },
@@ -507,6 +521,7 @@ new(molecule: :application) do |params, &bloc|
 
   main_app.define_singleton_method(:insert) do |bloc_to_add|
     bloc_to_add.each do |page_id, params_f|
+
       params_f.each do |block_id, block_content|
         @pages[page_id][:blocks] ||= {}
         @pages[page_id][:blocks][block_id.to_sym] = block_content
@@ -517,8 +532,11 @@ new(molecule: :application) do |params, &bloc|
 
   end
   main_app.define_singleton_method(:extract) do |bloc_to_extract|
-    bloc_to_extract.each do |page_id, block_id|
-      @blocks[page_id].delete(block_id)
+
+      bloc_to_extract.each do |page_id, block_id|
+        grab(block_id).delete({ recursive: true })
+        @blocks[page_id].delete(block_id)
+        grab(page_id).reorder_blocs
     end
 
   end
@@ -583,10 +601,23 @@ new(molecule: :show) do |page_id, &bloc|
   # now looking for associated blocks
   blocks_found = params[:blocks]
   @prev_bloc_height = 0
-  blocks_found&.each_with_index do |(bloc_id, bloc_content), index|
+  blocks_found&.each do |bloc_id, bloc_content|
+
+    new_bloc = new_page.box({ id: bloc_id, role: :block, width: '100%', height: 99, top: spacing + @prev_bloc_height, bottom: 0, left: 0, right: 0, spacing: spacing })
+
+    new_bloc.define_singleton_method(:subs) do |sub_params|
+      @prev_sub_width = 0
+      sub_params.each do |sub_id, sub_content|
+        sub_created = new_bloc.box({ id: sub_id, height: '100%', left: @prev_sub_width })
+        sub_created.set(sub_content)
+        @prev_sub_width = @prev_sub_width + sub_created.to_px(:width) + spacing
+        sub_created.width(sub_created.to_percent(:width))
+        sub_created.left(sub_created.to_percent(:left))
+      end
 
-    new_bloc = new_page.box({ id: bloc_id, width: '100%', height: 99, top: spacing + @prev_bloc_height, bottom: 0, left: 0, right: 0 })
+    end
     new_bloc.set(bloc_content)
+
     @prev_bloc_height = @prev_bloc_height + new_bloc.height + spacing
   end
 
@@ -595,25 +626,25 @@ new(molecule: :show) do |page_id, &bloc|
 
   new_page.set(particles_to_apply)
   if footer
-    new_footer = box({ left: 0, depth: -1, right: 0, width: :auto, top: :auto, bottom: 0, height: basic_size, category: :footer, id: "#{id_f}_footer" })
+    new_footer = box({ left: 0, depth: 999, right: 0, width: :auto, top: :auto, bottom: 0, height: basic_size, category: :footer, id: "#{id_f}_footer" })
     new_footer.remove(:box_color)
     new_footer.set(footer)
   end
 
   if header
-    new_header = box({ left: 0, right: 0, depth: -1, width: :auto, top: 0, height: basic_size, category: :header, id: "#{id_f}_header" })
+    new_header = box({ left: 0, right: 0, depth: 999, width: :auto, top: 0, height: basic_size, category: :header, id: "#{id_f}_header" })
     new_header.remove(:box_color)
     new_header.set(header)
   end
 
   if right_side_bar
-    new_right_side_bar = box({ left: :auto, depth: -1, right: 0, width: basic_size, top: 0, bottom: 0, height: :auto, category: :right_side_bar, id: "#{id_f}_right_side_bar" })
+    new_right_side_bar = box({ left: :auto, depth: 999, right: 0, width: basic_size, top: 0, bottom: 0, height: :auto, category: :right_side_bar, id: "#{id_f}_right_side_bar" })
     new_right_side_bar.remove(:box_color)
     new_right_side_bar.set(right_side_bar)
   end
 
   if left_side_bar
-    new_left_side_bar = box({ left: 0, right: :auto, depth: -1, width: basic_size, top: 0, bottom: 0, height: :auto, category: :left_side_bar, id: "#{id_f}_left_side_bar" })
+    new_left_side_bar = box({ left: 0, right: :auto, depth: 999, width: basic_size, top: 0, bottom: 0, height: :auto, category: :left_side_bar, id: "#{id_f}_left_side_bar" })
     new_left_side_bar.remove(:box_color)
     new_left_side_bar.set(left_side_bar)
   end
@@ -646,13 +677,22 @@ new(molecule: :show) do |page_id, &bloc|
   main_page
 end
 
+
+
 new(molecule: :buttons) do |params, &bloc|
+
+  keys_to_keep = [:inactive, :active]
+  remaining_params = remove_key_pair_but(params, keys_to_keep)
+  params = filter_keys_to_keep(params, keys_to_keep)
+
   role_f = params.delete(:role)
   actor_f = params.delete(:actor)
   params_saf = deep_copy(params)
-  context = params.delete(:attach) || :view
-  id_f = params.delete(:id) || identity_generator
+  context = remaining_params.delete(:attach) || :view
+  id_f = remaining_params.delete(:id) || identity_generator
   main = grab(context).box({ id: id_f })
+  main.set(remaining_params)
+
   main.role(role_f) || main.role(:buttons)
   main.actor(actor_f) if actor_f
   main.color({ blue: 0.5, red: 1, green: 1, alpha: 0 })

data/lib/renderers/html/atome_html.rb

@@ -19,4 +19,20 @@ class Atome
     JS
     JS.eval(ruby_wasm_code).to_f
   end
+
+  def to_percent(property)
+    parent = grab(attach)
+    parent_width = parent.to_px(:width)
+    parent_height = parent.to_px(:height)
+    property_needed_px = to_px(property)
+    case property
+    when :width, :left
+      "#{(property_needed_px / parent_width.to_f) * 100}%"
+    when :height, :top
+      "#{(property_needed_px / parent_height.to_f) * 100}%"
+    else
+      raise ArgumentError # unsupported property use left , top, width an height
+    end
+  end
+
 end

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

@@ -56,14 +56,19 @@ puts   " menus_found => #{menus_found}"
 
 bloc_to_add= {height: 156, color: :green}
 bloc_to_add2= {height: 99, color: :blue}
-bloc_to_add3= {height: 333, color: :orange}
+bloc_to_add3= {height: 333, color: :orange, subs:{contact: {width: '33%'}, project: {width: '33%'}, calendar: {width: '33%'}}}
  a.insert({page3: {block1: bloc_to_add , block2: bloc_to_add2, block3: bloc_to_add3}})
-puts   " blocks => #{a.blocks}"
-wait 3 do
+
+
+wait 1 do
   # how to remove blocks
    a.extract({page3: :block1})
 end
 
 a.show(:page3)
+# how access blocks
+# wait 3 do
+#   grab(:block2).color(:black)
+# end
 
 

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+
+
+view_width = parent_found.to_px(:width)
+view_height = parent_found.to_px(:height)
+
+
+text({data: "view width in px : #{view_width}, height: #{view_height}" })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.7.4.2
+  version: 0.5.7.4.3
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -656,6 +656,7 @@ files:
 - vendor/assets/application/examples/text.rb
 - vendor/assets/application/examples/text_align.rb
 - vendor/assets/application/examples/tick.rb
+- vendor/assets/application/examples/to_px.rb
 - vendor/assets/application/examples/tools.rb
 - vendor/assets/application/examples/touch.rb
 - vendor/assets/application/examples/type_mutation.rb