@sapui5/sap.fe.macros 1.99.0 → 1.100.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.macros",
-	"version": "1.99.0",
+	"version": "1.100.0",
 	"description": "SAPUI5 Library sap.fe.macros",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -13,7 +13,7 @@
 		"prepare-ui5-build-sources": "mkdirp target/ui5-build-tmp/src && babel src --out-dir target/ui5-build-tmp/src --extensions \".ts\" --config-file ../../.babelrc && babel test --out-dir target/ui5-build-tmp/test --extensions \".ts\" --config-file ../../.babelrc",
 		"test": "jest --maxWorkers=4",
 		"test-refs": "jest --runInBand --config jest.config-refs.js",
-		"test-updateSnapshots": "jest --runInBand --forceExit -u"
+		"test-updateSnapshots": "jest --maxWorkers=4 -u"
 	},
 	"keywords": [
 		"sapui5",

package/src/sap/fe/macros/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.99.0</version>
+    <version>1.100.0</version>
 
     <documentation>UI5 library: sap.fe.macros</documentation>
 

package/src/sap/fe/macros/Chart.metadata.js

@@ -205,7 +205,7 @@ sap.ui.define(
 				oProps.actions = this.createBindingContext(oChartDefinition.actions, mSettings);
 				oProps.selectionMode = oProps.selectionMode.toUpperCase();
 				if (oProps.filterBar) {
-					this.setDefaultValue(oProps, "filter", (oProps.filterBar += "-content"));
+					this.setDefaultValue(oProps, "filter", this.getContentId(oProps.filterBar));
 				} else if (!oProps.filter) {
 					this.setDefaultValue(oProps, "filter", oChartDefinition.filterId);
 				}
@@ -217,7 +217,7 @@ sap.ui.define(
 					oProps._contentId = oProps.id;
 				} else {
 					oProps._apiId = oProps.id;
-					oProps._contentId = oProps.id + "-content";
+					oProps._contentId = this.getContentId(oProps.id);
 				}
 
 				return oProps;

package/src/sap/fe/macros/ChartAPI.js

@@ -14,28 +14,12 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI", "sap/base/util/
 
   function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 
-  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
   function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
   function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
   function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 
   function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }
@@ -57,10 +41,10 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI", "sap/base/util/
   var ChartAPI = (_dec = APIClass("sap.fe.macros.ChartAPI"), _dec2 = Property({
     type: "string"
   }), _dec3 = Property({
-    type: "sap.ui.model.Context",
+    type: "string",
     required: true
   }), _dec4 = Property({
-    type: "sap.ui.model.Context",
+    type: "string",
     required: true
   }), _dec5 = Property({
     type: "string",
@@ -72,47 +56,42 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI", "sap/base/util/
   }), _dec(_class = (_class2 = /*#__PURE__*/function (_MacroAPI) {
     _inherits(ChartAPI, _MacroAPI);
 
-    var _super = _createSuper(ChartAPI);
-
     function ChartAPI() {
       var _this;
 
-      _classCallCheck(this, ChartAPI);
-
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
 
-      _this = _super.call.apply(_super, [this].concat(args));
+      _this = _MacroAPI.call.apply(_MacroAPI, [this].concat(args)) || this;
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "id", _descriptor, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "id", _descriptor, _assertThisInitialized(_this));
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "metaPath", _descriptor2, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "metaPath", _descriptor2, _assertThisInitialized(_this));
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "contextPath", _descriptor3, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "contextPath", _descriptor3, _assertThisInitialized(_this));
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "selectionMode", _descriptor4, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "selectionMode", _descriptor4, _assertThisInitialized(_this));
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "filterBar", _descriptor5, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "filterBar", _descriptor5, _assertThisInitialized(_this));
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "personalization", _descriptor6, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "personalization", _descriptor6, _assertThisInitialized(_this));
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "selectionChange", _descriptor7, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "selectionChange", _descriptor7, _assertThisInitialized(_this));
 
       return _this;
     }
 
-    _createClass(ChartAPI, [{
-      key: "handleSelectionChange",
-      value: function handleSelectionChange(oEvent) {
-        var aData = oEvent.getParameter("data");
-        var bSelected = oEvent.getParameter("name") === "selectData";
-        this.fireSelectionChange(merge({}, {
-          data: aData,
-          selected: bSelected
-        }));
-      }
-    }]);
+    var _proto = ChartAPI.prototype;
+
+    _proto.handleSelectionChange = function handleSelectionChange(oEvent) {
+      var aData = oEvent.getParameter("data");
+      var bSelected = oEvent.getParameter("name") === "selectData";
+      this.fireSelectionChange(merge({}, {
+        data: aData,
+        selected: bSelected
+      }));
+    };
 
     return ChartAPI;
   }(MacroAPI), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -153,4 +132,4 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI", "sap/base/util/
   }), _applyDecoratedDescriptor(_class2.prototype, "handleSelectionChange", [EventHandler], Object.getOwnPropertyDescriptor(_class2.prototype, "handleSelectionChange"), _class2.prototype)), _class2)) || _class);
   return ChartAPI;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNoYXJ0QVBJLnRzIl0sIm5hbWVzIjpbIkNoYXJ0QVBJIiwiQVBJQ2xhc3MiLCJQcm9wZXJ0eSIsInR5cGUiLCJyZXF1aXJlZCIsImRlZmF1bHRWYWx1ZSIsIm9FdmVudCIsImFEYXRhIiwiZ2V0UGFyYW1ldGVyIiwiYlNlbGVjdGVkIiwiZmlyZVNlbGVjdGlvbkNoYW5nZSIsIm1lcmdlIiwiZGF0YSIsInNlbGVjdGVkIiwiTWFjcm9BUEkiLCJFdmVudCIsIkV2ZW50SGFuZGxlciJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtNQUVNQSxRLFdBRExDLFFBQVEsQ0FBQyx3QkFBRCxDLFVBUVBDLFFBQVEsQ0FBQztBQUFFQyxJQUFBQSxJQUFJLEVBQUU7QUFBUixHQUFELEMsVUFRUkQsUUFBUSxDQUFDO0FBQUVDLElBQUFBLElBQUksRUFBRSxzQkFBUjtBQUFnQ0MsSUFBQUEsUUFBUSxFQUFFO0FBQTFDLEdBQUQsQyxVQVFSRixRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFLHNCQUFSO0FBQWdDQyxJQUFBQSxRQUFRLEVBQUU7QUFBMUMsR0FBRCxDLFVBUVJGLFFBQVEsQ0FBQztBQUFFQyxJQUFBQSxJQUFJLEVBQUUsUUFBUjtBQUFrQkUsSUFBQUEsWUFBWSxFQUFFO0FBQWhDLEdBQUQsQyxVQVFSSCxRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFO0FBQVIsR0FBRCxDLFVBUVJELFFBQVEsQ0FBQztBQUFFQyxJQUFBQSxJQUFJLEVBQUU7QUFBUixHQUFELEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O2FBWVQsK0JBQ3NCRyxNQUR0QixFQUN3QztBQUN2QyxZQUFNQyxLQUFLLEdBQUdELE1BQU0sQ0FBQ0UsWUFBUCxDQUFvQixNQUFwQixDQUFkO0FBQ0EsWUFBTUMsU0FBUyxHQUFHSCxNQUFNLENBQUNFLFlBQVAsQ0FBb0IsTUFBcEIsTUFBZ0MsWUFBbEQ7QUFDQyxZQUFELENBQWNFLG1CQUFkLENBQWtDQyxLQUFLLENBQUMsRUFBRCxFQUFLO0FBQUVDLFVBQUFBLElBQUksRUFBRUwsS0FBUjtBQUFlTSxVQUFBQSxRQUFRLEVBQUVKO0FBQXpCLFNBQUwsQ0FBdkM7QUFDQTs7OztJQWhFcUJLLFE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztzRkF3RHJCQyxLOzs7Ozs2RUFHQUMsWTtTQVFhaEIsUSIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQVBJQ2xhc3MsIFByb3BlcnR5LCBFdmVudEhhbmRsZXIsIEV2ZW50IH0gZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgTWFjcm9BUEkgZnJvbSBcIi4vTWFjcm9BUElcIjtcbmltcG9ydCBtZXJnZSBmcm9tIFwic2FwL2Jhc2UvdXRpbC9tZXJnZVwiO1xuXG4vKipcbiAqIEJ1aWxkaW5nIGJsb2NrIHVzZWQgdG8gY3JlYXRlIGEgY2hhcnQgYmFzZWQgb24gdGhlIG1ldGFkYXRhIHByb3ZpZGVkIGJ5IE9EYXRhIFY0LlxuICogPGJyPlxuICogVXN1YWxseSwgYSBjb250ZXh0UGF0aCBhbmQgbWV0YVBhdGggaXMgZXhwZWN0ZWQuXG4gKlxuICpcbiAqIFVzYWdlIGV4YW1wbGU6XG4gKiA8cHJlPlxuICogJmx0O21hY3JvOkNoYXJ0IGlkPVwiTXljaGFydFwiIGNvbnRleHRQYXRoPVwiL1Jvb3RFbnRpdHlcIiBtZXRhUGF0aD1cIkBjb20uc2FwLnZvY2FidWxhcmllcy5VSS52MS5DaGFydFwiIC8mZ3Q7XG4gKiA8L3ByZT5cbiAqXG4gKiBAYWxpYXMgc2FwLmZlLm1hY3Jvcy5DaGFydFxuICogQHB1YmxpY1xuICovXG5AQVBJQ2xhc3MoXCJzYXAuZmUubWFjcm9zLkNoYXJ0QVBJXCIpXG5jbGFzcyBDaGFydEFQSSBleHRlbmRzIE1hY3JvQVBJIHtcblx0LyoqXG5cdCAqXG5cdCAqIElEIG9mIHRoZSBjaGFydFxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRAUHJvcGVydHkoeyB0eXBlOiBcInN0cmluZ1wiIH0pXG5cdGlkITogc3RyaW5nO1xuXG5cdC8qKlxuXHQgKiBNZXRhZGF0YSBwYXRoIHRvIHRoZSBwcmVzZW50YXRpb24gKFVJLkNoYXJ0IHcgb3Igdy9vIHF1YWxpZmllcilcblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzYXAudWkubW9kZWwuQ29udGV4dFwiLCByZXF1aXJlZDogdHJ1ZSB9KVxuXHRtZXRhUGF0aCE6IHN0cmluZztcblxuXHQvKipcblx0ICogTWV0YWRhdGEgcGF0aCB0byB0aGUgZW50aXR5U2V0IG9yIG5hdmlnYXRpb25Qcm9wZXJ0eVxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRAUHJvcGVydHkoeyB0eXBlOiBcInNhcC51aS5tb2RlbC5Db250ZXh0XCIsIHJlcXVpcmVkOiB0cnVlIH0pXG5cdGNvbnRleHRQYXRoITogc3RyaW5nO1xuXG5cdC8qKlxuXHQgKiBTcGVjaWZpZXMgdGhlIHNlbGVjdGlvbiBtb2RlXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBQcm9wZXJ0eSh7IHR5cGU6IFwic3RyaW5nXCIsIGRlZmF1bHRWYWx1ZTogXCJNVUxUSVBMRVwiIH0pXG5cdHNlbGVjdGlvbk1vZGUhOiBzdHJpbmc7XG5cblx0LyoqXG5cdCAqIElkIG9mIHRoZSBGaWx0ZXJCYXIgYnVpbGRpbmcgYmxvY2sgYXNzb2NpYXRlZCB3aXRoIHRoZSBjaGFydC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzdHJpbmdcIiB9KVxuXHRmaWx0ZXJCYXIhOiBzdHJpbmc7XG5cblx0LyoqXG5cdCAqIFBhcmFtZXRlciB3aGljaCBzZXRzIHRoZSBwZXJzb25hbGl6YXRpb24gb2YgdGhlIE1EQyBjaGFydFxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRAUHJvcGVydHkoeyB0eXBlOiBcImJvb2xlYW58c3RyaW5nXCIgfSlcblx0cGVyc29uYWxpemF0aW9uITogYm9vbGVhbiB8IHN0cmluZztcblxuXHQvKipcblx0ICogQW4gZXZlbnQgdHJpZ2dlcmVkIHdoZW4gY2hhcnQgc2VsZWN0aW9ucyBhcmUgY2hhbmdlZC4gVGhlIGV2ZW50IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IHRoZSBkYXRhIHNlbGVjdGVkL2Rlc2VsZWN0ZWQgYW5kXG5cdCAqIGJvb2xlYW4gZmxhZyB0aGF0IGluZGljYXRlcyB3aGV0aGVyIGRhdGEgaXMgc2VsZWN0ZWQgb3IgZGVzZWxlY3RlZC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QEV2ZW50XG5cdHNlbGVjdGlvbkNoYW5nZSE6IEZ1bmN0aW9uO1xuXG5cdEBFdmVudEhhbmRsZXJcblx0aGFuZGxlU2VsZWN0aW9uQ2hhbmdlKG9FdmVudDogVUk1RXZlbnQpIHtcblx0XHRjb25zdCBhRGF0YSA9IG9FdmVudC5nZXRQYXJhbWV0ZXIoXCJkYXRhXCIpO1xuXHRcdGNvbnN0IGJTZWxlY3RlZCA9IG9FdmVudC5nZXRQYXJhbWV0ZXIoXCJuYW1lXCIpID09PSBcInNlbGVjdERhdGFcIjtcblx0XHQodGhpcyBhcyBhbnkpLmZpcmVTZWxlY3Rpb25DaGFuZ2UobWVyZ2Uoe30sIHsgZGF0YTogYURhdGEsIHNlbGVjdGVkOiBiU2VsZWN0ZWQgfSkpO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IENoYXJ0QVBJO1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNoYXJ0QVBJLnRzIl0sIm5hbWVzIjpbIkNoYXJ0QVBJIiwiQVBJQ2xhc3MiLCJQcm9wZXJ0eSIsInR5cGUiLCJyZXF1aXJlZCIsImRlZmF1bHRWYWx1ZSIsImhhbmRsZVNlbGVjdGlvbkNoYW5nZSIsIm9FdmVudCIsImFEYXRhIiwiZ2V0UGFyYW1ldGVyIiwiYlNlbGVjdGVkIiwiZmlyZVNlbGVjdGlvbkNoYW5nZSIsIm1lcmdlIiwiZGF0YSIsInNlbGVjdGVkIiwiTWFjcm9BUEkiLCJFdmVudCIsIkV2ZW50SGFuZGxlciJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO01BRU1BLFEsV0FETEMsUUFBUSxDQUFDLHdCQUFELEMsVUFRUEMsUUFBUSxDQUFDO0FBQUVDLElBQUFBLElBQUksRUFBRTtBQUFSLEdBQUQsQyxVQVFSRCxRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFLFFBQVI7QUFBa0JDLElBQUFBLFFBQVEsRUFBRTtBQUE1QixHQUFELEMsVUFRUkYsUUFBUSxDQUFDO0FBQUVDLElBQUFBLElBQUksRUFBRSxRQUFSO0FBQWtCQyxJQUFBQSxRQUFRLEVBQUU7QUFBNUIsR0FBRCxDLFVBUVJGLFFBQVEsQ0FBQztBQUFFQyxJQUFBQSxJQUFJLEVBQUUsUUFBUjtBQUFrQkUsSUFBQUEsWUFBWSxFQUFFO0FBQWhDLEdBQUQsQyxVQVFSSCxRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFO0FBQVIsR0FBRCxDLFVBUVJELFFBQVEsQ0FBQztBQUFFQyxJQUFBQSxJQUFJLEVBQUU7QUFBUixHQUFELEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7V0FhVEcscUIsR0FEQSwrQkFDc0JDLE1BRHRCLEVBQ3dDO0FBQ3ZDLFVBQU1DLEtBQUssR0FBR0QsTUFBTSxDQUFDRSxZQUFQLENBQW9CLE1BQXBCLENBQWQ7QUFDQSxVQUFNQyxTQUFTLEdBQUdILE1BQU0sQ0FBQ0UsWUFBUCxDQUFvQixNQUFwQixNQUFnQyxZQUFsRDtBQUNDLFVBQUQsQ0FBY0UsbUJBQWQsQ0FBa0NDLEtBQUssQ0FBQyxFQUFELEVBQUs7QUFBRUMsUUFBQUEsSUFBSSxFQUFFTCxLQUFSO0FBQWVNLFFBQUFBLFFBQVEsRUFBRUo7QUFBekIsT0FBTCxDQUF2QztBQUNBLEs7OztJQWhFcUJLLFE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztzRkF3RHJCQyxLOzs7Ozs2RUFHQUMsWTtTQVFhakIsUSIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQVBJQ2xhc3MsIFByb3BlcnR5LCBFdmVudEhhbmRsZXIsIEV2ZW50IH0gZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgTWFjcm9BUEkgZnJvbSBcIi4vTWFjcm9BUElcIjtcbmltcG9ydCBtZXJnZSBmcm9tIFwic2FwL2Jhc2UvdXRpbC9tZXJnZVwiO1xuaW1wb3J0IFVJNUV2ZW50IGZyb20gXCJzYXAvdWkvYmFzZS9FdmVudFwiO1xuLyoqXG4gKiBCdWlsZGluZyBibG9jayB1c2VkIHRvIGNyZWF0ZSBhIGNoYXJ0IGJhc2VkIG9uIHRoZSBtZXRhZGF0YSBwcm92aWRlZCBieSBPRGF0YSBWNC5cbiAqIDxicj5cbiAqIFVzdWFsbHksIGEgY29udGV4dFBhdGggYW5kIG1ldGFQYXRoIGlzIGV4cGVjdGVkLlxuICpcbiAqXG4gKiBVc2FnZSBleGFtcGxlOlxuICogPHByZT5cbiAqICZsdDttYWNybzpDaGFydCBpZD1cIk15Y2hhcnRcIiBjb250ZXh0UGF0aD1cIi9Sb290RW50aXR5XCIgbWV0YVBhdGg9XCJAY29tLnNhcC52b2NhYnVsYXJpZXMuVUkudjEuQ2hhcnRcIiAvJmd0O1xuICogPC9wcmU+XG4gKlxuICogQGFsaWFzIHNhcC5mZS5tYWNyb3MuQ2hhcnRcbiAqIEBwdWJsaWNcbiAqL1xuQEFQSUNsYXNzKFwic2FwLmZlLm1hY3Jvcy5DaGFydEFQSVwiKVxuY2xhc3MgQ2hhcnRBUEkgZXh0ZW5kcyBNYWNyb0FQSSB7XG5cdC8qKlxuXHQgKlxuXHQgKiBJRCBvZiB0aGUgY2hhcnRcblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzdHJpbmdcIiB9KVxuXHRpZCE6IHN0cmluZztcblxuXHQvKipcblx0ICogTWV0YWRhdGEgcGF0aCB0byB0aGUgcHJlc2VudGF0aW9uIChVSS5DaGFydCB3IG9yIHcvbyBxdWFsaWZpZXIpXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBQcm9wZXJ0eSh7IHR5cGU6IFwic3RyaW5nXCIsIHJlcXVpcmVkOiB0cnVlIH0pXG5cdG1ldGFQYXRoITogc3RyaW5nO1xuXG5cdC8qKlxuXHQgKiBNZXRhZGF0YSBwYXRoIHRvIHRoZSBlbnRpdHlTZXQgb3IgbmF2aWdhdGlvblByb3BlcnR5XG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBQcm9wZXJ0eSh7IHR5cGU6IFwic3RyaW5nXCIsIHJlcXVpcmVkOiB0cnVlIH0pXG5cdGNvbnRleHRQYXRoITogc3RyaW5nO1xuXG5cdC8qKlxuXHQgKiBTcGVjaWZpZXMgdGhlIHNlbGVjdGlvbiBtb2RlXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBQcm9wZXJ0eSh7IHR5cGU6IFwic3RyaW5nXCIsIGRlZmF1bHRWYWx1ZTogXCJNVUxUSVBMRVwiIH0pXG5cdHNlbGVjdGlvbk1vZGUhOiBzdHJpbmc7XG5cblx0LyoqXG5cdCAqIElkIG9mIHRoZSBGaWx0ZXJCYXIgYnVpbGRpbmcgYmxvY2sgYXNzb2NpYXRlZCB3aXRoIHRoZSBjaGFydC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzdHJpbmdcIiB9KVxuXHRmaWx0ZXJCYXIhOiBzdHJpbmc7XG5cblx0LyoqXG5cdCAqIFBhcmFtZXRlciB3aGljaCBzZXRzIHRoZSBwZXJzb25hbGl6YXRpb24gb2YgdGhlIE1EQyBjaGFydFxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRAUHJvcGVydHkoeyB0eXBlOiBcImJvb2xlYW58c3RyaW5nXCIgfSlcblx0cGVyc29uYWxpemF0aW9uITogYm9vbGVhbiB8IHN0cmluZztcblxuXHQvKipcblx0ICogQW4gZXZlbnQgdHJpZ2dlcmVkIHdoZW4gY2hhcnQgc2VsZWN0aW9ucyBhcmUgY2hhbmdlZC4gVGhlIGV2ZW50IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IHRoZSBkYXRhIHNlbGVjdGVkL2Rlc2VsZWN0ZWQgYW5kXG5cdCAqIGJvb2xlYW4gZmxhZyB0aGF0IGluZGljYXRlcyB3aGV0aGVyIGRhdGEgaXMgc2VsZWN0ZWQgb3IgZGVzZWxlY3RlZC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QEV2ZW50XG5cdHNlbGVjdGlvbkNoYW5nZSE6IEZ1bmN0aW9uO1xuXG5cdEBFdmVudEhhbmRsZXJcblx0aGFuZGxlU2VsZWN0aW9uQ2hhbmdlKG9FdmVudDogVUk1RXZlbnQpIHtcblx0XHRjb25zdCBhRGF0YSA9IG9FdmVudC5nZXRQYXJhbWV0ZXIoXCJkYXRhXCIpO1xuXHRcdGNvbnN0IGJTZWxlY3RlZCA9IG9FdmVudC5nZXRQYXJhbWV0ZXIoXCJuYW1lXCIpID09PSBcInNlbGVjdERhdGFcIjtcblx0XHQodGhpcyBhcyBhbnkpLmZpcmVTZWxlY3Rpb25DaGFuZ2UobWVyZ2Uoe30sIHsgZGF0YTogYURhdGEsIHNlbGVjdGVkOiBiU2VsZWN0ZWQgfSkpO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IENoYXJ0QVBJO1xuIl19

package/src/sap/fe/macros/ChartAPI.ts

@@ -1,7 +1,7 @@
 import { APIClass, Property, EventHandler, Event } from "sap/fe/core/helpers/ClassSupport";
 import MacroAPI from "./MacroAPI";
 import merge from "sap/base/util/merge";
-
+import UI5Event from "sap/ui/base/Event";
 /**
  * Building block used to create a chart based on the metadata provided by OData V4.
  * <br>
@@ -32,7 +32,7 @@ class ChartAPI extends MacroAPI {
 	 *
 	 * @public
 	 */
-	@Property({ type: "sap.ui.model.Context", required: true })
+	@Property({ type: "string", required: true })
 	metaPath!: string;
 
 	/**
@@ -40,7 +40,7 @@ class ChartAPI extends MacroAPI {
 	 *
 	 * @public
 	 */
-	@Property({ type: "sap.ui.model.Context", required: true })
+	@Property({ type: "string", required: true })
 	contextPath!: string;
 
 	/**

package/src/sap/fe/macros/ChartDelegate.js

@@ -194,37 +194,31 @@ sap.ui.define(
 						aggregatable: false,
 						maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
 						sortKey: sKey,
-						kind: "Groupable", //TODO: Rename in type; Only needed for P13n Item Panel
-						availableRoles: ChartDelegate._getLayoutOptionsForType("groupable"), //for p13n
 						role: MDCLib.ChartItemRoleType.category, //standard, normally this should be interpreted from UI.Chart annotation
 						criticality: sCriticality, //To be implemented by FE
 						textProperty:
 							!bIsNavigationText && oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text"]
 								? oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text"].$Path
 								: null, //To be implemented by FE
-						textFormatter: function(oValue1, oValue2) {
-							if (oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]) {
-								var oTextArrangementAnnotation =
-									oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"];
-								if (oTextArrangementAnnotation.$EnumMember === "com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst") {
-									return oValue2 + " (" + oValue1 + ")";
-								} else if (
-									oTextArrangementAnnotation.$EnumMember === "com.sap.vocabularies.UI.v1.TextArrangementType/TextLast"
-								) {
-									return oValue1 + " (" + oValue2 + ")";
-								} else if (
-									oTextArrangementAnnotation.$EnumMember === "com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"
-								) {
-									return oValue2;
-								}
-							}
-							return oValue2 ? oValue2 : oValue1;
-						}
+						textFormatter:
+							oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]
 					});
 				}
 			}
 		};
 
+		ChartDelegate._formatText = function(oValue1, oValue2) {
+			var oTextArrangementAnnotation = this.textFormatter;
+			if (oTextArrangementAnnotation.$EnumMember === "com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst") {
+				return oValue2 + " (" + oValue1 + ")";
+			} else if (oTextArrangementAnnotation.$EnumMember === "com.sap.vocabularies.UI.v1.TextArrangementType/TextLast") {
+				return oValue1 + " (" + oValue2 + ")";
+			} else if (oTextArrangementAnnotation.$EnumMember === "com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly") {
+				return oValue2;
+			}
+			return oValue2 ? oValue2 : oValue1;
+		};
+
 		ChartDelegate.updateBindingInfo = function(oChart, oBindingInfo) {
 			setChartNoDataText(oChart, oBindingInfo);
 
@@ -410,8 +404,6 @@ sap.ui.define(
 						aggregatable: true,
 						aggregationMethod: sAggregatable,
 						maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
-						kind: "Aggregatable", //Only needed for P13n Item Panel
-						availableRoles: ChartDelegate._getLayoutOptionsForType("aggregatable"), //for p13n
 						role: MDCLib.ChartItemRoleType.axis1,
 						datapoint: null //To be implemented by FE
 					});
@@ -422,8 +414,6 @@ sap.ui.define(
 						var oItem = merge({}, mCustomAggregates[sCustom], {
 							groupable: false,
 							aggregatable: true,
-							kind: "Aggregatable",
-							availableRoles: ChartDelegate._getLayoutOptionsForType("aggregatable"), //for p13n
 							role: MDCLib.ChartItemRoleType.axis1,
 							datapoint: null //To be implemented by FE
 						});

package/src/sap/fe/macros/CommonHelper.js

@@ -562,7 +562,7 @@ sap.ui.define(
 			 * @function
 			 * @memberof sap.fe.macros.CommonHelper
 			 * @param {string} sValue Some string that needs to be converted into single quotes
-			 * @param {boolean} bEscape Should the string be escaped beforehand
+			 * @param {boolean} [bEscape] Should the string be escaped beforehand
 			 * @returns {string} - String with single quotes
 			 **/
 			addSingleQuotes: function(sValue, bEscape) {

package/src/sap/fe/macros/DraftIndicator.fragment.xml

@@ -4,7 +4,8 @@
 	xmlns="sap.m"
 	template:require="{
 		FIELD: 'sap/fe/macros/field/FieldHelper',
-		ID: 'sap/fe/core/helpers/StableIdHelper'
+		ID: 'sap/fe/core/helpers/StableIdHelper',
+		FieldTemplating: 'sap/fe/macros/field/FieldTemplating'
 	}"
 >
 <!--	{IsActiveEntity} true when there are unsaved changes by other users.
@@ -18,7 +19,7 @@
 				press="DraftIndicator.onDraftLinkPressed($event, '{entitySet>@sapui.name}','{this>indicatorType}')"
 				visibility="{= !%{HasDraftEntity} ? 'TextOnly' : 'IconAndText' }"
 				visible="{this>isDraftIndicatorVisible}"
-				additionalInfo="{path: 'entitySet>$Type', formatter: 'FIELD.getBindingForDraftAdminBlockInline'}"
+				additionalInfo="{path: 'entitySet>$Type', formatter: 'FieldTemplating.getBindingForDraftAdminBlockInline'}"
 				ariaLabelledBy="{= ${this>ariaLabelledBy}}"
 			/>
 	</template:then>

package/src/sap/fe/macros/Field.fragment.xml

@@ -10,25 +10,24 @@
 		UI: 'sap/fe/core/templating/UIFormatters'
 	}"
 >
-	<template:with path="contextPath>" var="_entitySet" helper="UI.getTargetEntitySet">
 		<internalMacro:Field
-			entitySet="{_entitySet>}"
-			dataField="{metaPath>}"
-			editMode="{this>editModeExpression}"
-			onChange="{this>change}"
-			_flexId="{this>id}"
-			semanticObject="{this>semanticObject}"
-		>
+		entitySet="{contextPath>}"
+		dataField="{metaPath>}"
+		editMode="{this>editModeExpression}"
+		onChange="{this>change}"
+		_flexId="{this>id}"
+		semanticObject="{this>semanticObject}"
+	>
 			<internalMacro:formatOptions
-				textAlignMode="Form"
-				showEmptyIndicator="true"
-				displayMode="{this>formatOptions/displayMode}"
-				measureDisplayMode="{this>formatOptions/measureDisplayMode}"
-				textLinesEdit="{this>formatOptions/textLinesEdit}"
-				textMaxLines="{this>formatOptions/textMaxLines}"
-				textMaxCharactersDisplay="{this>formatOptions/textMaxCharactersDisplay}"
-				textExpandBehaviorDisplay="{this>formatOptions/textExpandBehaviorDisplay}"
-			/>
+			textAlignMode="Form"
+			showEmptyIndicator="true"
+			displayMode="{this>formatOptions/displayMode}"
+			measureDisplayMode="{this>formatOptions/measureDisplayMode}"
+			textLinesEdit="{this>formatOptions/textLinesEdit}"
+			textMaxLines="{this>formatOptions/textMaxLines}"
+			textMaxCharactersDisplay="{this>formatOptions/textMaxCharactersDisplay}"
+			textExpandBehaviorDisplay="{this>formatOptions/textExpandBehaviorDisplay}"
+		/>
 			<template:with path="metaPath>" helper="FIELD.valueHelpProperty" var="vhProperty">
 				<template:if test="{=FIELD.hasValueHelpAnnotation(${vhProperty>@})}">
 					<macro:dependents>
@@ -37,5 +36,4 @@
 				</template:if>
 			</template:with>
 		</internalMacro:Field>
-	</template:with>
 </core:FragmentDefinition>