Skip to content

refactor(ui5-card): render header if not empty #646

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

Merged
merged 4 commits into from
Jul 24, 2019
Merged

refactor(ui5-card): render header if not empty #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8533787
refactor(ui5-card): render header if not empty
ilhan007 Jul 15, 2019
dda7215
fix eslint
ilhan007 Jul 15, 2019
f98d4f1
merge master into branch
ilhan007 Jul 23, 2019
0ac7a9f
Merge branch 'master' into refactor-card-header
ilhan007 Jul 23, 2019
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
51 changes: 27 additions & 24 deletions packages/main/src/Card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,36 @@
class="{{classes.main}}"
dir="{{rtl}}"
>
<header class="{{classes.header}}"
@click="{{_headerClick}}"
@keydown="{{_headerKeydown}}"
@keyup="{{_headerKeyup}}"
tabindex="{{tabindex}}"
role="{{role}}">
{{#if image}}
<img src="{{avatar}}" aria-label="Avatar" class="ui5-card-avatar ui5-card-header-img">
{{/if}}

{{#if icon}}
<span role="img" aria-label="Avatar" class="ui5-card-avatar">
<ui5-icon class="ui5-card-header-icon" src="{{avatar}}"></ui5-icon>
</span>
{{/if}}

<div class="ui5-card-header-text">
{{#if heading}}
<div class="ui5-card-heading">{{heading}}</div>
{{#if hasHeader}}
<header class="{{classes.header}}"
@click="{{_headerClick}}"
@keydown="{{_headerKeydown}}"
@keyup="{{_headerKeyup}}"
tabindex="{{tabindex}}"
role="{{role}}">
{{#if image}}
<img src="{{avatar}}" aria-label="Avatar" class="ui5-card-avatar ui5-card-header-img">
{{/if}}

{{#if subtitle}}
<div class="ui5-card-subtitle ">{{subtitle}}</div>
{{#if icon}}
<span role="img" aria-label="Avatar" class="ui5-card-avatar">
<ui5-icon class="ui5-card-header-icon" src="{{avatar}}"></ui5-icon>
</span>
{{/if}}
</div>
<span part="status" class="ui5-card-status">{{status}}</span>
</header>

<div class="ui5-card-header-text">
{{#if heading}}
<div class="ui5-card-heading">{{heading}}</div>
{{/if}}

{{#if subtitle}}
<div class="ui5-card-subtitle ">{{subtitle}}</div>
{{/if}}
</div>
<span part="status" class="ui5-card-status">{{status}}</span>
</header>
{{/if}}

<section>
<slot></slot>
</section>
Expand Down
12 changes: 8 additions & 4 deletions packages/main/src/Card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,14 @@ class Card extends UI5Element {
return this.headerInteractive ? "0" : undefined;
}

get hasHeader() {
return !!(this.heading || this.subtitle || this.status || this.avatar);
}

get rtl() {
return getRTL() ? "rtl" : undefined;
}

static async define(...params) {
await Icon.define();

Expand Down Expand Up @@ -218,10 +226,6 @@ class Card extends UI5Element {
this.fireEvent("headerClick");
}
}

get rtl() {
return getRTL() ? "rtl" : undefined;
}
}

Card.define();
Expand Down
6 changes: 6 additions & 0 deletions packages/main/test/sap/ui/webcomponents/main/pages/Card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@
<ui5-li icon="sap-icon://horizontal-bullet-chart" >Template Based Segmentation</ui5-li>
<ui5-li icon="sap-icon://opportunity" >Segmentation Models</ui5-li>
</ui5-list>
</ui5-card>

<ui5-card>
<ui5-list id="myList3" separators="Inner">
<ui5-li icon="sap-icon://horizontal-bullet-chart" >Template Based Segmentation</ui5-li>
<ui5-li icon="sap-icon://opportunity" >Segmentation Models</ui5-li>
</ui5-list>
</ui5-card>

<script>
Expand Down