@sapui5/sap.fe.core 1.100.0 → 1.101.0

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

@@ -2,142 +2,147 @@ import MdcFilterBar from "sap/ui/mdc/FilterBar";
 import FilterItemLayout from "sap/ui/mdc/filterbar/aligned/FilterItemLayout";
 import VisualFilterContainer from "sap/fe/core/controls/filterbar/VisualFilterContainer";
 import FilterContainer from "sap/fe/core/controls/filterbar/FilterContainer";
-const FilterBar = MdcFilterBar.extend("sap.fe.core.controls.FilterBar", {
-	metadata: {
-		properties: {
-			initialLayout: {
-				type: "string",
-				defaultValue: "compact"
-			}
-		},
-		associations: {
-			/**
-			 * Control which allows for switching between visual and normal filter layouts
-			 */
-			toggleControl: {
-				type: "sap.m.SegmentedButton",
-				multiple: false
-			}
+import Core from "sap/ui/core/Core";
+import { association, defineUI5Class, property } from "sap/fe/core/helpers/ClassSupport";
+import SegmentedButton from "sap/m/SegmentedButton";
+@defineUI5Class("sap.fe.core.controls.FilterBar")
+class FilterBar extends MdcFilterBar {
+	@property({ type: "string", defaultValue: "compact" })
+	initialLayout!: string;
+	/**
+	 * Control which allows for switching between visual and normal filter layouts
+	 */
+	@association({
+		type: "sap.m.SegmentedButton",
+		multiple: false
+	})
+	toggleControl!: SegmentedButton;
+	private _oSegmentedButton?: SegmentedButton;
+	private _oSecondaryFilterBarLayout: any;
+	private _oFilterBarLayout: any;
+	private _cLayoutItem: any;
+
+	setToggleControl(vToggle: string | SegmentedButton) {
+		if (typeof vToggle === "string") {
+			this._oSegmentedButton = Core.byId(vToggle) as SegmentedButton;
+		} else {
+			this._oSegmentedButton = vToggle;
 		}
-	},
-	renderer: {
-		apiVersion: 2
-	}
-});
-FilterBar.prototype.setToggleControl = function(vToggle: any) {
-	if (typeof vToggle === "string") {
-		this._oSegmentedButton = sap.ui.getCore().byId(vToggle);
-	} else {
-		this._oSegmentedButton = vToggle;
-	}
 
-	if (this.getToggleControl() && this._oSegmentedButton) {
-		this._oSegmentedButton.detachEvent("select", this._toggleLayout.bind(this));
-	}
-	if (this._oSegmentedButton) {
-		this._oSegmentedButton.attachEvent("select", this._toggleLayout.bind(this));
-	}
-	this.setAssociation("toggleControl", vToggle, true);
-};
-FilterBar.prototype._toggleLayout = function() {
-	// Since primary layout is always compact
-	// hence set the secondary layout as visual filter only for the first time only
-	if (!this._oSecondaryFilterBarLayout) {
-		this._oSecondaryFilterBarLayout = new VisualFilterContainer();
+		if (this.toggleControl && this._oSegmentedButton) {
+			this._oSegmentedButton.detachEvent("select", this._toggleLayout.bind(this));
+		}
+		if (this._oSegmentedButton) {
+			this._oSegmentedButton.attachEvent("select", this._toggleLayout.bind(this));
+		}
+		this.setAssociation("toggleControl", vToggle, true);
 	}
 
-	// do not show Adapt Filters Button for visual layout
-	if (this._oSecondaryFilterBarLayout.isA("sap.fe.core.controls.filterbar.VisualFilterContainer")) {
-		this.setShowAdaptFiltersButton(false);
-	} else {
-		this.setShowAdaptFiltersButton(true);
-	}
+	_toggleLayout() {
+		// Since primary layout is always compact
+		// hence set the secondary layout as visual filter only for the first time only
+		if (!this._oSecondaryFilterBarLayout) {
+			this._oSecondaryFilterBarLayout = new VisualFilterContainer();
+		}
 
-	// get all filter fields and button of the current layout
-	const oCurrentFilterBarLayout = this._oFilterBarLayout;
-	const oFilterItems = this.getFilterItems();
-	const aFilterFields = oCurrentFilterBarLayout.getAllFilterFields();
-	const aSortedFilterFields = this.getSortedFilterFields(oFilterItems, aFilterFields);
-	const aButtons = oCurrentFilterBarLayout.getAllButtons();
-	const aVisualFilterFields = oCurrentFilterBarLayout.getAllVisualFilterFields && oCurrentFilterBarLayout.getAllVisualFilterFields();
-	if (this._oSecondaryFilterBarLayout.isA("sap.fe.core.controls.filterbar.VisualFilterContainer")) {
-		this._oSecondaryFilterBarLayout.setAllFilterFields(aSortedFilterFields, aVisualFilterFields);
-	}
-	// use secondary filter bar layout as new layout
-	this._oFilterBarLayout = this._oSecondaryFilterBarLayout;
+		// do not show Adapt Filters Button for visual layout
+		if (this._oSecondaryFilterBarLayout.isA("sap.fe.core.controls.filterbar.VisualFilterContainer")) {
+			this.setShowAdaptFiltersButton(false);
+		} else {
+			this.setShowAdaptFiltersButton(true);
+		}
 
-	// insert all filter fields from current layout to new layout
-	aFilterFields.forEach((oFilterField: any, iIndex: any) => {
-		oCurrentFilterBarLayout.removeFilterField(oFilterField);
-		this._oFilterBarLayout.insertFilterField(oFilterField, iIndex);
-	});
-	// insert all buttons from the current layout to the new layout
-	aButtons.forEach((oButton: any) => {
-		oCurrentFilterBarLayout.removeButton(oButton);
-		this._oFilterBarLayout.addButton(oButton);
-	});
+		// get all filter fields and button of the current layout
+		const oCurrentFilterBarLayout = this._oFilterBarLayout;
+		const oFilterItems = this.getFilterItems();
+		const aFilterFields = oCurrentFilterBarLayout.getAllFilterFields();
+		const aSortedFilterFields = this.getSortedFilterFields(oFilterItems, aFilterFields);
+		const aButtons = oCurrentFilterBarLayout.getAllButtons();
+		const aVisualFilterFields = oCurrentFilterBarLayout.getAllVisualFilterFields && oCurrentFilterBarLayout.getAllVisualFilterFields();
+		if (this._oSecondaryFilterBarLayout.isA("sap.fe.core.controls.filterbar.VisualFilterContainer")) {
+			this._oSecondaryFilterBarLayout.setAllFilterFields(aSortedFilterFields, aVisualFilterFields);
+		}
+		// use secondary filter bar layout as new layout
+		this._oFilterBarLayout = this._oSecondaryFilterBarLayout;
 
-	// set the current filter bar layout to the secondary one
-	this._oSecondaryFilterBarLayout = oCurrentFilterBarLayout;
+		// insert all filter fields from current layout to new layout
+		aFilterFields.forEach((oFilterField: any, iIndex: any) => {
+			oCurrentFilterBarLayout.removeFilterField(oFilterField);
+			this._oFilterBarLayout.insertFilterField(oFilterField, iIndex);
+		});
+		// insert all buttons from the current layout to the new layout
+		aButtons.forEach((oButton: any) => {
+			oCurrentFilterBarLayout.removeButton(oButton);
+			this._oFilterBarLayout.addButton(oButton);
+		});
 
-	// update the layout aggregation of the filter bar and rerender the same.
-	this.setAggregation("layout", this._oFilterBarLayout, true);
-	this._oFilterBarLayout.rerender();
-};
-FilterBar.prototype.getSortedFilterFields = function(aFilterItems: any, aFilterFields: any) {
-	const aFilterIds: any[] = [];
-	aFilterItems.forEach(function(oFilterItem: any) {
-		aFilterIds.push(oFilterItem.getId());
-	});
-	aFilterFields.sort(function(aFirstItem: any, aSecondItem: any) {
-		let sFirstItemVFId, sSecondItemVFId;
-		aFirstItem.getContent().forEach(function(oInnerControl: any) {
-			if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
-				sFirstItemVFId = oInnerControl.getId();
-			}
+		// set the current filter bar layout to the secondary one
+		this._oSecondaryFilterBarLayout = oCurrentFilterBarLayout;
+
+		// update the layout aggregation of the filter bar and rerender the same.
+		this.setAggregation("layout", this._oFilterBarLayout, true);
+		this._oFilterBarLayout.rerender();
+	}
+
+	getSortedFilterFields(aFilterItems: any, aFilterFields: any) {
+		const aFilterIds: any[] = [];
+		aFilterItems.forEach(function(oFilterItem: any) {
+			aFilterIds.push(oFilterItem.getId());
 		});
-		aSecondItem.getContent().forEach(function(oInnerControl: any) {
-			if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
-				sSecondItemVFId = oInnerControl.getId();
-			}
+		aFilterFields.sort(function(aFirstItem: any, aSecondItem: any) {
+			let sFirstItemVFId, sSecondItemVFId;
+			aFirstItem.getContent().forEach(function(oInnerControl: any) {
+				if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
+					sFirstItemVFId = oInnerControl.getId();
+				}
+			});
+			aSecondItem.getContent().forEach(function(oInnerControl: any) {
+				if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
+					sSecondItemVFId = oInnerControl.getId();
+				}
+			});
+			return aFilterIds.indexOf(sFirstItemVFId) - aFilterIds.indexOf(sSecondItemVFId);
 		});
-		return aFilterIds.indexOf(sFirstItemVFId) - aFilterIds.indexOf(sSecondItemVFId);
-	});
-	return aFilterFields;
-};
-FilterBar.prototype._createInnerLayout = function() {
-	this._oFilterBarLayout = new FilterContainer();
-	this._cLayoutItem = FilterItemLayout;
-	this._oFilterBarLayout.getInner().addStyleClass("sapUiMdcFilterBarBaseAFLayout");
-	this._addButtons();
+		return aFilterFields;
+	}
+
+	_createInnerLayout() {
+		this._oFilterBarLayout = new FilterContainer();
+		this._cLayoutItem = FilterItemLayout;
+		this._oFilterBarLayout.getInner().addStyleClass("sapUiMdcFilterBarBaseAFLayout");
+		this._addButtons();
 
-	// TODO: Check with MDC if there is a better way to load visual filter on the basis of control property
-	// _createInnerLayout is called on Init by the filter bar base.
-	// This mean that we do not have access to the control properties yet
-	// and hence we cannot decide on the basis of control properties whether initial layout should be compact or visual
-	// As a result we have to do this workaround to always load the compact layout by default
-	// And toogle the same in case the initialLayout was supposed to be visual filters.
-	const oInnerLayout = this._oFilterBarLayout.getInner();
-	const oFilterContainerInnerLayoutEventDelegate = {
-		onBeforeRendering: () => {
-			if (this.getInitialLayout() === "visual") {
-				this._toggleLayout();
+		// TODO: Check with MDC if there is a better way to load visual filter on the basis of control property
+		// _createInnerLayout is called on Init by the filter bar base.
+		// This mean that we do not have access to the control properties yet
+		// and hence we cannot decide on the basis of control properties whether initial layout should be compact or visual
+		// As a result we have to do this workaround to always load the compact layout by default
+		// And toogle the same in case the initialLayout was supposed to be visual filters.
+		const oInnerLayout = this._oFilterBarLayout.getInner();
+		const oFilterContainerInnerLayoutEventDelegate = {
+			onBeforeRendering: () => {
+				if (this.initialLayout === "visual") {
+					this._toggleLayout();
+				}
+				oInnerLayout.removeEventDelegate(oFilterContainerInnerLayoutEventDelegate);
 			}
-			oInnerLayout.removeEventDelegate(oFilterContainerInnerLayoutEventDelegate);
-		}
-	};
-	oInnerLayout.addEventDelegate(oFilterContainerInnerLayoutEventDelegate);
+		};
+		oInnerLayout.addEventDelegate(oFilterContainerInnerLayoutEventDelegate);
 
-	this.setAggregation("layout", this._oFilterBarLayout, true);
-};
-FilterBar.prototype.exit = function() {
-	(MdcFilterBar.prototype as any).exit.apply(this, []);
-	// Sometimes upon external navigation this._SegmentedButton is already destroyed
-	// so check if it exists and then only remove stuff
-	if (this._oSegmentedButton) {
-		this._oSegmentedButton.detachEvent("select", this._toggleLayout);
-		delete this._oSegmentedButton;
+		this.setAggregation("layout", this._oFilterBarLayout, true);
 	}
-};
 
+	exit() {
+		super.exit();
+		// Sometimes upon external navigation this._SegmentedButton is already destroyed
+		// so check if it exists and then only remove stuff
+		if (this._oSegmentedButton) {
+			this._oSegmentedButton.detachEvent("select", this._toggleLayout);
+			delete this._oSegmentedButton;
+		}
+	}
+}
+interface FilterBar {
+	_addButtons(): any;
+}
 export default FilterBar;

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

@@ -2,47 +2,102 @@
  * 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) {
+sap.ui.define(["sap/ui/core/Control", "sap/fe/core/helpers/ClassSupport"], function (Control, ClassSupport) {
   "use strict";
 
-  var FormElementWrapper = Control.extend("sap.fe.core.controls.FormElementWrapper", {
-    metadata: {
-      interfaces: ["sap.ui.core.IFormContent"],
-      properties: {
-        width: {
-          type: "sap.ui.core.CSSSize",
-          defaultValue: null
-        },
-        formDoNotAdjustWidth: {
-          type: "boolean",
-          defaultValue: false
-        }
-      },
-      defaultAggregation: "content",
-      aggregations: {
-        content: {
-          type: "sap.ui.core.Control",
-          multiple: false
-        }
+  var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
+
+  var property = ClassSupport.property;
+  var implementInterface = ClassSupport.implementInterface;
+  var defineUI5Class = ClassSupport.defineUI5Class;
+  var aggregation = ClassSupport.aggregation;
+
+  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 _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+  function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+
+  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+  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.'); }
+
+  var FormElementWrapper = (_dec = defineUI5Class("sap.fe.core.controls.FormElementWrapper"), _dec2 = implementInterface("sap.ui.core.IFormContent"), _dec3 = property({
+    type: "sap.ui.core.CSSSize",
+    defaultValue: null
+  }), _dec4 = property({
+    type: "boolean",
+    defaultValue: false
+  }), _dec5 = aggregation({
+    type: "sap.ui.core.Control",
+    multiple: false,
+    isDefault: true
+  }), _dec(_class = (_class2 = /*#__PURE__*/function (_Control) {
+    _inheritsLoose(FormElementWrapper, _Control);
+
+    function FormElementWrapper() {
+      var _this;
+
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
       }
-    },
-    getAccessibilityInfo: function () {
-      var oContent = this.getContent();
+
+      _this = _Control.call.apply(_Control, [this].concat(args)) || this;
+
+      _initializerDefineProperty(_this, "__implements__sap_ui_core_IFormContent", _descriptor, _assertThisInitialized(_this));
+
+      _initializerDefineProperty(_this, "width", _descriptor2, _assertThisInitialized(_this));
+
+      _initializerDefineProperty(_this, "formDoNotAdjustWidth", _descriptor3, _assertThisInitialized(_this));
+
+      _initializerDefineProperty(_this, "content", _descriptor4, _assertThisInitialized(_this));
+
+      return _this;
+    }
+
+    var _proto = FormElementWrapper.prototype;
+
+    _proto.getAccessibilityInfo = function getAccessibilityInfo() {
+      var oContent = this.content;
       return oContent && oContent.getAccessibilityInfo ? oContent.getAccessibilityInfo() : {};
-    },
-    renderer: {
-      apiVersion: 2,
-      render: function (oRm, oControl) {
-        oRm.openStart("div", oControl);
-        oRm.style("min-height", "1rem");
-        oRm.style("width", oControl.getWidth());
-        oRm.openEnd();
-        oRm.renderControl(oControl.getContent()); // render the child Control
-
-        oRm.close("div"); // end of the complete Control
-      }
+    };
+
+    FormElementWrapper.render = function render(oRm, oControl) {
+      oRm.openStart("div", oControl);
+      oRm.style("min-height", "1rem");
+      oRm.style("width", oControl.width);
+      oRm.openEnd();
+      oRm.renderControl(oControl.content); // render the child Control
+
+      oRm.close("div"); // end of the complete Control
+    };
+
+    return FormElementWrapper;
+  }(Control), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "__implements__sap_ui_core_IFormContent", [_dec2], {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    initializer: function () {
+      return true;
     }
-  });
+  }), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "width", [_dec3], {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    initializer: null
+  }), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "formDoNotAdjustWidth", [_dec4], {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    initializer: null
+  }), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "content", [_dec5], {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    initializer: null
+  })), _class2)) || _class);
   return FormElementWrapper;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZvcm1FbGVtZW50V3JhcHBlci50cyJdLCJuYW1lcyI6WyJGb3JtRWxlbWVudFdyYXBwZXIiLCJDb250cm9sIiwiZXh0ZW5kIiwibWV0YWRhdGEiLCJpbnRlcmZhY2VzIiwicHJvcGVydGllcyIsIndpZHRoIiwidHlwZSIsImRlZmF1bHRWYWx1ZSIsImZvcm1Eb05vdEFkanVzdFdpZHRoIiwiZGVmYXVsdEFnZ3JlZ2F0aW9uIiwiYWdncmVnYXRpb25zIiwiY29udGVudCIsIm11bHRpcGxlIiwiZ2V0QWNjZXNzaWJpbGl0eUluZm8iLCJvQ29udGVudCIsImdldENvbnRlbnQiLCJyZW5kZXJlciIsImFwaVZlcnNpb24iLCJyZW5kZXIiLCJvUm0iLCJvQ29udHJvbCIsIm9wZW5TdGFydCIsInN0eWxlIiwiZ2V0V2lkdGgiLCJvcGVuRW5kIiwicmVuZGVyQ29udHJvbCIsImNsb3NlIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBR0EsTUFBTUEsa0JBQWtCLEdBQUdDLE9BQU8sQ0FBQ0MsTUFBUixDQUFlLHlDQUFmLEVBQTBEO0FBQ3BGQyxJQUFBQSxRQUFRLEVBQUU7QUFDVEMsTUFBQUEsVUFBVSxFQUFFLENBQUMsMEJBQUQsQ0FESDtBQUVUQyxNQUFBQSxVQUFVLEVBQUU7QUFDWEMsUUFBQUEsS0FBSyxFQUFFO0FBQ05DLFVBQUFBLElBQUksRUFBRSxxQkFEQTtBQUVOQyxVQUFBQSxZQUFZLEVBQUU7QUFGUixTQURJO0FBS1hDLFFBQUFBLG9CQUFvQixFQUFFO0FBQ3JCRixVQUFBQSxJQUFJLEVBQUUsU0FEZTtBQUVyQkMsVUFBQUEsWUFBWSxFQUFFO0FBRk87QUFMWCxPQUZIO0FBWVRFLE1BQUFBLGtCQUFrQixFQUFFLFNBWlg7QUFhVEMsTUFBQUEsWUFBWSxFQUFFO0FBQ2JDLFFBQUFBLE9BQU8sRUFBRTtBQUFFTCxVQUFBQSxJQUFJLEVBQUUscUJBQVI7QUFBK0JNLFVBQUFBLFFBQVEsRUFBRTtBQUF6QztBQURJO0FBYkwsS0FEMEU7QUFrQnBGQyxJQUFBQSxvQkFBb0IsRUFBRSxZQUF1QztBQUM1RCxVQUFNQyxRQUFRLEdBQUcsS0FBS0MsVUFBTCxFQUFqQjtBQUNBLGFBQU9ELFFBQVEsSUFBSUEsUUFBUSxDQUFDRCxvQkFBckIsR0FBNENDLFFBQVEsQ0FBQ0Qsb0JBQVQsRUFBNUMsR0FBOEUsRUFBckY7QUFDQSxLQXJCbUY7QUFzQnBGRyxJQUFBQSxRQUFRLEVBQUU7QUFDVEMsTUFBQUEsVUFBVSxFQUFFLENBREg7QUFFVEMsTUFBQUEsTUFBTSxFQUFFLFVBQVNDLEdBQVQsRUFBbUJDLFFBQW5CLEVBQWtDO0FBQ3pDRCxRQUFBQSxHQUFHLENBQUNFLFNBQUosQ0FBYyxLQUFkLEVBQXFCRCxRQUFyQjtBQUNBRCxRQUFBQSxHQUFHLENBQUNHLEtBQUosQ0FBVSxZQUFWLEVBQXdCLE1BQXhCO0FBQ0FILFFBQUFBLEdBQUcsQ0FBQ0csS0FBSixDQUFVLE9BQVYsRUFBbUJGLFFBQVEsQ0FBQ0csUUFBVCxFQUFuQjtBQUNBSixRQUFBQSxHQUFHLENBQUNLLE9BQUo7QUFDQUwsUUFBQUEsR0FBRyxDQUFDTSxhQUFKLENBQWtCTCxRQUFRLENBQUNMLFVBQVQsRUFBbEIsRUFMeUMsQ0FLQzs7QUFDMUNJLFFBQUFBLEdBQUcsQ0FBQ08sS0FBSixDQUFVLEtBQVYsRUFOeUMsQ0FNdkI7QUFDbEI7QUFUUTtBQXRCMEUsR0FBMUQsQ0FBM0I7U0FrQ2UzQixrQiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IENvbnRyb2wgZnJvbSBcInNhcC91aS9jb3JlL0NvbnRyb2xcIjtcblxudHlwZSBGb3JtRWxlbWVudFdyYXBwZXJUeXBlID0ge1xuXHRnZXRDb250ZW50KCk6IENvbnRyb2w7XG59O1xuY29uc3QgRm9ybUVsZW1lbnRXcmFwcGVyID0gQ29udHJvbC5leHRlbmQoXCJzYXAuZmUuY29yZS5jb250cm9scy5Gb3JtRWxlbWVudFdyYXBwZXJcIiwge1xuXHRtZXRhZGF0YToge1xuXHRcdGludGVyZmFjZXM6IFtcInNhcC51aS5jb3JlLklGb3JtQ29udGVudFwiXSxcblx0XHRwcm9wZXJ0aWVzOiB7XG5cdFx0XHR3aWR0aDoge1xuXHRcdFx0XHR0eXBlOiBcInNhcC51aS5jb3JlLkNTU1NpemVcIixcblx0XHRcdFx0ZGVmYXVsdFZhbHVlOiBudWxsXG5cdFx0XHR9LFxuXHRcdFx0Zm9ybURvTm90QWRqdXN0V2lkdGg6IHtcblx0XHRcdFx0dHlwZTogXCJib29sZWFuXCIsXG5cdFx0XHRcdGRlZmF1bHRWYWx1ZTogZmFsc2Vcblx0XHRcdH1cblx0XHR9LFxuXHRcdGRlZmF1bHRBZ2dyZWdhdGlvbjogXCJjb250ZW50XCIsXG5cdFx0YWdncmVnYXRpb25zOiB7XG5cdFx0XHRjb250ZW50OiB7IHR5cGU6IFwic2FwLnVpLmNvcmUuQ29udHJvbFwiLCBtdWx0aXBsZTogZmFsc2UgfVxuXHRcdH1cblx0fSxcblx0Z2V0QWNjZXNzaWJpbGl0eUluZm86IGZ1bmN0aW9uKHRoaXM6IEZvcm1FbGVtZW50V3JhcHBlclR5cGUpIHtcblx0XHRjb25zdCBvQ29udGVudCA9IHRoaXMuZ2V0Q29udGVudCgpO1xuXHRcdHJldHVybiBvQ29udGVudCAmJiBvQ29udGVudC5nZXRBY2Nlc3NpYmlsaXR5SW5mbyA/IG9Db250ZW50LmdldEFjY2Vzc2liaWxpdHlJbmZvKCkgOiB7fTtcblx0fSxcblx0cmVuZGVyZXI6IHtcblx0XHRhcGlWZXJzaW9uOiAyLFxuXHRcdHJlbmRlcjogZnVuY3Rpb24ob1JtOiBhbnksIG9Db250cm9sOiBhbnkpIHtcblx0XHRcdG9SbS5vcGVuU3RhcnQoXCJkaXZcIiwgb0NvbnRyb2wpO1xuXHRcdFx0b1JtLnN0eWxlKFwibWluLWhlaWdodFwiLCBcIjFyZW1cIik7XG5cdFx0XHRvUm0uc3R5bGUoXCJ3aWR0aFwiLCBvQ29udHJvbC5nZXRXaWR0aCgpKTtcblx0XHRcdG9SbS5vcGVuRW5kKCk7XG5cdFx0XHRvUm0ucmVuZGVyQ29udHJvbChvQ29udHJvbC5nZXRDb250ZW50KCkpOyAvLyByZW5kZXIgdGhlIGNoaWxkIENvbnRyb2xcblx0XHRcdG9SbS5jbG9zZShcImRpdlwiKTsgLy8gZW5kIG9mIHRoZSBjb21wbGV0ZSBDb250cm9sXG5cdFx0fVxuXHR9XG59KTtcbmV4cG9ydCBkZWZhdWx0IEZvcm1FbGVtZW50V3JhcHBlcjtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZvcm1FbGVtZW50V3JhcHBlci50cyJdLCJuYW1lcyI6WyJGb3JtRWxlbWVudFdyYXBwZXIiLCJkZWZpbmVVSTVDbGFzcyIsImltcGxlbWVudEludGVyZmFjZSIsInByb3BlcnR5IiwidHlwZSIsImRlZmF1bHRWYWx1ZSIsImFnZ3JlZ2F0aW9uIiwibXVsdGlwbGUiLCJpc0RlZmF1bHQiLCJnZXRBY2Nlc3NpYmlsaXR5SW5mbyIsIm9Db250ZW50IiwiY29udGVudCIsInJlbmRlciIsIm9SbSIsIm9Db250cm9sIiwib3BlblN0YXJ0Iiwic3R5bGUiLCJ3aWR0aCIsIm9wZW5FbmQiLCJyZW5kZXJDb250cm9sIiwiY2xvc2UiLCJDb250cm9sIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztNQUlNQSxrQixXQURMQyxjQUFjLENBQUMseUNBQUQsQyxVQUViQyxrQkFBa0IsQ0FBQywwQkFBRCxDLFVBR2xCQyxRQUFRLENBQUM7QUFDVEMsSUFBQUEsSUFBSSxFQUFFLHFCQURHO0FBRVRDLElBQUFBLFlBQVksRUFBRTtBQUZMLEdBQUQsQyxVQUtSRixRQUFRLENBQUM7QUFDVEMsSUFBQUEsSUFBSSxFQUFFLFNBREc7QUFFVEMsSUFBQUEsWUFBWSxFQUFFO0FBRkwsR0FBRCxDLFVBS1JDLFdBQVcsQ0FBQztBQUFFRixJQUFBQSxJQUFJLEVBQUUscUJBQVI7QUFBK0JHLElBQUFBLFFBQVEsRUFBRSxLQUF6QztBQUFnREMsSUFBQUEsU0FBUyxFQUFFO0FBQTNELEdBQUQsQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztXQUdaQyxvQixHQUFBLGdDQUF1QjtBQUN0QixVQUFNQyxRQUFRLEdBQUcsS0FBS0MsT0FBdEI7QUFDQSxhQUFPRCxRQUFRLElBQUlBLFFBQVEsQ0FBQ0Qsb0JBQXJCLEdBQTRDQyxRQUFRLENBQUNELG9CQUFULEVBQTVDLEdBQThFLEVBQXJGO0FBQ0EsSzs7dUJBQ01HLE0sR0FBUCxnQkFBY0MsR0FBZCxFQUFrQ0MsUUFBbEMsRUFBZ0U7QUFDL0RELE1BQUFBLEdBQUcsQ0FBQ0UsU0FBSixDQUFjLEtBQWQsRUFBcUJELFFBQXJCO0FBQ0FELE1BQUFBLEdBQUcsQ0FBQ0csS0FBSixDQUFVLFlBQVYsRUFBd0IsTUFBeEI7QUFDQUgsTUFBQUEsR0FBRyxDQUFDRyxLQUFKLENBQVUsT0FBVixFQUFtQkYsUUFBUSxDQUFDRyxLQUE1QjtBQUNBSixNQUFBQSxHQUFHLENBQUNLLE9BQUo7QUFDQUwsTUFBQUEsR0FBRyxDQUFDTSxhQUFKLENBQWtCTCxRQUFRLENBQUNILE9BQTNCLEVBTCtELENBSzFCOztBQUNyQ0UsTUFBQUEsR0FBRyxDQUFDTyxLQUFKLENBQVUsS0FBVixFQU4rRCxDQU03QztBQUNsQixLOzs7SUE1QitCQyxPOzs7OzthQUVrQixJOzs7Ozs7Ozs7Ozs7Ozs7Ozs7U0E0QnBDckIsa0IiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb250cm9sIGZyb20gXCJzYXAvdWkvY29yZS9Db250cm9sXCI7XG5pbXBvcnQgeyBhZ2dyZWdhdGlvbiwgZGVmaW5lVUk1Q2xhc3MsIGltcGxlbWVudEludGVyZmFjZSwgcHJvcGVydHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCB7IENTU1NpemUsIElGb3JtQ29udGVudCB9IGZyb20gXCJzYXAvdWkvY29yZS9saWJyYXJ5XCI7XG5pbXBvcnQgUmVuZGVyTWFuYWdlciBmcm9tIFwic2FwL3VpL2NvcmUvUmVuZGVyTWFuYWdlclwiO1xuXG5AZGVmaW5lVUk1Q2xhc3MoXCJzYXAuZmUuY29yZS5jb250cm9scy5Gb3JtRWxlbWVudFdyYXBwZXJcIilcbmNsYXNzIEZvcm1FbGVtZW50V3JhcHBlciBleHRlbmRzIENvbnRyb2wgaW1wbGVtZW50cyBJRm9ybUNvbnRlbnQge1xuXHRAaW1wbGVtZW50SW50ZXJmYWNlKFwic2FwLnVpLmNvcmUuSUZvcm1Db250ZW50XCIpXG5cdF9faW1wbGVtZW50c19fc2FwX3VpX2NvcmVfSUZvcm1Db250ZW50OiBib29sZWFuID0gdHJ1ZTtcblxuXHRAcHJvcGVydHkoe1xuXHRcdHR5cGU6IFwic2FwLnVpLmNvcmUuQ1NTU2l6ZVwiLFxuXHRcdGRlZmF1bHRWYWx1ZTogbnVsbFxuXHR9KVxuXHR3aWR0aCE6IENTU1NpemU7XG5cdEBwcm9wZXJ0eSh7XG5cdFx0dHlwZTogXCJib29sZWFuXCIsXG5cdFx0ZGVmYXVsdFZhbHVlOiBmYWxzZVxuXHR9KVxuXHRmb3JtRG9Ob3RBZGp1c3RXaWR0aCE6IGJvb2xlYW47XG5cdEBhZ2dyZWdhdGlvbih7IHR5cGU6IFwic2FwLnVpLmNvcmUuQ29udHJvbFwiLCBtdWx0aXBsZTogZmFsc2UsIGlzRGVmYXVsdDogdHJ1ZSB9KVxuXHRjb250ZW50ITogQ29udHJvbDtcblxuXHRnZXRBY2Nlc3NpYmlsaXR5SW5mbygpIHtcblx0XHRjb25zdCBvQ29udGVudCA9IHRoaXMuY29udGVudDtcblx0XHRyZXR1cm4gb0NvbnRlbnQgJiYgb0NvbnRlbnQuZ2V0QWNjZXNzaWJpbGl0eUluZm8gPyBvQ29udGVudC5nZXRBY2Nlc3NpYmlsaXR5SW5mbygpIDoge307XG5cdH1cblx0c3RhdGljIHJlbmRlcihvUm06IFJlbmRlck1hbmFnZXIsIG9Db250cm9sOiBGb3JtRWxlbWVudFdyYXBwZXIpIHtcblx0XHRvUm0ub3BlblN0YXJ0KFwiZGl2XCIsIG9Db250cm9sKTtcblx0XHRvUm0uc3R5bGUoXCJtaW4taGVpZ2h0XCIsIFwiMXJlbVwiKTtcblx0XHRvUm0uc3R5bGUoXCJ3aWR0aFwiLCBvQ29udHJvbC53aWR0aCk7XG5cdFx0b1JtLm9wZW5FbmQoKTtcblx0XHRvUm0ucmVuZGVyQ29udHJvbChvQ29udHJvbC5jb250ZW50KTsgLy8gcmVuZGVyIHRoZSBjaGlsZCBDb250cm9sXG5cdFx0b1JtLmNsb3NlKFwiZGl2XCIpOyAvLyBlbmQgb2YgdGhlIGNvbXBsZXRlIENvbnRyb2xcblx0fVxufVxuZXhwb3J0IGRlZmF1bHQgRm9ybUVsZW1lbnRXcmFwcGVyO1xuIl19

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

@@ -1,40 +1,37 @@
 import Control from "sap/ui/core/Control";
+import { aggregation, defineUI5Class, implementInterface, property } from "sap/fe/core/helpers/ClassSupport";
+import { CSSSize, IFormContent } from "sap/ui/core/library";
+import RenderManager from "sap/ui/core/RenderManager";
 
-type FormElementWrapperType = {
-	getContent(): Control;
-};
-const FormElementWrapper = Control.extend("sap.fe.core.controls.FormElementWrapper", {
-	metadata: {
-		interfaces: ["sap.ui.core.IFormContent"],
-		properties: {
-			width: {
-				type: "sap.ui.core.CSSSize",
-				defaultValue: null
-			},
-			formDoNotAdjustWidth: {
-				type: "boolean",
-				defaultValue: false
-			}
-		},
-		defaultAggregation: "content",
-		aggregations: {
-			content: { type: "sap.ui.core.Control", multiple: false }
-		}
-	},
-	getAccessibilityInfo: function(this: FormElementWrapperType) {
-		const oContent = this.getContent();
+@defineUI5Class("sap.fe.core.controls.FormElementWrapper")
+class FormElementWrapper extends Control implements IFormContent {
+	@implementInterface("sap.ui.core.IFormContent")
+	__implements__sap_ui_core_IFormContent: boolean = true;
+
+	@property({
+		type: "sap.ui.core.CSSSize",
+		defaultValue: null
+	})
+	width!: CSSSize;
+	@property({
+		type: "boolean",
+		defaultValue: false
+	})
+	formDoNotAdjustWidth!: boolean;
+	@aggregation({ type: "sap.ui.core.Control", multiple: false, isDefault: true })
+	content!: Control;
+
+	getAccessibilityInfo() {
+		const oContent = this.content;
 		return oContent && oContent.getAccessibilityInfo ? oContent.getAccessibilityInfo() : {};
-	},
-	renderer: {
-		apiVersion: 2,
-		render: function(oRm: any, oControl: any) {
-			oRm.openStart("div", oControl);
-			oRm.style("min-height", "1rem");
-			oRm.style("width", oControl.getWidth());
-			oRm.openEnd();
-			oRm.renderControl(oControl.getContent()); // render the child Control
-			oRm.close("div"); // end of the complete Control
-		}
 	}
-});
+	static render(oRm: RenderManager, oControl: FormElementWrapper) {
+		oRm.openStart("div", oControl);
+		oRm.style("min-height", "1rem");
+		oRm.style("width", oControl.width);
+		oRm.openEnd();
+		oRm.renderControl(oControl.content); // render the child Control
+		oRm.close("div"); // end of the complete Control
+	}
+}
 export default FormElementWrapper;