(image: ) tag: width: auto

Fixes #5064

config/tags.php

@@ -112,6 +112,11 @@
 			'width'
 		],
 		'html' => function (KirbyTag $tag): string {
+			$kirby = $tag->kirby();
+
+			$tag->width  ??= $kirby->option('kirbytext.image.width');
+			$tag->height ??= $kirby->option('kirbytext.image.height');
+
 			if ($tag->file = $tag->file($tag->value)) {
 				$tag->src       = $tag->file->url();
 				$tag->alt     ??= $tag->file->alt()->or('')->value();
@@ -129,6 +134,14 @@
 
 					$tag->srcset = $tag->file->srcset($srcset);
 				}
+
+				if ($tag->width === 'auto') {
+					$tag->width = $tag->file->width();
+				}
+				if ($tag->height === 'auto') {
+					$tag->height = $tag->file->height();
+				}
+
 			} else {
 				$tag->src = Url::to($tag->value);
 			}
@@ -157,14 +170,14 @@
 				'alt'    => $tag->alt ?? ''
 			]);
 
-			if ($tag->kirby()->option('kirbytext.image.figure', true) === false) {
+			if ($kirby->option('kirbytext.image.figure', true) === false) {
 				return $link($image);
 			}
 
 			// render KirbyText in caption
 			if ($tag->caption) {
 				$options = ['markdown' => ['inline' => true]];
-				$caption = $tag->kirby()->kirbytext($tag->caption, $options);
+				$caption = $kirby->kirbytext($tag->caption, $options);
 				$tag->caption = [$caption];
 			}
 

tests/Text/ImageKirbyTagTest.php

@@ -250,4 +250,43 @@ public function testWithParent()
 			'parent' => $page,
 		]));
 	}
+
+	public function testWithWidthHeightAuto()
+	{
+		$app = $this->app->clone([
+			'options' => [
+				'kirbytext' => [
+					'image' => [
+						'width'  => 'auto',
+						'height' => 'auto'
+					]
+				]
+			],
+			'roots' => [
+				'index' => '/dev/null',
+			],
+			'site' => [
+				'children' => [
+					[
+						'slug' => 'a',
+						'root' => __DIR__ . '/fixtures/kirbytext/image-auto',
+						'files' => [
+							[
+								'filename' => 'cat.jpg',
+							]
+						]
+					]
+				]
+			]
+		]);
+
+		$page  = $app->page('a');
+		$image = $page->image('cat.jpg');
+		$expected = '<figure><img alt="" height="500" src="/media/pages/a/' . $image->mediaHash() . '/cat.jpg" width="500"></figure>';
+
+		$this->assertSame($expected, $app->kirbytag('image', 'cat.jpg', [], [
+			'parent' => $page,
+		]));
+	}
+
 }