Not quite working

Author: andreamancuso

main.rb

@@ -94,60 +94,13 @@
 font_defs_json = JSON.pretty_generate(defs: font_size_pairs)
 theme_json = JSON.pretty_generate(theme2)
 
-class Node
-  attr_accessor :id, :root
-
-  def initialize(id, root)
-    @type = 'node'
-    @id = id
-    @root = root
-  end
-
-  def to_json(*options)
-    {
-      type: @type,
-      id: @id,
-      root: @root
-    }.to_json(*options)
-  end
-end
-
-class UnformattedText
-  attr_accessor :id, :text
-
-  def initialize(id, text)
-    @type = 'unformatted-text'
-    @id = id
-    @text = text
-  end
-
-  def to_json(*options)
-    {
-      type: @type,
-      id: @id,
-      text: @text
-    }.to_json(*options)
-  end
-end
-
 service = WidgetRegistrationService.new
 shadow_node_traversal_helper = ShadowNodeTraversalHelper.new(service)
 
 on_init = FFI::Function.new(:void, []) do
-  # Create an Async task using concurrent-ruby's Async
-  # Concurrent::Async.perform do
-    # Thread.main do
-      puts "OnInit called!"
+    root = Root.new()
 
-      root = Root.new()
-
-      puts "After root creation"
-
-      shadow_node_traversal_helper.traverse_tree(root)
-
-      puts "After tree"
-    # end
-  # end
+    shadow_node_traversal_helper.traverse_tree(root)
 end
 
 on_text_changed = FFI::Function.new(:void, [:int, :string]) do |id, text|
@@ -172,6 +125,8 @@ def to_json(*options)
 end
 
 on_click = FFI::Function.new(:void, [:int]) do |id|
+  service.dispatch_on_click_event(id)
+
   puts "Button clicked: ID=#{id}"
 end
 

sampleapp.rb

@@ -25,16 +25,17 @@ def initialize(todo_text, todo_items)
 $sample_app_state = Rx::BehaviorSubject.new(AppState.new("", []))
 
 def on_click
-  new_todo_item = TodoItem.new("New Todo", false)
-
-  current_state = $sample_app_state.value
-
-  new_state = AppState.new(
-    current_state.todo_text,
-    current_state.todo_items + [new_todo_item]
-  )
+  promise = Concurrent::Promise.execute do
+    new_todo_item = TodoItem.new("New Todo", false)
+    current_state = $sample_app_state.value
+    new_state = AppState.new(
+      current_state.todo_text,
+      current_state.todo_items + [new_todo_item]
+    )
+    $sample_app_state.on_next(new_state)
+  end
 
-  $sample_app_state.on_next(new_state)
+  promise.wait
 end
 
 $text_style = WidgetStyle.new(
@@ -62,45 +63,38 @@ class App < BaseComponent
   def initialize
     super({})
 
-    @sample_app_state = Rx::BehaviorSubject.new(AppState.new("", []))
-
-    @props.on_next({
-      "todo_text" => "",
-      "todo_items" => []
-    })
-
-    puts "App initialize called 3"
-
     promise = Concurrent::Promise.execute do
-      @sample_app_state.subscribe do |latest_app_state|
-        # Safe operation, as Async ensures execution is handled in the appropriate thread
+      $sample_app_state.subscribe do |latest_app_state|
+        puts "app state changed"
+
         @props.on_next({
           "todo_text" => latest_app_state.todo_text,
           "todo_items" => latest_app_state.todo_items
         })
       end
     end
 
-    # Wait for the promise to complete before moving forward
     promise.wait
 
-    puts "App initialize called 4"
+    @props.on_next({
+      "todo_text" => "",
+      "todo_items" => [TodoItem.new("New Todo", false)]
+    })
   end
 
   def render
-    puts "App render called"
-    children = [button("Add todo", Proc.new {puts "suga"}, $button_style)]
-    # children = [button("Add todo")]
-    
-    puts "App render called 2"
-    
-    # props.value["todo_items"].each do |todo_item|
-      # text = "#{todo_item.text} (#{todo_item.done ? 'done' : 'to do'})."
-      # children << unformatted_text(text, $text_style)
-      # children << unformatted_text(text)
-    # end
+    children = [button("Add todo", Proc.new {
+      on_click()
+    }, $button_style)]
 
-    puts "App render called 3"
+    promise = Concurrent::Promise.execute do
+      @props.value["todo_items"].each do |todo_item|
+        text = "#{todo_item.text} (#{todo_item.done ? 'done' : 'to do'})."
+        children << unformatted_text(text, $text_style)
+      end
+    end
+
+    promise.wait
 
     node(children)
   end

services.rb

@@ -3,15 +3,25 @@
 require 'thread'
 require_relative 'xframes'
 
+# $events_subject = Rx::ReplaySubject.new()
+
 class WidgetRegistrationService
   def initialize
     @id_generator_lock = Mutex.new
     @id_widget_registration_lock = Mutex.new
     @id_event_registration_lock = Mutex.new
 
-    @events_subject = Rx::ReplaySubject.new(10)
-    # @events_subject.debounce(0.001).subscribe { |fn| fn.call }
-
+    
+    # @events_subject = Rx::ReplaySubject.new()
+    # @events_subject.debounce(0.001).subscribe(Proc.new { |fn| fn.call })
+    # promise = Concurrent::Promise.execute do
+    #   $events_subject.subscribe do |cb| 
+    #   puts "yo"
+    #   cb()
+    #   end
+    # end
+    # promise.wait
+    
     @widget_registry = {}
     @on_click_registry = Rx::BehaviorSubject.new({})
 
@@ -56,12 +66,22 @@ def register_on_click(widget_id, on_click)
   end
 
   def dispatch_on_click_event(widget_id)
-    on_click = @on_click_registry.value[widget_id]
-    if on_click
-      @events_subject.on_next(on_click)
-    else
-      puts "Widget with id #{widget_id} has no on_click handler"
+    promise = Concurrent::Promise.execute do
+      on_click = @on_click_registry.value[widget_id]
+
+      if on_click
+        # promise = Concurrent::Promise.execute do
+          on_click()
+          # $events_subject.on_next(on_click)
+        # end
+
+        
+      else
+        puts "Widget with id #{widget_id} has no on_click handler"
+      end
     end
+
+    promise.wait
   end
 
   def create_widget(widget)

treetraversal.rb

@@ -53,18 +53,22 @@ def subscribe_to_props_helper(shadow_node)
       shadow_node.props_change_subscription.dispose
     end
 
-    return nil
-
-    if shadow_node.renderable.is_a?(BaseComponent)
-      component = shadow_node.renderable
-      shadow_node.props_change_subscription = component.props.pipe(
-        Rx::Operators.skip(1)
-      ).subscribe { |new_props| handle_component_props_change(shadow_node, component, new_props) }
-    elsif shadow_node.renderable.is_a?(WidgetNode)
-      shadow_node.props_change_subscription = shadow_node.renderable.props.pipe(
-        Rx::Operators.skip(1)
-      ).subscribe { |new_props| handle_widget_node_props_change(shadow_node, shadow_node.renderable, new_props) }
+    promise = Concurrent::Promise.execute do
+
+      if shadow_node.renderable.is_a?(BaseComponent)
+        component = shadow_node.renderable
+        shadow_node.props_change_subscription = component.props.pipe(
+          Rx::Operators.skip(1)
+        ).subscribe { |new_props| handle_component_props_change(shadow_node, component, new_props) }
+      elsif shadow_node.renderable.is_a?(WidgetNode)
+        shadow_node.props_change_subscription = shadow_node.renderable.props.pipe(
+          Rx::Operators.skip(1)
+        ).subscribe { |new_props| handle_widget_node_props_change(shadow_node, shadow_node.renderable, new_props) }
+      end
+
     end
+
+    promise.wait
   end
 
   def handle_widget_node(widget)