root of componentUI renders

1 files changed, 15 insertions, 9 deletions

diff --git a/lib/Reaction/UI/View.pm b/lib/Reaction/UI/View.pm
index 8f0c265..daf1bbc 100644
--- a/lib/Reaction/UI/View.pm
+++ b/lib/Reaction/UI/View.pm
@@ -48,24 +48,25 @@ class View which {
     my ($self, $window) = @_;
     my $root_vp = $window->focus_stack->vp_head;
     my $rctx = $self->create_rendering_context;
-    $self->render_viewport($rctx, $root_vp);
+    my ($widget, $args) = $self->render_viewport_args($root_vp);
+    $widget->render(widget => $rctx, $args);
   };
 
-  implements 'render_viewport' => as {
-    my ($self, $rctx, $vp) = @_;
+  implements 'render_viewport_args' => as {
+    my ($self, $vp) = @_;
     my $layout_set = $self->layout_set_for($vp);
     my $widget = $self->widget_for($vp, $layout_set);
-    $widget->render($rctx, { viewport => $vp });
+    return ($widget, { viewport => $vp });
   };
 
   implements 'widget_for' => as {
     my ($self, $vp, $layout_set) = @_;
     return
       $self->_widget_cache->{$layout_set->name}
-        ||= $self->widget_class_for($layout_set)
-                 ->new(
-                     view => $self, layout_set => $layout_set
-                   );
+        ||= $layout_set->widget_class
+                       ->new(
+                           view => $self, layout_set => $layout_set
+                         );
   };
 
   implements 'widget_class_for' => as {
@@ -85,6 +86,7 @@ class View which {
       #only next when !exists
       eval { Class::MOP::load_class($class) };
       #$@ ? next : return  $class;
+      #warn "Loaded ${class}" unless $@;
       $@ ? next : return $cache->{ $lset_name } = $class;
     }
     confess "Couldn't load widget '$tail': tried: @haystack";
@@ -132,7 +134,11 @@ class View which {
 
   implements 'layout_set_args_for' => as {
     my ($self, $name) = @_;
-    return (name => $name, search_path => $self->layout_search_path);
+    return (
+      name => $name,
+      search_path => $self->layout_search_path,
+      view => $self,
+    );
   };
 
   implements 'layout_search_path' => as {