From 7f7125068827f06601b033181ad0c083382bddfe Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Wed, 6 Nov 2019 21:55:31 -0700
Subject: [PATCH 01/12] updated changelog date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e053ba54..85115650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # v4.0.0
-## 10/06/2019
+## 11/06/2019
 
 1. [](#new)
     * Added `tabindex` to global attributes of default field

From cda9cfa2902747338d034f6234f000e6f00ad298 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 19 Nov 2019 10:58:35 +0200
Subject: [PATCH 02/12] Improve Grav 1.7 support by not using deprecated
 `$page->modular()` call

---
 CHANGELOG.md     | 6 ++++++
 classes/Form.php | 2 +-
 form.php         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85115650..e5c3922b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v4.0.1
+## mm/dd/2019
+
+1. [](#new)
+    * Improve Grav 1.7 support by not using deprecated `$page->modular()` call
+
 # v4.0.0
 ## 11/06/2019
 
diff --git a/classes/Form.php b/classes/Form.php
index 285c735e..450ec90b 100644
--- a/classes/Form.php
+++ b/classes/Form.php
@@ -134,7 +134,7 @@ public function __construct(PageInterface $page, $name = null, $form = null)
         }
 
         // If we're on a modular page, find the real page.
-        while ($page && $page->modular()) {
+        while ($page && $page->modularTwig()) {
             $header = $page->header();
             $header->never_cache_twig = true;
             $page = $page->parent();
diff --git a/form.php b/form.php
index 08230bb3..dbc324a4 100644
--- a/form.php
+++ b/form.php
@@ -157,7 +157,7 @@ public function onPageProcessed(Event $e)
 
         // Force never_cache_twig if modular form (recursively up)
         $current = $page;
-        while ($current && $current->modular()) {
+        while ($current && $current->modularTwig()) {
             $header = $current->header();
             $header->never_cache_twig = true;
 

From 3e43df167a81f0febbf1a1fc751b0720fea99805 Mon Sep 17 00:00:00 2001
From: qumuq-til <43707841+qumuq-til@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:00:06 +0300
Subject: [PATCH 03/12] Update textarea.html.twig (#390)

removing extraneous %}
---
 templates/forms/fields/textarea/textarea.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/fields/textarea/textarea.html.twig b/templates/forms/fields/textarea/textarea.html.twig
index a3088ee2..44597e71 100644
--- a/templates/forms/fields/textarea/textarea.html.twig
+++ b/templates/forms/fields/textarea/textarea.html.twig
@@ -17,7 +17,7 @@
                 {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
                 {% if field.readonly in ['on', 'true', 1] %}readonly="readonly"{% endif %}
                 {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
-                {% if field.tabindex %}tabindex="{{ field.tabindex }}" %}{% endif %}
+                {% if field.tabindex %}tabindex="{{ field.tabindex }}"{% endif %}
                 {% if required %}required="required"{% endif %}
                 {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %}
                 {% if field.validate.message %}title="{{ field.validate.message|t|e }}"{% endif %}

From d8892f8bc7995aec09c130d7e68a329e483fcd6d Mon Sep 17 00:00:00 2001
From: qumuq-til <43707841+qumuq-til@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:00:24 +0300
Subject: [PATCH 04/12] Update checkbox.html.twig (#395)

removing extraneous %}
---
 templates/forms/fields/checkbox/checkbox.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/fields/checkbox/checkbox.html.twig b/templates/forms/fields/checkbox/checkbox.html.twig
index 07c51ef4..c458e979 100644
--- a/templates/forms/fields/checkbox/checkbox.html.twig
+++ b/templates/forms/fields/checkbox/checkbox.html.twig
@@ -22,7 +22,7 @@
                 {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
                 {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
                 {% if required %}required="required"{% endif %}
-                {% if field.tabindex %}tabindex="{{ field.tabindex }}" %}{% endif %}
+                {% if field.tabindex %}tabindex="{{ field.tabindex }}"{% endif %}
             {% endblock %}
             />
         <label style="display:inline;" class="inline" for="{{ id|e }}">

From c0d221693b6544bef55ae89855c1f85c7adc8d4e Mon Sep 17 00:00:00 2001
From: qumuq-til <43707841+qumuq-til@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:00:36 +0300
Subject: [PATCH 05/12] Update toggle.html.twig (#394)

removing extraneous %}
---
 templates/forms/fields/toggle/toggle.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/fields/toggle/toggle.html.twig b/templates/forms/fields/toggle/toggle.html.twig
index cea180f4..15ee90e0 100644
--- a/templates/forms/fields/toggle/toggle.html.twig
+++ b/templates/forms/fields/toggle/toggle.html.twig
@@ -55,7 +55,7 @@
             {% endif %}
           {% endif %}
           {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-          {% if field.tabindex %}tabindex="{{ field.tabindex }}" %}{% endif %}
+          {% if field.tabindex %}tabindex="{{ field.tabindex }}"{% endif %}
       />
       <label for="{{ id }}">{{ (macro.spanToggle(translation, maxLen)|trim)|raw }}</label>
     {% endfor %}

From 2b46a48b130438399279827b8aa26d46baec870d Mon Sep 17 00:00:00 2001
From: qumuq-til <43707841+qumuq-til@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:00:49 +0300
Subject: [PATCH 06/12] Update key.html.twig (#393)

removing extraneous %}
---
 templates/forms/fields/key/key.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/forms/fields/key/key.html.twig b/templates/forms/fields/key/key.html.twig
index ea5d54d6..cbc4da0d 100644
--- a/templates/forms/fields/key/key.html.twig
+++ b/templates/forms/fields/key/key.html.twig
@@ -16,7 +16,7 @@
                     {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
                     {% if field.readonly in ['on', 'true', 1] %}readonly="readonly"{% endif %}
                     {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
-                    {% if field.tabindex %}tabindex="{{ field.tabindex }}" %}{% endif %}
+                    {% if field.tabindex %}tabindex="{{ field.tabindex }}"{% endif %}
                     {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
                     {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %}
                     {% if field.validate.message %}title="{{ field.validate.message|e|t }}"
@@ -24,4 +24,4 @@
                 {% endblock %}
         />
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From f6431fa808319f573f8726b7228f3a38abe16a00 Mon Sep 17 00:00:00 2001
From: qumuq-til <43707841+qumuq-til@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:01:02 +0300
Subject: [PATCH 07/12] Update radio.html.twig (#392)

removing extraneous %}
---
 templates/forms/fields/radio/radio.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig
index 49d090a5..743a2cc9 100644
--- a/templates/forms/fields/radio/radio.html.twig
+++ b/templates/forms/fields/radio/radio.html.twig
@@ -16,7 +16,7 @@
                    {% if key == value %}checked="checked" {% endif %}
                    {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
                    {% if required %}required="required"{% endif %}
-                   {% if field.tabindex %}tabindex="{{ field.tabindex }}" %}{% endif %}
+                   {% if field.tabindex %}tabindex="{{ field.tabindex }}"{% endif %}
             />
             <label style="display: inline" class="inline" for="{{ id|e }}">{{ text|t|raw }}</label>
         </div>

From b924f66e135c94c0a99d19ea19ca8ca7bacd9574 Mon Sep 17 00:00:00 2001
From: qumuq-til <43707841+qumuq-til@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:01:15 +0300
Subject: [PATCH 08/12] Update select.html.twig (#391)

removing extraneous %}
---
 templates/forms/fields/select/select.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/fields/select/select.html.twig b/templates/forms/fields/select/select.html.twig
index a366a7e7..f3eb2a31 100644
--- a/templates/forms/fields/select/select.html.twig
+++ b/templates/forms/fields/select/select.html.twig
@@ -17,7 +17,7 @@
                 {% if required %}required="required"{% endif %}
                 {% if field.multiple in ['on', 'true', 1] %}multiple="multiple"{% endif %}
                 {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                {% if field.tabindex %}tabindex="{{ field.tabindex }}" %}{% endif %}
+                {% if field.tabindex %}tabindex="{{ field.tabindex }}"{% endif %}
                 {% if field.form %}form="{{ field.form }}"{% endif %}
                 {% if field.key %}
                     data-key-observe="{{ (scope ~ field.name)|fieldName }}"

From adc929615b51795cd13d48c1f52b5ffce8cbca07 Mon Sep 17 00:00:00 2001
From: qumuq-til <43707841+qumuq-til@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:01:30 +0300
Subject: [PATCH 09/12] Remove extraneous leftovers (#389)

which are polluting html output
---
 templates/forms/default/field.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/default/field.html.twig b/templates/forms/default/field.html.twig
index eb4c9908..91093623 100644
--- a/templates/forms/default/field.html.twig
+++ b/templates/forms/default/field.html.twig
@@ -124,7 +124,7 @@
   {% if field.autocomplete is defined %}autocomplete="{{ field.autocomplete }}"{% endif %}
   {% if field.autocapitalize in ['off', 'characters', 'words', 'sentences'] %}autocapitalize="{{ field.autocapitalize }}"{% endif %}
   {% if field.inputmode in ['none', 'text', 'decimal', 'numeric', 'tel', 'search', 'email', 'url'] %}inputmode="{{ field.inputmode }}"{% endif %}
-  {% if field.tabindex %}tabindex="{{ field.tabindex }}" %}{% endif %}
+  {% if field.tabindex %}tabindex="{{ field.tabindex }}"{% endif %}
   {% if field.spellcheck in ['true', 'false'] %}spellcheck="{{ field.spellcheck }}"{% endif %}
   {% if required %}required="required"{% endif %}
   {% if field.validate.pattern %}pattern="{{ field.validate.pattern|e }}"{% endif %}

From 8c66e08f8558bdd861f2316a5bb4c7150f701874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Droz?= <raphael.droz+floss@gmail.com>
Date: Mon, 16 Dec 2019 11:02:28 -0300
Subject: [PATCH 10/12] allow an empty form scope to be set from form
 parameters (#385)

---
 templates/forms/default/form.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/default/form.html.twig b/templates/forms/default/form.html.twig
index 74f19148..9bef26c3 100644
--- a/templates/forms/default/form.html.twig
+++ b/templates/forms/default/form.html.twig
@@ -4,7 +4,7 @@
 
 {% include 'partials/form-messages.html.twig' %}
 
-{% set scope = scope ?: 'data.' %}
+{% set scope = scope ?: form.scope is defined ? form.scope : 'data.' %}
 {% set multipart = '' %}
 {% set blueprints = blueprints ?? form.blueprint() %}
 {% set method = form.method|upper|default('POST') %}

From 3978f8ac6a39c78150839ad06915bdfeefd57f58 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Fri, 20 Dec 2019 20:54:53 +0200
Subject: [PATCH 11/12] Fixed bad looking `tabs` field with a single tab in
 admin

---
 CHANGELOG.md                               | 6 +++++-
 templates/forms/fields/tabs/tabs.html.twig | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5c3922b..b17dbf1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # v4.0.1
 ## mm/dd/2019
 
-1. [](#new)
+1. [](#improved)
     * Improve Grav 1.7 support by not using deprecated `$page->modular()` call
+    * Use form scope if it is defined
+1. [](#bugfix)
+    * Fixed bad HTML in select, radio, key, toggle, checkbox ad textarea when using tabindex attribute
+    * Fixed bad looking `tabs` field with a single tab in admin
 
 # v4.0.0
 ## 11/06/2019
diff --git a/templates/forms/fields/tabs/tabs.html.twig b/templates/forms/fields/tabs/tabs.html.twig
index 4d51f439..217fdafe 100644
--- a/templates/forms/fields/tabs/tabs.html.twig
+++ b/templates/forms/fields/tabs/tabs.html.twig
@@ -19,7 +19,7 @@
 
     {% if count == 0 %}
         {# Nothing to display #}
-    {% elseif count == 1 %}
+    {% elseif count == 1 and not admin %}
         {% for field in (tabs|first).fields %}
             {% if field.type %}
                 {% set value = field.name ? (form ? form.value(field.name) : data.value(field.name)) : data.toArray %}

From cfd530156a68b317ccb83add32aa672a487c3132 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 2 Jan 2020 16:42:23 -0700
Subject: [PATCH 12/12] prepare for release

---
 CHANGELOG.md    | 2 +-
 blueprints.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b17dbf1e..cf97cbdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # v4.0.1
-## mm/dd/2019
+## 01/02/2020
 
 1. [](#improved)
     * Improve Grav 1.7 support by not using deprecated `$page->modular()` call
diff --git a/blueprints.yaml b/blueprints.yaml
index 7b7d19fc..76988b8e 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Form
-version: 4.0.0
+version: 4.0.1
 testing: false
 description: Enables the forms handling
 icon: check-square