From 7bee2c7cfa08b364bfc24f6ca224f465ca479e90 Mon Sep 17 00:00:00 2001
From: "Julia.Svinareva" <julia.svinaryova@onlyoffice.com>
Date: Wed, 22 May 2024 17:30:45 +0300
Subject: [PATCH] [DE PE SSE PDF] Fix bug 67599

---
 apps/common/main/lib/component/Button.js                     | 1 +
 apps/documenteditor/main/app/template/StatusBar.template     | 4 ++--
 apps/pdfeditor/main/app/template/StatusBar.template          | 4 ++--
 apps/presentationeditor/main/app/template/StatusBar.template | 4 ++--
 apps/spreadsheeteditor/main/app/template/StatusBar.template  | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index 66b2ea6ad2..fba2d3d679 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -630,6 +630,7 @@ define([
 
                 if (me.menu) {
                     $('[data-toggle^=dropdown]', el).attr('aria-haspopup', 'menu');
+                    $('[data-toggle^=dropdown]', el).attr('aria-expanded', false);
                 }
 
                 if (!me.caption && me.options.hint) {
diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template
index b17b727d11..3913be9385 100644
--- a/apps/documenteditor/main/app/template/StatusBar.template
+++ b/apps/documenteditor/main/app/template/StatusBar.template
@@ -30,8 +30,8 @@
         <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</i></button>
         <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</i></button>
         <button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
-        <div class="cnt-zoom" role="button" aria-haspopup="menu">
-            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
+        <div class="cnt-zoom">
+            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
                 <label id="label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>
diff --git a/apps/pdfeditor/main/app/template/StatusBar.template b/apps/pdfeditor/main/app/template/StatusBar.template
index 6f89645dd4..9462a31f47 100644
--- a/apps/pdfeditor/main/app/template/StatusBar.template
+++ b/apps/pdfeditor/main/app/template/StatusBar.template
@@ -23,8 +23,8 @@
         <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</i></button>
         <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</i></button>
         <button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
-        <div class="cnt-zoom" role="button" aria-haspopup="menu">
-            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
+        <div class="cnt-zoom">
+            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
                 <label id="label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>
diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template
index 62cc39d848..2099200a44 100644
--- a/apps/presentationeditor/main/app/template/StatusBar.template
+++ b/apps/presentationeditor/main/app/template/StatusBar.template
@@ -22,8 +22,8 @@
         <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtoslide">&nbsp;</i></button>
         <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</i></button>
         <button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
-        <div class="cnt-zoom" role="button" aria-haspopup="menu">
-            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
+        <div class="cnt-zoom">
+            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
                 <label id="status-label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>
diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template
index 5936d00e75..ff65920a2c 100644
--- a/apps/spreadsheeteditor/main/app/template/StatusBar.template
+++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template
@@ -13,8 +13,8 @@
     <div id="status-zoom-box" class="status-group">
         <div class="separator short"></div>
         <button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
-        <div class="cnt-zoom" role="button" aria-haspopup="menu">
-            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
+        <div class="cnt-zoom">
+            <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
                 <label id="status-label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>