@openui5/sap.ui.mdc 1.93.3 → 1.96.1

package/src/sap/ui/mdc/chart/ToolbarHandler.js

@@ -5,6 +5,7 @@
  */
 
 sap.ui.define([
+	"sap/ui/core/Element",
 	"sap/ui/mdc/library",
 	"../ActionToolbar",
 	"sap/m/Title",
@@ -14,8 +15,10 @@ sap.ui.define([
 	"sap/ui/mdc/chart/ChartSettings",
 	"sap/ui/core/library",
 	"sap/ui/Device",
-	"sap/ui/core/ShortcutHintsMixin"
+	"sap/ui/core/ShortcutHintsMixin",
+	"sap/ui/mdc/actiontoolbar/ActionToolbarAction"
 ], function(
+	Element,
 	MDCLib,
 	ActionToolbar,
 	Title,
@@ -25,291 +28,300 @@ sap.ui.define([
 	ChartSettings,
 	CoreLibrary,
 	Device,
-	ShortcutHintsMixin
+	ShortcutHintsMixin,
+	ActionToolbarAction
 ) {
 	"use strict";
 
-	var HasPopup = CoreLibrary.aria.HasPopup;
+	/**
+	 /**
+	  * Constructor for a new ToolbarHandler.
+	  *
+	  * @param {string} [sId] id for the new control, generated automatically if no id is given
+	  * @param {object} [mSettings] initial settings for the new control
+	  * @class The ToolbarHandler control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
+	  * @extends sap.m.OverflowToolbar
+	  * @author SAP SE
+	  * @version 1.96.1
+	  * @constructor
+	  * @experimental As of version ...
+	  * @private
+	  * @since 1.88
+	  * @alias sap.ui.mdc.chart.ToolbarHandler
+	  * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	  */
+	var ToolbarHandler = Element.extend("sap.ui.mdc.ToolbarHandler", {});
+
 
+	var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+	var HasPopup = CoreLibrary.aria.HasPopup;
 	/**
-	 * Toolbar helper class for sap.ui.mdc.Chart.
 	 *
-	 * @author SAP SE
-	 * @private
-	 * @experimental
-	 * @since 1.60
-	 * @alias sap.ui.mdc.chart.ToolbarHandler
+	 * Creates a new toolbar for the mdc.Chart based on actions
 	 */
-	var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
-	var ToolbarHandler = {
-
-		/**
-		 *
-		 * Creates a new toolbar for the mdc.Chart based on actions
-		 */
-		createToolbar: function(oChart, aUserActions, bInitNotBound) {
-			aUserActions = aUserActions || [];
-
-			if (!oChart.getAggregation("_toolbar")) {
-				var oToolbar = new ActionToolbar(oChart.getId() + "--toolbar", {
-					design: "Transparent",
-					begin: [
-						new Title(oChart.getId() + "-title", {
-							text: oChart.getHeader()
-						})
-					]
-				});
+	 ToolbarHandler.prototype.createToolbar = function(oChart, aUserActions, bInitNotBound) {
+		aUserActions = aUserActions || [];
+
+		if (!oChart.getAggregation("_toolbar")) {
+			var oToolbar = new ActionToolbar(oChart.getId() + "--toolbar", {
+				design: "Transparent",
+				begin: [
+					new Title(oChart.getId() + "-title", {
+						text: oChart.getHeader()
+					})
+				]
+			});
 
-				oChart.setAggregation("_toolbar", oToolbar);
+			oChart.setAggregation("_toolbar", oToolbar);
 
-				this.initializeToolbarNotBound(oChart);
-				this.addActions(oToolbar, aUserActions); //Add actions after chart content for correct sorting
-				if (!bInitNotBound){
-					this.updateToolbar(oChart);
-				}
+			this.initializeToolbarNotBound(oChart);
+			this.addActions(oToolbar, aUserActions); //Add actions after chart content for correct sorting
+			if (!bInitNotBound){
+				this.updateToolbar(oChart);
 			}
-		},
+		}
+	};
+
+	ToolbarHandler.prototype.addActions = function(oToolbar, aActions) {
+		aActions.forEach(function(action) {
+			oToolbar.addAction(action);
+		});
+	};
 
-		addActions: function(oToolbar, aActions) {
-			aActions.forEach(function(action) {
-				oToolbar.addAction(action);
+	ToolbarHandler.prototype.initializeToolbarNotBound = function(oChart) {
+		var oToolbar = oChart.getAggregation("_toolbar");
+
+		if (!oToolbar) {
+			return;
+		}
+
+		if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.ZoomInOut)) {
+
+			this._oZoomInButton = new OverflowButton({
+				tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_IN"),
+				icon: "sap-icon://zoom-in",
+				enabled: "{= ${$mdcChart>/_chart/getZoomInfo/enabled} && ${$mdcChart>/_chart/getZoomInfo/currentZoomLevel} < 1}"
 			});
-		},
 
-		initializeToolbarNotBound: function(oChart) {
-			var oToolbar = oChart.getAggregation("_toolbar");
+			this._oZoomOutButton = new OverflowButton({
+				tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"),
+				icon: "sap-icon://zoom-out",
+				enabled: "{= ${$mdcChart>/_chart/getZoomInfo/enabled} && ${$mdcChart>/_chart/getZoomInfo/currentZoomLevel} > 0}"
+			});
 
-			if (!oToolbar) {
-				return;
-			}
+			oToolbar.addEnd(this._oZoomInButton);
+			oToolbar.addEnd(this._oZoomOutButton);
+		}
 
-			if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.ZoomInOut)) {
 
-				this._oZoomInButton = new OverflowButton({
-					tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_IN"),
-					icon: "sap-icon://zoom-in",
-					enabled: "{= ${$mdcChart>/_chart/getZoomInfo/enabled} && ${$mdcChart>/_chart/getZoomInfo/currentZoomLevel} < 1}"
-				});
+		if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.DrillDownUp) < 0) {
+			oChart._oDrillDownBtn = new OverflowButton(oChart.getId() + "-drillDown", {
+				icon: "sap-icon://drill-down",
+				enabled: false,
+				tooltip: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
+				text: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
+				press: [
+					oChart._showDrillDown, oChart
+				]
+			});
+			oToolbar.addEnd(oChart._oDrillDownBtn);
+		}
 
-				this._oZoomOutButton = new OverflowButton({
-					tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"),
-					icon: "sap-icon://zoom-out",
-					enabled: "{= ${$mdcChart>/_chart/getZoomInfo/enabled} && ${$mdcChart>/_chart/getZoomInfo/currentZoomLevel} > 0}"
-				});
+		if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.Legend) < 0) {
+			this._legendBtn = new OverflowToggleButton(oChart.getId() + "-chart_legend", {
+				type: "Transparent",
+				text: MDCRb.getText("chart.LEGENDBTN_TEXT"),
+				tooltip: MDCRb.getText('chart.LEGENDBTN_TOOLTIP'),
+				icon: "sap-icon://legend",
+				enabled: false,
+				pressed: false
+			});
 
-				oToolbar.addEnd(this._oZoomInButton);
-				oToolbar.addEnd(this._oZoomOutButton);
-			}
+			oToolbar.addEnd(this._legendBtn);
+		}
 
+		//Check p13n mode property on the chart and enable only desired buttons
+		var aP13nMode = oChart.getP13nMode() || [];
 
-			if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.DrillDownUp) < 0) {
-				oChart._oDrillDownBtn = new OverflowButton(oChart.getId() + "-drillDown", {
-					icon: "sap-icon://drill-down",
-					enabled: false,
-					tooltip: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
-					text: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
-					press: [
-						oChart._showDrillDown, oChart
-					]
-				});
-				oToolbar.addEnd(oChart._oDrillDownBtn);
-			}
+		if (aP13nMode.indexOf("Item") > -1) {
+			this._chartSettingsBtn = new OverflowButton(oChart.getId() + "-chart_settings", {
+				tooltip: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
+				text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
+				icon: "sap-icon://action-settings",//TODO the right icon for P13n chart dialog
+				ariaHasPopup: HasPopup.ListBox,
+				enabled: false
+			});
+			oToolbar.addEnd(this._chartSettingsBtn);
 
-			if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.Legend) < 0) {
-				this._legendBtn = new OverflowToggleButton(oChart.getId() + "-chart_legend", {
-					type: "Transparent",
-					text: MDCRb.getText("chart.LEGENDBTN_TEXT"),
-					icon: "sap-icon://legend",
-					enabled: false,
-					pressed: false
-				});
+			ShortcutHintsMixin.addConfig(this._chartSettingsBtn, {
+					addAccessibilityLabel: true,
+					messageBundleKey: Device.os.macintosh ? "mdc.PERSONALIZATION_SHORTCUT_MAC" : "mdc.PERSONALIZATION_SHORTCUT" // Cmd+, or Ctrl+,
+				},
+				oChart // we need the chart instance, otherwise the messageBundleKey does not find the resource bundle
+			);
 
-				oToolbar.addEnd(this._legendBtn);
-			}
+		}
 
-			//Check p13n mode property on the chart and enable only desired buttons
-			var aP13nMode = oChart.getP13nMode() || [];
+		if (aP13nMode.indexOf("Sort") > -1) {
+			this._sortBtn = new OverflowButton(oChart.getId() + "-sort_settings", {
+				ariaHasPopup: HasPopup.ListBox,
+				icon: "sap-icon://sort",
+				tooltip: MDCRb.getText('sort.PERSONALIZATION_DIALOG_TITLE'),
+				text: MDCRb.getText('sort.PERSONALIZATION_DIALOG_TITLE'),
+				enabled: false
+			});
+			oToolbar.addEnd(this._sortBtn);
+		}
 
-			if (aP13nMode.indexOf("Item") > -1) {
-				this._chartSettingsBtn = new OverflowButton(oChart.getId() + "-chart_settings", {
-					tooltip: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
-					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
-					icon: "sap-icon://action-settings",//TODO the right icon for P13n chart dialog
-					ariaHasPopup: HasPopup.ListBox,
-					enabled: false
-				});
-				oToolbar.addEnd(this._chartSettingsBtn);
+		if (aP13nMode.indexOf("Type") > -1) {
+			this._chartTypeBtn = new ChartTypeButton(oChart);
+			oToolbar.addEnd(this._chartTypeBtn);
+		}
 
-				ShortcutHintsMixin.addConfig(this._chartSettingsBtn, {
-						addAccessibilityLabel: true,
-						messageBundleKey: Device.os.macintosh ? "mdc.PERSONALIZATION_SHORTCUT_MAC" : "mdc.PERSONALIZATION_SHORTCUT" // Cmd+, or Ctrl+,
-					},
-					oChart // we need the chart instance, otherwise the messageBundleKey does not find the resource bundle
-				);
+		oToolbar.setEnabled(false);
+	};
 
-			}
+	/**
+	 *
+	 * Updates the mdc.Chart toolbar content
+	 */
+	 ToolbarHandler.prototype.updateToolbar = function(oChart) {
+		var oToolbar = oChart.getAggregation("_toolbar");
 
-			if (aP13nMode.indexOf("Sort") > -1) {
-				this._sortBtn = new OverflowButton(oChart.getId() + "-sort_settings", {
-					ariaHasPopup: HasPopup.ListBox,
-					icon: "sap-icon://sort",
-					tooltip: MDCRb.getText('sort.PERSONALIZATION_DIALOG_TITLE'),
-					text: MDCRb.getText('sort.PERSONALIZATION_DIALOG_TITLE'),
-					enabled: false
-				});
-				oToolbar.addEnd(this._sortBtn);
-			}
+		if (!oToolbar) {
+			return;
+		}
 
-			if (aP13nMode.indexOf("Type") > -1) {
-				this._chartTypeBtn = new ChartTypeButton(oChart);
-				oToolbar.addEnd(this._chartTypeBtn);
-			}
+		//oToolbar.destroyEnd(true);
 
-			oToolbar.setEnabled(false);
-		},
+		if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.ZoomInOut)) {
+			var oInnerChart = oChart.getAggregation("_chart");
 
-		/**
-		 *
-		 * Updates the mdc.Chart toolbar content
-		 */
-		updateToolbar: function(oChart) {
-			var oToolbar = oChart.getAggregation("_toolbar");
+			this._oZoomInButton.setTooltip(MDCRb.getText("chart.TOOLBAR_ZOOM_IN"));
+			this._oZoomInButton.setText(MDCRb.getText("chart.TOOLBAR_ZOOM_IN"));
+			this._oZoomInButton.attachPress(function onZoomInButtonPressed(oControlEvent) {
+				this.handleZoomIn(oInnerChart, this._oZoomInButton, this._oZoomOutButton);
+			}.bind(this));
 
-			if (!oToolbar) {
-				return;
-			}
+			this._oZoomOutButton.setTooltip(MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"));
+			this._oZoomOutButton.setText(MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"));
+			this._oZoomOutButton.attachPress(function onZoomInButtonPressed(oControlEvent) {
+				this.handleZoomOut(oInnerChart, this._oZoomInButton, this._oZoomOutButton);
+			}.bind(this));
 
-			//oToolbar.destroyEnd(true);
-
-			if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.ZoomInOut)) {
-				var oInnerChart = oChart.getAggregation("_chart");
-
-				this._oZoomInButton.setTooltip(MDCRb.getText("chart.TOOLBAR_ZOOM_IN"));
-				this._oZoomInButton.setText(MDCRb.getText("chart.TOOLBAR_ZOOM_IN"));
-				this._oZoomInButton.attachPress(function onZoomInButtonPressed(oControlEvent) {
-					this.handleZoomIn(oInnerChart, this._oZoomInButton, this._oZoomOutButton);
-				}.bind(this));
-
-				this._oZoomOutButton.setTooltip(MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"));
-				this._oZoomOutButton.setText(MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"));
-				this._oZoomOutButton.attachPress(function onZoomInButtonPressed(oControlEvent) {
-					this.handleZoomOut(oInnerChart, this._oZoomInButton, this._oZoomOutButton);
-				}.bind(this));
-
-				if (oInnerChart) {
-					oInnerChart.attachRenderComplete(function onInnerChartRenderCompleted(oControlEvent) {
-						var oZoomInfo = oInnerChart.getZoomInfo();
-						this.handleInnerChartRenderCompleted(oZoomInfo, this._oZoomInButton, this._oZoomOutButton);
-					}, this);
-				}
+			if (oInnerChart) {
+				oInnerChart.attachRenderComplete(function onInnerChartRenderCompleted(oControlEvent) {
+					var oZoomInfo = oInnerChart.getZoomInfo();
+					this.handleInnerChartRenderCompleted(oZoomInfo, this._oZoomInButton, this._oZoomOutButton);
+				}, this);
 			}
+		}
 
 
-			if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.DrillDownUp) < 0) {
+		if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.DrillDownUp) < 0) {
 
-				oChart._oDrillDownBtn.setEnabled(true);
-			}
+			oChart._oDrillDownBtn.setEnabled(true);
+		}
 
-			if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.Legend) < 0) {
-				this._legendBtn.setEnabled(true);
+		if (!oChart.getIgnoreToolbarActions().length || oChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.Legend) < 0) {
+			this._legendBtn.setEnabled(true);
+			this._legendBtn.setPressed(oChart.getLegendVisible());
+			this._legendBtn.attachPress(function(){
+				oChart.setLegendVisible(!oChart.getLegendVisible());
 				this._legendBtn.setPressed(oChart.getLegendVisible());
-				this._legendBtn.attachPress(function(){
-					oChart.setLegendVisible(!oChart.getLegendVisible());
-					this._legendBtn.setPressed(oChart.getLegendVisible());
-				}.bind(this));
-			}
+			}.bind(this));
+		}
 
-			//Check p13n mode property on the chart and enable only desired buttons
-			var aP13nMode = oChart.getP13nMode() || [];
+		//Check p13n mode property on the chart and enable only desired buttons
+		var aP13nMode = oChart.getP13nMode() || [];
 
-			if (aP13nMode.indexOf("Item") > -1) {
+		if (aP13nMode.indexOf("Item") > -1) {
 
-				this._chartSettingsBtn.setEnabled(true);
-				this._chartSettingsBtn.attachPress(function(oEvent) {
-					var oSource = oEvent.getSource();
-					oChart._getPropertyData().then(function(aProperties) {
-						ChartSettings.showPanel(oChart, "Chart", oSource, aProperties);
-					});
+			this._chartSettingsBtn.setEnabled(true);
+			this._chartSettingsBtn.attachPress(function(oEvent) {
+				var oSource = oEvent.getSource();
+				oChart._getPropertyData().then(function(aProperties) {
+					ChartSettings.showPanel(oChart, "Chart", oSource, aProperties);
 				});
-			}
+			});
+		}
 
-			if (aP13nMode.indexOf("Sort") > -1) {
-				this._sortBtn.setEnabled(true);
-				this._sortBtn.attachPress(function(oEvent) {
-					var oSource = oEvent.getSource();
-					oChart._getPropertyData().then(function(aProperties) {
-						ChartSettings.showPanel(oChart, "Sort", oSource, aProperties);
-					});
+		if (aP13nMode.indexOf("Sort") > -1) {
+			this._sortBtn.setEnabled(true);
+			this._sortBtn.attachPress(function(oEvent) {
+				var oSource = oEvent.getSource();
+				oChart._getPropertyData().then(function(aProperties) {
+					ChartSettings.showPanel(oChart, "Sort", oSource, aProperties);
 				});
-			}
-
-			if (aP13nMode.indexOf("Type") > -1) {
-				this._chartTypeBtn.bindToInnerChart(oChart);
-				//oToolbar.addEnd(new ChartTypeButton(oChart));
-			}
+			});
+		}
 
+		if (aP13nMode.indexOf("Type") > -1) {
+			this._chartTypeBtn.bindToInnerChart(oChart);
+			//oToolbar.addEnd(new ChartTypeButton(oChart));
+		}
 
-			oToolbar.setEnabled(true);
-		},
 
-		handleInnerChartRenderCompleted: function(oZoomInfo, oZoomInButton, oZoomOutButton) {
-			this.toggleZoomButtonsEnabledState(oZoomInfo, oZoomInButton, oZoomOutButton);
-		},
+		oToolbar.setEnabled(true);
+	};
 
-		handleZoomIn: function(oInnerChart, oZoomInButton, oZoomOutButton) {
-			oInnerChart.zoom({ direction: "in" });
-			var oZoomInfo = oInnerChart.getZoomInfo();
-			this.toggleZoomButtonsEnabledState(oZoomInfo, oZoomInButton, oZoomOutButton);
-		},
+	ToolbarHandler.prototype.handleInnerChartRenderCompleted = function(oZoomInfo, oZoomInButton, oZoomOutButton) {
+		this.toggleZoomButtonsEnabledState(oZoomInfo, oZoomInButton, oZoomOutButton);
+	};
 
-		handleZoomOut: function(oInnerChart, oZoomInButton, oZoomOutButton) {
-			oInnerChart.zoom({ direction: "out" });
-			var oZoomInfo = oInnerChart.getZoomInfo();
-			this.toggleZoomButtonsEnabledState(oZoomInfo, oZoomInButton, oZoomOutButton);
-		},
+	ToolbarHandler.prototype.handleZoomIn = function(oInnerChart, oZoomInButton, oZoomOutButton) {
+		oInnerChart.zoom({ direction: "in" });
+		var oZoomInfo = oInnerChart.getZoomInfo();
+		this.toggleZoomButtonsEnabledState(oZoomInfo, oZoomInButton, oZoomOutButton);
+	};
 
-		toggleZoomButtonsEnabledState: function(oZoomInfo, oZoomInButton, oZoomOutButton) {
-			var vZoomLevel = oZoomInfo.currentZoomLevel;
+	ToolbarHandler.prototype.handleZoomOut = function(oInnerChart, oZoomInButton, oZoomOutButton) {
+		oInnerChart.zoom({ direction: "out" });
+		var oZoomInfo = oInnerChart.getZoomInfo();
+		this.toggleZoomButtonsEnabledState(oZoomInfo, oZoomInButton, oZoomOutButton);
+	};
 
-			// zooming isn't applicable, perhaps all data points are plotted
-			if (vZoomLevel == null) { // zoom level is null or undefined
-				oZoomInButton.setEnabled(false);
-				oZoomOutButton.setEnabled(false);
-				return;
-			}
+	ToolbarHandler.prototype.toggleZoomButtonsEnabledState = function(oZoomInfo, oZoomInButton, oZoomOutButton) {
+		var vZoomLevel = oZoomInfo.currentZoomLevel;
 
-			// zoomed out all the way
-			if (vZoomLevel === 0) {
-				oZoomInButton.setEnabled(true);
-				oZoomOutButton.setEnabled(false);
+		// zooming isn't applicable, perhaps all data points are plotted
+		if (vZoomLevel == null) { // zoom level is null or undefined
+			oZoomInButton.setEnabled(false);
+			oZoomOutButton.setEnabled(false);
+			return;
+		}
 
-				// if the zoom out button is disabled and it currently has focus,
-				// set the focus to the zoom in button
-				if (oZoomOutButton.getFocusDomRef() === document.activeElement) {
-					oZoomInButton.focus();
-				}
+		// zoomed out all the way
+		if (vZoomLevel === 0) {
+			oZoomInButton.setEnabled(true);
+			oZoomOutButton.setEnabled(false);
 
-				return;
+			// if the zoom out button is disabled and it currently has focus,
+			// set the focus to the zoom in button
+			if (oZoomOutButton.getFocusDomRef() === document.activeElement) {
+				oZoomInButton.focus();
 			}
 
-			// zoomed in all the way
-			if (vZoomLevel === 1) {
-				oZoomOutButton.setEnabled(true);
-				oZoomInButton.setEnabled(false);
+			return;
+		}
 
-				// if the zoom in button is disabled and it currently has focus,
-				// set the focus to the zoom out button
-				if (oZoomInButton.getFocusDomRef() === document.activeElement) {
-					oZoomOutButton.focus();
-				}
+		// zoomed in all the way
+		if (vZoomLevel === 1) {
+			oZoomOutButton.setEnabled(true);
+			oZoomInButton.setEnabled(false);
 
-				return;
+			// if the zoom in button is disabled and it currently has focus,
+			// set the focus to the zoom out button
+			if (oZoomInButton.getFocusDomRef() === document.activeElement) {
+				oZoomOutButton.focus();
 			}
 
-			// the zoom level is between 0 and 1
-			oZoomInButton.setEnabled(true);
-			oZoomOutButton.setEnabled(true);
+			return;
 		}
+
+		// the zoom level is between 0 and 1
+		oZoomInButton.setEnabled(true);
+		oZoomOutButton.setEnabled(true);
 	};
 
 	return ToolbarHandler;

package/src/sap/ui/mdc/chartNew/ChartSelectionDetailsNew.js

@@ -33,7 +33,7 @@ sap.ui.define([
          * @class The ChartSelectionDetailsNew control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
          * @extends sap.m.SelectionDetails
          * @author SAP SE
-         * @version 1.93.3
+         * @version 1.96.1
          * @constructor
          * @experimental As of version ...
          * @private

package/src/sap/ui/mdc/chartNew/ChartToolbarNew.js

@@ -41,7 +41,7 @@ sap.ui.define([
          * @class The ChartToolbarNew control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
          * @extends sap.m.OverflowToolbar
          * @author SAP SE
-         * @version 1.93.3
+         * @version 1.96.1
          * @constructor
          * @experimental As of version ...
          * @private
@@ -92,7 +92,10 @@ sap.ui.define([
 
             this.addEnd(this._oChartSelectionDetails);
 
-            if (!oMDCChart.getIgnoreToolbarActions().length || oMDCChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.DrillDownUp) < 0) {
+            //Check p13n mode property on the chart and enable only desired buttons
+			var aP13nMode = oMDCChart.getP13nMode() || [];
+
+            if (  aP13nMode.indexOf("Item") > -1 && (!oMDCChart.getIgnoreToolbarActions().length || oMDCChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.DrillDownUp) < 0)) {
                 this._oDrillDownBtn = new OverflowButton(oMDCChart.getId() + "-drillDown", {
                     icon: "sap-icon://drill-down",
                     tooltip: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
@@ -140,9 +143,6 @@ sap.ui.define([
                 this.addEnd(this.oZoomOutButton);
             }
 
-			//Check p13n mode property on the chart and enable only desired buttons
-			var aP13nMode = oMDCChart.getP13nMode() || [];
-
             if (aP13nMode.indexOf("Sort") > -1 || aP13nMode.indexOf("Item") > -1) {
                 this._oSettingsBtn = new OverflowButton(oMDCChart.getId() + "-chart_settings", {
                     icon: "sap-icon://action-settings",//TODO the right icon for P13n chart dialog
@@ -160,10 +160,6 @@ sap.ui.define([
                 this.addEnd(this._oChartTypeBtn);
             }
 
-            //Add initial actions from MDC Chart
-            oMDCChart._getInitialToolbarActions().forEach(function(oAction){
-                this.addAction(oAction);
-            }.bind(this));
         };
 
         ChartToolbar.prototype.toggleZoomButtons = function (oMDCChart) {
@@ -194,7 +190,15 @@ sap.ui.define([
         };
 
         ChartToolbar.prototype._getZoomEnablement = function (oMDCChart) {
-            var zoomInfo = oMDCChart.getZoomState();
+            var zoomInfo;
+
+            try {
+                zoomInfo = oMDCChart.getZoomState();
+            } catch (error) {
+                //Catch the case when an inner chart is not yet rendered
+                zoomInfo = {enabled: false};
+            }
+
 
             if (zoomInfo && zoomInfo.hasOwnProperty("currentZoomLevel") && zoomInfo.currentZoomLevel != null && zoomInfo.enabled) {
                 var toolbarZoomInfo = {enabled: true};

package/src/sap/ui/mdc/chartNew/ChartTypeButtonNew.js

@@ -181,7 +181,7 @@ sap.ui.define([
 										control: oMDCChart,
 										chartType: oObj.key
 									}));
-									FlexUtil.handleChanges(aChanges, oMDCChart);
+									FlexUtil.handleChanges(aChanges);
 								});
 							}
 						}