fix: improve blueprint layouts (closes #119)

Author: tobimori

blueprints/fields/key.yml

@@ -1,7 +1,7 @@
 label: dreamform.common.key.label
 type: slug
 required: true
-width: 1/3
+width: 1/2
 icon: false # none would show an empty icon which cuts of the input too early
 wizard:
   field: label

classes/Fields/FileUploadField.php

@@ -43,17 +43,17 @@ public static function blueprint(): array
 				'validation' => [
 					'label' => t('dreamform.validation'),
 					'fields' => [
+						'required' => 'dreamform/fields/required',
 						'maxSize' => [
 							'label' => t('dreamform.fields.upload.maxSize.label'),
 							'type' => 'number',
 							'help' => tt('dreamform.fields.upload.maxSize.help', null, ['size' => ini_get('upload_max_filesize')]),
 							'after' => 'MB',
-							'width' => '1/4',
+							'width' => '1/2',
 						],
 						'allowedTypes' => [
 							'label' => t('dreamform.fields.upload.allowedTypes.label'),
 							'type' => 'multiselect',
-							'width' => '3/4',
 							'options' => A::map(
 								array_keys(static::availableTypes()),
 								fn ($type) => [
@@ -62,7 +62,6 @@ public static function blueprint(): array
 								]
 							)
 						],
-						'required' => 'dreamform/fields/required',
 						'errorMessage' => 'dreamform/fields/error-message',
 					]
 				]

classes/Fields/NumberField.php

@@ -21,16 +21,13 @@ public static function blueprint(): array
 					'fields' => [
 						'key' => 'dreamform/fields/key',
 						'label' => 'dreamform/fields/label',
-						'placeholder' => [
-							'extends' => 'dreamform/fields/placeholder',
-							'width' => '2/3'
-						],
+						'placeholder' => 'dreamform/fields/placeholder',
 						'step' => [
 							'label' => t('dreamform.fields.number.step.label'),
 							'type' => 'number',
 							'default' => 1,
 							'required' => true,
-							'width' => '1/3',
+							'width' => '1/2',
 							'help' => t('dreamform.fields.number.step.help')
 						],
 					]
@@ -41,18 +38,15 @@ public static function blueprint(): array
 						'min' => [
 							'label' => t('dreamform.fields.number.min.label'),
 							'type' => 'number',
-							'width' => '1/3'
+							'width' => '1/2'
 						],
 						'max' => [
 							'label' => t('dreamform.fields.number.max.label'),
 							'type' => 'number',
-							'width' => '1/3'
+							'width' => '1/2'
 						],
 						'required' => 'dreamform/fields/required',
-						'errorMessage' => [
-							'extends' => 'dreamform/fields/error-message',
-							'width' => '1'
-						],
+						'errorMessage' => 'dreamform/fields/error-message',
 					]
 				]
 			]

classes/Fields/PagesField.php

@@ -26,14 +26,14 @@ public static function blueprint(): array
 							'label' => t('dreamform.common.options.label'),
 							'type' => 'pages',
 							'query' => DreamForm::option('fields.pages.query'),
-							'width' => '2/3',
+							'width' => '1/2',
 						],
 						'useChildren' => [
 							'label' => t('dreamform.fields.pages.useChildren.label'),
 							'help' => t('dreamform.fields.pages.useChildren.help'),
 							'type' => 'toggle',
 							'default' => false,
-							'width' => '1/3',
+							'width' => '1/2',
 						],
 					]
 				],