From 5da8892e452b956352ca0df593b5eb634ae4fbfd Mon Sep 17 00:00:00 2001
From: "Julia.Svinareva" <julia.svinaryova@onlyoffice.com>
Date: Wed, 8 May 2024 20:41:15 +0300
Subject: [PATCH] [SSE] Fix bug 67614

---
 apps/common/main/lib/view/SearchPanel.js      | 21 ++++++++++---------
 .../main/app/controller/Search.js             | 12 +++++------
 apps/spreadsheeteditor/main/locale/en.json    |  1 +
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 1070551711..e1e7b39dbd 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -265,15 +265,15 @@ define([
                     this.cmbSearch.setValue(0);
                     this.cmbLookIn.setValue(0);
 
-                    var tableTemplate = '<div class="search-table">' +
-                        '<div class="header-items">' +
-                        '<div class="header-item">' + this.textSheet + '</div>' +
-                        '<div class="header-item">' + this.textName + '</div>' +
-                        '<div class="header-item">' + this.textCell + '</div>' +
-                        '<div class="header-item">' + this.textValue + '</div>' +
-                        '<div class="header-item">' + this.textFormula + '</div>' +
-                        '</div>' +
-                        '<div class="ps-container oo search-items"></div>' +
+                    var tableTemplate = '<div role="table" class="search-table" aria-label="' + this.textSearchResultsTable + '">' +
+                        '<div role="rowgroup"><div role="row" class="header-items">' +
+                        '<div role="columnheader" class="header-item">' + this.textSheet + '</div>' +
+                        '<div role="columnheader" class="header-item">' + this.textName + '</div>' +
+                        '<div role="columnheader" class="header-item">' + this.textCell + '</div>' +
+                        '<div role="columnheader" class="header-item">' + this.textValue + '</div>' +
+                        '<div role="columnheader" class="header-item">' + this.textFormula + '</div>' +
+                        '</div></div>' +
+                        '<div role="rowgroup" class="ps-container oo search-items"></div>' +
                         '</div>',
                         $resultTable = $(tableTemplate).appendTo(this.$resultsContainer);
                     this.$resultsContainer.scroller = new Common.UI.Scroller({
@@ -488,7 +488,8 @@ define([
         textContentChanged: 'Document changed.',
         textSearchAgain: '{0}Perform new search{1} for accurate results.',
         textItemsSuccessfullyReplaced: '{0} items successfully replaced.',
-        textPartOfItemsNotReplaced: '{0}/{1} items replaced. Remaining {2} items are locked by other users.'
+        textPartOfItemsNotReplaced: '{0}/{1} items replaced. Remaining {2} items are locked by other users.',
+        textSearchResultsTable: 'Search results'
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 74cd4079e9..b365de0b0e 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -454,12 +454,12 @@ define([
                 me.resultItems = [];
                 data.forEach(function (item, ind) {
                     var isSelected = ind === me._state.currentResult;
-                    var tr = '<div class="item" style="width: 100%;">' +
-                        '<div class="sheet">' + (item[1] ? Common.Utils.String.htmlEncode(item[1]) : '') + '</div>' +
-                        '<div class="name">' + (item[2] ? Common.Utils.String.htmlEncode(item[2]) : '') + '</div>' +
-                        '<div class="cell">' + (item[3] ? Common.Utils.String.htmlEncode(item[3]) : '') + '</div>' +
-                        '<div class="value">' + (item[4] ? Common.Utils.String.htmlEncode(item[4]) : '') + '</div>' +
-                        '<div class="formula">' + (item[5] ? Common.Utils.String.htmlEncode(item[5]) : '') + '</div>' +
+                    var tr = '<div role="row" class="item" style="width: 100%;">' +
+                        '<div role="cell" class="sheet">' + (item[1] ? Common.Utils.String.htmlEncode(item[1]) : '') + '</div>' +
+                        '<div role="cell" class="name">' + (item[2] ? Common.Utils.String.htmlEncode(item[2]) : '') + '</div>' +
+                        '<div role="cell" class="cell">' + (item[3] ? Common.Utils.String.htmlEncode(item[3]) : '') + '</div>' +
+                        '<div role="cell" class="value">' + (item[4] ? Common.Utils.String.htmlEncode(item[4]) : '') + '</div>' +
+                        '<div role="cell" class="formula">' + (item[5] ? Common.Utils.String.htmlEncode(item[5]) : '') + '</div>' +
                         '</div>';
                     var $item = $(tr).appendTo($innerResults);
                     if (isSelected) {
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 7ff4b3e448..13b6a8ac3e 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -664,6 +664,7 @@
   "Common.Views.SearchPanel.textWorkbook": "Workbook",
   "Common.Views.SearchPanel.tipNextResult": "Next result",
   "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
+  "Common.Views.SearchPanel.textSearchResultsTable": "Search results",
   "Common.Views.SelectFileDlg.textLoading": "Loading",
   "Common.Views.SelectFileDlg.textTitle": "Select data source",
   "Common.Views.SignDialog.textBold": "Bold",