From 8595c3231406ca80ae711294785022e807fb14e4 Mon Sep 17 00:00:00 2001
From: Andy Byers <a.byers@bbk.ac.uk>
Date: Thu, 16 Jul 2026 15:00:37 +0100
Subject: [PATCH 1/3] fix: #5387 add tabindex to clean table modal so it is
 keyboard dismissable

---
 src/journal/tests/test_journal_frontend.py    | 88 +++++++++++++++++++
 .../elements/journal/table_modal.html         |  4 +-
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/src/journal/tests/test_journal_frontend.py b/src/journal/tests/test_journal_frontend.py
index 6b94cbe600..63e3a85041 100644
--- a/src/journal/tests/test_journal_frontend.py
+++ b/src/journal/tests/test_journal_frontend.py
@@ -1,3 +1,8 @@
+import os
+import shutil
+
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase, override_settings
 from django.urls import reverse
 from django.utils import timezone
@@ -8,6 +13,7 @@
 from press.models import Press
 from utils.testing import helpers
 from utils import setting_handler
+from core import files as core_files
 from core import models as core_models
 from submission import models as submission_models
 
@@ -270,3 +276,85 @@ def test_search_excludes_artucle(self):
             response,
             self.article_title,
         )
+
+
+class TestTableModalKeyboardDismiss(TestCase):
+    """
+    Regression tests for #5387: the enlarged-table modal must be keyboard
+    dismissable. Without tabindex="-1" on the modal, Bootstrap cannot move
+    focus into it, so keyboard users can never reach the close button.
+    """
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.press = helpers.create_press()
+        cls.journal_domain = "tablemodal.janeway.systems"
+        cls.journal = make_test_journal(
+            code="tablemodal",
+            domain=cls.journal_domain,
+        )
+        setting_handler.save_setting(
+            "general",
+            "journal_theme",
+            cls.journal,
+            "clean",
+        )
+        helpers.create_roles(["Author"])
+        cls.owner = helpers.create_user(
+            "table_modal_owner@janeway.systems",
+            ["author"],
+            cls.journal,
+        )
+        cls.article = helpers.create_article(
+            journal=cls.journal,
+            title="An article with a table",
+            stage=submission_models.STAGE_PUBLISHED,
+            date_published=timezone.now(),
+            owner=cls.owner,
+        )
+        galley_html = (
+            '<div class="table-expansion" id="T1">'
+            "<table><caption>Table 1</caption>"
+            "<tr><td>Cell</td></tr></table>"
+            "</div>"
+        )
+        uploaded_file = SimpleUploadedFile(
+            "tables.html",
+            galley_html.encode("utf-8"),
+            content_type="text/html",
+        )
+        file_obj = core_files.save_file_to_article(
+            uploaded_file,
+            cls.article,
+            cls.owner,
+            label="HTML",
+            is_galley=True,
+        )
+        cls.galley = helpers.create_galley(
+            cls.article,
+            file_obj=file_obj,
+            label="HTML",
+            type="html",
+        )
+        cls.addClassCleanup(
+            shutil.rmtree,
+            os.path.join(settings.BASE_DIR, "files", "articles", str(cls.article.pk)),
+            ignore_errors=True,
+        )
+
+    def test_table_modal_is_focusable_for_keyboard_dismissal(self):
+        response = self.client.get(
+            reverse(
+                "article_view",
+                kwargs={
+                    "identifier_type": "id",
+                    "identifier": self.article.pk,
+                },
+            ),
+            SERVER_NAME=self.journal_domain,
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(
+            response,
+            'id="table-T1" tabindex="-1"',
+        )
diff --git a/src/themes/clean/templates/elements/journal/table_modal.html b/src/themes/clean/templates/elements/journal/table_modal.html
index 5d556521b9..d5423aa334 100644
--- a/src/themes/clean/templates/elements/journal/table_modal.html
+++ b/src/themes/clean/templates/elements/journal/table_modal.html
@@ -1,5 +1,5 @@
-<div class="modal " id="table-{{ tableid }}">
-  <div class="modal-dialog modal-xl">
+<div class="modal " id="table-{{ tableid }}" tabindex="-1" role="dialog" aria-labelledby="copy-of-{{ tableid }}-label">
+  <div class="modal-dialog modal-xl" role="document">
     <div class="modal-content">
 
       <!-- Modal body -->

From 4dcfcca50c8bb715c256fe75bc25cbbebccc5c1c Mon Sep 17 00:00:00 2001
From: Andy Byers <a.byers@bbk.ac.uk>
Date: Thu, 16 Jul 2026 15:00:37 +0100
Subject: [PATCH 2/3] fix: #5387 defer tabindex removal until blur so focus
 stays on in-page link target

---
 src/static/common/js/reversable-links.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/static/common/js/reversable-links.js b/src/static/common/js/reversable-links.js
index a236897e7b..28bb8cdeae 100644
--- a/src/static/common/js/reversable-links.js
+++ b/src/static/common/js/reversable-links.js
@@ -47,15 +47,26 @@ function drawUserAttention(targetElement){
         element.tabIndex = "-1"
         element.focus();
         
+        const restoreTabIndex = () => {
+            if (oldTabIndex === null) {
+                element.removeAttribute('tabIndex');
+            } else {
+                element.tabIndex = oldTabIndex;
+            }
+        };
+
         const timeout = setTimeout(() => {
             element.classList.remove('draw-attention');
             if (element.classList.length === 0) {
                 element.removeAttribute('class');
             }
-            if (oldTabIndex === null) {
-                element.removeAttribute('tabIndex');
+            if (document.activeElement === element) {
+                // Removing tabindex while the element is focused sends focus
+                // back to <body>, so tabbing would restart from the top of
+                // the page. Wait until focus moves on before restoring.
+                element.addEventListener('blur', restoreTabIndex, { once: true });
             } else {
-                element.tabIndex = oldTabIndex;
+                restoreTabIndex();
             }
             attentionTimeouts.delete(element);
         }, 2000);

From 7a185ff8ed12cc5c6eaa37e7642f2fe189596d24 Mon Sep 17 00:00:00 2001
From: Andy Byers <a.byers@bbk.ac.uk>
Date: Tue, 21 Jul 2026 12:25:58 +0100
Subject: [PATCH 3/3] feat: #5385 add article-authors-full class so themes can
 target the author details list

---
 src/templates/common/elements/journal/article_authors_full.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/common/elements/journal/article_authors_full.html b/src/templates/common/elements/journal/article_authors_full.html
index 02e8d88c66..fd4d103911 100644
--- a/src/templates/common/elements/journal/article_authors_full.html
+++ b/src/templates/common/elements/journal/article_authors_full.html
@@ -1,4 +1,4 @@
-<ul class="flex direction-column gap-0-5">
+<ul class="article-authors-full flex direction-column gap-0-5">
   {% for author in article.frozen_authors.all %}
     <li>{% include "common/elements/journal/article_author_display.html" %}</li>
   {% endfor %}