Merge branch 'master' into 12/form-label-fix

Author: rajeev-k-tomy

.github/workflows/static-tests.yml

@@ -58,5 +58,6 @@ jobs:
           test -f /tmp/magento/phpstan.neon || echo 'parameters:' > /tmp/magento/phpstan.neon
           echo "Testing for PHPStan level $PHPSTAN_LEVEL"
           cd /tmp/magento
-          php -d memory_limit=4G vendor/bin/phpstan analyse --level $PHPSTAN_LEVEL ${GITHUB_WORKSPACE}
+          export MODULE_PATH=$(realpath vendor/${COMPOSER_NAME})
+          php -d memory_limit=4G vendor/bin/phpstan analyse --level $PHPSTAN_LEVEL $MODULE_PATH
 

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.2] - 28 January 2026
+### Fixed
+- Add hidden-attribute to field-blocks
+- Fix new field types not having proper interface
+- Fix when there are no fieldset definitions
+- Allow Options-model to be either string or object
+- #8 Allow to set label for the base fieldset @rajeev-k-tomy
+- #4 Custom fields configured via layout xml file are not appearing in the form @rajeev-k-tomy
+- Resolve select field options from the Select field type class
+- #3 Create an abstract FieldType class to give access Field instance in every FieldType @rajeev-k-tomy
+
 ## [0.5.1] - 23 January 2026
 ### Fixed
 - Do not escape JSON

Component/Grid/GridRepository.php

@@ -13,6 +13,9 @@
 use Loki\AdminComponents\ProviderHandler\ProviderHandlerListing;
 use Loki\Components\Component\ComponentRepository;
 
+/**
+ * @method GridViewModel getViewModel()
+ */
 class GridRepository extends ComponentRepository
 {
     public function __construct(
@@ -25,7 +28,7 @@ public function __construct(
 
     public function getNamespace(): string
     {
-        return $this->getComponent()->getViewModel()->getNamespace();
+        return $this->getViewModel()->getNamespace();
     }
 
     // @todo: Remove the requirement for this
@@ -47,7 +50,7 @@ public function getPrimaryKey(): string
 
     public function getItems(): array
     {
-        $searchableFields = $this->getComponent()->getViewModel()->getSearchableFields();
+        $searchableFields = $this->getViewModel()->getSearchableFields();
         $this->getState()->setSearchableFields($searchableFields);
 
         return $this->getProviderHandler()->getItems($this->getProvider(), $this->getState());
@@ -102,7 +105,7 @@ protected function getState(): State
 
     protected function getBlock(): AbstractBlock
     {
-        return $this->getComponent()->getViewModel()->getBlock();
+        return $this->getViewModel()->getBlock();
     }
 
     public function getResourceModel(): ?AbstractDb

Form/Field/Field.php

@@ -4,6 +4,7 @@
 namespace Loki\AdminComponents\Form\Field;
 
 use Loki\AdminComponents\Form\Field\FieldType\Editor;
+use Loki\AdminComponents\Form\Field\FieldType\Input;
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\AbstractBlock;
 use RuntimeException;
@@ -84,6 +85,10 @@ public function getFieldAttributes(): array
             $fieldAttributes['required'] = null;
         }
 
+        if ($this->isHidden() && $this->getFieldType() instanceof Input) {
+            $fieldAttributes['type'] = 'hidden';
+        }
+
         return $fieldAttributes;
     }
 
@@ -107,4 +112,14 @@ public function isVisible(): bool
 
         return true;
     }
+
+    public function isHidden(): bool
+    {
+        $hidden = $this->getData('hidden');
+        if (is_bool($hidden)) {
+            return $hidden;
+        }
+
+        return false;
+    }
 }

Form/Field/FieldType/CustomerSelect.php

@@ -4,10 +4,9 @@
 namespace Loki\AdminComponents\Form\Field\FieldType;
 
 use Loki\AdminComponents\Form\Field\Field;
-use Loki\AdminComponents\Form\Field\FieldTypeInterface;
 use Magento\Customer\Model\ResourceModel\Customer\Collection;
 
-class CustomerSelect implements FieldTypeInterface
+class CustomerSelect extends FieldTypeAbstract
 {
     public function getInputType(): string
     {

Form/Field/FieldType/EntitySelect.php

@@ -3,9 +3,7 @@
 
 namespace Loki\AdminComponents\Form\Field\FieldType;
 
-use Loki\AdminComponents\Form\Field\FieldTypeInterface;
-
-class EntitySelect extends FieldTypeAbstract implements FieldTypeInterface
+class EntitySelect extends FieldTypeAbstract
 {
     public function getInputType(): string
     {

Form/Field/FieldType/FieldTypeAbstract.php

@@ -5,8 +5,9 @@
 namespace Loki\AdminComponents\Form\Field\FieldType;
 
 use Loki\AdminComponents\Form\Field\Field;
+use Loki\AdminComponents\Form\Field\FieldTypeInterface;
 
-abstract class FieldTypeAbstract
+abstract class FieldTypeAbstract implements FieldTypeInterface
 {
     protected ?Field $field = null;
 

Form/Field/FieldType/Input.php

@@ -2,9 +2,7 @@
 
 namespace Loki\AdminComponents\Form\Field\FieldType;
 
-use Loki\AdminComponents\Form\Field\FieldTypeInterface;
-
-class Input extends FieldTypeAbstract implements FieldTypeInterface
+class Input extends FieldTypeAbstract
 {
     public function getTemplate(): string
     {

Form/Field/FieldType/ProductSelect.php

@@ -4,10 +4,9 @@
 namespace Loki\AdminComponents\Form\Field\FieldType;
 
 use Loki\AdminComponents\Form\Field\Field;
-use Loki\AdminComponents\Form\Field\FieldTypeInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 
-class ProductSelect implements FieldTypeInterface
+class ProductSelect extends FieldTypeAbstract
 {
     public function getInputType(): string
     {

Form/Field/FieldType/Select.php

@@ -31,7 +31,9 @@ public function getOptions(): array
             return [];
         }
 
-        $options  = $this->objectManager->get($options);
+        if (is_string($options)) {
+            $options = $this->objectManager->get($options);
+        }
 
         if (!$options instanceof OptionSourceInterface) {
             return [];