Merge branch 'develop'

Author: mvorisek

demos/collection/grid.php

@@ -29,7 +29,7 @@
 
 // add country flag column
 $grid->addColumn('flag', [
-    Table\Column\Flag::class,
+    Table\Column\CountryFlag::class,
     'codeField' => $model->fieldName()->iso,
     'nameField' => $model->fieldName()->name,
 ]);

demos/collection/test.php

@@ -15,7 +15,7 @@
     'neverPersist' => true, // no need for actual value in this field
     'ui' => [
         'table' => [
-            Table\Column\Flag::class,
+            Table\Column\CountryFlag::class,
             [
                 'codeField' => $m->fieldName()->iso,
                 'nameField' => $m->fieldName()->name,

src/Table/Column/CountryFlag.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Atk4\Ui\Table\Column;
+
+use Atk4\Data\Field;
+use Atk4\Data\Model;
+use Atk4\Ui\Table;
+
+class CountryFlag extends Table\Column
+{
+    /** Name of country code model field (in ISO 3166-1 alpha-2 format) */
+    public string $codeField;
+
+    /** Optional name of model field which contains full country name. */
+    public ?string $nameField = null;
+
+    public function getHtmlTags(Model $row, ?Field $field): array
+    {
+        $countryCode = $row->get($this->codeField);
+        $countryName = $this->nameField ? $row->get($this->nameField) : null;
+
+        return [
+            $field->shortName => $countryCode === null
+                ? ''
+                : $this->getApp()->getTag('i', [
+                    'class' => strtolower($countryCode) . ' flag',
+                    'title' => strtoupper($countryCode) . ($countryName === null ? '' : ' - ' . $countryName),
+                ]),
+        ];
+    }
+}