@openui5/sap.ui.unified 1.150.0 → 1.152.0

package/THIRDPARTY.txt

@@ -6,31 +6,31 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.f:
 
-Component: UI5 Web Components, version: 2.23.2
+Component: UI5 Web Components, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Fiori, version: 2.23.2
+Component: UI5 Web Components Fiori, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Icons, version: 2.23.2
+Component: UI5 Web Components Icons, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Icons Business Suite, version: 2.23.1
+Component: UI5 Web Components Icons Business Suite, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Icons TNT, version: 2.23.1
+Component: UI5 Web Components Icons TNT, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -267,7 +267,7 @@ License: MIT
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/punycode.js
 
-Component: handlebars, version: 4.7.7
+Component: handlebars, version: 4.7.9
 Copyright: 2011-2019 by Yehuda Katz
 License: MIT
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.150.0",
+  "version": "1.152.0",
   "description": "OpenUI5 UI Library sap.ui.unified",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/UI5/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.150.0"
+    "@openui5/sap.ui.core": "1.152.0"
   }
 }

package/src/sap/ui/unified/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.150.0</version>
+  <version>1.152.0</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

package/src/sap/ui/unified/Calendar.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public
@@ -201,6 +201,15 @@ sap.ui.define([
 			 */
 			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : true},
 
+			/**
+			 * Determines whether the header of the week numbers column is displayed.
+			 * The column header text is translated according to the active language.
+			 *
+			 * <b>Note:</b> Takes effect only when <code>showWeekNumbers</code> is set to <code>true</code>.
+			 * @since 1.151
+			 */
+			showWeekNumbersHeader : {type : "boolean", group : "Appearance", defaultValue : false},
+
 			/**
 			 * Determines whether there is a shortcut navigation to Today. When used in Month, Year or
 			 * Year-range picker view, the calendar navigates to Day picker view.
@@ -216,6 +225,9 @@ sap.ui.define([
 			 */
 			_currentPicker : {type : "string", group : "Appearance", visibility: "hidden"},
 
+			/** Whether the high-zoom (≤320px) picker is active. @private */
+			_highZoomActive : {type : "boolean", defaultValue : false, visibility: "hidden"},
+
 			/**
 			 * If set, the calendar week numbering is used for display.
 			 * If not set, the calendar week numbering of the global configuration is used.
@@ -427,6 +439,11 @@ sap.ui.define([
 		//when used in a DatePicker, in mobile there is no cancel button
 		this._bSkipCancelButtonRendering = false;
 		this._bActionTriggeredFromSecondHeader = false;
+
+		// High-zoom (≤320px) support — only for standalone Calendar (not embedded in DatePicker)
+		this._oHZPicker = null;
+		this._bHZListenersRegistered = false;
+		this._fnHZResizeHandler = this._onHZResize.bind(this);
 	};
 
 	Calendar.prototype.exit = function(){
@@ -451,6 +468,19 @@ sap.ui.define([
 		}
 
 		this._oSelectedMonth = null;
+
+		// Cleanup high-zoom
+		if (this._bHZListenersRegistered) {
+			if (window.visualViewport) {
+				window.visualViewport.removeEventListener("resize", this._fnHZResizeHandler);
+			}
+			window.removeEventListener("resize", this._fnHZResizeHandler);
+		}
+		this._fnHZResizeHandler = null;
+		if (this._oHZPicker) {
+			this._oHZPicker.destroy();
+			this._oHZPicker = null;
+		}
 	};
 
 	Calendar.prototype._initializeHeader = function() {
@@ -620,6 +650,7 @@ sap.ui.define([
 			}
 			aMonths[i].displayDate(oDisplayDate.toLocalJSDate());
 			aMonths[i].setShowWeekNumbers(this.getShowWeekNumbers());
+			aMonths[i].setShowWeekNumbersHeader(this.getShowWeekNumbersHeader());
 		}
 
 		if (this._getMonthPicker()) {
@@ -639,6 +670,25 @@ sap.ui.define([
 
 	Calendar.prototype.onAfterRendering = function(oEvent){
 
+		// Check zoom state after first render (resize handler skips before DOM exists)
+		if (!this._oSpecialDatesControlOrigin) {
+			// Register listeners lazily so embedded Calendars (inside DatePicker) never get them
+			if (!this._bHZListenersRegistered) {
+				if (window.visualViewport) {
+					window.visualViewport.addEventListener("resize", this._fnHZResizeHandler);
+				}
+				window.addEventListener("resize", this._fnHZResizeHandler);
+				this._bHZListenersRegistered = true;
+			}
+			const bHighZoom = this._isHighZoom();
+			if (bHighZoom !== this.getProperty("_highZoomActive")) {
+				this.setProperty("_highZoomActive", bHighZoom);
+				if (bHighZoom) {
+					this._initHZPicker();
+				}
+			}
+		}
+
 		// check if day names and month names are too big -> use smaller ones
 		if (!this._getSucessorsPickerPopup()) {
 			_checkNamesLength.call(this);
@@ -1188,6 +1238,18 @@ sap.ui.define([
 		return this.setProperty("intervalSelection", bEnabled);
 	};
 
+	// Override to invalidate the high-zoom picker when interval selection changes
+	// so the correct picker type (DatePicker vs DateRangeSelection) is used on next zoom-in.
+	const _origSetIntervalSelection = Calendar.prototype.setIntervalSelection;
+	Calendar.prototype.setIntervalSelection = function(bEnabled) {
+		if (this._oHZPicker) {
+			this.removeDependent(this._oHZPicker);
+			this._oHZPicker.destroy();
+			this._oHZPicker = null;
+		}
+		return _origSetIntervalSelection.call(this, bEnabled);
+	};
+
 	/**
 	 * Setter for the property <code>singleSelection</code>. If set to <code>true</code> only a single date or single interval, when <code>intervalSelection</code> is set to <code>true</code>, can be selected.
 	 *
@@ -3144,6 +3206,133 @@ sap.ui.define([
 		this._updateHeadersYearPrimaryText(this._getYearString());
 	}
 
+	// ============================================================
+	// High-zoom (≤320px) support for standalone Calendar
+	// At ≤320px a DatePicker (or DateRangeSelection for intervalSelection)
+	// is shown instead of the calendar grid. DatePicker automatically
+	// activates its own DateHighZoomInputs layout at that viewport width.
+	// ============================================================
+
+	/**
+	 * Returns true when the viewport is ≤ 320 px.
+	 * @returns {boolean}
+	 * @private
+	 */
+	Calendar.prototype._isHighZoom = function() {
+		const iWidth = (window.visualViewport && window.visualViewport.width) || window.innerWidth;
+		return iWidth <= 320;
+	};
+
+	/**
+	 * Called on viewport resize. Activates or deactivates high-zoom mode
+	 * only for standalone Calendar (not when embedded in DatePicker).
+	 * @private
+	 */
+	Calendar.prototype._onHZResize = function() {
+		// Skip when Calendar is embedded in a picker — the picker manages zoom
+		if (this._oSpecialDatesControlOrigin) { return; }
+		// Skip until first render — visualViewport fires during initial layout
+		if (!this.getDomRef()) { return; }
+
+		const bHighZoom = this._isHighZoom();
+		if (bHighZoom === this.getProperty("_highZoomActive")) { return; }
+
+		if (bHighZoom) {
+			this.setProperty("_highZoomActive", true);
+			this._initHZPicker();
+		} else {
+			// Destroy the picker so Calendar re-renders cleanly as its own DOM root.
+			if (this._oHZPicker) {
+				this.removeDependent(this._oHZPicker);
+				this._oHZPicker.destroy();
+				this._oHZPicker = null;
+			}
+			this.setProperty("_highZoomActive", false);
+		}
+	};
+
+	/**
+	 * Lazily loads DatePicker (or DateRangeSelection) via runtime require
+	 * and shows it in place of the calendar grid at high zoom.
+	 * sap.ui.unified → sap.m is not a build-time dependency so we use
+	 * sap.ui.require (same pattern as FileUploader.js in this library).
+	 * @private
+	 */
+	Calendar.prototype._initHZPicker = function() {
+		const sModule = this.getIntervalSelection()
+			? "sap/m/DateRangeSelection"
+			: "sap/m/DatePicker";
+
+		const FnClass = sap.ui.require(sModule);
+		if (FnClass) {
+			this._createHZPicker(FnClass);
+		} else {
+			sap.ui.require([sModule], function(Cls) {
+				if (!this.bIsDestroyed) {
+					this._createHZPicker(Cls);
+				}
+			}.bind(this));
+		}
+	};
+
+	/**
+	 * Creates and configures the high-zoom picker (DatePicker or DateRangeSelection).
+	 * @param {function} FnClass - DatePicker or DateRangeSelection constructor
+	 * @private
+	 */
+		Calendar.prototype._createHZPicker = function(FnClass) {
+		if (!this._oHZPicker) {
+			const bRange = this.getIntervalSelection();
+			const sSecondary = this.getSecondaryCalendarType();
+			const sPrimary   = this.getProperty("primaryCalendarType");
+
+			const oPicker = new FnClass(this.getId() + "-hzPicker", {
+				displayFormat: "dd.MM.yyyy",
+				displayFormatType: sPrimary || undefined,
+				minDate: this._oMinDate.toLocalJSDate(),
+				maxDate: this._oMaxDate.toLocalJSDate(),
+				change: function(oEvent) {
+					// Propagate the selected date(s) back to the Calendar aggregation
+					const oDateValue = oPicker.getDateValue();
+					if (!oDateValue) { return; }
+
+					// DateRange is guaranteed loaded (transitive dep via Month/MonthPicker/YearPicker)
+					const DateRange = sap.ui.require("sap/ui/unified/DateRange");
+
+					if (DateRange) {
+						const oRange = new DateRange({ startDate: oDateValue });
+						if (bRange && oPicker.getSecondDateValue()) {
+							oRange.setEndDate(oPicker.getSecondDateValue());
+						}
+						this.removeAllSelectedDates();
+						this.addSelectedDate(oRange);
+						this.fireSelect();
+					}
+				}.bind(this)
+			});
+
+			// Pre-fill from current Calendar selection
+			const aSelected = this.getSelectedDates();
+			if (aSelected.length > 0 && aSelected[0].getStartDate()) {
+				oPicker.setDateValue(aSelected[0].getStartDate());
+				if (bRange && aSelected[0].getEndDate()) {
+					oPicker.setSecondDateValue(aSelected[0].getEndDate());
+				}
+			}
+
+			this._oHZPicker = oPicker;
+			// Use the setter so _bSecondaryCalendarTypeSet is flagged correctly —
+			// passing secondaryCalendarType in the constructor bypasses the setter.
+			if (sSecondary) {
+				oPicker.setSecondaryCalendarType(sSecondary);
+			}
+			this.addDependent(oPicker);
+		}
+
+		this._oHZPicker.setVisible(true);
+		this.invalidate();
+	};
+
 	return Calendar;
 
 });

package/src/sap/ui/unified/CalendarAppointment.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarDateInterval.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @class
 	 * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegend.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegendItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarMonthInterval.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * <b>Note:</b> UI5Date or JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
 	 * But the date part of the Date object is not used. If a Date object is returned the date will be set to the 1st of the corresponding month.
 	 * @extends sap.ui.core.Control
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarOneMonthInterval.js

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * Navigation via year picker switches to the corresponding year and the same month as before the navigation.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.150.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/unified/CalendarRenderer.js

@@ -67,10 +67,16 @@ sap.ui.define(["sap/ui/core/Lib"],
 		}
 
 		if (this.addAttributes) {
-			// additional stuff by inherited controls
 			this.addAttributes(oRm, oCal);
 		}
-		oRm.openEnd(); // div element
+		oRm.openEnd();
+
+		// In high-zoom standalone mode render only the DatePicker/DateRangeSelection proxy
+		if (oCal.getProperty("_highZoomActive") && oCal._oHZPicker) {
+			oRm.renderControl(oCal._oHZPicker);
+			oRm.close("div");
+			return;
+		}
 
 		var oHeader = oCal.getAggregation("header");
 		oRm.renderControl(oHeader);

package/src/sap/ui/unified/CalendarRow.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @class
 	 * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
 	 * @extends sap.ui.core.Control
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarTimeInterval.js

@@ -78,7 +78,7 @@ sap.ui.define([
 	 * @class
 	 * Calendar with granularity of time items displayed in one line.
 	 * @extends sap.ui.core.Control
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarWeekInterval.js

@@ -39,7 +39,7 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		 * its start date to the first date of the same week as the date the user chose.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.150.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/unified/ColorPicker.js

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public
@@ -1212,10 +1212,12 @@ sap.ui.define([
 	};
 
 	ColorPicker.prototype.exit = function() {
+		this._stopZoomWatch();
 		this._cleanup();
 	};
 
 	ColorPicker.prototype.onBeforeRendering = function() {
+		this._stopZoomWatch();
 		this._cleanup();
 		// Create the layout controls
 		this._createLayout();
@@ -2438,6 +2440,9 @@ sap.ui.define([
 			// toggle fields - HEX field will be visible initially on mobile
 			this._toggleFields();
 		}
+
+		this._bLastHighZoom = this._isHighZoom();
+		this._startZoomWatch();
 	};
 
 	/**
@@ -2652,6 +2657,46 @@ sap.ui.define([
 		}
 	};
 
+	ColorPicker.prototype._getViewportWidth = function() {
+		return (window.visualViewport && window.visualViewport.width) || window.innerWidth;
+	};
+
+	ColorPicker.prototype._isHighZoom = function() {
+		return this._getViewportWidth() <= 320;
+	};
+
+	ColorPicker.prototype._startZoomWatch = function() {
+		this._fnWindowResizeListener = function() {
+			if (!this.getDomRef()) { return; }
+			var bHighZoom = this._isHighZoom();
+			if (bHighZoom !== this._bLastHighZoom) {
+				this._bLastHighZoom = bHighZoom;
+				this.invalidate();
+			}
+		}.bind(this);
+		if (window.visualViewport) {
+			window.visualViewport.addEventListener("resize", this._fnWindowResizeListener);
+		}
+		window.addEventListener("resize", this._fnWindowResizeListener);
+	};
+
+	ColorPicker.prototype._stopZoomWatch = function() {
+		if (this._fnWindowResizeListener) {
+			window.removeEventListener("resize", this._fnWindowResizeListener);
+			if (window.visualViewport) {
+				window.visualViewport.removeEventListener("resize", this._fnWindowResizeListener);
+			}
+			this._fnWindowResizeListener = null;
+		}
+	};
+
+	ColorPicker.prototype._getEffectiveDisplayMode = function() {
+		if (this._isHighZoom()) {
+			return ColorPickerDisplayMode.Simplified;
+		}
+		return this.getDisplayMode();
+	};
+
 	return ColorPicker;
 
 });

package/src/sap/ui/unified/ColorPickerPopover.js

@@ -49,7 +49,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.ui.unified.ColorPicker} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.150.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/unified/ColorPickerRenderer.js

@@ -28,8 +28,9 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 	 * @param {sap.ui.unified.ColorPicker} oControl an object representation of the control that should be rendered
 	 */
 	ColorPickerRenderer.render = function(oRm, oControl){
-		var sDisplayMode = oControl.getDisplayMode(),
-			bResponsive = oControl.bResponsive;
+		var sDisplayMode = oControl._getEffectiveDisplayMode(),
+			bResponsive = oControl.bResponsive,
+			bHighZoom = oControl._isHighZoom();
 
 		oRm.openStart("div", oControl);
 
@@ -49,6 +50,9 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 		if (Device.system.phone) {
 			oRm.class("sapUiCPPhone");
 		}
+		if (bHighZoom) {
+			oRm.class("sapUiCPHighZoom");
+		}
 		oRm.openEnd();
 
 		if (!bResponsive) {
@@ -85,8 +89,9 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 	};
 
 	ColorPickerRenderer.renderDefaultColorPicker = function(oRm, oControl) {
+		var bHighZoom = oControl._isHighZoom();
 		oRm.renderControl(oControl.getAggregation("_oCPBox"));
-		if (Device.system.phone) { //mobile
+		if (Device.system.phone && !bHighZoom) { //mobile
 			oRm.openStart("div");
 			oRm.class("sapUiCPPhoneContent");
 			oRm.openEnd();
@@ -97,6 +102,9 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 			oRm.close("div");
 			this.renderMobileSwatches(oRm, oControl);
 			oRm.close("div");
+		} else if (bHighZoom) { //mobile 200% zoom
+			this.renderSliders(oRm, oControl);
+			this.renderDesktopSwatchesAndHexFields(oRm, oControl);
 		} else { //desktop or tablet
 			this.renderSliders(oRm, oControl);
 			this.renderDesktopSwatchesAndHexFields(oRm, oControl);
@@ -105,7 +113,7 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 		oRm.openStart("div");
 		oRm.class("sapUiCPDefaultWrapper");
 		oRm.openEnd();
-		if (Device.system.phone) {
+		if (Device.system.phone && !bHighZoom) {
 			oRm.renderControl(oControl.getAggregation("_oHexField"));
 			oRm.openStart("div");
 			oRm.class("sapUiCPHexText");
@@ -210,8 +218,9 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 	};
 
 	ColorPickerRenderer.renderSimplifiedColorPicker = function(oRm, oControl) {
+		var bHighZoom = oControl._isHighZoom();
 		oRm.renderControl(oControl.getAggregation("_oCPBox"));
-		if (Device.system.phone) {
+		if (Device.system.phone && !bHighZoom) {
 			oRm.openStart("div");
 			oRm.class("sapUiCPPhoneContent");
 			oRm.openEnd();
@@ -232,6 +241,9 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 			oRm.close("div");
 			oRm.close("div");
 			oRm.close("div");
+		} else if (bHighZoom) { //mobile 200% zoom
+			oRm.renderControl(oControl.getAggregation("_oSlider"));
+			this.renderDesktopSwatchesAndHexFields(oRm, oControl);
 		} else {
 			oRm.renderControl(oControl.getAggregation("_oSlider"));
 			this.renderDesktopSwatchesAndHexFields(oRm, oControl);
@@ -245,6 +257,14 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 	 * @param {sap.ui.unified.ColorPicker} oControl an object representation of the control that should be rendered
 	 */
 	ColorPickerRenderer.renderDesktopSwatchesAndHexFields = function(oRm, oControl) {
+		var bHighZoom = oControl._isHighZoom();
+
+		if (bHighZoom) {
+			oRm.openStart("div");
+			oRm.class("sapUiCPHexRow");
+			oRm.openEnd();
+		}
+
 		oRm.openStart("div");
 		oRm.class("sapUiCPComparisonWrapper");
 		oRm.openEnd();
@@ -259,17 +279,31 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 		oRm.openEnd();
 		oRm.close("div");
 		oRm.close("div");
-		oRm.openStart("div");
-		oRm.class("sapUiCPHexWrapper");
-		oRm.openEnd();
-		oRm.openStart("span");
-		oRm.class("sapUiCPHexText");
-		oRm.openEnd();
-		oRm.text("Hex");
-		oRm.close("span");
-		oRm.close("div");
-		oRm.renderControl(oControl.getAggregation("_oHexField"));
 
+		if (bHighZoom) {
+			oRm.openStart("div");
+			oRm.class("sapUiCPHexWrapper");
+			oRm.openEnd();
+			oRm.renderControl(oControl.getAggregation("_oHexField"));
+			oRm.openStart("span");
+			oRm.class("sapUiCPHexText");
+			oRm.openEnd();
+			oRm.text("Hex");
+			oRm.close("span");
+			oRm.close("div");
+			oRm.close("div"); // close sapUiCPHexRow
+		} else {
+			oRm.openStart("div");
+			oRm.class("sapUiCPHexWrapper");
+			oRm.openEnd();
+			oRm.openStart("span");
+			oRm.class("sapUiCPHexText");
+			oRm.openEnd();
+			oRm.text("Hex");
+			oRm.close("span");
+			oRm.close("div");
+			oRm.renderControl(oControl.getAggregation("_oHexField"));
+		}
 	};
 
 	/**

package/src/sap/ui/unified/ContentSwitcher.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/Currency.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.150.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/unified/CurrencyRenderer.js

@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/library", "sap/ui/core/Lib"],
 	/**
 	 * Currency renderer.
 	 *
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @namespace
 	 */
 	var CurrencyRenderer = {