Skip to content

Commit 38d7796

Browse files
committed
Allow textarea to determine rows
1 parent 87ce1ea commit 38d7796

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

Component/Form/FormViewModel.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ public function getFieldsets(): array
118118
}
119119

120120
$fieldDefinitions = (array)$this->getBlock()->getFields();
121+
121122
$fields = $this->fieldResolver->resolve($this->getRepository(), $fieldDefinitions);
122123

123124
foreach ($fields as $field) {
@@ -135,9 +136,9 @@ public function getFieldsets(): array
135136
$fieldsets['base']->addField($field);
136137
}
137138

138-
foreach ($fieldDefinitions as $fieldDefinitionName => $fieldDefinition) {
139+
foreach ($fieldDefinitions as $fieldDefinitionCode => $fieldDefinition) {
139140
if (!isset($fieldDefinition['code'])) {
140-
$fieldDefinition['code'] = $fieldDefinitionName;
141+
$fieldDefinition['code'] = $fieldDefinitionCode;
141142
}
142143

143144
$field = $this->fieldFactory->create($this->getBlock(), $fieldDefinition);

Form/Action/SaveAction.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public function execute(FormRepository $formRepository, array $value): void
2828
continue;
2929
}
3030

31-
if (is_array($propertyValue)) {
31+
//if (is_array($propertyValue)) {
3232
// @todo: Fix this because it breaks a lot of logic
3333
//continue;
34-
}
34+
//}
3535

3636
$this->setItemPropertyValue($item, $propertyKey, $propertyValue);
3737
}

view/adminhtml/templates/form/field_type/textarea.phtml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
22
declare(strict_types=1);
33

4-
/** @version 0.6.3 */
5-
64
use Magento\Framework\Escaper;
75
use Magento\Framework\View\Element\Template;
86
use Loki\AdminComponents\Form\Field\Field;
97
use Loki\AdminComponents\Form\Field\FieldType\Textarea;
108
use Loki\Components\Util\Block\TemplateRenderer;
119

10+
/** @version 0.6.3 */
1211
/** @var Escaper $escaper */
1312
/** @var Template $block */
1413
/** @var Field $field */
@@ -18,10 +17,12 @@ use Loki\Components\Util\Block\TemplateRenderer;
1817
$field = $block->getField();
1918
$fieldAttributes = $field->getFieldAttributes();
2019
$fieldType = $field->getFieldType();
20+
$rows = $fieldAttributes['rows'] ?? 3;
2121
?>
2222
<textarea
2323
class="admin__control-text"
2424
name="<?= $escaper->escapeHtml($field->getCode()) ?>"
25+
rows="<?= $rows ?>"
2526
data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
2627
<?php foreach ($fieldAttributes as $attributeName => $attributeValue) : ?>
2728
<?= /* @noEscape */ $attributeName ?>="<?= /* @noEscape */ $attributeValue ?>"

0 commit comments

Comments
 (0)