From e41b3b7b28d709b11fac7770ac433627ca9ebc87 Mon Sep 17 00:00:00 2001
From: Daniel Karaj <daniel.karaj@digital.cabinet-office.gov.uk>
Date: Wed, 6 Dec 2023 17:34:41 +0000
Subject: [PATCH 1/2] Add heading option to file input component

- aligns heading behaviour with other inputs (which allow for the label for the input to be wrapped in a heading tag)
- for situations where the input is the first or only thing on a page, and no other suitable heading is appropriate (https://design-system.service.gov.uk/patterns/question-pages/)
---
 .../components/_file_upload.html.erb          | 19 +++++++++++-
 .../components/docs/file_upload.yml           | 11 +++++++
 spec/components/file_upload_spec.rb           | 30 +++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/views/govuk_publishing_components/components/_file_upload.html.erb b/app/views/govuk_publishing_components/components/_file_upload.html.erb
index 2cb589ca7e..58dbfe9084 100644
--- a/app/views/govuk_publishing_components/components/_file_upload.html.erb
+++ b/app/views/govuk_publishing_components/components/_file_upload.html.erb
@@ -1,6 +1,8 @@
 <%
   add_gem_component_stylesheet("file-upload")
 
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
   id ||= "file-upload-#{SecureRandom.hex(4)}"
   value ||= nil
   accept ||= nil
@@ -13,6 +15,8 @@
   has_error = error_message || error_items.any?
   hint_id = "hint-#{SecureRandom.hex(4)}"
   error_id = "error-#{SecureRandom.hex(4)}"
+  heading_size = false unless shared_helper.valid_heading_size?(heading_size)
+  heading_level ||= nil
 
   css_classes = %w(gem-c-file-upload govuk-file-upload)
   css_classes << "govuk-file-upload--error" if has_error
@@ -30,7 +34,20 @@
 
 <%= content_tag :div, class: form_group_css_classes do %>
   <% if label %>
-    <%= render "govuk_publishing_components/components/label", { html_for: id, text: label[:text] }.merge(label.symbolize_keys) %>
+    <% label_markup = capture do %>
+      <%= render "govuk_publishing_components/components/label", {
+        html_for: id,
+        heading_size: heading_size
+      }.merge(label.symbolize_keys) %>
+    <% end %>
+
+    <% if heading_level %>
+      <%= content_tag(shared_helper.get_heading_level, class: "govuk-label-wrapper") do %>
+        <%= label_markup %>
+      <% end %>
+    <% else %>
+      <%= label_markup %>
+    <% end %>
   <% end %>
 
   <% if hint %>
diff --git a/app/views/govuk_publishing_components/components/docs/file_upload.yml b/app/views/govuk_publishing_components/components/docs/file_upload.yml
index 3ea53cfc3f..f78606591e 100644
--- a/app/views/govuk_publishing_components/components/docs/file_upload.yml
+++ b/app/views/govuk_publishing_components/components/docs/file_upload.yml
@@ -48,3 +48,14 @@ examples:
         text: "Upload an image"
       name: "file-upload-specific"
       accept: "image/*"
+  with_label_as_heading:
+    description: |
+      Wraps the label in a heading tag. Valid options are `1` to `6`. To adjust the size of the label/heading, use the `heading_size` option. Valid options are `s`, `m`, `l` and `xl`.
+
+      Based on the [heading/label pattern](https://design-system.service.gov.uk/patterns/question-pages/) in the GOV.UK Design System.
+    data:
+      label:
+        text: "This is a heading 1 and a label"
+      name: "name"
+      heading_level: 1
+      heading_size: "l"
diff --git a/spec/components/file_upload_spec.rb b/spec/components/file_upload_spec.rb
index 8407b3bcd3..ec884abacc 100644
--- a/spec/components/file_upload_spec.rb
+++ b/spec/components/file_upload_spec.rb
@@ -62,6 +62,36 @@ def component_name
     assert_select ".govuk-file-upload[accept='image/*']"
   end
 
+  it "renders text input different sized labels" do
+    render_component(
+      label: { text: "What is your email address?" },
+      name: "email-address",
+      heading_size: "xl",
+    )
+
+    assert_select ".govuk-label.govuk-label--xl"
+  end
+
+  it "renders the label wrapped in a heading" do
+    render_component(
+      label: { text: "Where's your head at?" },
+      name: "heading",
+      heading_level: 3,
+    )
+
+    assert_select "h3.govuk-label-wrapper .govuk-label", text: "Where's your head at?"
+  end
+
+  it "only renders a label wrapped in a heading if specified" do
+    render_component(
+      label: { text: "What is your email address?" },
+      name: "email-address",
+      heading_size: "xl",
+    )
+
+    assert_select ".govuk-label-wrapper", false
+  end
+
   context "when a hint is provided" do
     before do
       render_component(

From 5a76b45254b6eca4073d0084057436e4ad626062 Mon Sep 17 00:00:00 2001
From: Daniel Karaj <daniel.karaj@digital.cabinet-office.gov.uk>
Date: Wed, 6 Dec 2023 17:38:38 +0000
Subject: [PATCH 2/2] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 184004d9bb..b991eb53c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 * Standardise search term formatting across GA4 trackers ([PR #3746](https://github.com/alphagov/govuk_publishing_components/pull/3746))
 * Add ZIP file support to attachment component ([PR #3751](https://github.com/alphagov/govuk_publishing_components/pull/3751))
+* Add heading option to file input component ([PR #3755](https://github.com/alphagov/govuk_publishing_components/pull/3755))
 
 ## 36.0.2