From 9e4ea237be478c0a9fc94bc744da35910fe74dcd Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 30 May 2023 23:01:56 +0300
Subject: [PATCH] [SSE] Fix focus in chart settings dialog

---
 apps/common/main/lib/component/Button.js      |  4 +++
 .../main/app/view/ChartSettingsDlg.js         | 26 ++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index abfad08b86..78c29f6ddb 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -899,6 +899,10 @@ define([
                 }
             }
         },
+
+        focus: function() {
+            this.$el && this.$el.find('button').addBack().filter('button').focus();
+        }
     });
 });
 
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
index 1112264cb5..09c8e03720 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
@@ -1046,18 +1046,18 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
         getFocusedComponents: function() {
             return [
                 this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.chSeriesName, this.chCategoryName, this.chValue, this.txtSeparator, // 1 tab
-                this.cmbVertTitle[0], this.cmbVertGrid[0],
-                this.chVertHide[0], this.cmbMinType[0], this.spnMinValue[0], this.cmbMaxType[0], this.spnMaxValue[0], this.cmbVCrossType[0], this.spnVAxisCrosses[0],
-                this.cmbUnits[0] , this.chVReverse[0], this.chVLogScale[0], this.spnBase[0], this.cmbVMajorType[0], this.cmbVMinorType[0], this.cmbVLabelPos[0], // 2 tab
-                this.cmbVertTitle[1], this.cmbVertGrid[1],
-                this.chVertHide[1], this.cmbMinType[1] , this.spnMinValue[1], this.cmbMaxType[1], this.spnMaxValue[1], this.cmbVCrossType[1], this.spnVAxisCrosses[1],
-                this.cmbUnits[1] , this.chVReverse[1], this.chVLogScale[1], this.spnBase[1], this.cmbVMajorType[1], this.cmbVMinorType[1], this.cmbVLabelPos[1], // 3 tab
+                this.chVertHide[0], this.cmbVertTitle[0], this.cmbVertGrid[0],
+                this.cmbMinType[0], this.spnMinValue[0], this.cmbMaxType[0], this.spnMaxValue[0], this.cmbVCrossType[0], this.spnVAxisCrosses[0],
+                this.cmbUnits[0] , this.chVReverse[0], this.chVLogScale[0], this.spnBase[0], this.cmbVMajorType[0], this.cmbVMinorType[0], this.cmbVLabelPos[0], this.btnVFormat[0], // 2 tab
+                this.chVertHide[1], this.cmbVertTitle[1], this.cmbVertGrid[1],
+                this.cmbMinType[1] , this.spnMinValue[1], this.cmbMaxType[1], this.spnMaxValue[1], this.cmbVCrossType[1], this.spnVAxisCrosses[1],
+                this.cmbUnits[1] , this.chVReverse[1], this.chVLogScale[1], this.spnBase[1], this.cmbVMajorType[1], this.cmbVMinorType[1], this.cmbVLabelPos[1], this.btnVFormat[1], // 3 tab
                 this.chHorHide[0], this.cmbHorTitle[0], this.cmbHorGrid[0],
                 this.cmbHCrossType[0] , this.spnHAxisCrosses[0], this.cmbAxisPos[0], this.chHReverse[0], this.cmbHMajorType[0], this.cmbHMinorType[0], this.spnMarksInterval[0],
-                this.cmbHLabelPos[0] , this.spnLabelDist[0], this.cmbLabelInterval[0], this.spnLabelInterval[0], // 4 tab
+                this.cmbHLabelPos[0] , this.spnLabelDist[0], this.cmbLabelInterval[0], this.spnLabelInterval[0], this.btnHFormat[0], // 4 tab
                 this.chHorHide[1], this.cmbHorTitle[1], this.cmbHorGrid[1],
                 this.cmbHCrossType[1] , this.spnHAxisCrosses[1], this.cmbAxisPos[1], this.chHReverse[1], this.cmbHMajorType[1], this.cmbHMinorType[1], this.spnMarksInterval[1],
-                this.cmbHLabelPos[1] , this.spnLabelDist[1], this.cmbLabelInterval[1], this.spnLabelInterval[1], // 5 tab
+                this.cmbHLabelPos[1] , this.spnLabelDist[1], this.cmbLabelInterval[1], this.spnLabelInterval[1], this.btnHFormat[1], // 5 tab
                 this.cmbEmptyCells, this.chShowEmpty, // 6 tab
                 this.chShowAxis, this.chReverse, this.cmbSparkMinType, this.spnSparkMinValue, this.cmbSparkMaxType, this.spnSparkMaxValue, // 7 tab
                 this.radioTwoCell, this.radioOneCell, this.radioAbsolute, // 8 tab
@@ -1076,13 +1076,15 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                         break;
                     case 2:
                     case 3:
-                        me.onVCategoryClick(index-2);
-                        me.cmbMinType[index-2].focus();
+                        index -= 2;
+                        me.onVCategoryClick(index);
+                        (me.vertAxisProps[index].getAxisType()===Asc.c_oAscAxisType.val) ? me.cmbMinType[index].focus() : (me.cmbHCrossType[index].isDisabled() ? me.btnHFormat[index].focus() : me.cmbHCrossType[index].focus() );
                         break;
                     case 4:
                     case 5:
-                        me.onHCategoryClick(index-4);
-                        me.cmbHCrossType[index-4].focus();
+                        index -= 4;
+                        me.onHCategoryClick(index);
+                        (me.horAxisProps[index].getAxisType()===Asc.c_oAscAxisType.val) ? me.cmbMinType[index].focus() : (me.cmbHCrossType[index].isDisabled() ? me.btnHFormat[index].focus() : me.cmbHCrossType[index].focus());
                         break;
                     case 6:
                         me.cmbEmptyCells.focus();