Skip to content

Commit

Permalink
fix(ui5-responsive-popover): fix header styles (#3176)
Browse files Browse the repository at this point in the history
We use lit-html classMaps to render classes out of objects , but it works with this getter "get classes()" not with any getters.

FIXES: #3173
  • Loading branch information
ilhan007 authored Apr 22, 2021
1 parent 023945a commit 83a88af
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion packages/main/src/ResponsivePopover.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{{#if header.length}}
<slot slot="header" name="header"></slot>
{{else}}
<header class="{{dialogClasses.header}}">
<header class="{{classes.header}}">
{{#if headerText }}
<ui5-title level="H2" class="ui5-popup-header-text ui5-responsive-popover-header-text">{{headerText}}</ui5-title>
{{/if}}
Expand Down
14 changes: 8 additions & 6 deletions packages/main/src/ResponsivePopover.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@ class ResponsivePopover extends Popover {
return [Popover.styles, ResponsivePopoverCss];
}

get dialogClasses() {
return {
header: {
"ui5-responsive-popover-header": true,
"ui5-responsive-popover-header-no-title": !this.headerText,
},
get classes() {
const allClasses = super.classes;

allClasses.header = {
"ui5-responsive-popover-header": true,
"ui5-responsive-popover-header-no-title": !this.headerText,
};

return allClasses;
}

static get template() {
Expand Down
9 changes: 9 additions & 0 deletions packages/main/test/pages/ResponsivePopover.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ <h2> Inputs based component that opens popover/dialog within dialog</h2>
<ui5-date-picker></ui5-date-picker>
</ui5-dialog>

<ui5-button id="btnSimpleRP">Open Simple RP</ui5-button>
<ui5-responsive-popover id="simpleRP">
Content
</ui5-responsive-popover>

<script>
btnOpen.addEventListener("click", function(event) {
respPopover.open(btnOpen);
Expand All @@ -118,6 +123,10 @@ <h2> Inputs based component that opens popover/dialog within dialog</h2>
btnOpenDialog.addEventListener('click', function (event) {
dialog.open(btnOpenDialog);
});

btnSimpleRP.addEventListener("click", function(event) {
simpleRP.open(btnSimpleRP);
});
</script>
</body>
</html>

0 comments on commit 83a88af

Please sign in to comment.