Update Composer packages

kirby/src/Panel/Document.php

@@ -198,7 +198,9 @@ class Document
 	 */
 	public static function icons(): string
 	{
-		return F::read(App::instance()->root('kirby') . '/panel/dist/img/icons.svg');
+		$dev = App::instance()->option('panel.dev', false);
+		$dir = $dev ? 'public' : 'dist';
+		return F::read(App::instance()->root('kirby') . '/panel/' . $dir . '/img/icons.svg');
 	}
 
 	/**

kirby/src/Panel/File.php

@@ -196,9 +196,10 @@ class File extends Model
 			'rtf'   => 'blue-400'
 		];
 
-		return $extensions[$this->model->extension()] ??
-			   $types[$this->model->type()] ??
-			   parent::imageDefaults()['color'];
+		return
+			$extensions[$this->model->extension()] ??
+			$types[$this->model->type()] ??
+			parent::imageDefaults()['color'];
 	}
 
 	/**
@@ -237,9 +238,10 @@ class File extends Model
 			'md'    => 'markdown'
 		];
 
-		return $extensions[$this->model->extension()] ??
-			   $types[$this->model->type()] ??
-			   'file';
+		return
+			$extensions[$this->model->extension()] ??
+			$types[$this->model->type()] ??
+			'file';
 	}
 
 	/**
@@ -292,17 +294,22 @@ class File extends Model
 	public function pickerData(array $params = []): array
 	{
 		$name = $this->model->filename();
+		$id   = $this->model->id();
 
 		if (empty($params['model']) === false) {
 			$parent   = $this->model->parent();
+			// if the file belongs to the current parent model,
+			// store only name as ID to keep its path relative to the model
+			$id       = $parent === $params['model'] ? $name : $id;
 			$absolute = $parent !== $params['model'];
 		}
 
 		$params['text'] ??= '{{ file.filename }}';
 
 		return array_merge(parent::pickerData($params), [
-			'filename' => $name,
 			'dragText' => $this->dragText('auto', $absolute ?? false),
+			'filename' => $name,
+			'id'	   => $id,
 			'type'     => $this->model->type(),
 			'url'      => $this->model->url()
 		]);

kirby/src/Panel/Page.php

@@ -196,10 +196,7 @@ class Page extends Model
 	protected function imageSource(
 		string|null $query = null
 	): CmsFile|Asset|null {
-		if ($query === null) {
-			$query = 'page.image';
-		}
-
+		$query ??= 'page.image';
 		return parent::imageSource($query);
 	}
 
@@ -234,8 +231,9 @@ class Page extends Model
 	 */
 	public function position(): int
 	{
-		return $this->model->num() ??
-			   $this->model->parentModel()->children()->listed()->not($this->model)->count() + 1;
+		return
+			$this->model->num() ??
+			$this->model->parentModel()->children()->listed()->not($this->model)->count() + 1;
 	}
 
 	/**

kirby/src/Panel/Site.php

@@ -38,10 +38,7 @@ class Site extends Model
 	protected function imageSource(
 		string|null $query = null
 	): CmsFile|Asset|null {
-		if ($query === null) {
-			$query = 'site.image';
-		}
-
+		$query ??= 'site.image';
 		return parent::imageSource($query);
 	}