Merge pull request #4 from tienvx/fix-form-theme

Fix form theme
tienvx · Oct 3, 2021 · 0edf124 · 0edf124
2 parents 9ff24e3 + 26a2804
commit 0edf124
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,14 @@ class TaskType extends AbstractType
 }
 ```
 
+Then you need to set the form theme:
+```yaml
+# config/packages/twig.yaml
+twig:
+  # For bootstrap for example
+  form_themes: ['@CollectionJs/bootstrap_5_layout.html.twig']
+```
+
 ## Contributing
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
 

diff --git a/src/Resources/assets/package.json b/src/Resources/assets/package.json
@@ -20,7 +20,7 @@
     },
     "peerDependencies": {
         "stimulus": "^2.0.0",
-        "symfony-collection-js": "^4.2.0"
+        "symfony-collection-js": "^4.2.0-js-only"
     },
     "devDependencies": {
         "@babel/cli": "^7.12.1",
@@ -29,6 +29,6 @@
         "@babel/preset-env": "^7.12.7",
         "@symfony/stimulus-testing": "^1.1.0",
         "stimulus": "^2.0.0",
-        "symfony-collection-js": "^4.2.0"
+        "symfony-collection-js": "^4.2.0-js-only"
     }
 }
diff --git a/src/Resources/views/bootstrap_5_layout.html.twig b/src/Resources/views/bootstrap_5_layout.html.twig
@@ -13,10 +13,10 @@
     {%- set dataController = (attr['data-controller']|default('') ~ ' ' ~ controllerName)|trim -%}
     {% set row_attr = row_attr|merge({
         'data-controller': dataController,
-        'data-'~ controllerName ~ '-allow-add': allow_add ? 'true' : 'false',
-        'data-'~ controllerName ~ '-allow-delete': allow_delete ? 'true' : 'false',
-        'data-'~ controllerName ~ '-allow-move-up': allow_move_up ? 'true' : 'false',
-        'data-'~ controllerName ~ '-allow-move-down': allow_move_down ? 'true' : 'false',
+        ('data-'~ controllerName ~ '-allow-add'): allow_add ? 'true' : 'false',
+        ('data-'~ controllerName ~ '-allow-delete'): allow_delete ? 'true' : 'false',
+        ('data-'~ controllerName ~ '-allow-move-up'): allow_move_up ? 'true' : 'false',
+        ('data-'~ controllerName ~ '-allow-move-down'): allow_move_down ? 'true' : 'false',
     }) %}
 
     {{ block('form_row') }}
@@ -48,7 +48,7 @@
 {% block collection_js_entry_widget %}
     <div class="accordion-item">
         <h2 class="accordion-header" id="headingOne">
-            <h5 class="m-0">{{ value|string }}</h5>
+            <h5 class="m-0">{{ value }}</h5>
             <div>
                 <button class="accordion-button {{ render_expanded ? '' : '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>