@openui5/sap.f 1.120.6 → 1.121.0

package/src/sap/f/FlexibleColumnLayoutRenderer.js

@@ -4,11 +4,15 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/ui/Device", "sap/ui/core/Core", "sap/m/library"],
-	function (Device, Core, mobileLibrary) {
+sap.ui.define([
+	"sap/ui/Device",
+	"sap/m/library",
+	"sap/ui/core/Lib",
+	"sap/ui/core/IconPool" // side effect: required when calling RenderManager#icon
+], function (Device, mobileLibrary, Library) {
 		"use strict";
 
-		var oResourceBundle = Core.getLibraryResourceBundle("sap.f");
+		var oResourceBundle = Library.getResourceBundleFor("sap.f");
 
 		var FCLRenderer = {
 			apiVersion: 2

package/src/sap/f/FlexibleColumnLayoutSemanticHelper.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 * For more information, see {@link sap.f.FlexibleColumnLayoutSemanticHelper#getCurrentUIState} and {@link sap.f.FlexibleColumnLayoutSemanticHelper#getNextUIState}
 	 *
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @param {sap.f.FlexibleColumnLayout} oFlexibleColumnLayout
 	 * The <code>sap.f.FlexibleColumnLayout</code> object whose state will be manipulated.
 	 *

package/src/sap/f/GridContainer.js

@@ -11,18 +11,21 @@ sap.ui.define([
 	"./delegate/GridContainerItemNavigation",
 	"./library",
 	"./dnd/GridKeyboardDragAndDrop",
+	"sap/base/i18n/Localization",
 	"sap/base/strings/capitalize",
+	"sap/ui/core/Lib",
+	"sap/ui/core/RenderManager",
 	'sap/ui/core/delegate/ItemNavigation',
 	"sap/ui/base/ManagedObjectObserver",
 	"sap/ui/core/Control",
-	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/core/ResizeHandler",
 	"sap/ui/core/InvisibleMessage",
+	"sap/ui/core/Theming",
 	"sap/ui/Device",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/thirdparty/jquery"
-], function (
+], function(
 	GridContainerRenderer,
 	GridContainerSettings,
 	GridContainerUtils,
@@ -30,14 +33,17 @@ sap.ui.define([
 	GridContainerItemNavigation,
 	library,
 	GridKeyboardDragAndDrop,
+	Localization,
 	capitalize,
+	Library,
+	RenderManager,
 	ItemNavigation,
 	ManagedObjectObserver,
 	Control,
-	Core,
 	Element,
 	ResizeHandler,
 	InvisibleMessage,
+	Theming,
 	Device,
 	KeyCodes,
 	jQuery
@@ -171,7 +177,7 @@ sap.ui.define([
 	 * @see {@link sap.f.dnd.GridDropInfo}
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @extends sap.ui.core.Control
 	 *
@@ -247,38 +253,38 @@ sap.ui.define([
 				 *
 				 * <b>Note:</b> It is not possible to reuse the same instance of <code>GridContainerSettings</code> for several layouts. New instance has to be created for each of them. This is caused by the fact that one object can exist in only a single aggregation.
 				 */
-				layout: { type: "sap.f.GridContainerSettings", multiple: false },
+				layout: { type: "sap.f.GridContainerSettings", defaultClass: GridContainerSettings, multiple: false },
 
 				/**
 				 * The sap.f.GridContainerSettings applied for size "XS". Range: up to 374px.
 				 * @experimental As of version 1.71 Disclaimer: this property is in a beta state - incompatible API changes may be done before its official public release. Use at your own discretion.
 				 */
-				layoutXS: { type: "sap.f.GridContainerSettings", multiple: false },
+				layoutXS: { type: "sap.f.GridContainerSettings", defaultClass: GridContainerSettings, multiple: false },
 
 				/**
 				 * The sap.f.GridContainerSettings applied for size "S". Range: 375px - 599px.
 				 */
-				layoutS: { type: "sap.f.GridContainerSettings", multiple: false },
+				layoutS: { type: "sap.f.GridContainerSettings", defaultClass: GridContainerSettings, multiple: false },
 
 				/**
 				 * The sap.f.GridContainerSettings applied for size "M". Range: 600px - 1023px.
 				 */
-				layoutM: { type: "sap.f.GridContainerSettings", multiple: false },
+				layoutM: { type: "sap.f.GridContainerSettings", defaultClass: GridContainerSettings, multiple: false },
 
 				/**
 				 * The sap.f.GridContainerSettings applied for size "L". Range: 1023px - 1439px.
 				 */
-				layoutL: { type: "sap.f.GridContainerSettings", multiple: false },
+				layoutL: { type: "sap.f.GridContainerSettings", defaultClass: GridContainerSettings, multiple: false },
 
 				/**
 				 * The sap.f.GridContainerSettings applied for size "XL". Range: from 1440px.
 				 */
-				layoutXL: { type: "sap.f.GridContainerSettings", multiple: false },
+				layoutXL: { type: "sap.f.GridContainerSettings", defaultClass: GridContainerSettings, multiple: false },
 
 				/**
 				 * Default sap.f.GridContainerSettings
 				 */
-				_defaultLayout: { type: "sap.f.GridContainerSettings", multiple: false, visibility: "hidden" }
+				_defaultLayout: { type: "sap.f.GridContainerSettings", defaultClass: GridContainerSettings, multiple: false, visibility: "hidden" }
 			},
 			associations : {
 
@@ -521,7 +527,7 @@ sap.ui.define([
 			that.addDelegate(this._oItemNavigation);
 		}
 
-		that.$().children().map(function (iIndex, oWrapperItem) {
+		that.$("listUl").children().map(function (iIndex, oWrapperItem) {
 			if (oWrapperItem.getAttribute("class").indexOf("sapFGridContainerItemWrapper") > -1) {
 				aWrapperItemsDomRef.push(oWrapperItem);
 			}
@@ -624,7 +630,7 @@ sap.ui.define([
 	 * @private
 	 */
 	GridContainer.prototype.init = function () {
-		this._oRb  = Core.getLibraryResourceBundle("sap.f");
+		this._oRb  = Library.getResourceBundleFor("sap.f");
 		this.setAggregation("_defaultLayout", new GridContainerSettings());
 
 		this._initRangeSet();
@@ -645,6 +651,10 @@ sap.ui.define([
 		Device.resize.attachHandler(this._resizeDeviceHandler);
 
 		this._resizeItemHandler = this._resizeItem.bind(this);
+
+		this._bThemeApplied = false;
+		this._handleThemeAppliedBound = this._handleThemeApplied.bind(this);
+		Theming.attachApplied(this._handleThemeAppliedBound);
 	};
 
 	/**
@@ -666,15 +676,17 @@ sap.ui.define([
 			return this;
 		}
 
-		var oRm = Core.createRenderManager(),
+		iIndex = Math.max(0, Math.min(iIndex, this.getItems().length - 1));
+
+		var oRm = new RenderManager().getInterface(),
 			oWrapper = this._createItemWrapper(oItem),
-			oNextItem = this._getItemAt(iIndex + 1),
-			oGridRef = this.getDomRef();
+			oGridRef = this.getDomRef("listUl"),
+			oNextItem = oGridRef.children[iIndex];
 
 		if (oNextItem) {
-			oGridRef.insertBefore(oWrapper, GridContainerUtils.getItemWrapper(oNextItem));
+			oGridRef.insertBefore(oWrapper, oNextItem);
 		} else {
-			oGridRef.insertBefore(oWrapper, oGridRef.lastChild);
+			oGridRef.appendChild(oWrapper);
 		}
 
 		oRm.render(oItem, oWrapper);
@@ -686,13 +698,13 @@ sap.ui.define([
 	/**
 	 * Removes an item from the aggregation named <code>items</code>.
 	 *
-	 * @param {int | string | sap.ui.core.Control} vItem The item to remove or its index or ID.
+	 * @param {int | sap.ui.core.ID | sap.ui.core.Control} vItem The item to remove or its index or ID.
 	 * @returns {sap.ui.core.Control|null} The removed item or <code>null</code>.
 	 * @public
 	 */
 	GridContainer.prototype.removeItem = function (vItem) {
 		var oRemovedItem = this.removeAggregation("items", vItem, true),
-			oGridRef = this.getDomRef(),
+			oGridRef = this.getDomRef("listUl"),
 			oItemRef = oRemovedItem.getDomRef();
 
 		if (!oGridRef || !oItemRef) {
@@ -770,6 +782,8 @@ sap.ui.define([
 			clearTimeout(this._checkColumnsTimeout);
 			this._checkColumnsTimeout = null;
 		}
+
+		Theming.detachApplied(this._handleThemeAppliedBound);
 	};
 
 	/**
@@ -856,7 +870,7 @@ sap.ui.define([
 		}
 
 		if (bSettingsAreChanged) {
-			this.$().css(this._getActiveGridStyles());
+			this.$("listUl").css(this._getActiveGridStyles());
 			this.getItems().forEach(this._applyItemAutoRows.bind(this));
 		}
 
@@ -923,7 +937,7 @@ sap.ui.define([
 			return;
 		}
 
-		iMaxColumns = oSettings.getComputedColumnsCount(this.$().innerWidth());
+		iMaxColumns = oSettings.getComputedColumnsCount(this.$("listUl").innerWidth());
 
 		if (!iMaxColumns) {
 			// if the max columns can not be calculated correctly, don't do anything
@@ -936,26 +950,6 @@ sap.ui.define([
 		});
 	};
 
-	/**
-	 * Gets the item at specified index.
-	 * @param {int} iIndex Which item to get
-	 * @return {sap.ui.core.Control|null} The item at the specified index. <code>null</code> if index is out of range.
-	 */
-	GridContainer.prototype._getItemAt = function (iIndex) {
-		var aItems = this.getItems(),
-			oTarget;
-
-		if (iIndex < 0) {
-			iIndex = 0;
-		}
-
-		if (aItems.length && aItems[iIndex]) {
-			oTarget = aItems[iIndex];
-		}
-
-		return oTarget;
-	};
-
 	/**
 	 * Creates a wrapper div for the given item.
 	 * @param {sap.ui.core.Control} oItem The item
@@ -1062,7 +1056,7 @@ sap.ui.define([
 
 		switch (oEvent.keyCode) {
 			case KeyCodes.ARROW_RIGHT:
-				iInsertAt = Core.getConfiguration().getRTL() ? iItemIndex - 1 : iItemIndex + 1;
+				iInsertAt = Localization.getRTL() ? iItemIndex - 1 : iItemIndex + 1;
 
 				if (iInsertAt >= 0 && iInsertAt < iLength) {
 					oCfg = GridContainerUtils.createConfig(this, this.getItems()[iInsertAt]);
@@ -1071,7 +1065,7 @@ sap.ui.define([
 				}
 				break;
 			case KeyCodes.ARROW_LEFT:
-				iInsertAt = Core.getConfiguration().getRTL() ? iItemIndex + 1 : iItemIndex - 1;
+				iInsertAt = Localization.getRTL() ? iItemIndex + 1 : iItemIndex - 1;
 
 				if (iInsertAt >= 0 && iInsertAt < iLength) {
 					oCfg = GridContainerUtils.createConfig(this, this.getItems()[iInsertAt]);
@@ -1166,7 +1160,7 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	GridContainer.prototype.getNavigationMatrix = function () {
-		if (!Core.isThemeApplied()) {
+		if (!this._bThemeApplied) {
 			return null;
 		}
 
@@ -1177,12 +1171,17 @@ sap.ui.define([
 			return aAcc;
 		}, []);
 
-		return GridNavigationMatrix.create(this.getDomRef(), aItemsDomRefs);
+		return GridNavigationMatrix.create(this.getDomRef("listUl"), aItemsDomRefs);
 	};
 
 	GridContainer.prototype._isItemWrapper = function (oElement) {
 		return oElement.classList.contains("sapFGridContainerItemWrapper");
 	};
 
+	GridContainer.prototype._handleThemeApplied = function () {
+		this._bThemeApplied = true;
+		Theming.detachApplied(this._handleThemeAppliedBound);
+	};
+
 	return GridContainer;
 });

package/src/sap/f/GridContainerItemLayoutData.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/LayoutData'],
 		 * @see {@link topic:32d4b9c2b981425dbc374d3e9d5d0c2e Grid Controls}
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @extends sap.ui.core.LayoutData
 		 *

package/src/sap/f/GridContainerRenderer.js

@@ -27,7 +27,19 @@ sap.ui.define([], function () {
 			aItems = oControl.getItems(),
 			sTooltip = oControl.getTooltip_AsString();
 
-		oRM.openStart("div", oControl).class("sapFGridContainer");
+		oRM.openStart("div", oControl)
+			.class("sapFGridContainer");
+
+		if (oControl.getWidth()) {
+			oRM.style("width", oControl.getWidth());
+		}
+
+		oRM.openEnd();
+
+		this.renderDummyArea(oRM, sId, "before", aItems.length > 0 ? 0 : -1);
+
+		oRM.openStart("div", `${sId}-listUl`)
+			.class("sapFGridContainerListUl");
 
 		this.setGridStyles(oRM, oControl._getActiveGridStyles());
 
@@ -36,6 +48,10 @@ sap.ui.define([], function () {
 			roledescription: oControl._oRb.getText("GRIDCONTAINER_ROLEDESCRIPTION")
 		});
 
+		if (oControl.getMinHeight()) {
+			oRM.style("min-height", oControl.getMinHeight());
+		}
+
 		if (oControl.getSnapToRow()) {
 			oRM.class("sapFGridContainerSnapToRow");
 		}
@@ -44,26 +60,18 @@ sap.ui.define([], function () {
 			oRM.class("sapFGridContainerDenseFill");
 		}
 
-		if (oControl.getWidth()) {
-			oRM.style("width", oControl.getWidth());
-		}
-
-		if (oControl.getMinHeight()) {
-			oRM.style("min-height", oControl.getMinHeight());
-		}
-
 		if (sTooltip) {
 			oRM.attr("title", sTooltip);
 		}
 
 		oRM.openEnd();
 
-		this.renderDummyArea(oRM, sId, "before", aItems.length > 0 ? 0 : -1);
-
 		aItems.forEach(function (oItem, iIndex) {
 			this.renderItem(oRM, oItem, oControl, iIndex);
 		}.bind(this));
 
+		oRM.close("div");
+
 		this.renderDummyArea(oRM, sId, "after", 0);
 
 		oRM.close("div");

package/src/sap/f/GridContainerSettings.js

@@ -58,14 +58,14 @@ sap.ui.define([
 	 * Can be used to define the sizes of columns and rows for different screen sizes, by using the <code>layout</code> aggregations of <code>sap.f.GridContainer</code>.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @see {@link topic:32d4b9c2b981425dbc374d3e9d5d0c2e Grid Controls}
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @experimental Since 1.65 This class is experimental. The API may change.
 	 * @since 1.65

package/src/sap/f/GridList.js

@@ -10,7 +10,7 @@ sap.ui.define([
 	"./library",
 	"sap/m/ListBase",
 	"sap/ui/base/ManagedObjectObserver",
-	"sap/ui/core/Core",
+	"sap/ui/core/Theming",
 	"sap/ui/Device",
 	"sap/ui/layout/cssgrid/GridLayoutDelegate",
 	"sap/ui/layout/cssgrid/GridLayoutBase"
@@ -22,7 +22,7 @@ sap.ui.define([
 	library,
 	ListBase,
 	ManagedObjectObserver,
-	Core,
+	Theming,
 	Device,
 	GridLayoutDelegate,
 	GridLayoutBase
@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @extends sap.m.ListBase
 	 * @implements sap.ui.layout.cssgrid.IGridConfigurable
@@ -165,6 +165,10 @@ sap.ui.define([
 
 		this._oGridObserver = new ManagedObjectObserver(GridList.prototype._onGridChange.bind(this));
 		this._oGridObserver.observe(this, { aggregations: ["items"] });
+
+		this._bThemeApplied = false;
+		this._handleThemeAppliedBound = this._handleThemeApplied.bind(this);
+		Theming.attachApplied(this._handleThemeAppliedBound);
 	};
 
 	GridList.prototype.exit = function () {
@@ -175,6 +179,8 @@ sap.ui.define([
 			this._oGridObserver = null;
 		}
 
+		Theming.detachApplied(this._handleThemeAppliedBound);
+
 		ListBase.prototype.exit.apply(this, arguments);
 	};
 
@@ -247,7 +253,7 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	GridList.prototype.getNavigationMatrix = function () {
-		if (!Core.isThemeApplied()) {
+		if (!this._bThemeApplied) {
 			return null;
 		}
 
@@ -375,5 +381,10 @@ sap.ui.define([
 		GridLayoutBase.setItemStyles(oEvent.srcControl);
 	};
 
+	GridList.prototype._handleThemeApplied = function () {
+		this._bThemeApplied = true;
+		Theming.detachApplied(this._handleThemeAppliedBound);
+	};
+
 	return GridList;
 });

package/src/sap/f/GridListItem.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @since 1.70
 	 * @constructor

package/src/sap/f/GridNavigationMatrix.js

@@ -9,9 +9,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Configuration"
+	"sap/base/i18n/Localization"
 ], function (
-	Configuration
+	Localization
 ) {
 	"use strict";
 
@@ -102,7 +102,7 @@ sap.ui.define([
 				fLeftOffsetInGrid,
 				fRightOffsetInGrid;
 
-			if (Configuration.getRTL()) {
+			if (Localization.getRTL()) {
 				iEndCol = -1;
 				iStartCol = oLayoutSizes.columns.length - 1;
 				fRightOffsetInGrid = oGridRect.right - oLayoutSizes.paddingRight - oItemRect.right;

package/src/sap/f/IllustratedMessage.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.m.IllustratedMessage
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/Illustration.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.Illustration
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/PlanningCalendarInCardLegend.js

@@ -5,8 +5,8 @@
  */
 
 // Provides control sap.f.PlanningCalendarInCardLegend.
-sap.ui.define(['sap/m/PlanningCalendarLegend', 'sap/ui/unified/CalendarLegendItem', './PlanningCalendarInCardLegendRenderer', 'sap/ui/core/Core'],
-	function(PlanningCalendarLegend, CalendarLegendItem, PlanningCalendarInCardLegendRenderer, Core) {
+sap.ui.define(['sap/m/PlanningCalendarLegend', "sap/ui/core/Lib", 'sap/ui/unified/CalendarLegendItem', './PlanningCalendarInCardLegendRenderer'],
+	function(PlanningCalendarLegend, Library, CalendarLegendItem, PlanningCalendarInCardLegendRenderer) {
 		"use strict";
 
 
@@ -22,12 +22,11 @@ sap.ui.define(['sap/m/PlanningCalendarLegend', 'sap/ui/unified/CalendarLegendIte
 		 * @extends sap.m.PlanningCalendarLegend
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @private
 		 * @since 1.74
-		 * @experimental Since 1.74.
 		 * @alias sap.f.PlanningCalendarInCardLegend
 		 */
 		var PlanningCalendarInCardLegend = PlanningCalendarLegend.extend("sap.f.PlanningCalendarInCardLegend", /** @lends sap.f.PlanningCalendarInCardLegend.prototype */ {
@@ -60,7 +59,7 @@ sap.ui.define(['sap/m/PlanningCalendarLegend', 'sap/ui/unified/CalendarLegendIte
 		 */
 		PlanningCalendarInCardLegend.prototype._getMoreItemsText = function (iItemsLeft) {
 			if (!this._oItemsLink) {
-				var oRB = Core.getLibraryResourceBundle("sap.f");
+				var oRB = Library.getResourceBundleFor("sap.f");
 				this._oItemsLink = new CalendarLegendItem({
 					text: oRB.getText("CALENDAR_LEGEND_MORE") + " (" + iItemsLeft + ")"
 				});

package/src/sap/f/PlanningCalendarInCardLegendRenderer.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/PlanningCalendarLegendRenderer', 'sap/ui/core/Renderer'],
 		/**
 		 * Renders a header for the <code>items</code> list.
 		 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-		 * @param {sap.ui.unified.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
+		 * @param {sap.f.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
 		 * @override
 		 */
 		PlanningCalendarInCardLegendRenderer.renderItemsHeader = function(oRm, oLeg) {};
@@ -27,14 +27,14 @@ sap.ui.define(['sap/m/PlanningCalendarLegendRenderer', 'sap/ui/core/Renderer'],
 		/**
 		 * Renders a header for the <code>appointmentItems</code> list.
 		 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-		 * @param {sap.ui.unified.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
+		 * @param {sap.f.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
 		 */
 		PlanningCalendarInCardLegendRenderer.renderAppointmentsItemsHeader = function(oRm, oLeg) {};
 
 		/**
 		 * Renders additional content after the <code>items</code> list - a second list for the <code>appointmentItems</code> with a header.
 		 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-		 * @param {sap.ui.unified.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
+		 * @param {sap.f.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
 		 * @override
 		 */
 		PlanningCalendarInCardLegendRenderer.renderAdditionalContent = function(oRm, oLeg) {};
@@ -42,7 +42,7 @@ sap.ui.define(['sap/m/PlanningCalendarLegendRenderer', 'sap/ui/core/Renderer'],
 		/**
 		 * Renders additional content after the <code>items</code> list - a second list for the <code>appointmentItems</code> with a header.
 		 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-		 * @param {sap.ui.unified.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
+		 * @param {sap.f.PlanningCalendarInCardLegend} oLeg an object representation of the legend that should be rendered
 		 * @override
 		 */
 		PlanningCalendarInCardLegendRenderer.renderAdditionalItems = function(oRm, oLeg) {

package/src/sap/f/ProductSwitch.js

@@ -6,20 +6,20 @@
 
 // Provides control sap.f.ProductSwitch
 sap.ui.define([
-	"sap/ui/core/Core",
 	"sap/ui/core/Control",
 	"sap/f/GridContainer",
 	"sap/f/GridContainerSettings",
 	"sap/f/ProductSwitchItem",
-	"sap/f/ProductSwitchRenderer"
+	"sap/f/ProductSwitchRenderer",
+	"sap/ui/core/Element"
 ],
 	function (
-		Core,
 		Control,
 		GridContainer,
 		GridContainerSettings,
 		ProductSwitchItem,
-		ProductSwitchRenderer
+		ProductSwitchRenderer,
+		Element
 	) {
 		"use strict";
 		/**
@@ -34,7 +34,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -167,7 +167,7 @@ sap.ui.define([
 		/**
 		* Sets the <code>selectedItem</code> association.
 		*
-		* @param {string | sap.f.ProductSwitchItem | null} vItem New value for the <code>selectedItem</code> association.
+		* @param {sap.ui.core.ID | sap.f.ProductSwitchItem | null} vItem New value for the <code>selectedItem</code> association.
 		* If an ID of a <code>sap.f.ProductSwitchItem</code> instance is given, the item with this ID becomes the <code>selectedItem</code> association.
 		* Alternatively, a <code>sap.f.ProductSwitchItem</code> instance may be given or <code>null</code> to clear the selection.
 		*
@@ -177,7 +177,7 @@ sap.ui.define([
 
 		ProductSwitch.prototype.setSelectedItem = function (vItem) {
 			if (typeof vItem === "string") {
-				vItem = Core.byId(vItem);
+				vItem = Element.getElementById(vItem);
 			}
 
 			if (!(vItem instanceof ProductSwitchItem) && vItem !== null) {

package/src/sap/f/ProductSwitchItem.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/f/ProductSwitchRenderer.js

@@ -4,15 +4,15 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/ui/core/Core"],
-	function (Core) {
+sap.ui.define(["sap/ui/core/Lib"],
+	function (Library) {
 		"use strict";
 
 		return {
 			apiVersion: 2,
 
 			render: function (oRm, oControl) {
-				var oRb = Core.getLibraryResourceBundle("sap.f");
+				var oRb = Library.getResourceBundleFor("sap.f");
 
 				oRm.openStart("div", oControl);
 				oRm.attr("role", "menu");

package/src/sap/f/SearchManager.js

@@ -5,11 +5,11 @@
  */
 
 // Provides control sap.f.SearchManager.
-sap.ui.define(['sap/ui/core/Element', 'sap/ui/base/ManagedObjectObserver', './shellBar/Search'],
-	function (Element, ManagedObjectObserver, Search) {
+sap.ui.define(['sap/ui/core/Element', 'sap/ui/base/ManagedObjectObserver', './shellBar/Search', "sap/ui/core/Lib"],
+	function(Element, ManagedObjectObserver, Search, Library) {
 		"use strict";
 
-		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oResourceBundle = Library.getResourceBundleFor("sap.m");
 
 		/**
 		 * Constructor for a new <code>SearchManager</code>.
@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', 'sap/ui/base/ManagedObjectObserver', './sh
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public