Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ui5-dialog): fix focusing when dialog is open from OpenUI5 dialog #9204

Merged
merged 3 commits into from
Jun 20, 2024
Merged

fix(ui5-dialog): fix focusing when dialog is open from OpenUI5 dialog #9204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be77732
fix(ui5-dialog): fix focusing when dialog is open from OpenUI5 dialog
TeodorTaushanov Jun 13, 2024
20195b0
chore: remove an unnecessary line
TeodorTaushanov Jun 13, 2024
3d3c4f9
chore: address code review comments
TeodorTaushanov Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/base/src/features/OpenUI5Support.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ import { setTheme } from "../config/Theme.js";
import { getCurrentZIndex } from "../util/PopupUtils.js";
import { CLDRData } from "../asset-registries/LocaleData.js";
import type { LegacyDateCalendarCustomizing } from "../features/LegacyDateFormats.js";

type OpenUI5Popup = {
setInitialZIndex: (zIndex: number) => void,
getNextZIndex: () => number,
};
import patchPopup from "./patchPopup.js";
import type { OpenUI5Popup } from "./patchPopup.js";

type OpenUI5Core = {
attachInit: (callback: () => void) => void,
Expand Down Expand Up @@ -103,6 +100,7 @@ class OpenUI5Support {
}
window.sap.ui.require(deps, (Popup: OpenUI5Popup) => {
Popup.setInitialZIndex(getCurrentZIndex());
patchPopup(Popup);
resolve();
});
};
Expand Down
25 changes: 25 additions & 0 deletions packages/base/src/features/patchPopup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
type OpenUI5Popup = {
setInitialZIndex: (zIndex: number) => void,
getNextZIndex: () => number,
prototype: {
onFocusEvent: (e: FocusEvent) => void,
}
};

const patchFocusEvent = (Popup: OpenUI5Popup) => {
const origFocusEvent = Popup.prototype.onFocusEvent;
Popup.prototype.onFocusEvent = function onFocusEvent(e: FocusEvent) {
const isTypeFocus = e.type === "focus" || e.type === "activate";
const target = e.target as HTMLElement;
if (!isTypeFocus || !target.closest("[ui5-popover],[ui5-responsive-popover],[ui5-dialog]")) {
origFocusEvent.call(this, e);
}
};
};

const patchPopup = (Popup: OpenUI5Popup) => {
patchFocusEvent(Popup);// Popup.prototype.onFocusEvent
};

export default patchPopup;
export type { OpenUI5Popup };
96 changes: 96 additions & 0 deletions packages/main/test/pages/DialogAndOpenUI5Dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title>Dialog</title>
<script data-ui5-config type="application/json">
{
"language": "EN"
}
</script>
<script>
// delete Document.prototype.adoptedStyleSheets
</script>
<script src="%VITE_BUNDLE_PATH%" type="module"></script>
<script src="https://openui5.hana.ondemand.com/resources/sap-ui-core.js"
id="sap-ui-bootstrap"
data-sap-ui-libs="sap.m"
data-sap-ui-oninit="onOpenUI5Init"
data-sap-ui-compatVersion="edge"></script>
<script>
function onOpenUI5Init() {
sap.ui.require(["sap/m/Button", "sap/m/Dialog"], (Button, Dialog) => {
new Button("openUI5Button", {
text: "Open OpenUI5 Dialog",
press: function () {
new Dialog({
title: "OpenUI5 Dialog",
content: [
new Button({
text: "Focus stop"
}),
new Button("openResPopoverButton", {
text: "Open WebC Responsive Popover",
press: function () {
document.getElementById("respPopover").open = true;
}
})
],
afterClose: function () {
this.destroy();
}
}).open();
}
}).placeAt("content");
});
}

function init() {
document.getElementById("myButton").addEventListener("click", function() {
document.getElementById("dialog1").open = true;
});

document.getElementById("dialogButton").addEventListener("click", function () {
sap.ui.require(["sap/m/Button", "sap/m/Dialog"], (Button, Dialog) => {
new Dialog({
title: "OpenUI5 Dialog",
content: [
new Button({
text: "Focus stop"
}),
new Button("openUI5DialogButton", {
text: "Open WebC Dialog",
press: function () {
document.getElementById("newDialog1").open = true;
}
})
],
afterClose: function () {
this.destroy();
}
}).open();
});
});
}
</script>
</head>
<body class="sapUiBody" onload="init()">
<div id="buttonP">
<ui5-button id="myButton">Open WebC Dialog</ui5-button>
</div>
<ui5-dialog id="dialog1" header-text="This is an WebC Dialog 1">
<ui5-button id="dialogButton">Open UI5 dialog</ui5-button>
</ui5-dialog>
<ui5-dialog id="newDialog1" header-text="This is an WebC Dialog 2">
<ui5-button id="someButton">Some button</ui5-button>
</ui5-dialog>
<div id="content"></div>
<ui5-responsive-popover id="respPopover"
opener="openResPopoverButton"
header-text="This is an WebC Responsive Popover">
<ui5-button>Some button</ui5-button>
</ui5-responsive-popover>
</body>
</html>