From 85f994303f1f0494ca1fe1d90b3dd9b05d184be0 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 4 Feb 2022 19:21:48 +0300
Subject: [PATCH] [DE] Fix bug 55348

---
 apps/common/main/lib/component/DataView.js             | 5 +++--
 apps/documenteditor/main/app/view/ChartSettings.js     | 3 ++-
 apps/presentationeditor/main/app/view/ChartSettings.js | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js
index 86c884f08..80f5a65fa 100644
--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@@ -276,6 +276,7 @@ define([
             me.delayRenderTips = me.options.delayRenderTips || false;
             if (me.parentMenu)
                 me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0);
+            me.delaySelect = me.options.delaySelect || false;
             me.rendered       = false;
             me.dataViewItems = [];
             if (me.options.keyMoveDirection=='vertical')
@@ -396,10 +397,10 @@ define([
                 });
 
                 if (record) {
-                    if (Common.Utils.isSafari) {
+                    if (this.delaySelect) {
                         setTimeout(function () {
                             record.set({selected: true});
-                        }, 200);
+                        }, 300);
                     } else {
                         record.set({selected: true});
                     }
diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js
index d95285e1c..9c04a460e 100644
--- a/apps/documenteditor/main/app/view/ChartSettings.js
+++ b/apps/documenteditor/main/app/view/ChartSettings.js
@@ -276,7 +276,8 @@ define([
                     groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
                     store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'),
-                    delayRenderTips: true
+                    delayRenderTips: true,
+                    delaySelect: Common.Utils.isSafari
                 });
             });
             this.btnChartType.render($('#chart-button-type'));
diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js
index 9ac998a65..d99b1e1e0 100644
--- a/apps/presentationeditor/main/app/view/ChartSettings.js
+++ b/apps/presentationeditor/main/app/view/ChartSettings.js
@@ -227,7 +227,8 @@ define([
                     groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
                     store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'),
-                    delayRenderTips: true
+                    delayRenderTips: true,
+                    delaySelect: Common.Utils.isSafari
                 });
             });
             this.btnChartType.render($('#chart-button-type'));