Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/laravel-appkit/formulate
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
darrencoutts118 committed Jul 2, 2024
2 parents a94681e + fb39caa commit cc3baa1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .php-cs-fixer.cache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"php":"8.3.8","version":"3.59.3","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Facades\/Formulate.php":"e3dc688bb7787483b4ee2f3cb8f60955","src\/FormulateServiceProvider.php":"422255a9e03d78a7157af7a333f22851","src\/Id.php":"76a4d8d7cea098be691393b8d692a6b5","src\/Helpers\/Routing\/Route.php":"f89ffbfb7a07be8020882bcdef698988","src\/Helpers\/Routing\/RouteParameter.php":"c6de2beeee28859a9b0d3c645bd944d2","src\/Helpers\/Routing\/RouteParameterType.php":"f4afb40cef89b6cf2372cb2d207cc007","src\/FormulateComponentAttributeBag.php":"dea0be316bc21b5fe7bf15b6c7531fd6","src\/Middleware\/BaseMiddleware.php":"e0ad40a0581f9616ccbaebc33ddef8b9","src\/Middleware\/ApplyAlpineJsFormAttributes.php":"f161f56c2a815fa1f66454b8664b82d1","src\/Middleware\/RepeatingFieldsMiddleware.php":"4b45097456901714c0c2f14e82866476","src\/Middleware\/ApplyFormThemeClassesMiddleware.php":"34516fa9a2d78d619168766bb55d9d6d","src\/Middleware\/PrecognitionMiddleware.php":"26f36da8f25185420e12ff6790b1ff2f","src\/Formulate.php":"65c53df8f646c1386b4f57ec2d0e946c","src\/Components\/ReorderableListComponent.php":"7a0b1dff8942d64ab4b9d0525fa5b158","src\/Components\/OptionComponent.php":"3a12d87ae9cc630a7203d73dc0ece6b8","src\/Components\/ButtonComponent.php":"cb317bfe1ce482bc963c1aacee60ab9d","src\/Components\/RepeatingFieldComponent.php":"17452307703b22cbc183b70827fd0218","src\/Components\/BaseComponent.php":"dc1f1df9074138ed115dda04d724f2d7","src\/Components\/RepeatingFieldAddButtonComponent.php":"42a30ff592b7d7d46a7885f4d79e8c17","src\/Components\/SelectComponent.php":"b5c84db56963804b1807d8be3098bccd","src\/Components\/InputComponent.php":"b85dd12561657620c7bb0a76e20816a5","src\/Components\/RepeatingFieldRemoveButtonComponent.php":"23f2243341540a05f91552df605981c6","src\/Components\/TextareaComponent.php":"fb09712ce26e9c91baa39c4372229a6a","src\/Components\/BlankComponent.php":"5cbc611e71335a18190e00d291928da4","src\/Components\/Concerns\/InheritsAttributes.php":"abe46ecd73cfacc96584fd6faf1678d5","src\/Components\/FieldErrorComponent.php":"6b18d96e97e8c345e5487b418da3caf8","src\/Components\/LabelComponent.php":"9b91b30dd929b5930bc6699965a94ae2","src\/Components\/ReorderableHandleComponent.php":"905568d91815ac01d55bdf7705187d0d","src\/Components\/ReorderableButtonsComponent.php":"65b90811665270f83de22da396a47590","src\/Components\/CheckablesComponent.php":"009c52e68031ea8379f523992d3e5f39","src\/Components\/ReorderableItemComponent.php":"9772c72be812d82e5feb3c78c2a960ca","src\/Components\/FieldGroupComponent.php":"15acc9896cbfd02f19cab4387d12ed06","src\/Components\/FormComponent.php":"cc1deb10c39003d7295b0474592ce5f7","tests\/TestCase.php":"1eef33e654f2d94baec8ac9972499030","tests\/SelectComponentTest.php":"d035f54ae9e43c7f76ba17716a3f4136","tests\/FormValidationTest.php":"b3b09fe0f609b16bdb5066953219c3da","tests\/CheckboxInputComponentValueTest.php":"8dc0039a2bdd82b9c0a0203eb6f97f56","tests\/AlpineFormModelTest.php":"6fb696a2b575b78e48182f680206c086","tests\/InputValidationTest.php":"09d3c8a0d8c705e135d22ab72835dbff","tests\/SelectComponentValueTest.php":"0c476964764c6abc61e6baf18ea041ae","tests\/Element.php":"2982e62d5cec8840029f3c8c0434ccf9","tests\/TextareaComponentValueTest.php":"f9130ccac4f11194e0dbcbf32a981609","tests\/ModelRouteBindingTest.php":"2f64dd30a6fde036edb0a631c9a130e3","tests\/CheckboxInputComponentTest.php":"3f35d015a226e980bb9253d889148db0","tests\/Concerns\/Mocks.php":"cb49d40959a40b02db6693bbdfd57f3d","tests\/InputComponentTest.php":"1b5189946406ae2949114d718722b203","tests\/CheckboxArrayInputComponentValueTest.php":"78846a4c77a84b15c2e299870d3186ae","tests\/TextareaComponentTest.php":"281edcc3ce4c39f28647511f8722c7d1","tests\/Controllers\/ArticleController.php":"48af33c1f389b8c2b305df9a51da1154","tests\/ComponentThemeTest.php":"2cab09e6c7f2d564006111b0c345bd0c","tests\/RadioInputComponentValueTest.php":"e9232a520c46483d07717b3ba3ed9498","tests\/Models\/Article.php":"ad7409e9d187d6e950f76f364edcf8d8","tests\/FormValuesTest.php":"76e35abb5571f309f9a9e7b41d492599","tests\/database\/migrations\/2021_01_01_000000_create_articles_table.php":"7295915edef69800e96c4ab762641537","tests\/database\/factories\/ArticlesFactory.php":"45e6ad5e82892a0d43d8bb1ba457fbd7","tests\/RadioInputComponentTest.php":"68ef5aeb5d5947259bc7bf1a14ef3f90","tests\/FormComponentTest.php":"97b182071db8224524cba5c9632a45c4"}}
{"php":"8.3.8","version":"3.59.3","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Facades\/Formulate.php":"e3dc688bb7787483b4ee2f3cb8f60955","src\/FormulateServiceProvider.php":"422255a9e03d78a7157af7a333f22851","src\/Id.php":"76a4d8d7cea098be691393b8d692a6b5","src\/Helpers\/Routing\/Route.php":"f89ffbfb7a07be8020882bcdef698988","src\/Helpers\/Routing\/RouteParameter.php":"c6de2beeee28859a9b0d3c645bd944d2","src\/Helpers\/Routing\/RouteParameterType.php":"f4afb40cef89b6cf2372cb2d207cc007","src\/FormulateComponentAttributeBag.php":"dea0be316bc21b5fe7bf15b6c7531fd6","src\/Middleware\/BaseMiddleware.php":"e0ad40a0581f9616ccbaebc33ddef8b9","src\/Middleware\/ApplyAlpineJsFormAttributes.php":"f161f56c2a815fa1f66454b8664b82d1","src\/Middleware\/RepeatingFieldsMiddleware.php":"4b45097456901714c0c2f14e82866476","src\/Middleware\/ApplyFormThemeClassesMiddleware.php":"34516fa9a2d78d619168766bb55d9d6d","src\/Middleware\/PrecognitionMiddleware.php":"26f36da8f25185420e12ff6790b1ff2f","src\/Formulate.php":"65c53df8f646c1386b4f57ec2d0e946c","src\/Components\/ReorderableListComponent.php":"7a0b1dff8942d64ab4b9d0525fa5b158","src\/Components\/OptionComponent.php":"3a12d87ae9cc630a7203d73dc0ece6b8","src\/Components\/ButtonComponent.php":"cb317bfe1ce482bc963c1aacee60ab9d","src\/Components\/RepeatingFieldComponent.php":"4181e8663e067f67dec4ce63928fc242","src\/Components\/BaseComponent.php":"dc1f1df9074138ed115dda04d724f2d7","src\/Components\/RepeatingFieldAddButtonComponent.php":"42a30ff592b7d7d46a7885f4d79e8c17","src\/Components\/SelectComponent.php":"b5c84db56963804b1807d8be3098bccd","src\/Components\/InputComponent.php":"b85dd12561657620c7bb0a76e20816a5","src\/Components\/RepeatingFieldRemoveButtonComponent.php":"23f2243341540a05f91552df605981c6","src\/Components\/TextareaComponent.php":"fb09712ce26e9c91baa39c4372229a6a","src\/Components\/BlankComponent.php":"5cbc611e71335a18190e00d291928da4","src\/Components\/Concerns\/InheritsAttributes.php":"abe46ecd73cfacc96584fd6faf1678d5","src\/Components\/FieldErrorComponent.php":"6b18d96e97e8c345e5487b418da3caf8","src\/Components\/LabelComponent.php":"9b91b30dd929b5930bc6699965a94ae2","src\/Components\/ReorderableHandleComponent.php":"905568d91815ac01d55bdf7705187d0d","src\/Components\/ReorderableButtonsComponent.php":"65b90811665270f83de22da396a47590","src\/Components\/CheckablesComponent.php":"009c52e68031ea8379f523992d3e5f39","src\/Components\/ReorderableItemComponent.php":"9772c72be812d82e5feb3c78c2a960ca","src\/Components\/FieldGroupComponent.php":"15acc9896cbfd02f19cab4387d12ed06","src\/Components\/FormComponent.php":"cc1deb10c39003d7295b0474592ce5f7","tests\/TestCase.php":"1eef33e654f2d94baec8ac9972499030","tests\/SelectComponentTest.php":"d035f54ae9e43c7f76ba17716a3f4136","tests\/FormValidationTest.php":"b3b09fe0f609b16bdb5066953219c3da","tests\/CheckboxInputComponentValueTest.php":"8dc0039a2bdd82b9c0a0203eb6f97f56","tests\/AlpineFormModelTest.php":"6fb696a2b575b78e48182f680206c086","tests\/InputValidationTest.php":"09d3c8a0d8c705e135d22ab72835dbff","tests\/SelectComponentValueTest.php":"0c476964764c6abc61e6baf18ea041ae","tests\/Element.php":"2982e62d5cec8840029f3c8c0434ccf9","tests\/TextareaComponentValueTest.php":"f9130ccac4f11194e0dbcbf32a981609","tests\/ModelRouteBindingTest.php":"2f64dd30a6fde036edb0a631c9a130e3","tests\/CheckboxInputComponentTest.php":"3f35d015a226e980bb9253d889148db0","tests\/Concerns\/Mocks.php":"cb49d40959a40b02db6693bbdfd57f3d","tests\/InputComponentTest.php":"1b5189946406ae2949114d718722b203","tests\/CheckboxArrayInputComponentValueTest.php":"78846a4c77a84b15c2e299870d3186ae","tests\/TextareaComponentTest.php":"281edcc3ce4c39f28647511f8722c7d1","tests\/Controllers\/ArticleController.php":"48af33c1f389b8c2b305df9a51da1154","tests\/ComponentThemeTest.php":"2cab09e6c7f2d564006111b0c345bd0c","tests\/RadioInputComponentValueTest.php":"e9232a520c46483d07717b3ba3ed9498","tests\/Models\/Article.php":"ad7409e9d187d6e950f76f364edcf8d8","tests\/FormValuesTest.php":"76e35abb5571f309f9a9e7b41d492599","tests\/database\/migrations\/2021_01_01_000000_create_articles_table.php":"7295915edef69800e96c4ab762641537","tests\/database\/factories\/ArticlesFactory.php":"45e6ad5e82892a0d43d8bb1ba457fbd7","tests\/RadioInputComponentTest.php":"68ef5aeb5d5947259bc7bf1a14ef3f90","tests\/FormComponentTest.php":"97b182071db8224524cba5c9632a45c4"}}
5 changes: 5 additions & 0 deletions resources/views/components/field-group.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,8 @@
<x-formulate-field-errors :$field />
</div> --}}
{{-- </x-dynamic-component> --}}
<x-dynamic-component component="{{ Formulate::getDynamicComponentName('repeating-field') }}" :$field>
<x-appkit::field-group label="{{ $field->label }}" help="" error="Something went wrong">
{{ $slot }}
</x-appkit::field-group>
</x-dynamic-component>
4 changes: 2 additions & 2 deletions resources/views/components/select.blade.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<x-formulate-field-group :field="$field">
<x-formulate-field-group :$field>
<x-appkit::select name="{{ $name }}" id="{{ $id }}" {{ $attributes }}>
@if (!empty($options))
@foreach ($options as $value => $title)
<x-dynamic-component component="{{ Formulate::getDynamicComponentName('option') }}" :value="$value">{{ $title }}</x-dynamic-component>
<x-formulate-option :$value>{{ $title }}</x-formulate-option>
@endforeach
@else
{{ $slot }}
Expand Down
2 changes: 1 addition & 1 deletion src/Components/RepeatingFieldComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class RepeatingFieldComponent extends BaseComponent
*/
public function __construct(public InputComponent $field)
{
$this->labelAttributes = $this->field->labelAttributes->get('class');
$this->labelAttributes = '';

$this->label = Str::of($field->label)->plural()->toString();

Expand Down

0 comments on commit cc3baa1

Please sign in to comment.