@openui5/sap.m 1.111.2 → 1.112.2

package/src/sap/m/semantic/DetailPage.js

@@ -46,7 +46,7 @@ sap.ui.define(["sap/m/semantic/ShareMenuPage", "sap/m/semantic/SemanticConfigura
 	 * @extends sap.m.semantic.ShareMenuPage
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/DiscussInJamAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/EditAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/FavoriteAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticToggleButton'], function(SemanticToggleBu
 	 * @extends sap.m.semantic.SemanticToggleButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/FilterAction.js

@@ -25,7 +25,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @implements sap.m.semantic.IFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/FilterSelect.js

@@ -24,7 +24,7 @@ sap.ui.define(['sap/m/semantic/SemanticSelect'], function(SemanticSelect) {
 	 * @implements sap.m.semantic.IFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/FlagAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticToggleButton'], function(SemanticToggleBu
 	 * @extends sap.m.semantic.SemanticToggleButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/ForwardAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/FullscreenPage.js

@@ -39,7 +39,7 @@ sap.ui.define(["sap/m/semantic/ShareMenuPage", "sap/m/semantic/SemanticConfigura
 	 * @extends sap.m.semantic.ShareMenuPage
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/GroupAction.js

@@ -25,7 +25,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @implements sap.m.semantic.IGroup
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/GroupSelect.js

@@ -24,7 +24,7 @@ sap.ui.define(['sap/m/semantic/SemanticSelect'], function(SemanticSelect) {
 	 * @implements sap.m.semantic.IGroup
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/MainAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/MasterPage.js

@@ -45,7 +45,7 @@ sap.ui.define(["sap/m/semantic/SemanticPage", "sap/m/semantic/SemanticPageRender
 	 * @extends sap.m.semantic.SemanticPage
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/MessagesIndicator.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/MultiSelectAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticToggleButton'], function(SemanticToggleBu
 	 * @extends sap.m.semantic.SemanticToggleButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/NegativeAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/OpenInAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/PositiveAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/PrintAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SaveAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/Segment.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/Log"], function(BaseObject, Log)
 	 * Constructor for an sap.m.semantic.Segment.
 	 *
 	 * @class Abstraction for a segment in a SegmentedContainer
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.Segment

package/src/sap/m/semantic/SegmentedContainer.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/m/semantic/Segment', 'sap/ui/base/Object', "sap/base/Log"],
 	 * Constructor for an sap.m.semantic.SegmentedContainer.
 	 *
 	 * @class text
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.SegmentedContainer

package/src/sap/m/semantic/SemanticButton.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SemanticConfiguration.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * Constructor for an sap.m.semantic.SemanticConfiguration.
 	 *
 	 * @class Defines the visual properties and positioning for each supported semantic type
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.SemanticConfiguration

package/src/sap/m/semantic/SemanticControl.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SemanticOverflowToolbarButton.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/m/OverflowToolbarButton', 'sap/m/ButtonRenderer'],
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/semantic/SemanticOverflowToolbarToggleButton.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/m/OverflowToolbarToggleButton", "sap/m/ToggleButtonRenderer"
 		 * @extends sap.m.OverflowToolbarToggleButton
 		 *
 		 * @author SAP SE
-		 * @version 1.111.2
+		 * @version 1.112.2
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/semantic/SemanticPage.js

@@ -19,6 +19,7 @@ sap.ui.define([
 	'sap/ui/base/ManagedObjectObserver',
 	'sap/ui/core/Control',
 	'sap/ui/core/library',
+	"sap/ui/core/InvisibleText",
 	'sap/m/library',
 	"./SemanticPageRenderer",
 	"sap/base/Log",
@@ -39,6 +40,7 @@ function(
 	ManagedObjectObserver,
 	Control,
 	coreLibrary,
+	InvisibleText,
 	library,
 	SemanticPageRenderer,
 	Log,
@@ -109,7 +111,7 @@ function(
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public
@@ -281,17 +283,29 @@ function(
 		renderer: SemanticPageRenderer
 	});
 
+	// Static members
+	SemanticPage._getResourceBundle = function () {
+		return sap.ui.getCore().getLibraryResourceBundle("sap.m");
+	};
+
+	SemanticPage.ARIA = {
+		TOOLBAR_HEADER_ACTIONS: SemanticPage._getResourceBundle().getText('ARIA_LABEL_TOOLBAR_HEADER_ACTIONS'),
+		TOOLBAR_FOOTER_ACTIONS: SemanticPage._getResourceBundle().getText('ARIA_LABEL_TOOLBAR_FOOTER_ACTIONS')
+	};
+
+	// Lifecycle methods
 	SemanticPage.prototype.init = function () {
+		this._aCachedInvisibleTexts = [];
+
 		this._oHeaderObserver = new ManagedObjectObserver(SemanticPage.prototype._updateHeaderVisibility.bind(this));
 
 		this._currentMode = SemanticConfiguration._PageMode.display;
 		this._getPage().setCustomHeader(this._getInternalHeader());
-		this._getPage().setFooter(new OverflowToolbar(this.getId() + "-footer"));
+		this._getPage().setFooter(this._getInternalOverflowToolbar());
 		this.setLandmarkInfo(new PageAccessibleLandmarkInfo());
 		this._getPage().setShowHeader(false);
 	};
 
-
 	/**
 	 * Function is called when exiting the control.
 	 *
@@ -324,6 +338,7 @@ function(
 			this._oHeaderObserver = null;
 		}
 
+		this._destroyInvisibleTexts();
 		this._oPositionsMap = null;
 	};
 
@@ -595,7 +610,7 @@ function(
 		if (!this._oNavButton) {
 			this._oNavButton = new Button(this.getId() + "-navButton", {
 				type: ButtonType.Up,
-				tooltip: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("PAGE_NAVBUTTON_TEXT"),
+				tooltip: SemanticPage._getResourceBundle().getText("PAGE_NAVBUTTON_TEXT"),
 				press: jQuery.proxy(this.fireNavButtonPress, this)
 			});
 		}
@@ -753,7 +768,12 @@ function(
 	SemanticPage.prototype._getInternalHeader = function () {
 
 		if (!this._oInternalHeader) {
-			this._oInternalHeader = new Bar(this.getId() + "-intHeader");
+			var sId = this.getId() + "-intHeader";
+
+			this._oInternalHeader = new Bar({
+				id: sId,
+				ariaLabelledBy: this._getInvisibleText(sId, SemanticPage.ARIA.TOOLBAR_HEADER_ACTIONS)
+			});
 
 			if (this._oHeaderObserver) {
 				this._oHeaderObserver.observe(this._oInternalHeader, {
@@ -767,6 +787,19 @@ function(
 		return this._oInternalHeader;
 	};
 
+	/**
+	 * @returns {sap.m.OverflowToolbar} The internal overflow toolbar.
+	 * @private
+	 */
+	SemanticPage.prototype._getInternalOverflowToolbar = function () {
+		var sId = this.getId() + "-footer";
+
+		return new OverflowToolbar({
+			id: sId,
+			ariaLabelledBy: this._getInvisibleText(sId, SemanticPage.ARIA.TOOLBAR_FOOTER_ACTIONS)
+		});
+	};
+
 	/**
 	 * Returns the custom or internal header
 	 * @private
@@ -851,6 +884,35 @@ function(
 
 	};
 
+	/**
+	 * Creates and caches an instance of the {@link sap.ui.core.InvisibleText} control for the specified aria label.
+	 * @param {string} sId The ID for the invisible text control.
+	 * @param {string} sAriaLabel The aria label to set for the invisible text control.
+	 * @returns {sap.ui.core.InvisibleText} The created invisible text control.
+	 * @private
+	 */
+	SemanticPage.prototype._getInvisibleText = function(sId, sAriaLabel) {
+		var oInvisibleText = new InvisibleText({
+			id: sId + "-InvisibleText",
+			text: sAriaLabel
+		}).toStatic();
+
+		this._aCachedInvisibleTexts.push(oInvisibleText);
+		return oInvisibleText;
+	};
+
+	/**
+ 	 * Destroys all cached instances of the {@link sap.ui.core.InvisibleText} control.
+	 * @private
+ 	 */
+	SemanticPage.prototype._destroyInvisibleTexts = function () {
+		this._aCachedInvisibleTexts.forEach(function (oInvisibleText) {
+			oInvisibleText.destroy();
+		});
+
+		this._aCachedInvisibleTexts = [];
+	};
+
 	/*
 	 helper functions
 	 */

package/src/sap/m/semantic/SemanticSelect.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticControl', 'sap/m/Select', "sap/base/Log"]
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SemanticToggleButton.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SendEmailAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SendMessageAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/ShareInJamAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/ShareMenu.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * ShareMenu is a special menu that is represented by (1) an actionSheet with the menu items and (2) a button that opens the actionSheet.
 	 * If the menu has only one item, then that item appears in place of the button that opens the actionSheet.
 	 *
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.ShareMenu

package/src/sap/m/semantic/ShareMenuPage.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/m/semantic/SemanticPage", "sap/m/semantic/SemanticConfigurat
 	 * @extends sap.m.semantic.SemanticPage
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SortAction.js

@@ -25,7 +25,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @implements sap.m.semantic.ISort
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SortSelect.js

@@ -24,7 +24,7 @@ sap.ui.define(['sap/m/semantic/SemanticSelect'], function(SemanticSelect) {
 	 * @implements sap.m.semantic.ISort
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/table/Util.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/m/table/Util
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @since 1.96.0
 	 * @private
 	 * @ui5-restricted sap.fe, sap.ui.mdc, sap.ui.comp

package/src/sap/m/table/columnmenu/ActionItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/Entry.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/Item.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/ItemBase.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/Menu.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @public
 	 * @since 1.110
@@ -235,6 +235,10 @@ sap.ui.define([
 	Menu.prototype.close = function () {
 		this._previousView = null;
 		if (this._oPopover && this._oPopover.isOpen()) {
+			if (this._oQuickActionContainer) {
+				this._oQuickActionContainer.destroyFormContainers();
+			}
+
 			this._oPopover.close();
 			ControlEvents.unbindAnyEvent(this.fAnyEventHandlerProxy);
 		}
@@ -245,6 +249,9 @@ sap.ui.define([
 		if (this._oPopover) {
 			delete this._oPopover;
 		}
+		if (this._oQuickActionContainer) {
+			delete this._oQuickActionContainer;
+		}
 		if (this._oItemsContainer) {
 			delete this._oItemsContainer;
 		}
@@ -305,13 +312,18 @@ sap.ui.define([
 		}
 
 		if (oEvent.type == "mousedown" || oEvent.type == "touchstart") {
-			if (containsOrEquals(this.getDomRef(), oEvent.target) || isInControlTree(this, Element.closestTo(jQuery(oEvent.target)))) {
+			if (containsOrEquals(this.getDomRef(), oEvent.target) ||
+				containsOrEquals(Core.getStaticAreaRef(), oEvent.target) ||
+				isInControlTree(this, Element.closestTo(oEvent.target))) {
 				isInMenuHierarchy = true;
 			}
 		} else if (oEvent.type == "sapfocusleave") {
 			if (oEvent.relatedControlId && containsOrEquals(this.getDomRef(), jQuery(document.getElementById(oEvent.relatedControlId)).get(0)) ||
 				isInControlTree(this, Core.byId(oEvent.relatedControlId))) {
 				isInMenuHierarchy = true;
+				if (oEvent.relatedControlId === this._oPopover._oControl.getId()) {
+					document.getElementById(this.getId() + "-focusDummy").focus();
+				}
 			}
 		}
 
@@ -547,16 +559,6 @@ sap.ui.define([
 		}
 	};
 
-	Menu.prototype._focusInitialQuickAction = function () {
-		var aQuickActions = [];
-		if (this.getAggregation("_quickActions")) {
-			aQuickActions = this.getAggregation("_quickActions")[0].getEffectiveQuickActions();
-		} else if (this.getQuickActions().length > 0) {
-			aQuickActions = this.getQuickActions()[0].getEffectiveQuickActions();
-		}
-		aQuickActions.length > 0 && aQuickActions[0].getContent()[0].focus();
-	};
-
 	Menu.prototype._setItemVisibility = function (oItem, bVisible) {
 		var oList = this._oItemsContainer._getNavigationList().getItems();
 		var oListItem = oList.find(function (oListItem) {
@@ -566,13 +568,9 @@ sap.ui.define([
 	};
 
 	Menu.prototype._initQuickActionContainer = function () {
-		var oFormContainer;
+		var oFormContainer = new FormContainer();
 
-		if (this._oQuickActionContainer) {
-			oFormContainer = this._oQuickActionContainer.getFormContainers()[0];
-			oFormContainer.destroyFormElements();
-		} else {
-			oFormContainer = new FormContainer();
+		if (!this._oQuickActionContainer) {
 			this._oQuickActionContainer = new Form({
 				layout: new ResponsiveGridLayout({
 					breakpointM: 600,
@@ -584,9 +582,9 @@ sap.ui.define([
 					columnsM: 1,
 					adjustLabelSpan: false
 				}),
-				editable: true,
-				formContainers: oFormContainer
+				editable: true
 			});
+
 			this._oQuickActionContainer.addStyleClass("sapMTCMenuQAForm");
 			this._oQuickActionContainer.addAriaLabelledBy(this.getId() + "-actionContainerDescription");
 			this._oQuickActionContainer.addEventDelegate({
@@ -594,8 +592,12 @@ sap.ui.define([
 					this.getDomRef().classList.remove("sapUiFormLblColon");
 				}
 			}, this._oQuickActionContainer);
+		} else {
+			this._oQuickActionContainer.destroyFormContainers();
 		}
 
+		this._oQuickActionContainer.addFormContainer(oFormContainer);
+
 		this._getAllEffectiveQuickActions().forEach(function(oQuickAction) {
 			if (!oQuickAction.getVisible()) {
 				return;