From ecdb0e242b7526a443639f77c1c9eac81a16aba4 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Fri, 6 Sep 2024 12:17:01 +0100
Subject: [PATCH 1/2] Use hidden attribute to show/hide expiry notices

This means the notice we want to hide on page load
doesn't depend on CSS for that.

It also makes it much clearer in the page
semantics that the notices are hidden or not.
---
 lib/assets/javascripts/_modules/page-expiry.js   | 4 ++--
 lib/assets/stylesheets/modules/_page-review.scss | 2 --
 lib/source/layouts/_page_review.erb              | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/assets/javascripts/_modules/page-expiry.js b/lib/assets/javascripts/_modules/page-expiry.js
index 1bc228b0..983201d6 100644
--- a/lib/assets/javascripts/_modules/page-expiry.js
+++ b/lib/assets/javascripts/_modules/page-expiry.js
@@ -7,8 +7,8 @@
       var isExpired = Date.parse(rawDate) < new Date()
 
       if (isExpired) {
-        $element.find('.page-expiry--not-expired').hide(0)
-        $element.find('.page-expiry--expired').show(0)
+        $element.find('.page-expiry--not-expired').attr('hidden', '')
+        $element.find('.page-expiry--expired').removeAttr('hidden')
       }
     }
   }
diff --git a/lib/assets/stylesheets/modules/_page-review.scss b/lib/assets/stylesheets/modules/_page-review.scss
index 753617a4..dd449667 100644
--- a/lib/assets/stylesheets/modules/_page-review.scss
+++ b/lib/assets/stylesheets/modules/_page-review.scss
@@ -24,8 +24,6 @@
 }
 
 .page-expiry--expired {
-  display: none;
-
   padding: govuk-spacing(3);
   margin-top: govuk-spacing(9);
   border: govuk-spacing(1) solid $govuk-error-colour;
diff --git a/lib/source/layouts/_page_review.erb b/lib/source/layouts/_page_review.erb
index 3327eee4..6550f56f 100644
--- a/lib/source/layouts/_page_review.erb
+++ b/lib/source/layouts/_page_review.erb
@@ -12,7 +12,7 @@
     </div>
 
     <% if current_page_review.show_expiry? %>
-    <div class='page-expiry--expired'>
+    <div class='page-expiry--expired' hidden>
       This page was set to be reviewed before <%= format_date current_page_review.review_by %><% if current_page_review.owner_slack %>
        by the page owner <%= link_to current_page_review.owner_slack, current_page_review.owner_slack_url %><% end %>.
       This might mean the content is out of date.

From de4a27f94f259193cee53204da453112a152b589 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Tue, 17 Sep 2024 09:57:25 +0100
Subject: [PATCH 2/2] Update CHANGLOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98c9454b..df756c63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Update gem dependencies.
 - Declare some missing indirect dependencies to prepare for Ruby 3.4. This also resolves some warnings about this at build time.
 - Remove aria-hidden from search label to let assistive technologies see its accessible name
+- Use hidden attribute to show/hide expiry notices instead of just CSS
 
 ## 3.5.0