@openui5/sap.ui.mdc 1.102.1 → 1.103.1

package/src/sap/ui/mdc/flexibility/SortFlex.js

@@ -3,7 +3,10 @@
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(["sap/ui/mdc/p13n/Engine"], function(Engine) {
+sap.ui.define([
+	"sap/ui/mdc/p13n/Engine",
+	"sap/ui/mdc/flexibility/Util"
+], function(Engine, Util) {
 	"use strict";
 	var fRebindControl = function(oControl) {
 		var bExecuteRebindForTable = oControl && oControl.isA && oControl.isA("sap.ui.mdc.Table") && oControl.isTableBound();
@@ -36,8 +39,9 @@ sap.ui.define(["sap/ui/mdc/p13n/Engine"], function(Engine) {
 		fRebindControl(oControl);
 	};
 
-	var fAddSort = function(oChange, oControl, mPropertyBag, bIsRevert) {
+	var fAddSort = function(oChange, oControl, mPropertyBag, sChangeReason) {
 		return new Promise(function(resolve, reject) {
+			var bIsRevert = (sChangeReason === Util.REVERT);
 			var oModifier = mPropertyBag.modifier;
 			var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 			Promise.resolve()
@@ -66,9 +70,10 @@ sap.ui.define(["sap/ui/mdc/p13n/Engine"], function(Engine) {
 		});
 	};
 
-	var fRemoveSort = function(oChange, oControl, mPropertyBag, bIsRevert) {
+	var fRemoveSort = function(oChange, oControl, mPropertyBag, sChangeReason) {
 		return new Promise(function(resolve, reject) {
 			var oModifier = mPropertyBag.modifier;
+			var bIsRevert = (sChangeReason === Util.REVERT);
 			var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 			Promise.resolve()
 				.then(oModifier.getProperty.bind(oModifier, oControl, "sortConditions"))
@@ -101,8 +106,9 @@ sap.ui.define(["sap/ui/mdc/p13n/Engine"], function(Engine) {
 		});
 	};
 
-	var fMoveSort = function(oChange, oControl, mPropertyBag, bIsRevert) {
+	var fMoveSort = function(oChange, oControl, mPropertyBag, sChangeReason) {
 		return new Promise(function(resolve, reject) {
+			var bIsRevert = (sChangeReason === Util.REVERT);
 			var oModifier = mPropertyBag.modifier;
 			var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 			Promise.resolve()
@@ -134,55 +140,20 @@ sap.ui.define(["sap/ui/mdc/p13n/Engine"], function(Engine) {
 	};
 
 	var Sort = {};
-	Sort.removeSort = {
-		"changeHandler": {
-			applyChange: function(oChange, oControl, mPropertyBag) {
-				return fRemoveSort(oChange, oControl, mPropertyBag, false);
-			},
-			completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
-				// Not used, but needs to be there
-			},
-			revertChange: function(oChange, oControl, mPropertyBag) {
-				return fAddSort(oChange, oControl, mPropertyBag, true);
-			}
-		},
-		"layers": {
-			"USER": true
-		}
-	};
+	Sort.removeSort = Util.createChangeHandler({
+		apply: fRemoveSort,
+		revert: fAddSort
+	});
 
-	Sort.addSort = {
-		"changeHandler": {
-			applyChange: function(oChange, oControl, mPropertyBag) {
-				return fAddSort(oChange, oControl, mPropertyBag, false);
-			},
-			completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
-				// Not used, but needs to be there
-			},
-			revertChange: function(oChange, oControl, mPropertyBag) {
-				return fRemoveSort(oChange, oControl, mPropertyBag, true);
-			}
-		},
-		"layers": {
-			"USER": true
-		}
-	};
+	Sort.addSort = Util.createChangeHandler({
+		apply: fAddSort,
+		revert: fRemoveSort
+	});
+
+	Sort.moveSort = Util.createChangeHandler({
+		apply: fMoveSort,
+		revert: fMoveSort
+	});
 
-	Sort.moveSort = {
-		"changeHandler": {
-			applyChange: function(oChange, oControl, mPropertyBag) {
-				return fMoveSort(oChange, oControl, mPropertyBag);
-			},
-			completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
-				// Not used, but needs to be there
-			},
-			revertChange: function(oChange, oControl, mPropertyBag) {
-				return fMoveSort(oChange, oControl, mPropertyBag, true);
-			}
-		},
-		"layers": {
-			"USER": true
-		}
-	};
 	return Sort;
 });

package/src/sap/ui/mdc/flexibility/Table.flexibility.js

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	'./SortFlex', './ColumnFlex', './ConditionFlex', './GroupFlex', './AggregateFlex', './AggregationConfigFlex'
-], function(SortFlex, ColumnFlex, ConditionFlex, GroupFlex, AggregateFlex, AggregationConfigFlex) {
+	'./SortFlex', './ColumnFlex', './ConditionFlex', './GroupFlex', './AggregateFlex', './xConfigFlex'
+], function(SortFlex, ColumnFlex, ConditionFlex, GroupFlex, AggregateFlex, xConfigFlex) {
 	"use strict";
 
 	return {
@@ -25,7 +25,7 @@ sap.ui.define([
 		moveGroup: GroupFlex.moveGroup,
 		removeAggregate: AggregateFlex.removeAggregate,
 		addAggregate: AggregateFlex.addAggregate,
-		setColumnWidth: AggregationConfigFlex.createSetChangeHandler({
+		setColumnWidth: xConfigFlex.createSetChangeHandler({
 			aggregation: "columns",
 			property: "width"
 		})

package/src/sap/ui/mdc/flexibility/Util.js

@@ -0,0 +1,82 @@
+/*
+* ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+*/
+sap.ui.define([
+	"sap/ui/mdc/util/loadModules"
+], function(loadModules) {
+	"use strict";
+
+	/**
+	 * Utility functionality for mdc flexibility changehandlers.
+	 *
+	 * @author SAP SE
+	 * @namespace
+	 * @alias module:sap/ui/mdc/flexibility/Util
+	 * @since 1.101
+	 * @private
+	 */
+	var Util = {};
+
+	Util.APPLY = "apply";
+	Util.REVERT = "revert";
+
+	/**
+	 * Creates a changehandler object for mdc controls.
+	 * The changehandler will also call the <code>onAfterXMLChangeProcessing</code> hook on the control's delegate
+	 * in case it's available.
+	 *
+	 * @param {object} mSettings An object defining the changehandler settings
+	 * @param {function} mSettings.apply The changehandler applyChange function
+	 * @param {function} mSettings.revert The changehandler applyChange function
+	 * @param {function} [mSettings.complete] The changehandler applyChange function
+	 *
+	 * @returns {object} A Changehandler object
+	 */
+	Util.createChangeHandler = function(mSettings) {
+
+		var fApply = mSettings.apply instanceof Function && mSettings.apply;
+		var fRevert = mSettings.revert instanceof Function && mSettings.revert;
+		var fComplete = mSettings.complete instanceof Function && mSettings.complete;
+
+		if (!fApply || !fRevert) {
+			throw new Error("Please provide atleast an apply and revert function!");
+		}
+
+		return {
+			"changeHandler": {
+				applyChange: function(oChange, oControl, mPropertyBag) {
+					return fApply(oChange, oControl, mPropertyBag, Util.APPLY);
+				},
+				completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
+					if (fComplete) {
+						fComplete(oChange, mChangeSpecificInfo, mPropertyBag);
+					}
+				},
+				revertChange: function(oChange, oControl, mPropertyBag) {
+					return fRevert(oChange, oControl, mPropertyBag, Util.REVERT);
+				},
+				onAfterXMLChangeProcessing: function(oControl, mPropertyBag) {
+					mPropertyBag.modifier.getProperty(oControl, "delegate")
+					.then(function(oDelegate){
+						loadModules(oDelegate.name)
+						.then(function(aModules){
+							var oDelegate = aModules[0];
+
+							if (oDelegate.onAfterXMLChangeProcessing instanceof Function) {
+								oDelegate.onAfterXMLChangeProcessing(oControl, mPropertyBag);
+							}
+
+						});
+					});
+				}
+			},
+			"layers": {
+				"USER": true
+			}
+		};
+	};
+
+	return Util;
+});

package/src/sap/ui/mdc/flexibility/xConfigFlex.js

@@ -0,0 +1,137 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+    'sap/ui/mdc/p13n/Engine',
+    'sap/ui/mdc/flexibility/Util'
+], function(Engine, Util) {
+	"use strict";
+
+	/**
+	 * @class Utility class for generic mdc xConfig handling by utilizing the
+     * <code>sap.ui.mdc.p13n.Engine</code> and its <code>Modificationhandler</code>.
+     * This class should be used to handle property changes that should be persisted
+     * as flex changes for MDC control while enabling preprocessing via customdata.
+	 *
+	 * @author SAP SE
+	 * @private
+	 * @alias sap.ui.mdc.flexibility.xConfigFlex
+	 */
+    var xConfigFlex = {};
+
+    var fConfigModified = function(oControl) {
+        if (!oControl._bWaitForModificationChanges && oControl.isA) {
+            oControl._bWaitForModificationChanges = true;
+            Engine.getInstance().waitForChanges(oControl).then(function() {
+                if (oControl._onModifications instanceof Function) {
+                    oControl._onModifications();
+                }
+                delete oControl._bWaitForModificationChanges;
+            });
+        }
+	};
+
+    var fnQueueChange = function(oControl, fTask) {
+		var fCleanupPromiseQueue = function(pOriginalPromise) {
+			if (oControl._pQueue === pOriginalPromise){
+				delete oControl._pQueue;
+			}
+		};
+
+		oControl._pQueue = oControl._pQueue instanceof Promise ? oControl._pQueue.then(fTask) : fTask();
+		oControl._pQueue.then(fCleanupPromiseQueue.bind(null, oControl._pQueue));
+
+		return oControl._pQueue;
+	};
+
+    /**
+     * Creates a changehandler specific to the provided aggregation and property name,
+     * to enhance the xConfig object for a given mdc control instance.
+     *
+     * The enhanced object can be accesed using <code>Engine#readAggregationConfig</code>.
+     *
+     * @param {object} mMetaConfig A map describing the metadata structure that is affected by this changehandler
+     * @param {object} mMetaConfig.aggregation The aggregation name (such as <code>columns</code> or <code>filterItemes</code>)
+     * @param {object} mMetaConfig.property The property name (such as <code>width</code> or <code>label</code>)
+     *
+     * @returns {object} The created changehandler object
+     */
+    xConfigFlex.createSetChangeHandler = function(mMetaConfig) {
+
+        if (!mMetaConfig || !mMetaConfig.hasOwnProperty("aggregation") || !mMetaConfig.hasOwnProperty("property")) {
+            throw new Error("Please provide a map containing the affected aggregation and property name!");
+        }
+
+        var sAffectedAggregation = mMetaConfig.aggregation;
+        var sAffectedProperty = mMetaConfig.property;
+
+        var fApply = function (oChange, oControl, mPropertyBag) {
+
+            return fnQueueChange(oControl, function(){
+                return Engine.getInstance().readXConfig(oControl, {
+                    propertyBag: mPropertyBag
+                })
+                .then(function(oPriorAggregationConfig) {
+                    var sOldValue = null;
+
+                    if (oPriorAggregationConfig
+                        && oPriorAggregationConfig.aggregations
+                        && oPriorAggregationConfig.aggregations[sAffectedAggregation]
+                        && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name]
+                        && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty]
+                        ){
+                            sOldValue = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty];
+                    }
+
+                    oChange.setRevertData({
+                        name: oChange.getContent().name,
+                        value: sOldValue
+                    });
+
+                    return Engine.getInstance().enhanceXConfig(oControl, {
+                        controlMeta: {
+                            aggregation: sAffectedAggregation,
+                            property: sAffectedProperty
+                        },
+                        name: oChange.getContent().name,
+                        value: oChange.getContent().value,
+                        propertyBag: mPropertyBag
+                    });
+                })
+                .then(function() {
+                    fConfigModified(oControl);
+                });
+
+            });
+
+        };
+
+        var fRevert = function (oChange, oControl, mPropertyBag) {
+            return Engine.getInstance().enhanceXConfig(oControl, {
+                controlMeta: {
+                    aggregation: sAffectedAggregation,
+                    property: sAffectedProperty
+                },
+                name: oChange.getRevertData().name,
+                value: oChange.getRevertData().value,
+                propertyBag: mPropertyBag
+            })
+            .then(function() {
+                oChange.resetRevertData();
+                fConfigModified(oControl);
+            });
+        };
+
+        return Util.createChangeHandler({
+            apply: fApply,
+            revert: fRevert
+        });
+
+    };
+
+    return xConfigFlex;
+
+});

package/src/sap/ui/mdc/flp/FlpLinkDelegate.js

@@ -304,7 +304,8 @@ sap.ui.define([
 									// multiple contexts (~XXXX in hash) they will all be skipped
 									oNavigationTargets.ownNavigation = new LinkItem({
 										href: sHref,
-										text: oLink.text
+										text: oLink.text,
+										internalHref: oLink.intent
 									});
 									return;
 								}
@@ -314,6 +315,7 @@ sap.ui.define([
 									text: oLink.text,
 									description: undefined,
 									href: sHref,
+									internalHref: oLink.intent,
 									// target: not supported yet
 									icon: undefined, //oLink.icon,
 									initiallyVisible: (oLink.tags && oLink.tags.indexOf("superiorAction") > -1)

package/src/sap/ui/mdc/library.js

@@ -23,14 +23,14 @@
 	 * @namespace
 	 * @alias sap.ui.mdc
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @since 1.80
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @experimental As of version 1.54 Disclaimer: Usage Restrictions: The components of this library are under development and documented as private. Their APIs are subject to change and should not be used in productive scenarios without further agreement. A general availability of sap.ui.mdc will be announced via the usual channels.
 	 */
 	 var thisLib = sap.ui.getCore().initLibrary({
-		version: "1.102.1",
+		version: "1.103.1",
 		name: "sap.ui.mdc",
 		dependencies: ["sap.ui.core", "sap.m"],
 		designtime: "sap/ui/mdc/designtime/library.designtime",
@@ -251,7 +251,6 @@
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valuehelp.ITypeaheadContainer
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 
@@ -284,7 +283,6 @@
 	 * @method
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valuehelp.ITypeaheadContainer
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	*/
 
 	/**
@@ -296,7 +294,6 @@
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valuehelp.ITypeaheadContainer
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 	/**
@@ -307,7 +304,6 @@
 	 * @returns {boolean} True if value help shall open as valuehelp
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valuehelp.ITypeaheadContainer
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 	/**
@@ -316,11 +312,10 @@
 	 * @method
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valuehelp.ITypeaheadContainer
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 
-		/**
+	/**
 	 *
 	 * Interface for valuehelp containers
 	 *
@@ -442,7 +437,6 @@
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 
@@ -475,8 +469,7 @@
 	 * @method
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
-	*/
+	 */
 
 	/**
 	 * Defines if the typeahead can be used for input validation.
@@ -487,7 +480,6 @@
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 	/**
@@ -498,7 +490,6 @@
 	 * @returns {boolean} True if value help shall open as valuehelp
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 	/**
@@ -507,7 +498,6 @@
 	 * @method
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 
@@ -720,7 +710,6 @@
 	 * @since 1.80
 	 * @public
 	 * @function
-	 * @ui5-metamodel This interface also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 	/**

package/src/sap/ui/mdc/link/ContactDetails.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The ContactDetails control is used to show additional information like for example 'contact details'.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/ContactDetailsAddressItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/ContactDetailsEmailItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/ContactDetailsItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/ContactDetailsPhoneItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/Factory.js

@@ -11,7 +11,7 @@ sap.ui.define([], function() {
 	 * @namespace Factory to access services outside of sap.ui.mdc library like for example <code>ushell</code> services.
 	 * @name sap.ui.mdc.link.Factory
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @private
 	 * @since 1.54.0
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel

package/src/sap/ui/mdc/link/FakeFlpConnector.js

@@ -13,7 +13,7 @@ sap.ui.define([
 	 * @namespace FakeFlpConnector.
 	 * @name sap.ui.mdc.link.FakeFlpConnector
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @private
 	 * @since 1.54.0
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel

package/src/sap/ui/mdc/link/LinkItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A <code>LinkItem</code> control is used in the {@link sap.ui.mdc.Link} control to provide a navigation target.
 	 * @extends sap.ui.core.Element
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @since 1.58.0
@@ -40,6 +40,14 @@ sap.ui.define([
 				href: {
 					type: "string"
 				},
+				/**
+				 * Destination link for a navigation operation in internal format provided by FLP.
+				 * @protected
+				 */
+				internalHref: {
+					type: "string",
+					defaultValue: null
+				},
 				target: {
 					type: "string",
 					defaultValue: "_self"

package/src/sap/ui/mdc/link/Panel.js

@@ -24,8 +24,9 @@ sap.ui.define([
 	"sap/ui/mdc/p13n/subcontroller/LinkPanelController",
 	"sap/ui/mdc/p13n/Engine",
 	"sap/ui/mdc/mixin/AdaptationMixin",
-	"sap/ui/mdc/link/PanelItem"
-], function(Control, PanelRenderer, VerticalLayout, Log, HorizontalLayout, HBox, VBox, ImageContent, Link, Label, Text, Button, FlexItemData, JSONModel, BindingMode, ManagedObjectObserver, LinkPanelController, Engine, AdaptationMixin, PanelItem) {
+	"sap/ui/mdc/link/PanelItem",
+	"sap/ui/core/CustomData"
+], function(Control, PanelRenderer, VerticalLayout, Log, HorizontalLayout, HBox, VBox, ImageContent, Link, Label, Text, Button, FlexItemData, JSONModel, BindingMode, ManagedObjectObserver, LinkPanelController, Engine, AdaptationMixin, PanelItem, CustomData) {
 	"use strict";
 
 	/**
@@ -37,7 +38,7 @@ sap.ui.define([
 	 * supposed that the properties of the item structure is not changed.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @since 1.54.0
@@ -254,7 +255,11 @@ sap.ui.define([
 				}
 			},
 			press: this.onPressLink.bind(this),
-			wrapping: true
+			wrapping: true,
+			customData: new CustomData({
+				key: "internalHref",
+				value: "{$sapuimdclinkPanel>internalHref}"
+			})
 		});
 		var oLabel = new Label({
 			text: "{$sapuimdclinkPanel>text}",
@@ -316,8 +321,11 @@ sap.ui.define([
 	};
 
 	Panel.prototype.onPressLink = function(oEvent) {
-		if (this.getBeforeNavigationCallback() && oEvent.getSource() && oEvent.getSource().getTarget() !== "_blank") {
-			var sHref = oEvent.getSource().getHref();
+		var oLink = oEvent.getSource();
+		if (this.getBeforeNavigationCallback() && oLink && oLink.getTarget() !== "_blank") {
+			// Fall back to using href property when there is no internalHref
+			var bUseInternalHref = oLink && oLink.getCustomData() && oLink.getCustomData()[0].getValue();
+			var sHref = bUseInternalHref ? oLink.getCustomData()[0].getValue() : oLink.getHref();
 			oEvent.preventDefault();
 			this.getBeforeNavigationCallback()(oEvent).then(function(bNavigate) {
 				if (bNavigate) {
@@ -364,6 +372,7 @@ sap.ui.define([
 						id: oItem.name,
 						description: oItem.description,
 						href: oItem.href,
+						internalHref: oItem.internalHref,
 						target: oItem.target,
 						text: oItem.text,
 						visible: oItem.visible
@@ -373,8 +382,11 @@ sap.ui.define([
 				this._getInternalModel().setProperty("/showResetEnabled", bShowResetEnabled);
 			};
 
-			var oPopover = this.getParent();
-			oPopover.setModal(true);
+			var oParent = this.getParent();
+			// In case of mobile oParent isA sap.m.Dialog
+			if (oParent.isA("sap.m.Popover")) {
+				oParent.setModal(true);
+			}
 			Engine.getInstance().uimanager.show(this, "LinkItems").then(function(oDialog) {
 				var oResetButton = oDialog.getCustomHeader().getContentRight()[0];
 				var oSelectionPanel = oDialog.getContent()[0];
@@ -386,8 +398,10 @@ sap.ui.define([
 				oSelectionPanel.attachChange(function(oEvent) {
 					fnUpdateResetButton.call(this, oSelectionPanel);
 				}.bind(this));
-				oDialog.attachAfterClose(function(){
-					oPopover.setModal(false);
+				oDialog.attachAfterClose(function() {
+					if (oParent.isA("sap.m.Popover")) {
+						oParent.setModal(false);
+					}
 				});
 			}.bind(this));
 		}.bind(this));
@@ -591,6 +605,7 @@ sap.ui.define([
 							},
 							text: oItem.text,
 							href: oItem.href,
+							internalHref: oItem.internalHref,
 							description: oItem.description,
 							target: oItem.target,
 							visible: oItem.visible