@ui5/webcomponents 1.2.3 → 1.2.4

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.4](https://github.com/SAP/ui5-webcomponents/compare/v1.2.3...v1.2.4) (2022-03-30)
+
+
+### Bug Fixes
+
+* **ui5-card-header:** prevent events from action slot to trigger header's click event ([#4965](https://github.com/SAP/ui5-webcomponents/issues/4965)) ([f87d898](https://github.com/SAP/ui5-webcomponents/commit/f87d898)), closes [#4891](https://github.com/SAP/ui5-webcomponents/issues/4891)
+* **ui5-date-picker:** adjust initial value formatting ([#4967](https://github.com/SAP/ui5-webcomponents/issues/4967)) ([3648b01](https://github.com/SAP/ui5-webcomponents/commit/3648b01)), closes [#4958](https://github.com/SAP/ui5-webcomponents/issues/4958) [#4958](https://github.com/SAP/ui5-webcomponents/issues/4958)
+* **ui5-datetime-picker:** enable secondary calendar type ([#4970](https://github.com/SAP/ui5-webcomponents/issues/4970)) ([6bc84f7](https://github.com/SAP/ui5-webcomponents/commit/6bc84f7)), closes [#4959](https://github.com/SAP/ui5-webcomponents/issues/4959)
+* **ui5-popover:** prevent arrow placement over popover's rounded corners ([#4960](https://github.com/SAP/ui5-webcomponents/issues/4960)) ([66604c3](https://github.com/SAP/ui5-webcomponents/commit/66604c3)), closes [#4599](https://github.com/SAP/ui5-webcomponents/issues/4599) [#4797](https://github.com/SAP/ui5-webcomponents/issues/4797)
+
+
+
+
+
 ## [1.2.3](https://github.com/SAP/ui5-webcomponents/compare/v1.2.2...v1.2.3) (2022-03-23)
 
 

package/dist/Breadcrumbs.js

@@ -472,7 +472,7 @@ class Breadcrumbs extends UI5Element {
 	}
 
 	get _currentLocationLabel() {
-		return this.shadowRoot.querySelector(".ui5-breadcrumbs-current-location ui5-label");
+		return this.shadowRoot.querySelector(".ui5-breadcrumbs-current-location [ui5-label]");
 	}
 
 	get _isDropdownArrowFocused() {
@@ -499,7 +499,7 @@ class Breadcrumbs extends UI5Element {
 	 * @private
 	 */
 	get _dropdownArrowLink() {
-		return this.shadowRoot.querySelector(".ui5-breadcrumbs-dropdown-arrow-link-wrapper ui5-link");
+		return this.shadowRoot.querySelector(".ui5-breadcrumbs-dropdown-arrow-link-wrapper [ui5-link]");
 	}
 
 	/**
@@ -529,7 +529,7 @@ class Breadcrumbs extends UI5Element {
 	 * Getter for the list of links corresponding to the abstract breadcrumb items
 	 */
 	get _links() {
-		return Array.from(this.shadowRoot.querySelectorAll(".ui5-breadcrumbs-link-wrapper ui5-link"));
+		return Array.from(this.shadowRoot.querySelectorAll(".ui5-breadcrumbs-link-wrapper [ui5-link]"));
 	}
 
 	get _isOverflowEmpty() {

package/dist/CardHeader.js

@@ -241,15 +241,16 @@ class CardHeader extends UI5Element {
 	}
 
 	_headerClick(event) {
-		event.stopImmediatePropagation(); // prevents the native browser "click" event from firing
+		// prevents the native browser "click" event from firing
+		event.stopImmediatePropagation();
 
-		if (this.interactive) {
+		if (this.interactive && event.target === event.currentTarget) {
 			this.fireEvent("click");
 		}
 	}
 
 	_headerKeydown(event) {
-		if (!this.interactive) {
+		if (!this.interactive || event.target !== event.currentTarget) {
 			return;
 		}
 
@@ -269,7 +270,7 @@ class CardHeader extends UI5Element {
 	}
 
 	_headerKeyup(event) {
-		if (!this.interactive) {
+		if (!this.interactive || event.target !== event.currentTarget) {
 			return;
 		}
 

package/dist/DatePicker.js

@@ -415,7 +415,7 @@ class DatePicker extends DateComponentBase {
 			console.warn(`In order for the "name" property to have effect, you should also: import "@ui5/webcomponents/dist/features/InputElementsFormSupport.js";`); // eslint-disable-line
 		}
 
-		this.value = this.normalizeValue(this.value);
+		this.value = this.normalizeValue(this.value) || this.value;
 		this.liveValue = this.value;
 	}
 

package/dist/Popover.js

@@ -15,7 +15,7 @@ import browserScrollbarCSS from "./generated/themes/BrowserScrollbar.css.js";
 import PopupsCommonCss from "./generated/themes/PopupsCommon.css.js";
 import PopoverCss from "./generated/themes/Popover.css.js";
 
-const arrowSize = 8;
+const ARROW_SIZE = 8;
 
 /**
  * @public
@@ -303,10 +303,6 @@ class Popover extends Popup {
 		return 10; // px
 	}
 
-	static get ARROW_MARGIN() {
-		return 6; // px
-	}
-
 	onAfterRendering() {
 		if (!this.isOpen() && this.open) {
 			const opener = document.getElementById(this.opener);
@@ -456,12 +452,8 @@ class Popover extends Popup {
 			top = Math.max(top, this._top);
 		}
 
-		const isVertical = this.actualPlacementType === PopoverPlacementType.Top || this.actualPlacementType === PopoverPlacementType.Bottom;
-		const borderRadius = Number.parseInt(window.getComputedStyle(this).getPropertyValue("border-radius"));
-		const arrow = this._clampArrowPlacement(placement.arrow, isVertical, this._top, this._left, popoverSize, borderRadius);
-
-		this.arrowTranslateX = arrow.x;
-		this.arrowTranslateY = arrow.y;
+		this.arrowTranslateX = placement.arrow.x;
+		this.arrowTranslateY = placement.arrow.y;
 
 		top = this._adjustForIOSKeyboard(top);
 
@@ -476,59 +468,6 @@ class Popover extends Popup {
 		}
 	}
 
-	/**
-	 * Restricts the arrow's coordinates within the bounds of the popover.
-	 * @private
-	 * @param {{x: number, y: number}} arrow arrow's coordinates
-	 * @param {boolean} isVertical if the popover is placed vertically relative to the opener
-	 * @param {number} top popover's top
-	 * @param {number} left popover's left
-	 * @param {{width: number, height: number}} popoverSize popover's width and height
-	 * @param {number} borderRadius value of the border-radius property
-	 * @returns {{x: number, y: number}} Arrow's coordinates
-	 */
-	_clampArrowPlacement({ x, y }, isVertical, top, left, { width, height }, borderRadius) {
-		const maxY = this._getArrowRange(height, borderRadius);
-		const maxX = this._getArrowRange(width, borderRadius);
-
-		if (isVertical) {
-			const popoverOnLeftBorderOffset = Popover.VIEWPORT_MARGIN - left;
-			const popoverOnRightBorderOffset = left + width + Popover.VIEWPORT_MARGIN - document.documentElement.clientWidth;
-
-			if (popoverOnLeftBorderOffset > 0) {
-				x = Math.max(x - popoverOnLeftBorderOffset, -maxX);
-			} else if (popoverOnRightBorderOffset > 0) {
-				x = Math.min(x + popoverOnRightBorderOffset, maxX);
-			}
-		}
-
-		if (!isVertical) {
-			const popoverOnTopBorderOffset = Popover.VIEWPORT_MARGIN - top;
-			const popoverOnBottomBorderOffset = top + height + Popover.VIEWPORT_MARGIN - document.documentElement.clientHeight;
-			if (popoverOnTopBorderOffset > 0) {
-				y = Math.max(y - popoverOnTopBorderOffset, -maxY);
-			} else if (popoverOnBottomBorderOffset > 0) {
-				y = Math.min(y + popoverOnBottomBorderOffset, maxY);
-			}
-		}
-
-		return {
-			x: Math.round(x),
-			y: Math.round(y),
-		};
-	}
-
-	/**
-	 * Returns the allowed range for the popover arrow based on its dimension.
-	 * @private
-	 * @param {number} dimension the height or width of the popover
-	 * @param {number} borderRadius border radius of the popover
-	 * @returns {number}
-	 */
-	_getArrowRange(dimension, borderRadius) {
-		return Math.floor((dimension / 2) - (borderRadius + Popover.ARROW_MARGIN));
-	}
-
 	/**
 	 * Adjust the desired top position to compensate for shift of the screen
 	 * caused by opened keyboard on iOS which affects all elements with position:fixed.
@@ -598,7 +537,7 @@ class Popover extends Popup {
 			popoverSize.height = targetRect.height;
 		}
 
-		const arrowOffset = this.hideArrow ? 0 : arrowSize;
+		const arrowOffset = this.hideArrow ? 0 : ARROW_SIZE;
 
 		// calc popover positions
 		switch (placementType) {
@@ -666,7 +605,8 @@ class Popover extends Popup {
 			this._top = Math.round(top);
 		}
 
-		const arrowPos = this.getArrowPosition(targetRect, popoverSize, left, top, isVertical);
+		const borderRadius = Number.parseInt(window.getComputedStyle(this).getPropertyValue("border-radius"));
+		const arrowPos = this.getArrowPosition(targetRect, popoverSize, left, top, isVertical, borderRadius);
 
 		return {
 			arrow: arrowPos,
@@ -680,33 +620,50 @@ class Popover extends Popup {
 	 * Calculates the position for the arrow.
 	 * @private
 	 * @param targetRect BoundingClientRect of the target element
-	 * @param popoverSize Width and height of the popover
+	 * @param {{width: number, height: number}} popoverSize Width and height of the popover
 	 * @param left Left offset of the popover
 	 * @param top Top offset of the popover
-	 * @param isVertical if the popover is positioned vertically to the target element
+	 * @param isVertical If the popover is positioned vertically to the target element
+	 * @param {number} borderRadius Value of the border-radius property
 	 * @returns {{x: number, y: number}} Arrow's coordinates
 	 */
-	getArrowPosition(targetRect, popoverSize, left, top, isVertical) {
+	getArrowPosition(targetRect, { width, height }, left, top, isVertical, borderRadius) {
 		let arrowXCentered = this.horizontalAlign === PopoverHorizontalAlign.Center || this.horizontalAlign === PopoverHorizontalAlign.Stretch;
 
 		if (this.horizontalAlign === PopoverHorizontalAlign.Right && left <= targetRect.left) {
 			arrowXCentered = true;
 		}
 
-		if (this.horizontalAlign === PopoverHorizontalAlign.Left && left + popoverSize.width >= targetRect.left + targetRect.width) {
+		if (this.horizontalAlign === PopoverHorizontalAlign.Left && left + width >= targetRect.left + targetRect.width) {
 			arrowXCentered = true;
 		}
 
 		let arrowTranslateX = 0;
 		if (isVertical && arrowXCentered) {
-			arrowTranslateX = targetRect.left + targetRect.width / 2 - left - popoverSize.width / 2;
+			arrowTranslateX = targetRect.left + targetRect.width / 2 - left - width / 2;
 		}
 
 		let arrowTranslateY = 0;
 		if (!isVertical) {
-			arrowTranslateY = targetRect.top + targetRect.height / 2 - top - popoverSize.height / 2;
+			arrowTranslateY = targetRect.top + targetRect.height / 2 - top - height / 2;
 		}
 
+		// Restricts the arrow's translate value along each dimension,
+		// so that the arrow does not clip over the popover's rounded borders.
+		const safeRangeForArrowY = height / 2 - borderRadius - ARROW_SIZE / 2;
+		arrowTranslateY = clamp(
+			arrowTranslateY,
+			-safeRangeForArrowY,
+			safeRangeForArrowY,
+		);
+
+		const safeRangeForArrowX = width / 2 - borderRadius - ARROW_SIZE / 2;
+		arrowTranslateX = clamp(
+			arrowTranslateX,
+			-safeRangeForArrowX,
+			safeRangeForArrowX,
+		);
+
 		return {
 			x: Math.round(arrowTranslateX),
 			y: Math.round(arrowTranslateY),

package/dist/TimeSelection.js

@@ -7,6 +7,7 @@ import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
 import DateFormat from "@ui5/webcomponents-localization/dist/DateFormat.js";
 import getCachedLocaleDataInstance from "@ui5/webcomponents-localization/dist/getCachedLocaleDataInstance.js";
 import "@ui5/webcomponents-localization/dist/features/calendar/Gregorian.js"; // default calendar for bundling
+import CalendarType from "@ui5/webcomponents-base/dist/types/CalendarType.js";
 import { fetchCldr } from "@ui5/webcomponents-base/dist/asset-registries/LocaleData.js";
 import {
 	isLeft,
@@ -136,6 +137,10 @@ const metadata = {
 			type: String,
 			defaultValue: "hours",
 		},
+
+		_calendarType: {
+			type: CalendarType,
+		},
 	},
 	events: /** @lends sap.ui.webcomponents.main.TimeSelection.prototype */ {
 		/**
@@ -435,10 +440,12 @@ class TimeSelection extends UI5Element {
 		let dateFormat;
 		if (this._isPattern) {
 			dateFormat = DateFormat.getInstance({
+				calendarType: this._calendarType,
 				pattern: this._formatPattern,
 			});
 		} else {
 			dateFormat = DateFormat.getInstance({
+				calendarType: this._calendarType,
 				style: this._formatPattern,
 			});
 		}

package/dist/generated/templates/DateTimePickerPopoverTemplate.lit.js

@@ -1,7 +1,7 @@
 /* eslint no-unused-vars: 0 */
 import { html, svg, repeat, classMap, styleMap, ifDefined, unsafeHTML, scopeTag } from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
 
-const block0 = (context, tags, suffix) => html`<${scopeTag("ui5-responsive-popover", tags, suffix)} id="${ifDefined(context._id)}-responsive-popover" allow-target-overlap placement-type="Bottom" horizontal-align="Left" ?disable-scrolling="${context._isIE}" hide-arrow ?_hide-header=${ifDefined(context._shouldHideHeader)} @keydown="${context._onkeydown}" @ui5-after-close="${ifDefined(context.onResponsivePopoverAfterClose)}">${ context.showHeader ? block1(context, tags, suffix) : undefined }<div class="ui5-dt-picker-content ${classMap(context.classes.picker)}"><${scopeTag("ui5-calendar", tags, suffix)} class="ui5-dt-cal ${classMap(context.classes.dateTimeView)}" id="${ifDefined(context._id)}-calendar" primary-calendar-type="${ifDefined(context._primaryCalendarType)}" format-pattern="${ifDefined(context._formatPattern)}" timestamp="${ifDefined(context._calendarTimestamp)}" .selectionMode="${ifDefined(context._calendarSelectionMode)}" .minDate="${ifDefined(context.minDate)}" .maxDate="${ifDefined(context.maxDate)}" @ui5-selected-dates-change="${ifDefined(context.onSelectedDatesChange)}" @ui5-show-month-press="${ifDefined(context.onHeaderShowMonthPress)}" @ui5-show-year-press="${ifDefined(context.onHeaderShowYearPress)}" ?hide-week-numbers="${context.hideWeekNumbers}" ._currentPicker="${ifDefined(context._calendarCurrentPicker)}">${ repeat(context._calendarSelectedDates, (item, index) => item._id || index, (item, index) => block3(item, index, context, tags, suffix)) }</${scopeTag("ui5-calendar", tags, suffix)}>${ !context.phone ? block4(context, tags, suffix) : undefined }<${scopeTag("ui5-time-selection", tags, suffix)} id="${ifDefined(context._id)}-time-sel" class="ui5-dt-time ${classMap(context.classes.dateTimeView)}" value="${ifDefined(context._timeSelectionValue)}" format-pattern="${ifDefined(context._formatPattern)}" ._currentSlider="${ifDefined(context._currentTimeSlider)}" @ui5-change="${ifDefined(context.onTimeSelectionChange)}" @ui5-slider-change="${ifDefined(context.onTimeSliderChange)}"></${scopeTag("ui5-time-selection", tags, suffix)}></div>${ context.showFooter ? block5(context, tags, suffix) : undefined }</${scopeTag("ui5-responsive-popover", tags, suffix)}> `;
+const block0 = (context, tags, suffix) => html`<${scopeTag("ui5-responsive-popover", tags, suffix)} id="${ifDefined(context._id)}-responsive-popover" allow-target-overlap placement-type="Bottom" horizontal-align="Left" ?disable-scrolling="${context._isIE}" hide-arrow ?_hide-header=${ifDefined(context._shouldHideHeader)} @keydown="${context._onkeydown}" @ui5-after-close="${ifDefined(context.onResponsivePopoverAfterClose)}">${ context.showHeader ? block1(context, tags, suffix) : undefined }<div class="ui5-dt-picker-content ${classMap(context.classes.picker)}"><${scopeTag("ui5-calendar", tags, suffix)} class="ui5-dt-cal ${classMap(context.classes.dateTimeView)}" id="${ifDefined(context._id)}-calendar" primary-calendar-type="${ifDefined(context._primaryCalendarType)}" secondary-calendar-type="${ifDefined(context.secondaryCalendarType)}" format-pattern="${ifDefined(context._formatPattern)}" timestamp="${ifDefined(context._calendarTimestamp)}" .selectionMode="${ifDefined(context._calendarSelectionMode)}" .minDate="${ifDefined(context.minDate)}" .maxDate="${ifDefined(context.maxDate)}" @ui5-selected-dates-change="${ifDefined(context.onSelectedDatesChange)}" @ui5-show-month-press="${ifDefined(context.onHeaderShowMonthPress)}" @ui5-show-year-press="${ifDefined(context.onHeaderShowYearPress)}" ?hide-week-numbers="${context.hideWeekNumbers}" ._currentPicker="${ifDefined(context._calendarCurrentPicker)}">${ repeat(context._calendarSelectedDates, (item, index) => item._id || index, (item, index) => block3(item, index, context, tags, suffix)) }</${scopeTag("ui5-calendar", tags, suffix)}>${ !context.phone ? block4(context, tags, suffix) : undefined }<${scopeTag("ui5-time-selection", tags, suffix)} id="${ifDefined(context._id)}-time-sel" class="ui5-dt-time ${classMap(context.classes.dateTimeView)}" value="${ifDefined(context._timeSelectionValue)}" format-pattern="${ifDefined(context._formatPattern)}" ._currentSlider="${ifDefined(context._currentTimeSlider)}" ._calendarType="${ifDefined(context._primaryCalendarType)}" @ui5-change="${ifDefined(context.onTimeSelectionChange)}" @ui5-slider-change="${ifDefined(context.onTimeSliderChange)}"></${scopeTag("ui5-time-selection", tags, suffix)}></div>${ context.showFooter ? block5(context, tags, suffix) : undefined }</${scopeTag("ui5-responsive-popover", tags, suffix)}> `;
 const block1 = (context, tags, suffix) => html`${ context.phone ? block2(context, tags, suffix) : undefined }`;
 const block2 = (context, tags, suffix) => html`<div class="ui5-dt-picker-header"><${scopeTag("ui5-segmented-button", tags, suffix)} class="ui5-dt-picker-toggle-button"><${scopeTag("ui5-toggle-button", tags, suffix)} key="Date" ?pressed="${context.showDateView}" @click="${context._dateTimeSwitchChange}">${ifDefined(context.btnDateLabel)}</${scopeTag("ui5-toggle-button", tags, suffix)}><${scopeTag("ui5-toggle-button", tags, suffix)} key="Time" ?pressed="${context.showTimeView}" @click="${context._dateTimeSwitchChange}">${ifDefined(context.btnTimeLabel)}</${scopeTag("ui5-toggle-button", tags, suffix)}></${scopeTag("ui5-segmented-button", tags, suffix)}></div>`;
 const block3 = (item, index, context, tags, suffix) => html`<${scopeTag("ui5-date", tags, suffix)} value="${ifDefined(item)}"></${scopeTag("ui5-date", tags, suffix)}>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "UI5 Web Components: webcomponents.main",
   "ui5": {
     "webComponentsPackage": true
@@ -42,14 +42,14 @@
     "directory": "packages/main"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "1.2.3",
-    "@ui5/webcomponents-icons": "1.2.3",
-    "@ui5/webcomponents-ie11": "1.2.3",
-    "@ui5/webcomponents-localization": "1.2.3",
-    "@ui5/webcomponents-theming": "1.2.3"
+    "@ui5/webcomponents-base": "1.2.4",
+    "@ui5/webcomponents-icons": "1.2.4",
+    "@ui5/webcomponents-ie11": "1.2.4",
+    "@ui5/webcomponents-localization": "1.2.4",
+    "@ui5/webcomponents-theming": "1.2.4"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "1.2.3",
+    "@ui5/webcomponents-tools": "1.2.4",
     "chromedriver": "99.0.0"
   }
-}
+}

package/src/Breadcrumbs.js

@@ -472,7 +472,7 @@ class Breadcrumbs extends UI5Element {
 	}
 
 	get _currentLocationLabel() {
-		return this.shadowRoot.querySelector(".ui5-breadcrumbs-current-location ui5-label");
+		return this.shadowRoot.querySelector(".ui5-breadcrumbs-current-location [ui5-label]");
 	}
 
 	get _isDropdownArrowFocused() {
@@ -499,7 +499,7 @@ class Breadcrumbs extends UI5Element {
 	 * @private
 	 */
 	get _dropdownArrowLink() {
-		return this.shadowRoot.querySelector(".ui5-breadcrumbs-dropdown-arrow-link-wrapper ui5-link");
+		return this.shadowRoot.querySelector(".ui5-breadcrumbs-dropdown-arrow-link-wrapper [ui5-link]");
 	}
 
 	/**
@@ -529,7 +529,7 @@ class Breadcrumbs extends UI5Element {
 	 * Getter for the list of links corresponding to the abstract breadcrumb items
 	 */
 	get _links() {
-		return Array.from(this.shadowRoot.querySelectorAll(".ui5-breadcrumbs-link-wrapper ui5-link"));
+		return Array.from(this.shadowRoot.querySelectorAll(".ui5-breadcrumbs-link-wrapper [ui5-link]"));
 	}
 
 	get _isOverflowEmpty() {

package/src/CardHeader.hbs

@@ -35,7 +35,7 @@
 				id="{{_id}}-status"
 				part="status"
 				class="ui5-card-header-status"
-				dir="auto"	
+				dir="auto"
 			>{{status}}</span>
 		{{/if}}
 	</div>

package/src/CardHeader.js

@@ -241,15 +241,16 @@ class CardHeader extends UI5Element {
 	}
 
 	_headerClick(event) {
-		event.stopImmediatePropagation(); // prevents the native browser "click" event from firing
+		// prevents the native browser "click" event from firing
+		event.stopImmediatePropagation();
 
-		if (this.interactive) {
+		if (this.interactive && event.target === event.currentTarget) {
 			this.fireEvent("click");
 		}
 	}
 
 	_headerKeydown(event) {
-		if (!this.interactive) {
+		if (!this.interactive || event.target !== event.currentTarget) {
 			return;
 		}
 
@@ -269,7 +270,7 @@ class CardHeader extends UI5Element {
 	}
 
 	_headerKeyup(event) {
-		if (!this.interactive) {
+		if (!this.interactive || event.target !== event.currentTarget) {
 			return;
 		}
 

package/src/DatePicker.js

@@ -415,7 +415,7 @@ class DatePicker extends DateComponentBase {
 			console.warn(`In order for the "name" property to have effect, you should also: import "@ui5/webcomponents/dist/features/InputElementsFormSupport.js";`); // eslint-disable-line
 		}
 
-		this.value = this.normalizeValue(this.value);
+		this.value = this.normalizeValue(this.value) || this.value;
 		this.liveValue = this.value;
 	}
 

package/src/DateTimePickerPopover.hbs

@@ -18,6 +18,7 @@
 			class="ui5-dt-cal {{classes.dateTimeView}}"
 			id="{{_id}}-calendar"
 			primary-calendar-type="{{_primaryCalendarType}}"
+			secondary-calendar-type="{{secondaryCalendarType}}"
 			format-pattern="{{_formatPattern}}"
 			timestamp="{{_calendarTimestamp}}"
 			.selectionMode="{{_calendarSelectionMode}}"
@@ -44,6 +45,7 @@
 				value="{{_timeSelectionValue}}"
 				format-pattern="{{_formatPattern}}"
 				._currentSlider="{{_currentTimeSlider}}"
+				._calendarType="{{_primaryCalendarType}}"
 				@ui5-change="{{onTimeSelectionChange}}"
 				@ui5-slider-change="{{onTimeSliderChange}}"
 		></ui5-time-selection>

package/src/Popover.js

@@ -15,7 +15,7 @@ import browserScrollbarCSS from "./generated/themes/BrowserScrollbar.css.js";
 import PopupsCommonCss from "./generated/themes/PopupsCommon.css.js";
 import PopoverCss from "./generated/themes/Popover.css.js";
 
-const arrowSize = 8;
+const ARROW_SIZE = 8;
 
 /**
  * @public
@@ -303,10 +303,6 @@ class Popover extends Popup {
 		return 10; // px
 	}
 
-	static get ARROW_MARGIN() {
-		return 6; // px
-	}
-
 	onAfterRendering() {
 		if (!this.isOpen() && this.open) {
 			const opener = document.getElementById(this.opener);
@@ -456,12 +452,8 @@ class Popover extends Popup {
 			top = Math.max(top, this._top);
 		}
 
-		const isVertical = this.actualPlacementType === PopoverPlacementType.Top || this.actualPlacementType === PopoverPlacementType.Bottom;
-		const borderRadius = Number.parseInt(window.getComputedStyle(this).getPropertyValue("border-radius"));
-		const arrow = this._clampArrowPlacement(placement.arrow, isVertical, this._top, this._left, popoverSize, borderRadius);
-
-		this.arrowTranslateX = arrow.x;
-		this.arrowTranslateY = arrow.y;
+		this.arrowTranslateX = placement.arrow.x;
+		this.arrowTranslateY = placement.arrow.y;
 
 		top = this._adjustForIOSKeyboard(top);
 
@@ -476,59 +468,6 @@ class Popover extends Popup {
 		}
 	}
 
-	/**
-	 * Restricts the arrow's coordinates within the bounds of the popover.
-	 * @private
-	 * @param {{x: number, y: number}} arrow arrow's coordinates
-	 * @param {boolean} isVertical if the popover is placed vertically relative to the opener
-	 * @param {number} top popover's top
-	 * @param {number} left popover's left
-	 * @param {{width: number, height: number}} popoverSize popover's width and height
-	 * @param {number} borderRadius value of the border-radius property
-	 * @returns {{x: number, y: number}} Arrow's coordinates
-	 */
-	_clampArrowPlacement({ x, y }, isVertical, top, left, { width, height }, borderRadius) {
-		const maxY = this._getArrowRange(height, borderRadius);
-		const maxX = this._getArrowRange(width, borderRadius);
-
-		if (isVertical) {
-			const popoverOnLeftBorderOffset = Popover.VIEWPORT_MARGIN - left;
-			const popoverOnRightBorderOffset = left + width + Popover.VIEWPORT_MARGIN - document.documentElement.clientWidth;
-
-			if (popoverOnLeftBorderOffset > 0) {
-				x = Math.max(x - popoverOnLeftBorderOffset, -maxX);
-			} else if (popoverOnRightBorderOffset > 0) {
-				x = Math.min(x + popoverOnRightBorderOffset, maxX);
-			}
-		}
-
-		if (!isVertical) {
-			const popoverOnTopBorderOffset = Popover.VIEWPORT_MARGIN - top;
-			const popoverOnBottomBorderOffset = top + height + Popover.VIEWPORT_MARGIN - document.documentElement.clientHeight;
-			if (popoverOnTopBorderOffset > 0) {
-				y = Math.max(y - popoverOnTopBorderOffset, -maxY);
-			} else if (popoverOnBottomBorderOffset > 0) {
-				y = Math.min(y + popoverOnBottomBorderOffset, maxY);
-			}
-		}
-
-		return {
-			x: Math.round(x),
-			y: Math.round(y),
-		};
-	}
-
-	/**
-	 * Returns the allowed range for the popover arrow based on its dimension.
-	 * @private
-	 * @param {number} dimension the height or width of the popover
-	 * @param {number} borderRadius border radius of the popover
-	 * @returns {number}
-	 */
-	_getArrowRange(dimension, borderRadius) {
-		return Math.floor((dimension / 2) - (borderRadius + Popover.ARROW_MARGIN));
-	}
-
 	/**
 	 * Adjust the desired top position to compensate for shift of the screen
 	 * caused by opened keyboard on iOS which affects all elements with position:fixed.
@@ -598,7 +537,7 @@ class Popover extends Popup {
 			popoverSize.height = targetRect.height;
 		}
 
-		const arrowOffset = this.hideArrow ? 0 : arrowSize;
+		const arrowOffset = this.hideArrow ? 0 : ARROW_SIZE;
 
 		// calc popover positions
 		switch (placementType) {
@@ -666,7 +605,8 @@ class Popover extends Popup {
 			this._top = Math.round(top);
 		}
 
-		const arrowPos = this.getArrowPosition(targetRect, popoverSize, left, top, isVertical);
+		const borderRadius = Number.parseInt(window.getComputedStyle(this).getPropertyValue("border-radius"));
+		const arrowPos = this.getArrowPosition(targetRect, popoverSize, left, top, isVertical, borderRadius);
 
 		return {
 			arrow: arrowPos,
@@ -680,33 +620,50 @@ class Popover extends Popup {
 	 * Calculates the position for the arrow.
 	 * @private
 	 * @param targetRect BoundingClientRect of the target element
-	 * @param popoverSize Width and height of the popover
+	 * @param {{width: number, height: number}} popoverSize Width and height of the popover
 	 * @param left Left offset of the popover
 	 * @param top Top offset of the popover
-	 * @param isVertical if the popover is positioned vertically to the target element
+	 * @param isVertical If the popover is positioned vertically to the target element
+	 * @param {number} borderRadius Value of the border-radius property
 	 * @returns {{x: number, y: number}} Arrow's coordinates
 	 */
-	getArrowPosition(targetRect, popoverSize, left, top, isVertical) {
+	getArrowPosition(targetRect, { width, height }, left, top, isVertical, borderRadius) {
 		let arrowXCentered = this.horizontalAlign === PopoverHorizontalAlign.Center || this.horizontalAlign === PopoverHorizontalAlign.Stretch;
 
 		if (this.horizontalAlign === PopoverHorizontalAlign.Right && left <= targetRect.left) {
 			arrowXCentered = true;
 		}
 
-		if (this.horizontalAlign === PopoverHorizontalAlign.Left && left + popoverSize.width >= targetRect.left + targetRect.width) {
+		if (this.horizontalAlign === PopoverHorizontalAlign.Left && left + width >= targetRect.left + targetRect.width) {
 			arrowXCentered = true;
 		}
 
 		let arrowTranslateX = 0;
 		if (isVertical && arrowXCentered) {
-			arrowTranslateX = targetRect.left + targetRect.width / 2 - left - popoverSize.width / 2;
+			arrowTranslateX = targetRect.left + targetRect.width / 2 - left - width / 2;
 		}
 
 		let arrowTranslateY = 0;
 		if (!isVertical) {
-			arrowTranslateY = targetRect.top + targetRect.height / 2 - top - popoverSize.height / 2;
+			arrowTranslateY = targetRect.top + targetRect.height / 2 - top - height / 2;
 		}
 
+		// Restricts the arrow's translate value along each dimension,
+		// so that the arrow does not clip over the popover's rounded borders.
+		const safeRangeForArrowY = height / 2 - borderRadius - ARROW_SIZE / 2;
+		arrowTranslateY = clamp(
+			arrowTranslateY,
+			-safeRangeForArrowY,
+			safeRangeForArrowY,
+		);
+
+		const safeRangeForArrowX = width / 2 - borderRadius - ARROW_SIZE / 2;
+		arrowTranslateX = clamp(
+			arrowTranslateX,
+			-safeRangeForArrowX,
+			safeRangeForArrowX,
+		);
+
 		return {
 			x: Math.round(arrowTranslateX),
 			y: Math.round(arrowTranslateY),

package/src/TimeSelection.js

@@ -7,6 +7,7 @@ import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
 import DateFormat from "@ui5/webcomponents-localization/dist/DateFormat.js";
 import getCachedLocaleDataInstance from "@ui5/webcomponents-localization/dist/getCachedLocaleDataInstance.js";
 import "@ui5/webcomponents-localization/dist/features/calendar/Gregorian.js"; // default calendar for bundling
+import CalendarType from "@ui5/webcomponents-base/dist/types/CalendarType.js";
 import { fetchCldr } from "@ui5/webcomponents-base/dist/asset-registries/LocaleData.js";
 import {
 	isLeft,
@@ -136,6 +137,10 @@ const metadata = {
 			type: String,
 			defaultValue: "hours",
 		},
+
+		_calendarType: {
+			type: CalendarType,
+		},
 	},
 	events: /** @lends sap.ui.webcomponents.main.TimeSelection.prototype */ {
 		/**
@@ -435,10 +440,12 @@ class TimeSelection extends UI5Element {
 		let dateFormat;
 		if (this._isPattern) {
 			dateFormat = DateFormat.getInstance({
+				calendarType: this._calendarType,
 				pattern: this._formatPattern,
 			});
 		} else {
 			dateFormat = DateFormat.getInstance({
+				calendarType: this._calendarType,
 				style: this._formatPattern,
 			});
 		}