Merge pull request #26 from inertiajs/improved-share

Add ability to use share() with only a callback

Author: reinink

src/Response.php

@@ -11,16 +11,14 @@ class Response implements Responsable
     protected $component;
     protected $props;
     protected $rootView;
-    protected $sharedProps;
     protected $version;
     protected $viewData = [];
 
-    public function __construct($component, $props, $rootView = 'app', $sharedProps = [], $version = null)
+    public function __construct($component, $props, $rootView = 'app', $version = null)
     {
         $this->component = $component;
         $this->props = $props;
         $this->rootView = $rootView;
-        $this->sharedProps = $sharedProps;
         $this->version = $version;
     }
 
@@ -46,7 +44,7 @@ public function toResponse($request)
     {
         $page = [
             'component' => $this->component,
-            'props' => array_merge($this->sharedProps, $this->props),
+            'props' => $this->props,
             'url' => $request->getRequestUri(),
             'version' => $this->version,
         ];

src/ResponseFactory.php

@@ -2,23 +2,29 @@
 
 namespace Inertia;
 
+use Closure;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 
 class ResponseFactory
 {
     protected $rootView = 'app';
     protected $sharedProps = [];
+    protected $sharedPropsCallbacks = [];
     protected $version = null;
 
     public function setRootView($name)
     {
         $this->rootView = $name;
     }
 
-    public function share($key, $value)
+    public function share($key, $value = null)
     {
-        Arr::set($this->sharedProps, $key, $value);
+        if ($key instanceof Closure) {
+            $this->sharedPropsCallbacks[] = $key;
+        } else {
+            Arr::set($this->sharedProps, $key, $value);
+        }
     }
 
     public function getShared($key = null)
@@ -42,12 +48,18 @@ public function getVersion()
 
     public function render($component, $props = [])
     {
-        array_walk_recursive($this->sharedProps, function (&$item, $key) {
-            if (is_callable($item)) {
-                $item = App::call($item);
+        $props = array_merge($this->sharedProps, $props);
+
+        foreach ($this->sharedPropsCallbacks as $callback) {
+            $props = array_merge($props, App::call($callback));
+        }
+
+        array_walk_recursive($props, function (&$prop) {
+            if (is_callable($prop)) {
+                $prop = App::call($prop);
             }
         });
 
-        return new Response($component, $props, $this->rootView, $this->sharedProps, $this->getVersion());
+        return new Response($component, $props, $this->rootView, $this->getVersion());
     }
 }

tests/ResponseTest.php

@@ -17,7 +17,6 @@ public function test_server_response()
             'User/Edit',
             ['user' => ['name' => 'Jonathan']],
             'app',
-            ['foo' => 'bar'],
             '123'
         );
 
@@ -27,10 +26,9 @@ public function test_server_response()
         $this->assertInstanceOf(View::class, $response);
         $this->assertSame('User/Edit', $page['component']);
         $this->assertSame('Jonathan', $page['props']['user']['name']);
-        $this->assertSame('bar', $page['props']['foo']);
         $this->assertSame('/user/123', $page['url']);
         $this->assertSame('123', $page['version']);
-        $this->assertSame('<div id="app" data-page="{&quot;component&quot;:&quot;User\/Edit&quot;,&quot;props&quot;:{&quot;foo&quot;:&quot;bar&quot;,&quot;user&quot;:{&quot;name&quot;:&quot;Jonathan&quot;}},&quot;url&quot;:&quot;\/user\/123&quot;,&quot;version&quot;:&quot;123&quot;}"></div>'."\n", $response->render());
+        $this->assertSame('<div id="app" data-page="{&quot;component&quot;:&quot;User\/Edit&quot;,&quot;props&quot;:{&quot;user&quot;:{&quot;name&quot;:&quot;Jonathan&quot;}},&quot;url&quot;:&quot;\/user\/123&quot;,&quot;version&quot;:&quot;123&quot;}"></div>'."\n", $response->render());
     }
 
     public function test_xhr_response()
@@ -42,7 +40,6 @@ public function test_xhr_response()
             'User/Edit',
             ['user' => ['name' => 'Jonathan']],
             'app',
-            ['foo' => 'bar'],
             '123'
         );
 
@@ -52,7 +49,6 @@ public function test_xhr_response()
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertSame('User/Edit', $page->component);
         $this->assertSame('Jonathan', $page->props->user->name);
-        $this->assertSame('bar', $page->props->foo);
         $this->assertSame('/user/123', $page->url);
         $this->assertSame('123', $page->version);
     }