diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js index 5ed0e8b03..b71d962be 100644 --- a/src/registrar/assets/src/js/getgov/table-base.js +++ b/src/registrar/assets/src/js/getgov/table-base.js @@ -448,6 +448,7 @@ export class BaseTable { const baseUrlValue = this.getBaseUrl()?.innerHTML ?? null; if (!baseUrlValue) return; + this.tableAnnouncementRegion.innerHTML = '

Loading table.

'; let url = `${baseUrlValue}?${searchParams.toString()}` fetch(url) .then(response => response.json()) @@ -480,6 +481,18 @@ export class BaseTable { // Do not scroll on first page load if (scroll) scrollToElement('class', this.sectionSelector); + // Note: this code is similar to that in updateDisplay. + // This is slightly different in that we control this via scroll, hence we have this here. + const { unfiltered_total, total } = data; + if (unfiltered_total) { + if (total) { + this.tableWrapper.focus(); + }else { + this.noSearchResultsWrapper.focus(); + } + }else { + this.noDataWrapper.focus(); + } this.scrollToTable = true; // update pagination @@ -493,6 +506,7 @@ export class BaseTable { this.currentSortBy = sortBy; this.currentOrder = order; this.currentSearchTerm = searchTerm; + this.tableAnnouncmentRegion.innerHTML = ''; }) .catch(error => console.error('Error fetching objects:', error)); } diff --git a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js index 6481094a0..6168e07f8 100644 --- a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js +++ b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js @@ -90,6 +90,7 @@ export class EditMemberDomainsTable extends BaseTable { addRow(dataObject, tbody, customTableOptions) { const domain = dataObject; const row = document.createElement('tr'); + row.setAttribute("tabindex", "-1"); let checked = false; let disabled = false; if ( diff --git a/src/registrar/assets/src/js/getgov/table-member-domains.js b/src/registrar/assets/src/js/getgov/table-member-domains.js index f9b789e1f..63c455e9e 100644 --- a/src/registrar/assets/src/js/getgov/table-member-domains.js +++ b/src/registrar/assets/src/js/getgov/table-member-domains.js @@ -18,6 +18,7 @@ export class MemberDomainsTable extends BaseTable { addRow(dataObject, tbody, customTableOptions) { const domain = dataObject; const row = document.createElement('tr'); + row.setAttribute("tabindex", "-1"); row.innerHTML = ` ${domain.name} diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html index b026a7a6b..bea2fce4c 100644 --- a/src/registrar/templates/includes/domain_requests_table.html +++ b/src/registrar/templates/includes/domain_requests_table.html @@ -196,11 +196,11 @@
- - - - -