Merge c16c7f2 into 2c4b5f4

tienvx · Oct 9, 2021 · a301b61 · a301b61
2 parents 2c4b5f4 + c16c7f2
commit a301b61
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ class TaskType extends AbstractType
                 'allow_remove' => true,
                 'allow_move_up' => true,
                 'allow_move_down' => true,
-                'render_expanded' => false,
+                'call_post_add_on_init' => true,
                 'prototype' => true,
             ])
             // ...

diff --git a/src/Form/CollectionJsType.php b/src/Form/CollectionJsType.php
@@ -35,7 +35,6 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setDefaults([
             'allow_move_up' => false,
             'allow_move_down' => false,
-            'render_expanded' => false,
             'entry_options' => function (OptionsResolver $entryOptionsResolver) {
                 $entryOptionsResolver
                     ->setDefaults([
@@ -55,7 +54,6 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         $view->vars = array_replace($view->vars, [
             'allow_move_up' => $options['allow_move_up'],
             'allow_move_down' => $options['allow_move_down'],
-            'render_expanded' => $options['render_expanded'],
             'prototype_name' => $options['prototype_name'],
             'call_post_add_on_init' => $options['call_post_add_on_init'],
         ]);

diff --git a/src/Resources/views/bootstrap_5_layout.html.twig b/src/Resources/views/bootstrap_5_layout.html.twig
@@ -36,7 +36,7 @@
 {% block collection_js_entry_widget %}
     <div class="accordion-item">
         <h2 class="accordion-header">
-            <button class="accordion-button {{ form_parent(form).vars.render_expanded ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#{{ id }}-contents">
+            <button class="accordion-button {{ form.vars.valid ? 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#{{ id }}-contents">
                 <i class="fas fw fa-chevron-right form-collection-item-collapse-marker"></i>
                 {% if ea is defined %}
                     {{ value|ea_as_string }}
@@ -73,7 +73,7 @@
                 {% endapply %}
             </div>
         </h2>
-        <div id="{{ id }}-contents" class="accordion-collapse collapse {{ form_parent(form).vars.render_expanded ? 'show' }}">
+        <div id="{{ id }}-contents" class="accordion-collapse collapse {{ not form.vars.valid ? 'show' }}">
             <div class="accordion-body">
                 {{ form_widget(form) }}
             </div>

diff --git a/tests/Form/CollectionJsTypeTest.php b/tests/Form/CollectionJsTypeTest.php
@@ -30,7 +30,7 @@ public function testDefaultOptions()
         $view = $form->createView();
         $this->assertFalse($view->vars['allow_move_up']);
         $this->assertFalse($view->vars['allow_move_down']);
-        $this->assertFalse($view->vars['render_expanded']);
+        $this->assertFalse($view->vars['call_post_add_on_init']);
     }
 
     public function testCustomOptions()
@@ -40,7 +40,7 @@ public function testCustomOptions()
                 'entry_type' => TextType::class,
                 'allow_move_up' => true,
                 'allow_move_down' => true,
-                'render_expanded' => true,
+                'call_post_add_on_init' => true,
             ])
         ;
         $this->assertSame([
@@ -52,6 +52,6 @@ public function testCustomOptions()
         $view = $form->createView();
         $this->assertTrue($view->vars['allow_move_up']);
         $this->assertTrue($view->vars['allow_move_down']);
-        $this->assertTrue($view->vars['render_expanded']);
+        $this->assertTrue($view->vars['call_post_add_on_init']);
     }
 }