Merge branch 'main' into cp-external-keyboard-mouse-mobile-focus

CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.2...v2.2.0-rc.3) (2024-08-29)
+
+
+### Bug Fixes
+
+* **ui5-breadcrumbs:** current link aria-current ([#9668](https://github.com/SAP/ui5-webcomponents/issues/9668)) ([87732a1](https://github.com/SAP/ui5-webcomponents/commit/87732a151562d6e387dcf85baefca23b265774ac))
+* **ui5-calendar:** adjust aria-disabled attribute ([#9732](https://github.com/SAP/ui5-webcomponents/issues/9732)) ([29a30f9](https://github.com/SAP/ui5-webcomponents/commit/29a30f9b21f5a978e2b1163d0484de2df859d907)), closes [#9719](https://github.com/SAP/ui5-webcomponents/issues/9719)
+* **ui5-color-palette-popover:** set opener attribute ([#9746](https://github.com/SAP/ui5-webcomponents/issues/9746)) ([6d20dcd](https://github.com/SAP/ui5-webcomponents/commit/6d20dcd186d04d52783cf4083b4d8f014cd07a1e)), closes [#9708](https://github.com/SAP/ui5-webcomponents/issues/9708)
+* **ui5-multi-combobox:** correct submit event ([#9731](https://github.com/SAP/ui5-webcomponents/issues/9731)) ([0405c2b](https://github.com/SAP/ui5-webcomponents/commit/0405c2b4e0273649a2c110471b55d480d37c2db2))
+* **ui5-multi-combobox:** remove VS header after setting VH to None ([#9744](https://github.com/SAP/ui5-webcomponents/issues/9744)) ([287d3a6](https://github.com/SAP/ui5-webcomponents/commit/287d3a65054ef9e081ed9f627420af03007ea7e9)), closes [#9736](https://github.com/SAP/ui5-webcomponents/issues/9736)
+* **ui5-table:** busy indicator overlay (compat) ([#9737](https://github.com/SAP/ui5-webcomponents/issues/9737)) ([9de42b0](https://github.com/SAP/ui5-webcomponents/commit/9de42b01cd471fcf0411290c004c80c860c0eddc)), closes [#9438](https://github.com/SAP/ui5-webcomponents/issues/9438)
+* **ui5-table:** fix border and focus overlap (compat) ([#9726](https://github.com/SAP/ui5-webcomponents/issues/9726)) ([e51d35e](https://github.com/SAP/ui5-webcomponents/commit/e51d35e7cd3b860a963255271050a1f996b300f6)), closes [#9526](https://github.com/SAP/ui5-webcomponents/issues/9526)
+* **ui5-wizard:** improve accessibility ([#9738](https://github.com/SAP/ui5-webcomponents/issues/9738)) ([d8a1196](https://github.com/SAP/ui5-webcomponents/commit/d8a1196586535034bfe87e0583f250543d02b3ba))
+
+
+### Features
+
+* **ui5-calendar:** implement calendar week numbering ([#9694](https://github.com/SAP/ui5-webcomponents/issues/9694)) ([efc8053](https://github.com/SAP/ui5-webcomponents/commit/efc8053e756156cca5e239f1886469c6b92c2cf7))
+* **ui5-daterange-picker:** implement month and year range selection ([#9680](https://github.com/SAP/ui5-webcomponents/issues/9680)) ([0a150dd](https://github.com/SAP/ui5-webcomponents/commit/0a150dd6808dbd7ec7e4e599eab2ff4abf9396f0)), closes [#8177](https://github.com/SAP/ui5-webcomponents/issues/8177) [#8187](https://github.com/SAP/ui5-webcomponents/issues/8187)
+
+
+
+
+
 # [2.2.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.1...v2.2.0-rc.2) (2024-08-22)
 
 

lerna.json

@@ -14,7 +14,7 @@
     "packages/create-package",
     "packages/compat"
   ],
-  "version": "2.2.0-rc.2",
+  "version": "2.2.0-rc.3",
   "command": {
     "publish": {
       "allowBranch": "*",

packages/ai/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.2...v2.2.0-rc.3) (2024-08-29)
+
+**Note:** Version bump only for package @ui5/webcomponents-ai
+
+
+
+
+
 # [2.2.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.1...v2.2.0-rc.2) (2024-08-22)
 
 **Note:** Version bump only for package @ui5/webcomponents-ai

packages/ai/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-ai",
-  "version": "2.2.0-rc.2",
+  "version": "2.2.0-rc.3",
   "description": "UI5 Web Components: webcomponents.ai",
   "ui5": {
     "webComponentsPackage": true
@@ -45,13 +45,13 @@
     "directory": "packages/ai"
   },
   "dependencies": {
-    "@ui5/webcomponents": "2.2.0-rc.2",
-    "@ui5/webcomponents-base": "2.2.0-rc.2",
-    "@ui5/webcomponents-icons": "2.2.0-rc.2",
-    "@ui5/webcomponents-theming": "2.2.0-rc.2"
+    "@ui5/webcomponents": "2.2.0-rc.3",
+    "@ui5/webcomponents-base": "2.2.0-rc.3",
+    "@ui5/webcomponents-icons": "2.2.0-rc.3",
+    "@ui5/webcomponents-theming": "2.2.0-rc.3"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "2.2.0-rc.2",
-    "chromedriver": "^126.0.0"
+    "@ui5/webcomponents-tools": "2.2.0-rc.3",
+    "chromedriver": "^127.0.3"
   }
 }

packages/ai/src/i18n/messagebundle_en_US_saptrc.properties

@@ -1,4 +1,4 @@
 
-PROMPT_INPUT_CHARACTERS_LEFT=8YAimQO+ecRpscnE1PqDjA_{0} characters remaining
+PROMPT_INPUT_CHARACTERS_LEFT=6PVdksQU16mGDfLHCB3D7g_{0} characters remaining
 
-PROMPT_INPUT_CHARACTERS_EXCEEDED=uzwAxzxvnp2ayE36MzQCNw_{0} characters over limit
+PROMPT_INPUT_CHARACTERS_EXCEEDED=BH/EJSWUGaLLgpsIfqSJNA_{0} characters over limit

packages/base/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.2...v2.2.0-rc.3) (2024-08-29)
+
+
+### Bug Fixes
+
+* **ui5-breadcrumbs:** current link aria-current ([#9668](https://github.com/SAP/ui5-webcomponents/issues/9668)) ([87732a1](https://github.com/SAP/ui5-webcomponents/commit/87732a151562d6e387dcf85baefca23b265774ac))
+
+
+
+
+
 # [2.2.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.1...v2.2.0-rc.2) (2024-08-22)
 
 

packages/base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-base",
-  "version": "2.2.0-rc.2",
+  "version": "2.2.0-rc.3",
   "description": "UI5 Web Components: webcomponents.base",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -52,8 +52,8 @@
   },
   "devDependencies": {
     "@openui5/sap.ui.core": "1.120.17",
-    "@ui5/webcomponents-tools": "2.2.0-rc.2",
-    "chromedriver": "^126.0.0",
+    "@ui5/webcomponents-tools": "2.2.0-rc.3",
+    "chromedriver": "^127.0.3",
     "clean-css": "^5.2.2",
     "copy-and-watch": "^0.1.5",
     "cross-env": "^7.0.3",

packages/compat/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.2...v2.2.0-rc.3) (2024-08-29)
+
+
+### Bug Fixes
+
+* **ui5-table:** busy indicator overlay (compat) ([#9737](https://github.com/SAP/ui5-webcomponents/issues/9737)) ([9de42b0](https://github.com/SAP/ui5-webcomponents/commit/9de42b01cd471fcf0411290c004c80c860c0eddc)), closes [#9438](https://github.com/SAP/ui5-webcomponents/issues/9438)
+* **ui5-table:** fix border and focus overlap (compat) ([#9726](https://github.com/SAP/ui5-webcomponents/issues/9726)) ([e51d35e](https://github.com/SAP/ui5-webcomponents/commit/e51d35e7cd3b860a963255271050a1f996b300f6)), closes [#9526](https://github.com/SAP/ui5-webcomponents/issues/9526)
+
+
+
+
+
 # [2.2.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.2.0-rc.1...v2.2.0-rc.2) (2024-08-22)
 
 **Note:** Version bump only for package @ui5/webcomponents-compat

packages/compat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-compat",
-  "version": "2.2.0-rc.2",
+  "version": "2.2.0-rc.3",
   "description": "UI5 Web Components: webcomponents.compat",
   "ui5": {
     "webComponentsPackage": true
@@ -45,13 +45,13 @@
     "directory": "packages/compat"
   },
   "dependencies": {
-    "@ui5/webcomponents": "2.2.0-rc.2",
-    "@ui5/webcomponents-base": "2.2.0-rc.2",
-    "@ui5/webcomponents-icons": "2.2.0-rc.2",
-    "@ui5/webcomponents-theming": "2.2.0-rc.2"
+    "@ui5/webcomponents": "2.2.0-rc.3",
+    "@ui5/webcomponents-base": "2.2.0-rc.3",
+    "@ui5/webcomponents-icons": "2.2.0-rc.3",
+    "@ui5/webcomponents-theming": "2.2.0-rc.3"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "2.2.0-rc.2",
-    "chromedriver": "^126.0.0"
+    "@ui5/webcomponents-tools": "2.2.0-rc.3",
+    "chromedriver": "^127.0.3"
   }
 }

packages/compat/src/Table.hbs

@@ -5,12 +5,14 @@
 	@ui5-_forward-before="{{_onForwardBefore}}"
 	@focusin="{{_onfocusin}}"
 >
+	<ui5-busy-indicator
+		id="{{_id}}-busyIndicator"
+		delay="{{busyDelay}}"
+		?active="{{busy}}"
+		class="ui5-table-busy-indicator"
+	>
 	<div id="{{_id}}-before" tabindex="0" class="ui5-table-focusarea"></div>
 
-	{{#if busy}}
-		{{> busyRow}}
-	{{/if}}
-
 	<table border="0" cellspacing="0" cellpadding="0" @keydown="{{_onkeydown}}" role="table" aria-label="{{tableAriaLabelText}}">
 		<thead>
 			<tr
@@ -73,6 +75,7 @@
 
 	<div id="{{_id}}-after" tabindex="0" class="ui5-table-focusarea"></div>
 </div>
+	</ui5-busy-indicator>
 
 {{#*inline "moreRow"}}
 <tr>
@@ -106,16 +109,4 @@
 			<span tabindex="-1" aria-hidden="true" class="ui5-table-end-marker"></span>
 		</td>
 	</tr>
-{{/inline}}
-
-{{#*inline "busyRow"}}
-	<div tabindex="-1" class="ui5-table-busy-row">
-		<ui5-busy-indicator
-			delay="{{busyDelay}}"
-			class="ui5-table-busy-ind"
-			style="{{styles.busy}}"
-			active
-			data-sap-focus-ref
-		></ui5-busy-indicator>
-	</div>
-{{/inline}}
+{{/inline}}

packages/compat/src/Table.ts

@@ -32,7 +32,6 @@ import { getLastTabbableElement, getTabbableElements } from "@ui5/webcomponents-
 import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
 import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
 import debounce from "@ui5/webcomponents-base/dist/util/debounce.js";
-import isElementInView from "@ui5/webcomponents-base/dist/util/isElementInView.js";
 import BusyIndicator from "@ui5/webcomponents/dist/BusyIndicator.js";
 import CheckBox from "@ui5/webcomponents/dist/CheckBox.js";
 import TableGrowingMode from "./types/TableGrowingMode.js";
@@ -392,13 +391,6 @@ class Table extends UI5Element {
 	@property({ type: Object })
 	_columnHeader: TableColumnHeaderInfo;
 
-	/**
-	 * Defines if the entire table is in view port.
-	 * @private
-	 */
-	@property({ type: Boolean })
-	_inViewport = false;
-
 	/**
 	 * Defines whether all rows are selected or not when table is in MultiSelect mode.
 	 * @default false
@@ -543,8 +535,6 @@ class Table extends UI5Element {
 		if (this.growsOnScroll) {
 			this.observeTableEnd();
 		}
-
-		this.checkTableInViewport();
 	}
 
 	onEnterDOM() {
@@ -1070,13 +1060,9 @@ class Table extends UI5Element {
 	}
 
 	handleResize() {
-		this.checkTableInViewport();
 		this.popinContent();
 	}
 
-	checkTableInViewport() {
-		this._inViewport = isElementInView(this.getDomRef()!);
-	}
 	popinContent() {
 		const clientRect: DOMRect = this.getDomRef()!.getBoundingClientRect();
 		const tableWidth: number = clientRect.width;
@@ -1144,14 +1130,6 @@ class Table extends UI5Element {
 		return this.growingIntersectionObserver;
 	}
 
-	get styles() {
-		return {
-			busy: {
-				position: this.busyIndPosition,
-			},
-		};
-	}
-
 	get growsWithButton(): boolean {
 		return this.growing === TableGrowingMode.Button;
 	}
@@ -1194,10 +1172,6 @@ class Table extends UI5Element {
 		return this.shadowRoot!.querySelector(".ui5-table-end-marker")!;
 	}
 
-	get busyIndPosition(): string {
-		return this._inViewport ? "absolute" : "sticky";
-	}
-
 	get isMultiSelect(): boolean {
 		return this.mode === TableMode.MultiSelect;
 	}

packages/compat/src/i18n/messagebundle_en_US_saptrc.properties

@@ -1,20 +1,20 @@
 
-LOAD_MORE_TEXT=kb5XNzezLmbut0XTYcjX1A_More
+LOAD_MORE_TEXT=FXkUlPopy129pMIn9dJL0g_More
 
-TABLE_HEADER_ROW_INFORMATION=co+BAoIQ8nPHaN+R17SOVw_Header Row 1 of {0}
+TABLE_HEADER_ROW_INFORMATION=e7TJhY30Sa8z1MiR0eUxwA_Header Row 1 of {0}
 
-TABLE_ROW_POSITION=tAwKzzlzLveQyi0BLpgcoA_{0} of {1}
+TABLE_ROW_POSITION=atr4ShtCDCmY8swMcNJ76g_{0} of {1}
 
-TABLE_GROUP_ROW_ARIA_LABEL=S7PAffYw13Yr5LY8RuLMzA_Group Header Row
+TABLE_GROUP_ROW_ARIA_LABEL=pdn+l0y8QB/vftRA/KEZZA_Group Header Row
 
-ARIA_LABEL_ROW_SELECTION=Yu3tp24k4KxOXHlufNR+1A_Item Selection
+ARIA_LABEL_ROW_SELECTION=c00sVpxrd9bpiKk1Is8KHw_Item Selection
 
-ARIA_LABEL_SELECT_ALL_CHECKBOX=tek8pTFI3r88NlL3B42wLw_Select All Rows
+ARIA_LABEL_SELECT_ALL_CHECKBOX=n6YI34B2djUWWDDUtTeXeg_Select All Rows
 
-ARIA_LABEL_EMPTY_CELL=TQitpcusrjQr0qTbPSJxyA_Empty
+ARIA_LABEL_EMPTY_CELL=pGtlZ5xQVi2zo6uRr3QePw_Empty
 
-LIST_ITEM_SELECTED=pSZ+rsFCo0kjxngooozl0A_Selected
+LIST_ITEM_SELECTED=yA/a/aB9ZyfYS5CzHpbbDg_Selected
 
-LIST_ITEM_NOT_SELECTED=oSFF6vbJjvoUhiYGt0fmNQ_Not Selected
+LIST_ITEM_NOT_SELECTED=9jNJZuzn4DlYHIZN6yJi3A_Not Selected
 
-LIST_ITEM_GROUP_HEADER=0whbFqy8sbNzwavbSA01pA_Group Header
+LIST_ITEM_GROUP_HEADER=IW1IqVg104VQhxsKk8/8lQ_Group Header

packages/compat/src/themes/Table.css

@@ -10,6 +10,13 @@
 	border-bottom: var(--ui5_table_bottom_border);
 }
 
+.ui5-table-root,
+.ui5-table-busy-indicator {
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+}
+
 table {
 	width: 100%;
 	border-spacing: 0;
@@ -60,24 +67,6 @@ tr {
 	height: 0px;
 }
 
-:host([busy]) .ui5-table-busy-row {
-	position: absolute;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	top: 0;
-	outline: none;
-	z-index: 100;
-}
-
-:host([busy]) .ui5-table-busy-ind {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	z-index: 1;
-}
-
 :host([busy]) [growing-button] {
 	opacity: 0.72;
 }
@@ -94,7 +83,7 @@ tr {
 :host([sticky-column-header]) .ui5-table-header-row {
 	position: sticky;
 	top: 0;
-	z-index: 99;
+	z-index: 98;
 }
 
 th {

packages/compat/test/pages/TableGrowingWithButton.html

@@ -767,8 +767,6 @@ <h3>Custom texts</h3>
 		var loadMoreTracker = 1;
 
 		function init(tbl, rows) {
-			tbl.busy = true;
-
 			var html = '';
 			products.ProductCollection.slice(0, ROWS).forEach(function (product, index, arr) {
 				var test = "<ui5-table-row><ui5-table-cell><ui5-label>".concat(product.Name, "</ui5-label><ui5-label>").concat(product.ProductId, "</ui5-label></ui5-table-cell><ui5-table-cell><ui5-label>").concat(product.SupplierName, "</ui5-label></ui5-table-cell><ui5-table-cell><ui5-label >").concat(product.Width, " x ").concat(product.Depth, " x ").concat(product.Height, " ").concat(product.DimUnit, "</ui5-label></ui5-table-cell><ui5-table-cell><ui5-label>").concat(product.WeightMeasure, "</b> ").concat(product.WeightUnit, "</ui5-label></ui5-table-cell><ui5-table-cell><ui5-label>").concat(product.Price, "</b> ").concat(product.CurrencyCode, "</ui5-label></ui5-table-cell></ui5-table-row>");
@@ -779,10 +777,6 @@ <h3>Custom texts</h3>
 
 			tbl.setAttribute("growing-button-subtext", "[" + loadMoreTracker * ROWS + " / 123]");
 			inputLoadMoreCounter.value = `${loadMoreTracker - 1}`;
-
-			setTimeout(function() {
-				tbl.busy = false;
-			}, 1500);
 		}
 
 		function loadMore() {