Merge "[FIX] sap.tnt.NavigationList: Application of sapTntNLISelected class is corrected"

Author: s-todorova

src/sap.tnt/src/sap/tnt/NavigationList.js

@@ -546,6 +546,14 @@ sap.ui.define([
 		let oSelectedItem;
 		if (this._selectedItem) {
 			this._selectedItem._toggle(false);
+
+			const oPrevParent = this._selectedItem.getParent();
+			if (oPrevParent && oPrevParent.isA && oPrevParent.isA("sap.tnt.NavigationListItem") &&
+				oPrevParent.getExpanded() === false && oPrevParent._getVisibleItems(oPrevParent).includes(this._selectedItem)) {
+				if (!oPrevParent._getVisibleItems(oPrevParent).includes(oItem)) {
+					oPrevParent._toggle(false);
+				}
+			}
 		}
 
 		if (!oItem) {

src/sap.tnt/test/sap/tnt/qunit/NavigationList.qunit.js

@@ -1837,6 +1837,31 @@ sap.ui.define([
 		assert.notOk(oDefaultItem.classList.contains("sapTntNLITwoClickAreas"), "sapTntNLITwoClickAreas class is not set when item has no children");
 	});
 
+	QUnit.test("correct application of sapTntNLISelected class", async function (assert) {
+
+		const oUnselectableParent = this.navigationList.getItems()[0];
+		const oUnselectableParentDomRef = oUnselectableParent.getDomRef().querySelector(".sapTntNLI");
+		const oChildOfUnselectableParent = this.navigationList.getItems()[0].getItems()[0];
+		const oChildOfUnselectableParentDomRef = this.navigationList.getItems()[0].getItems()[0].getDomRef();
+		const oDefaultItem = this.navigationList.getItems()[3];
+		const oDefaultItemDomRef = oDefaultItem.getDomRef().querySelector(".sapTntNLI");
+
+		QUnitUtils.triggerEvent("tap", oChildOfUnselectableParentDomRef);
+		oUnselectableParent.setExpanded(false);
+		await nextUIUpdate();
+
+		assert.equal(oUnselectableParent.getExpanded(), false, "Unselectable parent is collapsed");
+		assert.equal(this.navigationList.getSelectedItem(), oChildOfUnselectableParent, "Selected item is the child");
+		assert.ok(oUnselectableParentDomRef.classList.contains("sapTntNLISelected"), "sapTntNLISelected class is set on the collapsed parent");
+
+		QUnitUtils.triggerEvent("tap", oDefaultItemDomRef);
+		await nextUIUpdate();
+
+		assert.equal(this.navigationList.getSelectedItem(), oDefaultItem, "Selected item is the new one");
+		assert.ok(oDefaultItemDomRef.classList.contains("sapTntNLISelected"), "sapTntNLISelected class is set on the newly selected item");
+		assert.notOk(oUnselectableParentDomRef.classList.contains("sapTntNLISelected"), "sapTntNLISelected class is not set on the previously selected item's parent");
+	});
+
 	QUnit.test("Design Action", function (assert) {
 
 		const oActionItem = this.navigationList.getItems()[2].getDomRef().querySelector(".sapTntNLI");