fix(ui5-popover): fix finding opener (#10360)

* fix(ui5-popover): fix finding opener * chore(ui5-popover): add tests
SAP · Dec 13, 2024 · 941c6eb · 941c6eb
1 parent fe8d224
commit 941c6eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/packages/main/src/Popover.ts b/packages/main/src/Popover.ts
@@ -312,7 +312,7 @@ class Popover extends Popup {
 		}
 
 		if (openerHTMLElement && this._isUI5Element(openerHTMLElement)) {
-			return openerHTMLElement.getFocusDomRef();
+			return openerHTMLElement.getFocusDomRef() || openerHTMLElement;
 		}
 
 		return openerHTMLElement;

diff --git a/packages/main/test/pages/PopoverInitiallyOpen.html b/packages/main/test/pages/PopoverInitiallyOpen.html
@@ -36,5 +36,15 @@
 </head>
 <body onload="init()">
 	<ui5-button id="btn1">Open Popover</ui5-button>
+
+	<ui5-button id="openPopoverBtn1">Open Popover</ui5-button>
+	<ui5-popover id="popover1" opener="openPopoverBtn1" open>Content</ui5-popover>
+
+	<br />
+	<br />
+	<br />
+
+	<ui5-button id="openPopoverBtn2">Open Popover</ui5-button>
+	<ui5-popover id="popover2" open opener="openPopoverBtn2">Content</ui5-popover>
 </body>
 </html>
diff --git a/packages/main/test/specs/Popover.spec.js b/packages/main/test/specs/Popover.spec.js
@@ -475,6 +475,12 @@ describe("Initially opened", () => {
 	it("test initial focus", async () => {
 		assert.ok(await browser.$("#popoverBtn").matches(":focus"), "initial focus is correct");
 	});
+
+	it("test _open", async () => {
+		assert.ok(await browser.$("#popoverOpen")._open, "_open is set");
+		assert.ok(await browser.$("#popover1")._open, "_open is set");
+		assert.ok(await browser.$("#popover2")._open, "_open is set");
+	});
 });
 
 describe("Acc", () => {