@sapui5/sap.fe.core 1.97.0 → 1.100.0

package/src/sap/fe/core/controls/ActionParameterDialog.fragment.xml

@@ -38,8 +38,9 @@
 
 						<template:if test="{=  !${parameter>$isCollection} }">
 						<template:then>
+						<!--The payload of FieldBaseDelegate is used to control the fallback feature 'retrieveTextFromValueList' -->
 							<mdc:Field
-								delegate="{name: 'sap/ui/mdc/odata/v4/FieldBaseDelegate'}"
+								delegate="{name:'sap/fe/macros/FieldBaseDelegate', payload:{retrieveTextFromValueList:true}}"
 								unittest:id="ActionParameterDialogFieldExpressionTest"
 								id="{= ID.generate(['APD_', ${parameter>$Name}]) }"
 								value="{parameter>@@MODEL.format}"
@@ -50,7 +51,7 @@
 								required="{= FIELD.isRequired(${actionParameter>@@FIELD.fieldControl}, 'Editable')}"
 								change="{= '.handleChange($event, \'' + ${parameter>$Name} + '\')' }"
 								fieldHelp="{= FIELD.getActionParameterDialogFieldHelp(${actionParameter>@}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
-								visible="{actionParameter>@@COMMON.isVisible}"
+								visible="{actionParameter>@com.sap.vocabularies.UI.v1.Hidden@@FIELD.getActionParameterVisibility}"
 							>
 							<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />
 							</mdc:Field>
@@ -67,7 +68,7 @@
 								multipleLines="{= ${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} ? (${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} !== false)  : undefined}"
 								required="{= FIELD.isRequired(${actionParameter>@@FIELD.fieldControl}, 'Editable')}"
 								fieldHelp="{= FIELD.getActionParameterDialogFieldHelp(${actionParameter>@}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
-								visible="{actionParameter>@@COMMON.isVisible}"
+								visible="{actionParameter>@com.sap.vocabularies.UI.v1.Hidden@@FIELD.getActionParameterVisibility}"
 							>
 							<mdcField:MultiValueFieldItem key="{path: 'mvfview>Key', type:'sap.ui.model.type.String'}" description="{mvfview>Desc}" />
 							<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />

package/src/sap/fe/core/controls/ActionPartial.fragment.xml

@@ -37,8 +37,8 @@
                 <items>
                     <CustomListItem>
                         <HBox justifyContent="Start">
-                             <Text
-										text="{= '{notApplicable>' + ${headerInfo>Title/Value/$Path} + '}'  }"
+ 							<Text
+										text="{= '{= !${notApplicable>' + ${headerInfo>Title/Value/$Path} + '} ? ${sap.fe.i18n>T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR} : ${notApplicable>' + ${headerInfo>Title/Value/$Path} + '}}' }"
 										class="sapUiTinyMarginBegin sapUiTinyMarginTopBottom"
 										unittest:id="ActionPartialHeaderInfoListItemText"
 									/>

package/src/sap/fe/core/controls/CommandExecution.js

@@ -1,70 +1,72 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/core/CommandExecution", "sap/base/Log", "sap/ui/core/Element", "sap/ui/core/Shortcut"], function(
-	CommandExecution,
-	Log,
-	Element,
-	Shortcut
-) {
-	"use strict";
-	return CommandExecution.extend("sap.fe.core.controls.CommandExecution", {
-		setParent: function(oParent) {
-			var aExcludedSingleKey = ["escape"],
-				aCommands;
-			CommandExecution.prototype.setParent.apply(this, arguments);
-			aCommands = oParent.data("sap.ui.core.Shortcut");
-			if (Array.isArray(aCommands) && aCommands.length > 0) {
-				var oCommand = oParent.data("sap.ui.core.Shortcut")[aCommands.length - 1],
-					oShortcut = oCommand.shortcutSpec;
-				if (oShortcut && aExcludedSingleKey.indexOf(oShortcut.key) > -1) {
-					// Check if single key shortcut
-					for (var key in oShortcut) {
-						if (oShortcut[key] && key !== "key") {
-							return this;
-						}
-					}
-					// Need to disable ShortCut when user press single shortcut key into an input
-					oParent.addDelegate(
-						{
-							"onkeydown": function(oEvent) {
-								if (aExcludedSingleKey.indexOf(oEvent.key.toLowerCase()) > -1) {
-									var sElement = oEvent.target ? oEvent.target.tagName.toLowerCase() : undefined;
-									if (sElement === "input") {
-										oEvent.setMarked();
-									}
-								}
-							}
-						},
-						true,
-						undefined,
-						true
-					);
-				}
-				return this;
-			}
-		},
+sap.ui.define(["sap/ui/core/CommandExecution", "sap/base/Log", "sap/ui/core/Element", "sap/ui/core/Shortcut"], function (CommandExecution, Log, Element, Shortcut) {
+  "use strict";
 
-		destroy: function() {
-			var oParent = this.getParent();
-			if (oParent) {
-				var oCommand = this._getCommandInfo();
-				if (oCommand) {
-					Shortcut.unregister(this.getParent(), oCommand.shortcut);
-				}
-				this._cleanupContext(oParent);
-			}
-			Element.prototype.destroy.apply(this, arguments);
-		},
+  var CustomCommandExecution = CommandExecution.extend("sap.fe.core.controls.CommandExecution", {
+    setParent: function (oParent) {
+      var aExcludedSingleKey = ["escape"];
+      CommandExecution.prototype.setParent.apply(this, [oParent]);
+      var aCommands = oParent.data("sap.ui.core.Shortcut");
 
-		setVisible: function(bValue) {
-			var oCommand = this._getCommandInfo();
-			if (oCommand) {
-				CommandExecution.prototype.setVisible.apply(this, arguments);
-			} else {
-				Log.info("There is no shortcut definition registered in the manifest for the command : " + this.getCommand());
-			}
-		}
-	});
-});
+      if (Array.isArray(aCommands) && aCommands.length > 0) {
+        var oCommand = oParent.data("sap.ui.core.Shortcut")[aCommands.length - 1],
+            oShortcut = oCommand.shortcutSpec;
+
+        if (oShortcut && aExcludedSingleKey.indexOf(oShortcut.key) > -1) {
+          // Check if single key shortcut
+          for (var key in oShortcut) {
+            if (oShortcut[key] && key !== "key") {
+              return this;
+            }
+          } // Need to disable ShortCut when user press single shortcut key into an input
+
+
+          oParent.addDelegate({
+            "onkeydown": function (oEvent) {
+              if (aExcludedSingleKey.indexOf(oEvent.key.toLowerCase()) > -1) {
+                var sElement = oEvent.target ? oEvent.target.tagName.toLowerCase() : undefined;
+
+                if (sElement === "input") {
+                  oEvent.setMarked();
+                }
+              }
+            }
+          }, true, undefined, true);
+        }
+
+        return this;
+      }
+    },
+    destroy: function (bSuppressInvalidate) {
+      var oParent = this.getParent();
+
+      if (oParent) {
+        var oCommand = this._getCommandInfo();
+
+        if (oCommand) {
+          Shortcut.unregister(this.getParent(), oCommand.shortcut);
+        }
+
+        this._cleanupContext(oParent);
+      }
+
+      Element.prototype.destroy.apply(this, [bSuppressInvalidate]);
+    },
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    setVisible: function (bValue) {
+      var oCommand = this._getCommandInfo();
+
+      if (oCommand) {
+        return CommandExecution.prototype.setVisible.apply(this, [bValue]);
+      } else {
+        Log.info("There is no shortcut definition registered in the manifest for the command : " + this.getCommand());
+      }
+    }
+  });
+  return CustomCommandExecution;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1hbmRFeGVjdXRpb24udHMiXSwibmFtZXMiOlsiQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiIsIkNvbW1hbmRFeGVjdXRpb24iLCJleHRlbmQiLCJzZXRQYXJlbnQiLCJvUGFyZW50IiwiYUV4Y2x1ZGVkU2luZ2xlS2V5IiwicHJvdG90eXBlIiwiYXBwbHkiLCJhQ29tbWFuZHMiLCJkYXRhIiwiQXJyYXkiLCJpc0FycmF5IiwibGVuZ3RoIiwib0NvbW1hbmQiLCJvU2hvcnRjdXQiLCJzaG9ydGN1dFNwZWMiLCJpbmRleE9mIiwia2V5IiwiYWRkRGVsZWdhdGUiLCJvRXZlbnQiLCJ0b0xvd2VyQ2FzZSIsInNFbGVtZW50IiwidGFyZ2V0IiwidGFnTmFtZSIsInVuZGVmaW5lZCIsInNldE1hcmtlZCIsImRlc3Ryb3kiLCJiU3VwcHJlc3NJbnZhbGlkYXRlIiwiZ2V0UGFyZW50IiwiX2dldENvbW1hbmRJbmZvIiwiU2hvcnRjdXQiLCJ1bnJlZ2lzdGVyIiwic2hvcnRjdXQiLCJfY2xlYW51cENvbnRleHQiLCJFbGVtZW50Iiwic2V0VmlzaWJsZSIsImJWYWx1ZSIsIkxvZyIsImluZm8iLCJnZXRDb21tYW5kIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBU0EsTUFBTUEsc0JBQXNCLEdBQUdDLGdCQUFnQixDQUFDQyxNQUFqQixDQUF3Qix1Q0FBeEIsRUFBaUU7QUFDL0ZDLElBQUFBLFNBQVMsRUFBRSxVQUFTQyxPQUFULEVBQXVCO0FBQ2pDLFVBQU1DLGtCQUFrQixHQUFHLENBQUMsUUFBRCxDQUEzQjtBQUNDSixNQUFBQSxnQkFBZ0IsQ0FBQ0ssU0FBbEIsQ0FBb0NILFNBQXBDLENBQThDSSxLQUE5QyxDQUFvRCxJQUFwRCxFQUEwRCxDQUFDSCxPQUFELENBQTFEO0FBQ0EsVUFBTUksU0FBUyxHQUFHSixPQUFPLENBQUNLLElBQVIsQ0FBYSxzQkFBYixDQUFsQjs7QUFDQSxVQUFJQyxLQUFLLENBQUNDLE9BQU4sQ0FBY0gsU0FBZCxLQUE0QkEsU0FBUyxDQUFDSSxNQUFWLEdBQW1CLENBQW5ELEVBQXNEO0FBQ3JELFlBQU1DLFFBQVEsR0FBR1QsT0FBTyxDQUFDSyxJQUFSLENBQWEsc0JBQWIsRUFBcUNELFNBQVMsQ0FBQ0ksTUFBVixHQUFtQixDQUF4RCxDQUFqQjtBQUFBLFlBQ0NFLFNBQVMsR0FBR0QsUUFBUSxDQUFDRSxZQUR0Qjs7QUFFQSxZQUFJRCxTQUFTLElBQUlULGtCQUFrQixDQUFDVyxPQUFuQixDQUEyQkYsU0FBUyxDQUFDRyxHQUFyQyxJQUE0QyxDQUFDLENBQTlELEVBQWlFO0FBQ2hFO0FBQ0EsZUFBSyxJQUFNQSxHQUFYLElBQWtCSCxTQUFsQixFQUE2QjtBQUM1QixnQkFBSUEsU0FBUyxDQUFDRyxHQUFELENBQVQsSUFBa0JBLEdBQUcsS0FBSyxLQUE5QixFQUFxQztBQUNwQyxxQkFBTyxJQUFQO0FBQ0E7QUFDRCxXQU4rRCxDQU9oRTs7O0FBQ0FiLFVBQUFBLE9BQU8sQ0FBQ2MsV0FBUixDQUNDO0FBQ0MseUJBQWEsVUFBU0MsTUFBVCxFQUFzQjtBQUNsQyxrQkFBSWQsa0JBQWtCLENBQUNXLE9BQW5CLENBQTJCRyxNQUFNLENBQUNGLEdBQVAsQ0FBV0csV0FBWCxFQUEzQixJQUF1RCxDQUFDLENBQTVELEVBQStEO0FBQzlELG9CQUFNQyxRQUFRLEdBQUdGLE1BQU0sQ0FBQ0csTUFBUCxHQUFnQkgsTUFBTSxDQUFDRyxNQUFQLENBQWNDLE9BQWQsQ0FBc0JILFdBQXRCLEVBQWhCLEdBQXNESSxTQUF2RTs7QUFDQSxvQkFBSUgsUUFBUSxLQUFLLE9BQWpCLEVBQTBCO0FBQ3pCRixrQkFBQUEsTUFBTSxDQUFDTSxTQUFQO0FBQ0E7QUFDRDtBQUNEO0FBUkYsV0FERCxFQVdDLElBWEQsRUFZQ0QsU0FaRCxFQWFDLElBYkQ7QUFlQTs7QUFDRCxlQUFPLElBQVA7QUFDQTtBQUNELEtBbEM4RjtBQW9DL0ZFLElBQUFBLE9BQU8sRUFBRSxVQUFtQ0MsbUJBQW5DLEVBQXdEO0FBQ2hFLFVBQU12QixPQUFPLEdBQUcsS0FBS3dCLFNBQUwsRUFBaEI7O0FBQ0EsVUFBSXhCLE9BQUosRUFBYTtBQUNaLFlBQU1TLFFBQVEsR0FBRyxLQUFLZ0IsZUFBTCxFQUFqQjs7QUFDQSxZQUFJaEIsUUFBSixFQUFjO0FBQ2JpQixVQUFBQSxRQUFRLENBQUNDLFVBQVQsQ0FBb0IsS0FBS0gsU0FBTCxFQUFwQixFQUFzQ2YsUUFBUSxDQUFDbUIsUUFBL0M7QUFDQTs7QUFDRCxhQUFLQyxlQUFMLENBQXFCN0IsT0FBckI7QUFDQTs7QUFDRDhCLE1BQUFBLE9BQU8sQ0FBQzVCLFNBQVIsQ0FBa0JvQixPQUFsQixDQUEwQm5CLEtBQTFCLENBQWdDLElBQWhDLEVBQXNDLENBQUNvQixtQkFBRCxDQUF0QztBQUNBLEtBOUM4RjtBQWdEL0Y7QUFDQTtBQUNBUSxJQUFBQSxVQUFVLEVBQUUsVUFBbUNDLE1BQW5DLEVBQWdEO0FBQzNELFVBQU12QixRQUFRLEdBQUcsS0FBS2dCLGVBQUwsRUFBakI7O0FBQ0EsVUFBSWhCLFFBQUosRUFBYztBQUNiLGVBQU9aLGdCQUFnQixDQUFDSyxTQUFqQixDQUEyQjZCLFVBQTNCLENBQXNDNUIsS0FBdEMsQ0FBNEMsSUFBNUMsRUFBa0QsQ0FBQzZCLE1BQUQsQ0FBbEQsQ0FBUDtBQUNBLE9BRkQsTUFFTztBQUNOQyxRQUFBQSxHQUFHLENBQUNDLElBQUosQ0FBUyxrRkFBa0YsS0FBS0MsVUFBTCxFQUEzRjtBQUNBO0FBQ0Q7QUF6RDhGLEdBQWpFLENBQS9CO1NBNERldkMsc0IiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb21tYW5kRXhlY3V0aW9uIGZyb20gXCJzYXAvdWkvY29yZS9Db21tYW5kRXhlY3V0aW9uXCI7XG5pbXBvcnQgTG9nIGZyb20gXCJzYXAvYmFzZS9Mb2dcIjtcbmltcG9ydCBFbGVtZW50IGZyb20gXCJzYXAvdWkvY29yZS9FbGVtZW50XCI7XG5pbXBvcnQgU2hvcnRjdXQgZnJvbSBcInNhcC91aS9jb3JlL1Nob3J0Y3V0XCI7XG5cbnR5cGUgQ29tbWFuZEV4ZWN1dGlvbkV4ID0gQ29tbWFuZEV4ZWN1dGlvbiAmIHtcblx0c2V0UGFyZW50KG9QYXJlbnQ6IGFueSk6IHZvaWQ7XG5cdF9nZXRDb21tYW5kSW5mbygpOiBhbnk7XG5cdF9jbGVhbnVwQ29udGV4dChvUGFyZW50OiBhbnkpOiB2b2lkO1xufTtcblxuY29uc3QgQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiA9IENvbW1hbmRFeGVjdXRpb24uZXh0ZW5kKFwic2FwLmZlLmNvcmUuY29udHJvbHMuQ29tbWFuZEV4ZWN1dGlvblwiLCB7XG5cdHNldFBhcmVudDogZnVuY3Rpb24ob1BhcmVudDogYW55KSB7XG5cdFx0Y29uc3QgYUV4Y2x1ZGVkU2luZ2xlS2V5ID0gW1wiZXNjYXBlXCJdO1xuXHRcdChDb21tYW5kRXhlY3V0aW9uLnByb3RvdHlwZSBhcyBhbnkpLnNldFBhcmVudC5hcHBseSh0aGlzLCBbb1BhcmVudF0pO1xuXHRcdGNvbnN0IGFDb21tYW5kcyA9IG9QYXJlbnQuZGF0YShcInNhcC51aS5jb3JlLlNob3J0Y3V0XCIpO1xuXHRcdGlmIChBcnJheS5pc0FycmF5KGFDb21tYW5kcykgJiYgYUNvbW1hbmRzLmxlbmd0aCA+IDApIHtcblx0XHRcdGNvbnN0IG9Db21tYW5kID0gb1BhcmVudC5kYXRhKFwic2FwLnVpLmNvcmUuU2hvcnRjdXRcIilbYUNvbW1hbmRzLmxlbmd0aCAtIDFdLFxuXHRcdFx0XHRvU2hvcnRjdXQgPSBvQ29tbWFuZC5zaG9ydGN1dFNwZWM7XG5cdFx0XHRpZiAob1Nob3J0Y3V0ICYmIGFFeGNsdWRlZFNpbmdsZUtleS5pbmRleE9mKG9TaG9ydGN1dC5rZXkpID4gLTEpIHtcblx0XHRcdFx0Ly8gQ2hlY2sgaWYgc2luZ2xlIGtleSBzaG9ydGN1dFxuXHRcdFx0XHRmb3IgKGNvbnN0IGtleSBpbiBvU2hvcnRjdXQpIHtcblx0XHRcdFx0XHRpZiAob1Nob3J0Y3V0W2tleV0gJiYga2V5ICE9PSBcImtleVwiKSB7XG5cdFx0XHRcdFx0XHRyZXR1cm4gdGhpcztcblx0XHRcdFx0XHR9XG5cdFx0XHRcdH1cblx0XHRcdFx0Ly8gTmVlZCB0byBkaXNhYmxlIFNob3J0Q3V0IHdoZW4gdXNlciBwcmVzcyBzaW5nbGUgc2hvcnRjdXQga2V5IGludG8gYW4gaW5wdXRcblx0XHRcdFx0b1BhcmVudC5hZGREZWxlZ2F0ZShcblx0XHRcdFx0XHR7XG5cdFx0XHRcdFx0XHRcIm9ua2V5ZG93blwiOiBmdW5jdGlvbihvRXZlbnQ6IGFueSkge1xuXHRcdFx0XHRcdFx0XHRpZiAoYUV4Y2x1ZGVkU2luZ2xlS2V5LmluZGV4T2Yob0V2ZW50LmtleS50b0xvd2VyQ2FzZSgpKSA+IC0xKSB7XG5cdFx0XHRcdFx0XHRcdFx0Y29uc3Qgc0VsZW1lbnQgPSBvRXZlbnQudGFyZ2V0ID8gb0V2ZW50LnRhcmdldC50YWdOYW1lLnRvTG93ZXJDYXNlKCkgOiB1bmRlZmluZWQ7XG5cdFx0XHRcdFx0XHRcdFx0aWYgKHNFbGVtZW50ID09PSBcImlucHV0XCIpIHtcblx0XHRcdFx0XHRcdFx0XHRcdG9FdmVudC5zZXRNYXJrZWQoKTtcblx0XHRcdFx0XHRcdFx0XHR9XG5cdFx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHR9LFxuXHRcdFx0XHRcdHRydWUsXG5cdFx0XHRcdFx0dW5kZWZpbmVkLFxuXHRcdFx0XHRcdHRydWVcblx0XHRcdFx0KTtcblx0XHRcdH1cblx0XHRcdHJldHVybiB0aGlzO1xuXHRcdH1cblx0fSxcblxuXHRkZXN0cm95OiBmdW5jdGlvbih0aGlzOiBDb21tYW5kRXhlY3V0aW9uRXgsIGJTdXBwcmVzc0ludmFsaWRhdGUpIHtcblx0XHRjb25zdCBvUGFyZW50ID0gdGhpcy5nZXRQYXJlbnQoKTtcblx0XHRpZiAob1BhcmVudCkge1xuXHRcdFx0Y29uc3Qgb0NvbW1hbmQgPSB0aGlzLl9nZXRDb21tYW5kSW5mbygpO1xuXHRcdFx0aWYgKG9Db21tYW5kKSB7XG5cdFx0XHRcdFNob3J0Y3V0LnVucmVnaXN0ZXIodGhpcy5nZXRQYXJlbnQoKSwgb0NvbW1hbmQuc2hvcnRjdXQpO1xuXHRcdFx0fVxuXHRcdFx0dGhpcy5fY2xlYW51cENvbnRleHQob1BhcmVudCk7XG5cdFx0fVxuXHRcdEVsZW1lbnQucHJvdG90eXBlLmRlc3Ryb3kuYXBwbHkodGhpcywgW2JTdXBwcmVzc0ludmFsaWRhdGVdKTtcblx0fSxcblxuXHQvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L2Jhbi10cy1jb21tZW50XG5cdC8vIEB0cy1pZ25vcmVcblx0c2V0VmlzaWJsZTogZnVuY3Rpb24odGhpczogQ29tbWFuZEV4ZWN1dGlvbkV4LCBiVmFsdWU6IGFueSkge1xuXHRcdGNvbnN0IG9Db21tYW5kID0gdGhpcy5fZ2V0Q29tbWFuZEluZm8oKTtcblx0XHRpZiAob0NvbW1hbmQpIHtcblx0XHRcdHJldHVybiBDb21tYW5kRXhlY3V0aW9uLnByb3RvdHlwZS5zZXRWaXNpYmxlLmFwcGx5KHRoaXMsIFtiVmFsdWVdKTtcblx0XHR9IGVsc2Uge1xuXHRcdFx0TG9nLmluZm8oXCJUaGVyZSBpcyBubyBzaG9ydGN1dCBkZWZpbml0aW9uIHJlZ2lzdGVyZWQgaW4gdGhlIG1hbmlmZXN0IGZvciB0aGUgY29tbWFuZCA6IFwiICsgdGhpcy5nZXRDb21tYW5kKCkpO1xuXHRcdH1cblx0fVxufSk7XG5cbmV4cG9ydCBkZWZhdWx0IEN1c3RvbUNvbW1hbmRFeGVjdXRpb247XG4iXX0=

package/src/sap/fe/core/controls/CommandExecution.ts

@@ -0,0 +1,72 @@
+import CommandExecution from "sap/ui/core/CommandExecution";
+import Log from "sap/base/Log";
+import Element from "sap/ui/core/Element";
+import Shortcut from "sap/ui/core/Shortcut";
+
+type CommandExecutionEx = CommandExecution & {
+	setParent(oParent: any): void;
+	_getCommandInfo(): any;
+	_cleanupContext(oParent: any): void;
+};
+
+const CustomCommandExecution = CommandExecution.extend("sap.fe.core.controls.CommandExecution", {
+	setParent: function(oParent: any) {
+		const aExcludedSingleKey = ["escape"];
+		(CommandExecution.prototype as any).setParent.apply(this, [oParent]);
+		const aCommands = oParent.data("sap.ui.core.Shortcut");
+		if (Array.isArray(aCommands) && aCommands.length > 0) {
+			const oCommand = oParent.data("sap.ui.core.Shortcut")[aCommands.length - 1],
+				oShortcut = oCommand.shortcutSpec;
+			if (oShortcut && aExcludedSingleKey.indexOf(oShortcut.key) > -1) {
+				// Check if single key shortcut
+				for (const key in oShortcut) {
+					if (oShortcut[key] && key !== "key") {
+						return this;
+					}
+				}
+				// Need to disable ShortCut when user press single shortcut key into an input
+				oParent.addDelegate(
+					{
+						"onkeydown": function(oEvent: any) {
+							if (aExcludedSingleKey.indexOf(oEvent.key.toLowerCase()) > -1) {
+								const sElement = oEvent.target ? oEvent.target.tagName.toLowerCase() : undefined;
+								if (sElement === "input") {
+									oEvent.setMarked();
+								}
+							}
+						}
+					},
+					true,
+					undefined,
+					true
+				);
+			}
+			return this;
+		}
+	},
+
+	destroy: function(this: CommandExecutionEx, bSuppressInvalidate) {
+		const oParent = this.getParent();
+		if (oParent) {
+			const oCommand = this._getCommandInfo();
+			if (oCommand) {
+				Shortcut.unregister(this.getParent(), oCommand.shortcut);
+			}
+			this._cleanupContext(oParent);
+		}
+		Element.prototype.destroy.apply(this, [bSuppressInvalidate]);
+	},
+
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore
+	setVisible: function(this: CommandExecutionEx, bValue: any) {
+		const oCommand = this._getCommandInfo();
+		if (oCommand) {
+			return CommandExecution.prototype.setVisible.apply(this, [bValue]);
+		} else {
+			Log.info("There is no shortcut definition registered in the manifest for the command : " + this.getCommand());
+		}
+	}
+});
+
+export default CustomCommandExecution;

package/src/sap/fe/core/controls/ConditionalWrapper.js

@@ -1,81 +1,97 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/core/Control"], function(Control) {
-	"use strict";
+sap.ui.define(["sap/ui/core/Control"], function (Control) {
+  "use strict";
 
-	return Control.extend("sap.fe.core.controls.ConditionalWrapper", {
-		metadata: {
-			interfaces: ["sap.ui.core.IFormContent"],
-			properties: {
-				width: {
-					type: "sap.ui.core.CSSSize",
-					defaultValue: null
-				},
-				formDoNotAdjustWidth: {
-					type: "boolean",
-					defaultValue: false
-				},
-				condition: {
-					type: "boolean",
-					defaultValue: false
-				}
-			},
-			associations: {
-				/**
-				 * Association to controls / IDs that label this control (see WAI-ARIA attribute aria-labelledby).
-				 */
-				ariaLabelledBy: { type: "sap.ui.core.Control", multiple: true, singularName: "ariaLabelledBy" }
-			},
-			defaultAggregation: "contentTrue",
-			aggregations: {
-				contentTrue: { type: "sap.ui.core.Control", multiple: false },
-				contentFalse: { type: "sap.ui.core.Control", multiple: false }
-			}
-		},
-		enhanceAccessibilityState: function(oElement, mAriaProps) {
-			var oParent = this.getParent();
+  var ConditionalWrapper = Control.extend("sap.fe.core.controls.ConditionalWrapper", {
+    metadata: {
+      interfaces: ["sap.ui.core.IFormContent"],
+      properties: {
+        width: {
+          type: "sap.ui.core.CSSSize",
+          defaultValue: null
+        },
+        formDoNotAdjustWidth: {
+          type: "boolean",
+          defaultValue: false
+        },
+        condition: {
+          type: "boolean",
+          defaultValue: false
+        }
+      },
+      associations: {
+        /**
+         * Association to controls / IDs that label this control (see WAI-ARIA attribute aria-labelledby).
+         */
+        ariaLabelledBy: {
+          type: "sap.ui.core.Control",
+          multiple: true,
+          singularName: "ariaLabelledBy"
+        }
+      },
+      defaultAggregation: "contentTrue",
+      aggregations: {
+        contentTrue: {
+          type: "sap.ui.core.Control",
+          multiple: false
+        },
+        contentFalse: {
+          type: "sap.ui.core.Control",
+          multiple: false
+        }
+      }
+    },
+    enhanceAccessibilityState: function (oElement, mAriaProps) {
+      var oParent = this.getParent();
 
-			if (oParent && oParent.enhanceAccessibilityState) {
-				oParent.enhanceAccessibilityState(this, mAriaProps);
-			}
+      if (oParent && oParent.enhanceAccessibilityState) {
+        oParent.enhanceAccessibilityState(this, mAriaProps);
+      }
 
-			return mAriaProps;
-		},
-		_setAriaLabelledBy: function(oContent) {
-			if (oContent && oContent.addAriaLabelledBy) {
-				var aAriaLabelledBy = this.getAriaLabelledBy();
+      return mAriaProps;
+    },
+    _setAriaLabelledBy: function (oContent) {
+      if (oContent && oContent.addAriaLabelledBy) {
+        var aAriaLabelledBy = this.getAriaLabelledBy();
 
-				for (var i = 0; i < aAriaLabelledBy.length; i++) {
-					var sId = aAriaLabelledBy[i];
-					var aAriaLabelledBys = oContent.getAriaLabelledBy() || [];
-					if (aAriaLabelledBys.indexOf(sId) === -1) {
-						oContent.addAriaLabelledBy(sId);
-					}
-				}
-			}
-		},
-		onBeforeRendering: function() {
-			// before calling the renderer of the ConditionalWrapper parent control may have set ariaLabelledBy
-			// we ensure it is passed to its inner controls
-			this._setAriaLabelledBy(this.getContentTrue());
-			this._setAriaLabelledBy(this.getContentFalse());
-		},
-		renderer: {
-			apiVersion: 2,
-			render: function(oRm, oControl) {
-				oRm.openStart("div", oControl);
-				oRm.style("width", oControl.getWidth());
-				oRm.style("display", "inline-block");
-				oRm.openEnd();
-				if (oControl.getCondition()) {
-					oRm.renderControl(oControl.getContentTrue());
-				} else {
-					oRm.renderControl(oControl.getContentFalse());
-				}
-				oRm.close("div"); // end of the complete Control
-			}
-		}
-	});
-});
+        for (var i = 0; i < aAriaLabelledBy.length; i++) {
+          var sId = aAriaLabelledBy[i];
+          var aAriaLabelledBys = oContent.getAriaLabelledBy() || [];
+
+          if (aAriaLabelledBys.indexOf(sId) === -1) {
+            oContent.addAriaLabelledBy(sId);
+          }
+        }
+      }
+    },
+    onBeforeRendering: function () {
+      // before calling the renderer of the ConditionalWrapper parent control may have set ariaLabelledBy
+      // we ensure it is passed to its inner controls
+      this._setAriaLabelledBy(this.getContentTrue());
+
+      this._setAriaLabelledBy(this.getContentFalse());
+    },
+    renderer: {
+      apiVersion: 2,
+      render: function (oRm, oControl) {
+        oRm.openStart("div", oControl);
+        oRm.style("width", oControl.getWidth());
+        oRm.style("display", "inline-block");
+        oRm.openEnd();
+
+        if (oControl.getCondition()) {
+          oRm.renderControl(oControl.getContentTrue());
+        } else {
+          oRm.renderControl(oControl.getContentFalse());
+        }
+
+        oRm.close("div"); // end of the complete Control
+      }
+    }
+  });
+  return ConditionalWrapper;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbmRpdGlvbmFsV3JhcHBlci50cyJdLCJuYW1lcyI6WyJDb25kaXRpb25hbFdyYXBwZXIiLCJDb250cm9sIiwiZXh0ZW5kIiwibWV0YWRhdGEiLCJpbnRlcmZhY2VzIiwicHJvcGVydGllcyIsIndpZHRoIiwidHlwZSIsImRlZmF1bHRWYWx1ZSIsImZvcm1Eb05vdEFkanVzdFdpZHRoIiwiY29uZGl0aW9uIiwiYXNzb2NpYXRpb25zIiwiYXJpYUxhYmVsbGVkQnkiLCJtdWx0aXBsZSIsInNpbmd1bGFyTmFtZSIsImRlZmF1bHRBZ2dyZWdhdGlvbiIsImFnZ3JlZ2F0aW9ucyIsImNvbnRlbnRUcnVlIiwiY29udGVudEZhbHNlIiwiZW5oYW5jZUFjY2Vzc2liaWxpdHlTdGF0ZSIsIm9FbGVtZW50IiwibUFyaWFQcm9wcyIsIm9QYXJlbnQiLCJnZXRQYXJlbnQiLCJfc2V0QXJpYUxhYmVsbGVkQnkiLCJvQ29udGVudCIsImFkZEFyaWFMYWJlbGxlZEJ5IiwiYUFyaWFMYWJlbGxlZEJ5IiwiZ2V0QXJpYUxhYmVsbGVkQnkiLCJpIiwibGVuZ3RoIiwic0lkIiwiYUFyaWFMYWJlbGxlZEJ5cyIsImluZGV4T2YiLCJvbkJlZm9yZVJlbmRlcmluZyIsImdldENvbnRlbnRUcnVlIiwiZ2V0Q29udGVudEZhbHNlIiwicmVuZGVyZXIiLCJhcGlWZXJzaW9uIiwicmVuZGVyIiwib1JtIiwib0NvbnRyb2wiLCJvcGVuU3RhcnQiLCJzdHlsZSIsImdldFdpZHRoIiwib3BlbkVuZCIsImdldENvbmRpdGlvbiIsInJlbmRlckNvbnRyb2wiLCJjbG9zZSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztBQU1BLE1BQU1BLGtCQUFrQixHQUFHQyxPQUFPLENBQUNDLE1BQVIsQ0FBZSx5Q0FBZixFQUEwRDtBQUNwRkMsSUFBQUEsUUFBUSxFQUFFO0FBQ1RDLE1BQUFBLFVBQVUsRUFBRSxDQUFDLDBCQUFELENBREg7QUFFVEMsTUFBQUEsVUFBVSxFQUFFO0FBQ1hDLFFB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QUFDNUJOLFVBQUFBLEdBQUcsQ0FBQ08sYUFBSixDQUFrQk4sUUFBUSxDQUFDTixjQUFULEVBQWxCO0FBQ0EsU0FGRCxNQUVPO0FBQ05LLFVBQUFBLEdBQUcsQ0FBQ08sYUFBSixDQUFrQk4sUUFBUSxDQUFDTCxlQUFULEVBQWxCO0FBQ0E7O0FBQ0RJLFFBQUFBLEdBQUcsQ0FBQ1EsS0FBSixDQUFVLEtBQVYsRUFWeUMsQ0FVdkI7QUFDbEI7QUFiUTtBQXpEMEUsR0FBMUQsQ0FBM0I7U0EwRWVoRCxrQiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IENvbnRyb2wgZnJvbSBcInNhcC91aS9jb3JlL0NvbnRyb2xcIjtcblxudHlwZSBDb25kaXRpb25hbFdyYXBwZXJUeXBlID0gQ29udHJvbCAmIHtcblx0Z2V0Q29udGVudFRydWUoKTogQ29udHJvbDtcblx0Z2V0Q29udGVudEZhbHNlKCk6IENvbnRyb2w7XG5cdF9zZXRBcmlhTGFiZWxsZWRCeShvQ29udHJvbDogQ29udHJvbCk6IHZvaWQ7XG5cdGdldEFyaWFMYWJlbGxlZEJ5KCk6IENvbnRyb2xbXTtcbn07XG5jb25zdCBDb25kaXRpb25hbFdyYXBwZXIgPSBDb250cm9sLmV4dGVuZChcInNhcC5mZS5jb3JlLmNvbnRyb2xzLkNvbmRpdGlvbmFsV3JhcHBlclwiLCB7XG5cdG1ldGFkYXRhOiB7XG5cdFx0aW50ZXJmYWNlczogW1wic2FwLnVpLmNvcmUuSUZvcm1Db250ZW50XCJdLFxuXHRcdHByb3BlcnRpZXM6IHtcblx0XHRcdHdpZHRoOiB7XG5cdFx0XHRcdHR5cGU6IFwic2FwLnVpLmNvcmUuQ1NTU2l6ZVwiLFxuXHRcdFx0XHRkZWZhdWx0VmFsdWU6IG51bGxcblx0XHRcdH0sXG5cdFx0XHRmb3JtRG9Ob3RBZGp1c3RXaWR0aDoge1xuXHRcdFx0XHR0eXBlOiBcImJvb2xlYW5cIixcblx0XHRcdFx0ZGVmYXVsdFZhbHVlOiBmYWxzZVxuXHRcdFx0fSxcblx0XHRcdGNvbmRpdGlvbjoge1xuXHRcdFx0XHR0eXBlOiBcImJvb2xlYW5cIixcblx0XHRcdFx0ZGVmYXVsdFZhbHVlOiBmYWxzZVxuXHRcdFx0fVxuXHRcdH0sXG5cdFx0YXNzb2NpYXRpb25zOiB7XG5cdFx0XHQvKipcblx0XHRcdCAqIEFzc29jaWF0aW9uIHRvIGNvbnRyb2xzIC8gSURzIHRoYXQgbGFiZWwgdGhpcyBjb250cm9sIChzZWUgV0FJLUFSSUEgYXR0cmlidXRlIGFyaWEtbGFiZWxsZWRieSkuXG5cdFx0XHQgKi9cblx0XHRcdGFyaWFMYWJlbGxlZEJ5OiB7IHR5cGU6IFwic2FwLnVpLmNvcmUuQ29udHJvbFwiLCBtdWx0aXBsZTogdHJ1ZSwgc2luZ3VsYXJOYW1lOiBcImFyaWFMYWJlbGxlZEJ5XCIgfVxuXHRcdH0sXG5cdFx0ZGVmYXVsdEFnZ3JlZ2F0aW9uOiBcImNvbnRlbnRUcnVlXCIsXG5cdFx0YWdncmVnYXRpb25zOiB7XG5cdFx0XHRjb250ZW50VHJ1ZTogeyB0eXBlOiBcInNhcC51aS5jb3JlLkNvbnRyb2xcIiwgbXVsdGlwbGU6IGZhbHNlIH0sXG5cdFx0XHRjb250ZW50RmFsc2U6IHsgdHlwZTogXCJzYXAudWkuY29yZS5Db250cm9sXCIsIG11bHRpcGxlOiBmYWxzZSB9XG5cdFx0fVxuXHR9LFxuXHRlbmhhbmNlQWNjZXNzaWJpbGl0eVN0YXRlOiBmdW5jdGlvbihvRWxlbWVudDogYW55LCBtQXJpYVByb3BzOiBhbnkpIHtcblx0XHRjb25zdCBvUGFyZW50ID0gdGhpcy5nZXRQYXJlbnQoKSBhcyBhbnk7XG5cblx0XHRpZiAob1BhcmVudCAmJiBvUGFyZW50LmVuaGFuY2VBY2Nlc3NpYmlsaXR5U3RhdGUpIHtcblx0XHRcdG9QYXJlbnQuZW5oYW5jZUFjY2Vzc2liaWxpdHlTdGF0ZSh0aGlzLCBtQXJpYVByb3BzKTtcblx0XHR9XG5cblx0XHRyZXR1cm4gbUFyaWFQcm9wcztcblx0fSxcblx0X3NldEFyaWFMYWJlbGxlZEJ5OiBmdW5jdGlvbih0aGlzOiBDb25kaXRpb25hbFdyYXBwZXJUeXBlLCBvQ29udGVudDogYW55KSB7XG5cdFx0aWYgKG9Db250ZW50ICYmIG9Db250ZW50LmFkZEFyaWFMYWJlbGxlZEJ5KSB7XG5cdFx0XHRjb25zdCBhQXJpYUxhYmVsbGVkQnkgPSB0aGlzLmdldEFyaWFMYWJlbGxlZEJ5KCk7XG5cblx0XHRcdGZvciAobGV0IGkgPSAwOyBpIDwgYUFyaWFMYWJlbGxlZEJ5Lmxlbmd0aDsgaSsrKSB7XG5cdFx0XHRcdGNvbnN0IHNJZCA9IGFBcmlhTGFiZWxsZWRCeVtpXTtcblx0XHRcdFx0Y29uc3QgYUFyaWFMYWJlbGxlZEJ5cyA9IG9Db250ZW50LmdldEFyaWFMYWJlbGxlZEJ5KCkgfHwgW107XG5cdFx0XHRcdGlmIChhQXJpYUxhYmVsbGVkQnlzLmluZGV4T2Yoc0lkKSA9PT0gLTEpIHtcblx0XHRcdFx0XHRvQ29udGVudC5hZGRBcmlhTGFiZWxsZWRCeShzSWQpO1xuXHRcdFx0XHR9XG5cdFx0XHR9XG5cdFx0fVxuXHR9LFxuXHRvbkJlZm9yZVJlbmRlcmluZzogZnVuY3Rpb24odGhpczogQ29uZGl0aW9uYWxXcmFwcGVyVHlwZSkge1xuXHRcdC8vIGJlZm9yZSBjYWxsaW5nIHRoZSByZW5kZXJlciBvZiB0aGUgQ29uZGl0aW9uYWxXcmFwcGVyIHBhcmVudCBjb250cm9sIG1heSBoYXZlIHNldCBhcmlhTGFiZWxsZWRCeVxuXHRcdC8vIHdlIGVuc3VyZSBpdCBpcyBwYXNzZWQgdG8gaXRzIGlubmVyIGNvbnRyb2xzXG5cdFx0dGhpcy5fc2V0QXJpYUxhYmVsbGVkQnkodGhpcy5nZXRDb250ZW50VHJ1ZSgpKTtcblx0XHR0aGlzLl9zZXRBcmlhTGFiZWxsZWRCeSh0aGlzLmdldENvbnRlbnRGYWxzZSgpKTtcblx0fSxcblx0cmVuZGVyZXI6IHtcblx0XHRhcGlWZXJzaW9uOiAyLFxuXHRcdHJlbmRlcjogZnVuY3Rpb24ob1JtOiBhbnksIG9Db250cm9sOiBhbnkpIHtcblx0XHRcdG9SbS5vcGVuU3RhcnQoXCJkaXZcIiwgb0NvbnRyb2wpO1xuXHRcdFx0b1JtLnN0eWxlKFwid2lkdGhcIiwgb0NvbnRyb2wuZ2V0V2lkdGgoKSk7XG5cdFx0XHRvUm0uc3R5bGUoXCJkaXNwbGF5XCIsIFwiaW5saW5lLWJsb2NrXCIpO1xuXHRcdFx0b1JtLm9wZW5FbmQoKTtcblx0XHRcdGlmIChvQ29udHJvbC5nZXRDb25kaXRpb24oKSkge1xuXHRcdFx0XHRvUm0ucmVuZGVyQ29udHJvbChvQ29udHJvbC5nZXRDb250ZW50VHJ1ZSgpKTtcblx0XHRcdH0gZWxzZSB7XG5cdFx0XHRcdG9SbS5yZW5kZXJDb250cm9sKG9Db250cm9sLmdldENvbnRlbnRGYWxzZSgpKTtcblx0XHRcdH1cblx0XHRcdG9SbS5jbG9zZShcImRpdlwiKTsgLy8gZW5kIG9mIHRoZSBjb21wbGV0ZSBDb250cm9sXG5cdFx0fVxuXHR9XG59KTtcblxuZXhwb3J0IGRlZmF1bHQgQ29uZGl0aW9uYWxXcmFwcGVyO1xuIl19

package/src/sap/fe/core/controls/ConditionalWrapper.ts

@@ -0,0 +1,83 @@
+import Control from "sap/ui/core/Control";
+
+type ConditionalWrapperType = Control & {
+	getContentTrue(): Control;
+	getContentFalse(): Control;
+	_setAriaLabelledBy(oControl: Control): void;
+	getAriaLabelledBy(): Control[];
+};
+const ConditionalWrapper = Control.extend("sap.fe.core.controls.ConditionalWrapper", {
+	metadata: {
+		interfaces: ["sap.ui.core.IFormContent"],
+		properties: {
+			width: {
+				type: "sap.ui.core.CSSSize",
+				defaultValue: null
+			},
+			formDoNotAdjustWidth: {
+				type: "boolean",
+				defaultValue: false
+			},
+			condition: {
+				type: "boolean",
+				defaultValue: false
+			}
+		},
+		associations: {
+			/**
+			 * Association to controls / IDs that label this control (see WAI-ARIA attribute aria-labelledby).
+			 */
+			ariaLabelledBy: { type: "sap.ui.core.Control", multiple: true, singularName: "ariaLabelledBy" }
+		},
+		defaultAggregation: "contentTrue",
+		aggregations: {
+			contentTrue: { type: "sap.ui.core.Control", multiple: false },
+			contentFalse: { type: "sap.ui.core.Control", multiple: false }
+		}
+	},
+	enhanceAccessibilityState: function(oElement: any, mAriaProps: any) {
+		const oParent = this.getParent() as any;
+
+		if (oParent && oParent.enhanceAccessibilityState) {
+			oParent.enhanceAccessibilityState(this, mAriaProps);
+		}
+
+		return mAriaProps;
+	},
+	_setAriaLabelledBy: function(this: ConditionalWrapperType, oContent: any) {
+		if (oContent && oContent.addAriaLabelledBy) {
+			const aAriaLabelledBy = this.getAriaLabelledBy();
+
+			for (let i = 0; i < aAriaLabelledBy.length; i++) {
+				const sId = aAriaLabelledBy[i];
+				const aAriaLabelledBys = oContent.getAriaLabelledBy() || [];
+				if (aAriaLabelledBys.indexOf(sId) === -1) {
+					oContent.addAriaLabelledBy(sId);
+				}
+			}
+		}
+	},
+	onBeforeRendering: function(this: ConditionalWrapperType) {
+		// before calling the renderer of the ConditionalWrapper parent control may have set ariaLabelledBy
+		// we ensure it is passed to its inner controls
+		this._setAriaLabelledBy(this.getContentTrue());
+		this._setAriaLabelledBy(this.getContentFalse());
+	},
+	renderer: {
+		apiVersion: 2,
+		render: function(oRm: any, oControl: any) {
+			oRm.openStart("div", oControl);
+			oRm.style("width", oControl.getWidth());
+			oRm.style("display", "inline-block");
+			oRm.openEnd();
+			if (oControl.getCondition()) {
+				oRm.renderControl(oControl.getContentTrue());
+			} else {
+				oRm.renderControl(oControl.getContentFalse());
+			}
+			oRm.close("div"); // end of the complete Control
+		}
+	}
+});
+
+export default ConditionalWrapper;