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

fix: make static are items recognizable to openui5 dialogs #5888

Merged
merged 4 commits into from
Oct 7, 2022
Merged

fix: make static are items recognizable to openui5 dialogs #5888

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24b1812
fix: make static are items recognizable to openui5 dialogs
ilhan007 Oct 5, 2022
7e21b56
chore: set always the popup integration attribute
ilhan007 Oct 6, 2022
d06ded3
chore: update
ilhan007 Oct 6, 2022
38dbf9d
chore: fix comments
ilhan007 Oct 6, 2022
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: 7 additions & 1 deletion packages/base/src/StaticAreaItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class StaticAreaItem extends HTMLElement {
this._rendered = false;
this.attachShadow({ mode: "open" });
this.pureTagName = "ui5-static-area-item";
this.popupIntegrationAttr = "data-sap-ui-integration-popup-content";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to have this as a constant in the module directly

}

/**
Expand All @@ -37,9 +38,9 @@ class StaticAreaItem extends HTMLElement {
*/
update() {
if (this._rendered) {
this.setAttribute(this.pureTagName, "");
this._updateContentDensity();
this._updateDirection();
this._updateAdditionalAttrs();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this is not a problem at all, but it would be safest IMO to move this method call to where the old this.setAttribute was (before updateContentDensity and updateDirection) so that we don't break any functionality in these methods that relies on this.pureTagName, if such exists.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree 👍

updateShadowRoot(this.ownerElement, true);
}
}
Expand Down Expand Up @@ -67,6 +68,11 @@ class StaticAreaItem extends HTMLElement {
}
}

_updateAdditionalAttrs() {
this.setAttribute(this.pureTagName, "");
this.setAttribute(this.popupIntegrationAttr, "");
}

/**
* @protected
* Returns reference to the DOM element where the current fragment is added.
Expand Down
55 changes: 42 additions & 13 deletions packages/main/test/pages/OpenUI5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,54 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta charset="utf-8">

<title>Button</title>
<title>OpenUI5 + UI5 Web Components</title>

<script id='sap-ui-bootstrap'
src='https://sdk.openui5.org/resources/sap-ui-core.js'
data-sap-ui-theme='sap_belize_hcb'
data-sap-ui-libs='sap.m'
data-sap-ui-libs='sap.m, sap.ui.core'
data-sap-ui-preload="async"
></script>

<script>
sap.ui.getCore().attachInit(function() {
var btn = new sap.m.Button({
text:'OpenUI5',
const dialog = new sap.m.Dialog({
content: [
new sap.ui.core.HTML({
content: '<ui5-date-picker id="myDatepicker" value="Aug 14, 2018" data-sap-ui-integration-popup-content></ui5-date-picker>'
}),
]
});

const dialog2 = new sap.m.Dialog({
content: [
new sap.ui.core.HTML({
content: '<ui5-calendar id="myCalendar" value="Aug 14, 2018"></ui5-calendar>'
}),
]
});

const btn = new sap.m.Button({
text: "DialogWithDatePicker",
press: function() {
dialog.open();
},
});

const btn2 = new sap.m.Button({
text: "DialogWithCalendar",
press: function() {
alert("Hello!")
}
dialog2.open();
},
});
btn.placeAt('content');

const page = new sap.m.Page({
content: [
dialog, dialog2, btn, btn2
],
});

page.placeAt('content');
});
</script>

Expand All @@ -35,18 +66,16 @@
}
</script>


<script src="../../bundle.esm.js" type="module"></script>

<link rel="stylesheet" type="text/css" href="./styles/OpenUI5.css">
<link rel="stylesheet" type="text/css" href="./styles/OpenUI5.css">
</head>

<body class="openui51auto">

<ui5-button icon="download">Web Component</ui5-button>
<ui5-datepicker></ui5-datepicker>

<div id='content'></div>
<ui5-button icon="download">Web Component</ui5-button>
<ui5-datepicker></ui5-datepicker>

<div id='content'></div>
</body>
</html>
4 changes: 4 additions & 0 deletions packages/main/test/pages/styles/OpenUI5.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
html, body, #content {
height: 100%;
}

.openui51auto {
background-color: var(--sapBackgroundColor);
}