View buttons: i18n + query support

src/Panel/File.php

@@ -76,10 +76,7 @@ public function buttons(): array
 			'preview',
 			'settings',
 			'languages'
-		)->bind([
-			'file'  => $this->model(),
-			'model' => $this->model()
-		])->render();
+		)->render();
 	}
 
 	/**

src/Panel/Page.php

@@ -51,10 +51,7 @@ public function buttons(): array
 			'settings',
 			'languages',
 			'status'
-		)->bind([
-			'page'  => $this->model(),
-			'model' => $this->model()
-		])->render();
+		)->render();
 	}
 
 	/**

src/Panel/Site.php

@@ -33,10 +33,7 @@ public function buttons(): array
 		return ViewButtons::view($this)->defaults(
 			'preview',
 			'languages'
-		)->bind([
-			'model' => $this->model(),
-			'site'  => $this->model()
-		])->render();
+		)->render();
 	}
 
 	/**

src/Panel/Ui/Button.php

@@ -2,6 +2,8 @@
 
 namespace Kirby\Panel\Ui;
 
+use Kirby\Toolkit\I18n;
+
 /**
  * @package   Kirby Panel
  * @author    Bastian Allgeier <[email protected]>
@@ -28,9 +30,9 @@ public function __construct(
 		public string|null $size = null,
 		public string|null $style = null,
 		public string|null $target = null,
-		public string|null $text = null,
+		public string|array|null $text = null,
 		public string|null $theme = null,
-		public string|null $title = null,
+		public string|array|null $title = null,
 		public string $type = 'button',
 		public string|null $variant = null,
 	) {
@@ -51,9 +53,9 @@ public function props(): array
 			'responsive' => $this->responsive,
 			'size'       => $this->size,
 			'target'     => $this->target,
-			'text'       => $this->text,
+			'text'       => I18n::translate($this->text, $this->text),
 			'theme'      => $this->theme,
-			'title'      => $this->title,
+			'title'      => I18n::translate($this->title, $this->title),
 			'type'       => $this->type,
 			'variant'    => $this->variant,
 		];

src/Panel/Ui/Buttons/LanguagesDropdown.php

@@ -25,17 +25,18 @@ class LanguagesDropdown extends ViewButton
 	protected App $kirby;
 
 	public function __construct(
-		protected ModelWithContent $model
+		ModelWithContent $model
 	) {
 		$this->kirby = $model->kirby();
 
 		parent::__construct(
 			component: 'k-languages-dropdown',
+			model: $model,
 			class: 'k-languages-dropdown',
 			icon: 'translate',
 			// Fiber dropdown endpoint to load options
 			// only when dropdown is opened
-			options: $this->model->panel()->url(true) . '/languages',
+			options: $model->panel()->url(true) . '/languages',
 			responsive: 'text',
 			text: Str::upper($this->kirby->language()?->code())
 		);

src/Panel/Ui/Buttons/ViewButton.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Kirby\Cms\App;
+use Kirby\Cms\ModelWithContent;
 use Kirby\Panel\Panel;
 use Kirby\Panel\Ui\Button;
 use Kirby\Toolkit\Controller;
@@ -24,6 +25,7 @@ class ViewButton extends Button
 {
 	public function __construct(
 		public string $component = 'k-view-button',
+		public readonly ModelWithContent|null $model = null,
 		public array|null $badge = null,
 		public string|null $class = null,
 		public string|bool|null $current = null,
@@ -38,9 +40,9 @@ public function __construct(
 		public string|null $size = 'sm',
 		public string|null $style = null,
 		public string|null $target = null,
-		public string|null $text = null,
+		public string|array|null $text = null,
 		public string|null $theme = null,
-		public string|null $title = null,
+		public string|array|null $title = null,
 		public string $type = 'button',
 		public string|null $variant = 'filled',
 	) {
@@ -54,14 +56,15 @@ public function __construct(
 	public static function factory(
 		string|array|Closure $button,
 		string|null $view = null,
+		ModelWithContent|null $model = null,
 		array $data = []
 	): static|null {
 		// referenced by name
 		if (is_string($button) === true) {
 			$button = static::find($button, $view);
 		}
 
-		$button = static::resolve($button, $data);
+		$button = static::resolve($button, $model, $data);
 
 		if (
 			$button === null ||
@@ -70,7 +73,7 @@ public static function factory(
 			return $button;
 		}
 
-		return new static(...static::normalize($button));
+		return new static(...static::normalize($button), model: $model);
 	}
 
 	/**
@@ -125,8 +128,16 @@ public static function normalize(array $button): array
 
 	public function props(): array
 	{
+		$resolve = fn ($value) =>
+			$value ?
+			$this->model?->toSafeString($value) ?? $value :
+			null;
+
 		return [
 			...parent::props(),
+			'dialog'  => $resolve($this->dialog),
+			'drawer'  => $resolve($this->drawer),
+			'link'    => $resolve($this->link),
 			'options' => $this->options
 		];
 	}
@@ -138,12 +149,22 @@ public function props(): array
 	 */
 	public static function resolve(
 		Closure|array $button,
+		ModelWithContent|null $model = null,
 		array $data = []
 	): static|array|null {
 		if ($button instanceof Closure) {
 			$kirby      = App::instance();
 			$controller = new Controller($button);
-			$button     = $controller->call(data: [
+
+			if ($model instanceof ModelWithContent) {
+				$data = [
+					'model'             => $model,
+					$model::CLASS_ALIAS => $model,
+					...$data
+				];
+			}
+
+			$button = $controller->call(data: [
 				'kirby' => $kirby,
 				'site'  => $kirby->site(),
 				'user'  => $kirby->user(),

src/Panel/Ui/Buttons/ViewButtons.php

@@ -3,6 +3,7 @@
 namespace Kirby\Panel\Ui\Buttons;
 
 use Kirby\Cms\App;
+use Kirby\Cms\ModelWithContent;
 use Kirby\Panel\Model;
 use Kirby\Toolkit\A;
 
@@ -21,6 +22,7 @@ class ViewButtons
 {
 	public function __construct(
 		public readonly string $view,
+		public readonly ModelWithContent|null $model = null,
 		public array|false|null $buttons = null,
 		public array $data = []
 	) {
@@ -66,9 +68,10 @@ public function render(): array
 			$this->buttons ?? [],
 			fn ($button) =>
 				ViewButton::factory(
-					$button,
-					$this->view,
-					$this->data
+					button: $button,
+					view: $this->view,
+					model: $this->model,
+					data: $this->data
 				)?->render()
 		);
 
@@ -79,15 +82,19 @@ public function render(): array
 	 * Creates new instance for a view
 	 * with special support for model views
 	 */
-	public static function view(string|Model $view): static
-	{
+	public static function view(
+		string|Model $view,
+		ModelWithContent|null $model = null
+	): static {
 		if ($view instanceof Model) {
-			$blueprint = $view->model()->blueprint()->buttons();
-			$view      = $view->model()::CLASS_ALIAS;
+			$model     = $view->model();
+			$blueprint = $model->blueprint()->buttons();
+			$view      = $model::CLASS_ALIAS;
 		}
 
 		return new static(
 			view: $view,
+			model: $model ?? null,
 			buttons: $blueprint ?? null
 		);
 	}

src/Panel/User.php

@@ -50,10 +50,7 @@ public function buttons(): array
 			'theme',
 			'settings',
 			'languages'
-		)->bind([
-			'model' => $this->model(),
-			'user'  => $this->model()
-		])->render();
+		)->render();
 	}
 
 	/**

tests/Panel/Ui/Buttons/ViewButtonTest.php

@@ -24,9 +24,11 @@ public function setUp(): void
 	public function testFactoryFromClosure()
 	{
 		$button = ViewButton::factory(
-			fn (string $name) => ['component' => 'k-' . $name . '-view-button'],
-			'test',
-			['name' => 'foo']
+			button: fn (string $name) => [
+				'component' => 'k-' . $name . '-view-button'
+			],
+			view: 'test',
+			data: ['name' => 'foo']
 		);
 
 		$this->assertInstanceOf(ViewButton::class, $button);
@@ -175,15 +177,18 @@ public function testProps()
 	public function testResolve(): void
 	{
 		$test   = $this;
-		$result = ViewButton::resolve(function (string $b, bool $a, App $kirby) use ($test) {
-			$test->assertFalse($a);
-			$test->assertSame('foo', $b);
-			$test->assertInstanceOf(App::class, $kirby);
-			return ['component' => 'k-test-view-button'];
-		}, [
-			'a' => false,
-			'b' => 'foo'
-		]);
+		$result = ViewButton::resolve(
+			button: function (string $b, bool $a, App $kirby) use ($test) {
+				$test->assertFalse($a);
+				$test->assertSame('foo', $b);
+				$test->assertInstanceOf(App::class, $kirby);
+				return ['component' => 'k-test-view-button'];
+			},
+			data: [
+				'a' => false,
+				'b' => 'foo'
+			]
+		);
 
 		$this->assertSame('k-test-view-button', $result['component']);
 

tests/Panel/Ui/Buttons/ViewButtonsTest.php

@@ -37,11 +37,11 @@ public function setUp(): void
 	public function testConstruct()
 	{
 		// no buttons
-		$buttons = new ViewButtons('test', []);
+		$buttons = new ViewButtons('test', buttons: []);
 		$this->assertCount(0, $buttons->buttons);
 
 		// passed directly
-		$buttons = new ViewButtons('test', ['a', 'b']);
+		$buttons = new ViewButtons('test', buttons: ['a', 'b']);
 		$this->assertCount(2, $buttons->buttons);
 
 		// from options
@@ -82,7 +82,7 @@ public function testDefaults()
 	 */
 	public function testRender()
 	{
-		$buttons = new ViewButtons('test', ['a', 'b']);
+		$buttons = new ViewButtons('test', buttons: ['a', 'b']);
 		$result  = $buttons->render();
 
 		$this->assertCount(2, $result);