hokusai-zero 0.1.4 → 0.1.6

data/ui/src/hokusai/node_mounter.rb

@@ -13,7 +13,7 @@ module Hokusai
       @primary_stack = []
 
       node.ast.children.each_with_index do |child, index|
-        primary_stack << Mounting::MountEntry.new(index, child, root, root, previous_target || root)
+        primary_stack << Mounting::MountEntry.new(index, child, root, root, previous_target || root, providers: root.providers)
       end
     end
 
@@ -78,7 +78,7 @@ module Hokusai
 
           entry.ast.children.each_with_index do |child, child_index|
             child.has_if_condition?
-            items << Mounting::MountEntry.new(child_index, child, child_block, entry.parent, entry.target, context: entry.ctx)
+            items << Mounting::MountEntry.new(child_index, child, child_block, entry.parent, entry.target, context: entry.ctx, providers: entry.providers.merge(child_block.providers))
           end
 
           secondary_stack.unshift items
@@ -88,7 +88,7 @@ module Hokusai
           primary_items = []
 
           child_block.node.ast.children.each_with_index do |child, child_index|
-            primary_items << Mounting::MountEntry.new(child_index, child, child_block, child_block, context: entry.ctx)
+            primary_items << Mounting::MountEntry.new(child_index, child, child_block, child_block, context: entry.ctx, providers: entry.providers.merge(child_block.providers))
           end
 
           self.primary_stack = primary_items + primary_stack

data/ui/src/hokusai/painter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "./event"
+require "colorize"
 
 module Hokusai
   class PainterEntry
@@ -22,6 +23,9 @@ module Hokusai
     end
   end
 
+  ZTARGET_ROOT = "root"
+  ZTARGET_PARENT = "parent"
+
   class Painter
     attr_reader :root, :input, :before_render, :after_render,
                 :events
@@ -52,17 +56,36 @@ module Hokusai
       @after_render = block
     end
 
+    # def debug(parent, children)
+    #   @i ||= 0
+      
+    #   pp [
+    #     "#{@i}",
+    #     "parent: #{parent.block.class}##{parent.block.node.portal&.ast&.id} (z: #{parent.block.node.meta.get_prop(:z)})",
+    #     "children: #{children.map {|c| "#{c.block.class}##{c.block.node.portal&.ast&.id} (z: #{c.block.node.meta.get_prop(:z)})"} }"
+    #   ]
+    #   @i += 1
+    # end
+
     # @return [Array(Commands::Base)] the command list
     def render(canvas, resize = false, capture: true)
       return if root.children.empty?
 
+      zindexed = {}
+      zindex_counter = 0
+      zroot_x = canvas.x
+      zroot_y = canvas.y
+      zroot_w = canvas.width
+      zroot_h = canvas.height
+
       @root.on_resize(canvas) if resize
 
       before_render&.call([root, nil], canvas, input)
 
       root_children = (canvas.reverse? ? root.children?&.reverse.dup : root.children?&.dup) || []
       groups = []
-      groups << [root, measure(root_children, canvas)]
+      root_entry = PainterEntry.new(root, canvas.x, canvas.y, canvas.width, canvas.height)
+      groups << [root_entry, measure(root_children, canvas)]
 
       mouse_y = input.mouse.pos[:y]
       can_capture = mouse_y >= (canvas.y || 0.0) && mouse_y <= (canvas.y || 0.0) + canvas.height
@@ -71,9 +94,25 @@ module Hokusai
 
       while payload = groups.pop
         group_parent, group_children = payload
+        
+        parent_z = group_parent.block.node.meta.get_prop(:z)&.to_i
+        zindex_counter -= 1 if (parent_z || 0) > 0 && group_children.empty?
 
         while group = group_children.shift
-          canvas.reset(group.x, group.y, group.w, group.h)
+          z = group.block.node.meta.get_prop(:z)&.to_i || 0
+          ztarget = group.block.node.meta.get_prop(:ztarget)
+          entry = PainterEntry.new(group.block, group.x, group.y, group.w, group.h)
+
+          if (zindex_counter > 0 || z > 0)
+            case ztarget
+            when ZTARGET_ROOT
+              entry = PainterEntry.new(group.block, zroot_x || 0.0, zroot_y || 0.0, zroot_w, zroot_h).freeze
+            when ZTARGET_PARENT
+              entry = PainterEntry.new(group.block, group_parent.x || 0.0, group_parent.y || 0.0, group_parent.w, group_parent.h).freeze
+            end
+          end
+
+          canvas.reset(entry.x, entry.y, entry.w, entry.h)
 
           before_render&.call([group.block, group.parent], canvas, input.raw)
 
@@ -92,17 +131,36 @@ module Hokusai
 
             unless local_children.nil?
               groups << [group_parent, group_children]
-              groups << [group.block, measure(local_children, local_canvas)]
+              parent = PainterEntry.new(group.block, canvas.x, canvas.y, canvas.width, canvas.height)
+              groups << [parent, measure(local_children, local_canvas)]
+
               breaked = true
             else
               breaked = false
             end
           end
+          
+          if z > 0
+            zindex_counter += 1
+            # puts ["start (#{z}) <#{parent_z}> {#{zindex_counter}} #{group.block.class}".colorize(:blue), z, group.block.node.portal&.ast&.id]
+            zindexed[zindex_counter] ||= []
+            zindexed[zindex_counter] << group.block
+          elsif zindex_counter > 0
+            # puts ["push (#{z}) <#{parent_z}>  {#{zindex_counter}} initial #{group.block.class}".colorize(:red), z, group.block.node.portal&.ast&.id]
+            zindexed[zindex_counter] << group.block
+          else
+            # puts ["draw (#{z}) <#{parent_z}>  {#{zindex_counter}} #{group.block.class}".colorize(:yellow), z, group.block.node.portal&.ast&.id]
+            group.block.execute_draw
+          end
 
           break if breaked
         end
       end
 
+      zindexed.sort.each do |z, blocks|
+        blocks.each(&:execute_draw)
+      end
+
       if capture
         events[:hover].bubble
         events[:wheel].bubble
@@ -132,10 +190,12 @@ module Hokusai
       hsum = 0.0
 
       children.each do |block|
-        # children.each do |block|
+        z = block.node.meta.get_prop?(:z)&.to_i || 0
         h = block.node.meta.get_prop?(:height)&.to_f
         w = block.node.meta.get_prop?(:width)&.to_f
 
+        next if z > 0
+
         if w
           wsum += w
           wcount = wcount.succ
@@ -195,12 +255,11 @@ module Hokusai
         events[:hover].capture(block, canvas)
         events[:click].capture(block, canvas)
         events[:wheel].capture(block, canvas)
-        events[:mousedown].capture(block, canvas)
         events[:mouseup].capture(block, canvas)
+        events[:mousedown].capture(block, canvas)
       else
         events[:mouseout].capture(block, canvas)
       end
-
       events[:mousemove].capture(block, canvas)
 
       if block_is_hovered || block.node.meta.focused

data/ui/src/hokusai/util/clamping_iterator.rb

@@ -15,11 +15,11 @@ module Hokusai::Util
     end
 
     def draw(font_size, boundary, selection: nil)
-      # selection_extract(font_size, boundary, selection: selection)
+      selection_extract(font_size, boundary, selection: selection)
       draw_text(font_size, boundary)
-      # selection_update(selection)
-      # self.start_select = 0.0
-      # self.stop_select = nil
+      selection_update(selection)
+      self.start_select = 0.0
+      self.stop_select = nil
     end
 
     def selection_extract(font_size, boundary, selection: nil)
@@ -165,6 +165,8 @@ module Hokusai::Util
         if start = start_select
           on_selection_change_cb&.call(start, stop_select)
         end
+
+        nil
       end
     ensure
       @i += 1

data/ui/src/hokusai.rb

@@ -1,3 +1,5 @@
+ASSETS_FOLDER = "#{__dir__}/hokusai/assets"
+
 require_relative '../lib/lib_hokusai'
 require_relative './hokusai/error'
 require_relative './hokusai/types'
@@ -34,6 +36,8 @@ require_relative './hokusai/blocks/selectable'
 require_relative './hokusai/blocks/input'
 require_relative './hokusai/blocks/variable'
 require_relative './hokusai/blocks/titlebar/osx'
+require_relative './hokusai/blocks/modal'
+require_relative './hokusai/blocks/dropdown'
 
 require "concurrent"
 
@@ -48,6 +52,19 @@ module Hokusai
     fallback_policy: :caller_runs
   )
 
+  SHADER_UNIFORM_FLOAT = 0      # Shader uniform type: float
+  SHADER_UNIFORM_VEC2 = 1       # Shader uniform type: vec2 (2 float)
+  SHADER_UNIFORM_VEC3 = 2       # Shader uniform type: vec3 (3 float)
+  SHADER_UNIFORM_VEC4 = 3       # Shader uniform type: vec4 (4 float)
+  SHADER_UNIFORM_INT = 4        # Shader uniform type: int
+  SHADER_UNIFORM_IVEC2 = 5      # Shader uniform type: ivec2 (2 int)
+  SHADER_UNIFORM_IVEC3 = 6      # Shader uniform type: ivec3 (3 int)
+  SHADER_UNIFORM_IVEC4 = 7      # Shader uniform type: ivec4 (4 int)
+  SHADER_UNIFORM_UINT = 8       # Shader uniform type: unsigned int
+  SHADER_UNIFORM_UIVEC2 = 9     # Shader uniform type: uivec2 (2 unsigned int)
+  SHADER_UNIFORM_UIVEC3 = 10    # Shader uniform type: uivec3 (3 unsigned int)
+  SHADER_UNIFORM_UIVEC4 = 11    # Shader uniform type: uivec4 (4 unsigned int)
+
   # Access the font registry
   #
   # @return [Hokusai::FontRegistry]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hokusai-zero
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - skinnyjames
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,9 @@ files:
 - ui/spec/hokusai_spec.rb
 - ui/spec/spec_helper.rb
 - ui/src/hokusai.rb
+- ui/src/hokusai/assets/arrow-drop-down-line.png
+- ui/src/hokusai/assets/chevron-down.svg
+- ui/src/hokusai/assets/close-large-line.png
 - ui/src/hokusai/ast.rb
 - ui/src/hokusai/automation.rb
 - ui/src/hokusai/automation/client.rb
@@ -224,12 +241,14 @@ files:
 - ui/src/hokusai/blocks/circle.rb
 - ui/src/hokusai/blocks/clipped.rb
 - ui/src/hokusai/blocks/cursor.rb
+- ui/src/hokusai/blocks/dropdown.rb
 - ui/src/hokusai/blocks/dynamic.rb
 - ui/src/hokusai/blocks/empty.rb
 - ui/src/hokusai/blocks/hblock.rb
 - ui/src/hokusai/blocks/image.rb
 - ui/src/hokusai/blocks/input.rb
 - ui/src/hokusai/blocks/label.rb
+- ui/src/hokusai/blocks/modal.rb
 - ui/src/hokusai/blocks/panel.rb
 - ui/src/hokusai/blocks/rect.rb
 - ui/src/hokusai/blocks/scissor_begin.rb