@sapui5/sap.fe.core 1.99.0 → 1.100.0

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

@@ -0,0 +1,115 @@
+import Control from "sap/ui/core/Control";
+
+export type FieldWrapperType = Control & {
+	getEditMode(): string;
+	getContentDisplay(): Control;
+	getContentEdit(): Control[];
+	getAriaLabelledBy(): Control[];
+	_setAriaLabelledBy(oControl: Control): void;
+};
+const FieldWrapper = Control.extend("sap.fe.core.controls.FieldWrapper", {
+	metadata: {
+		interfaces: ["sap.ui.core.IFormContent"],
+		properties: {
+			textAlign: {
+				type: "sap.ui.core.TextAlign"
+			},
+			width: {
+				type: "sap.ui.core.CSSSize",
+				defaultValue: null
+			},
+			formDoNotAdjustWidth: {
+				type: "boolean",
+				defaultValue: false
+			},
+			editMode: {
+				type: "string",
+				defaultValue: "Display"
+			},
+			required: {
+				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: "contentDisplay",
+		aggregations: {
+			contentDisplay: { type: "sap.ui.core.Control", multiple: false },
+			contentEdit: { type: "sap.ui.core.Control", multiple: true }
+		}
+	},
+	enhanceAccessibilityState: function(oElement: any, mAriaProps: any) {
+		const oParent = this.getParent() as any;
+
+		if (oParent && oParent.enhanceAccessibilityState) {
+			// use FieldWrapper as control, but aria properties of rendered inner control.
+			oParent.enhanceAccessibilityState(this, mAriaProps);
+		}
+
+		return mAriaProps;
+	},
+	getAccessibilityInfo: function(this: FieldWrapperType) {
+		let oContent;
+		if (this.getEditMode() === "Display") {
+			oContent = this.getContentDisplay();
+		} else {
+			oContent = this.getContentEdit().length ? this.getContentEdit()[0] : null;
+		}
+		return oContent && oContent.getAccessibilityInfo ? oContent.getAccessibilityInfo() : {};
+	},
+
+	_setAriaLabelledBy: function(this: FieldWrapperType, 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: FieldWrapperType) {
+		// before calling the renderer of the FieldWrapper parent control may have set ariaLabelledBy
+		// we ensure it is passed to its inner controls
+		this._setAriaLabelledBy(this.getContentDisplay());
+		const aContentEdit = this.getContentEdit();
+		for (let i = 0; i < aContentEdit.length; i++) {
+			this._setAriaLabelledBy(aContentEdit[i]);
+		}
+	},
+	renderer: {
+		apiVersion: 2,
+		render: function(oRm: any, oControl: any) {
+			oRm.openStart("div", oControl);
+			oRm.style("text-align", oControl.getTextAlign());
+			if (oControl.getEditMode() === "Display") {
+				oRm.style("width", oControl.getWidth());
+				oRm.openEnd();
+				oRm.renderControl(oControl.getContentDisplay()); // render the child Control for display
+			} else {
+				const aContentEdit = oControl.getContentEdit();
+
+				// if (aContentEdit.length > 1) {
+				// 	oRm.class("sapUiMdcFieldBaseMoreFields");
+				// }
+				oRm.style("width", oControl.getWidth());
+				oRm.openEnd();
+				for (let i = 0; i < aContentEdit.length; i++) {
+					const oContent = aContentEdit[i]; // render the child Control  for edit
+					oRm.renderControl(oContent);
+				}
+			}
+			oRm.close("div"); // end of the complete Control
+		}
+	}
+});
+
+export default FieldWrapper;

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

@@ -1,162 +1,165 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
-        (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(
-	[
-		"sap/ui/mdc/FilterBar",
-		"sap/ui/mdc/filterbar/FilterBarBaseRenderer",
-		"sap/ui/mdc/filterbar/aligned/FilterItemLayout",
-		"sap/fe/core/controls/filterbar/VisualFilterContainer",
-		"sap/fe/core/controls/filterbar/FilterContainer"
-	],
-	function(MdcFilterBar, FilterBarBaseRenderer, FilterItemLayout, VisualFilterContainer, FilterContainer) {
-		"use strict";
-		var 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
-					}
-				}
-			},
-			renderer: FilterBarBaseRenderer
-		});
-
-		FilterBar.prototype.setToggleControl = function(vToggle) {
-			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();
-			}
-
-			// 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);
-			}
-
-			// get all filter fields and button of the current layout
-			var oCurrentFilterBarLayout = this._oFilterBarLayout;
-			var oFilterItems = this.getFilterItems();
-			var aFilterFields = oCurrentFilterBarLayout.getAllFilterFields();
-			var aSortedFilterFields = this.getSortedFilterFields(oFilterItems, aFilterFields);
-			var aButtons = oCurrentFilterBarLayout.getAllButtons();
-			var 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;
-
-			// insert all filter fields from current layout to new layout
-			var that = this;
-			aFilterFields.forEach(function(oFilterField, iIndex) {
-				oCurrentFilterBarLayout.removeFilterField(oFilterField);
-				that._oFilterBarLayout.insertFilterField(oFilterField, iIndex);
-			});
-			// insert all buttons from the current layout to the new layout
-			aButtons.forEach(function(oButton) {
-				oCurrentFilterBarLayout.removeButton(oButton);
-				that._oFilterBarLayout.addButton(oButton);
-			});
-
-			// 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", that._oFilterBarLayout, true);
-			this._oFilterBarLayout.rerender();
-		};
-
-		FilterBar.prototype.getSortedFilterFields = function(aFilterItems, aFilterFields) {
-			var aFilterIds = [];
-			aFilterItems.forEach(function(oFilterItem) {
-				aFilterIds.push(oFilterItem.getId());
-			});
-			aFilterFields.sort(function(aFirstItem, aSecondItem) {
-				var sFirstItemVFId, sSecondItemVFId;
-				aFirstItem.getContent().forEach(function(oInnerControl) {
-					if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
-						sFirstItemVFId = oInnerControl.getId();
-					}
-				});
-				aSecondItem.getContent().forEach(function(oInnerControl) {
-					if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
-						sSecondItemVFId = oInnerControl.getId();
-					}
-				});
-				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();
-
-			// 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.
-			var oInnerLayout = this._oFilterBarLayout.getInner(),
-				that = this;
-			var oFilterContainerInnerLayoutEventDelegate = {
-				onBeforeRendering: function() {
-					if (that.getInitialLayout() === "visual") {
-						that._toggleLayout();
-					}
-					oInnerLayout.removeEventDelegate(oFilterContainerInnerLayoutEventDelegate);
-				}
-			};
-			oInnerLayout.addEventDelegate(oFilterContainerInnerLayoutEventDelegate);
-
-			this.setAggregation("layout", this._oFilterBarLayout, true);
-		};
-
-		FilterBar.prototype.exit = function() {
-			MdcFilterBar.prototype.exit.apply(this, arguments);
-			// 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;
-			}
-		};
-
-		return FilterBar;
-	}
-);
+sap.ui.define(["sap/ui/mdc/FilterBar", "sap/ui/mdc/filterbar/aligned/FilterItemLayout", "sap/fe/core/controls/filterbar/VisualFilterContainer", "sap/fe/core/controls/filterbar/FilterContainer"], function (MdcFilterBar, FilterItemLayout, VisualFilterContainer, FilterContainer) {
+  "use strict";
+
+  var 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
+        }
+      }
+    },
+    renderer: {
+      apiVersion: 2
+    }
+  });
+
+  FilterBar.prototype.setToggleControl = function (vToggle) {
+    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 () {
+    var _this = this;
+
+    // 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();
+    } // 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);
+    } // get all filter fields and button of the current layout
+
+
+    var oCurrentFilterBarLayout = this._oFilterBarLayout;
+    var oFilterItems = this.getFilterItems();
+    var aFilterFields = oCurrentFilterBarLayout.getAllFilterFields();
+    var aSortedFilterFields = this.getSortedFilterFields(oFilterItems, aFilterFields);
+    var aButtons = oCurrentFilterBarLayout.getAllButtons();
+    var 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; // insert all filter fields from current layout to new layout
+
+    aFilterFields.forEach(function (oFilterField, iIndex) {
+      oCurrentFilterBarLayout.removeFilterField(oFilterField);
+
+      _this._oFilterBarLayout.insertFilterField(oFilterField, iIndex);
+    }); // insert all buttons from the current layout to the new layout
+
+    aButtons.forEach(function (oButton) {
+      oCurrentFilterBarLayout.removeButton(oButton);
+
+      _this._oFilterBarLayout.addButton(oButton);
+    }); // 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();
+  };
+
+  FilterBar.prototype.getSortedFilterFields = function (aFilterItems, aFilterFields) {
+    var aFilterIds = [];
+    aFilterItems.forEach(function (oFilterItem) {
+      aFilterIds.push(oFilterItem.getId());
+    });
+    aFilterFields.sort(function (aFirstItem, aSecondItem) {
+      var sFirstItemVFId, sSecondItemVFId;
+      aFirstItem.getContent().forEach(function (oInnerControl) {
+        if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
+          sFirstItemVFId = oInnerControl.getId();
+        }
+      });
+      aSecondItem.getContent().forEach(function (oInnerControl) {
+        if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
+          sSecondItemVFId = oInnerControl.getId();
+        }
+      });
+      return aFilterIds.indexOf(sFirstItemVFId) - aFilterIds.indexOf(sSecondItemVFId);
+    });
+    return aFilterFields;
+  };
+
+  FilterBar.prototype._createInnerLayout = function () {
+    var _this2 = this;
+
+    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.
+
+
+    var oInnerLayout = this._oFilterBarLayout.getInner();
+
+    var oFilterContainerInnerLayoutEventDelegate = {
+      onBeforeRendering: function () {
+        if (_this2.getInitialLayout() === "visual") {
+          _this2._toggleLayout();
+        }
+
+        oInnerLayout.removeEventDelegate(oFilterContainerInnerLayoutEventDelegate);
+      }
+    };
+    oInnerLayout.addEventDelegate(oFilterContainerInnerLayoutEventDelegate);
+    this.setAggregation("layout", this._oFilterBarLayout, true);
+  };
+
+  FilterBar.prototype.exit = function () {
+    MdcFilterBar.prototype.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;
+    }
+  };
+
+  return FilterBar;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["FilterBar.ts"],"names":["FilterBar","MdcFilterBar","extend","metadata","properties","initialLayout","type","defaultValue","associations","toggleControl","multiple","renderer","apiVersion","prototype","setToggleControl","vToggle","_oSegmentedButton","sap","ui","getCore","byId","getToggleControl","detachEvent","_toggleLayout","bind","attachEvent","setAssociation","_oSecondaryFilterBarLayout","VisualFilterContainer","isA","setShowAdaptFiltersButton","oCurrentFilterBarLayout","_oFilterBarLayout","oFilterItems","getFilterItems","aFilterFields","getAllFilterFields","aSortedFilterFields","getSortedFilterFields","aButtons","getAllButtons","aVisualFilterFields","getAllVisualFilterFields","setAllFilterFields","forEach","oFilterField","iIndex","removeFilterField","insertFilterField","oButton","removeButton","addButton","setAggregation","rerender","aFilterItems","aFilterIds","oFilterItem","push","getId","sort","aFirstItem","aSecondItem","sFirstItemVFId","sSecondItemVFId","getContent","oInnerControl","indexOf","_createInnerLayout","FilterContainer","_cLayoutItem","FilterItemLayout","getInner","addStyleClass","_addButtons","oInnerLayout","oFilterContainerInnerLayoutEventDelegate","onBeforeRendering","getInitialLayout","removeEventDelegate","addEventDelegate","exit","apply"],"mappings":"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","sourceRoot":".","sourcesContent":["import MdcFilterBar from \"sap/ui/mdc/FilterBar\";\nimport FilterItemLayout from \"sap/ui/mdc/filterbar/aligned/FilterItemLayout\";\nimport VisualFilterContainer from \"sap/fe/core/controls/filterbar/VisualFilterContainer\";\nimport FilterContainer from \"sap/fe/core/controls/filterbar/FilterContainer\";\nconst FilterBar = MdcFilterBar.extend(\"sap.fe.core.controls.FilterBar\", {\n\tmetadata: {\n\t\tproperties: {\n\t\t\tinitialLayout: {\n\t\t\t\ttype: \"string\",\n\t\t\t\tdefaultValue: \"compact\"\n\t\t\t}\n\t\t},\n\t\tassociations: {\n\t\t\t/**\n\t\t\t * Control which allows for switching between visual and normal filter layouts\n\t\t\t */\n\t\t\ttoggleControl: {\n\t\t\t\ttype: \"sap.m.SegmentedButton\",\n\t\t\t\tmultiple: false\n\t\t\t}\n\t\t}\n\t},\n\trenderer: {\n\t\tapiVersion: 2\n\t}\n});\nFilterBar.prototype.setToggleControl = function(vToggle: any) {\n\tif (typeof vToggle === \"string\") {\n\t\tthis._oSegmentedButton = sap.ui.getCore().byId(vToggle);\n\t} else {\n\t\tthis._oSegmentedButton = vToggle;\n\t}\n\n\tif (this.getToggleControl() && this._oSegmentedButton) {\n\t\tthis._oSegmentedButton.detachEvent(\"select\", this._toggleLayout.bind(this));\n\t}\n\tif (this._oSegmentedButton) {\n\t\tthis._oSegmentedButton.attachEvent(\"select\", this._toggleLayout.bind(this));\n\t}\n\tthis.setAssociation(\"toggleControl\", vToggle, true);\n};\nFilterBar.prototype._toggleLayout = function() {\n\t// Since primary layout is always compact\n\t// hence set the secondary layout as visual filter only for the first time only\n\tif (!this._oSecondaryFilterBarLayout) {\n\t\tthis._oSecondaryFilterBarLayout = new VisualFilterContainer();\n\t}\n\n\t// do not show Adapt Filters Button for visual layout\n\tif (this._oSecondaryFilterBarLayout.isA(\"sap.fe.core.controls.filterbar.VisualFilterContainer\")) {\n\t\tthis.setShowAdaptFiltersButton(false);\n\t} else {\n\t\tthis.setShowAdaptFiltersButton(true);\n\t}\n\n\t// get all filter fields and button of the current layout\n\tconst oCurrentFilterBarLayout = this._oFilterBarLayout;\n\tconst oFilterItems = this.getFilterItems();\n\tconst aFilterFields = oCurrentFilterBarLayout.getAllFilterFields();\n\tconst aSortedFilterFields = this.getSortedFilterFields(oFilterItems, aFilterFields);\n\tconst aButtons = oCurrentFilterBarLayout.getAllButtons();\n\tconst aVisualFilterFields = oCurrentFilterBarLayout.getAllVisualFilterFields && oCurrentFilterBarLayout.getAllVisualFilterFields();\n\tif (this._oSecondaryFilterBarLayout.isA(\"sap.fe.core.controls.filterbar.VisualFilterContainer\")) {\n\t\tthis._oSecondaryFilterBarLayout.setAllFilterFields(aSortedFilterFields, aVisualFilterFields);\n\t}\n\t// use secondary filter bar layout as new layout\n\tthis._oFilterBarLayout = this._oSecondaryFilterBarLayout;\n\n\t// insert all filter fields from current layout to new layout\n\taFilterFields.forEach((oFilterField: any, iIndex: any) => {\n\t\toCurrentFilterBarLayout.removeFilterField(oFilterField);\n\t\tthis._oFilterBarLayout.insertFilterField(oFilterField, iIndex);\n\t});\n\t// insert all buttons from the current layout to the new layout\n\taButtons.forEach((oButton: any) => {\n\t\toCurrentFilterBarLayout.removeButton(oButton);\n\t\tthis._oFilterBarLayout.addButton(oButton);\n\t});\n\n\t// set the current filter bar layout to the secondary one\n\tthis._oSecondaryFilterBarLayout = oCurrentFilterBarLayout;\n\n\t// update the layout aggregation of the filter bar and rerender the same.\n\tthis.setAggregation(\"layout\", this._oFilterBarLayout, true);\n\tthis._oFilterBarLayout.rerender();\n};\nFilterBar.prototype.getSortedFilterFields = function(aFilterItems: any, aFilterFields: any) {\n\tconst aFilterIds: any[] = [];\n\taFilterItems.forEach(function(oFilterItem: any) {\n\t\taFilterIds.push(oFilterItem.getId());\n\t});\n\taFilterFields.sort(function(aFirstItem: any, aSecondItem: any) {\n\t\tlet sFirstItemVFId, sSecondItemVFId;\n\t\taFirstItem.getContent().forEach(function(oInnerControl: any) {\n\t\t\tif (oInnerControl.isA(\"sap.ui.mdc.FilterField\")) {\n\t\t\t\tsFirstItemVFId = oInnerControl.getId();\n\t\t\t}\n\t\t});\n\t\taSecondItem.getContent().forEach(function(oInnerControl: any) {\n\t\t\tif (oInnerControl.isA(\"sap.ui.mdc.FilterField\")) {\n\t\t\t\tsSecondItemVFId = oInnerControl.getId();\n\t\t\t}\n\t\t});\n\t\treturn aFilterIds.indexOf(sFirstItemVFId) - aFilterIds.indexOf(sSecondItemVFId);\n\t});\n\treturn aFilterFields;\n};\nFilterBar.prototype._createInnerLayout = function() {\n\tthis._oFilterBarLayout = new FilterContainer();\n\tthis._cLayoutItem = FilterItemLayout;\n\tthis._oFilterBarLayout.getInner().addStyleClass(\"sapUiMdcFilterBarBaseAFLayout\");\n\tthis._addButtons();\n\n\t// TODO: Check with MDC if there is a better way to load visual filter on the basis of control property\n\t// _createInnerLayout is called on Init by the filter bar base.\n\t// This mean that we do not have access to the control properties yet\n\t// and hence we cannot decide on the basis of control properties whether initial layout should be compact or visual\n\t// As a result we have to do this workaround to always load the compact layout by default\n\t// And toogle the same in case the initialLayout was supposed to be visual filters.\n\tconst oInnerLayout = this._oFilterBarLayout.getInner();\n\tconst oFilterContainerInnerLayoutEventDelegate = {\n\t\tonBeforeRendering: () => {\n\t\t\tif (this.getInitialLayout() === \"visual\") {\n\t\t\t\tthis._toggleLayout();\n\t\t\t}\n\t\t\toInnerLayout.removeEventDelegate(oFilterContainerInnerLayoutEventDelegate);\n\t\t}\n\t};\n\toInnerLayout.addEventDelegate(oFilterContainerInnerLayoutEventDelegate);\n\n\tthis.setAggregation(\"layout\", this._oFilterBarLayout, true);\n};\nFilterBar.prototype.exit = function() {\n\t(MdcFilterBar.prototype as any).exit.apply(this, []);\n\t// Sometimes upon external navigation this._SegmentedButton is already destroyed\n\t// so check if it exists and then only remove stuff\n\tif (this._oSegmentedButton) {\n\t\tthis._oSegmentedButton.detachEvent(\"select\", this._toggleLayout);\n\t\tdelete this._oSegmentedButton;\n\t}\n};\n\nexport default FilterBar;\n"]}

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

@@ -0,0 +1,143 @@
+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
+			}
+		}
+	},
+	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();
+	}
+
+	// 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);
+	}
+
+	// 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;
+
+	// 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);
+	});
+
+	// 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();
+};
+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();
+			}
+		});
+		aSecondItem.getContent().forEach(function(oInnerControl: any) {
+			if (oInnerControl.isA("sap.ui.mdc.FilterField")) {
+				sSecondItemVFId = oInnerControl.getId();
+			}
+		});
+		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();
+
+	// 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();
+			}
+			oInnerLayout.removeEventDelegate(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;
+	}
+};
+
+export default FilterBar;