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(ui5-rating-indicator): refactor rating-indicator to use SVG icons #5191

Merged
merged 7 commits into from
May 16, 2022
Merged

fix(ui5-rating-indicator): refactor rating-indicator to use SVG icons #5191

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e653d3
fix(ui5-rating-indicator): refactor rating-indicator to use SVG icons
ivoplashkov May 10, 2022
5862807
replace custom svg with ui5-icon
ivoplashkov May 10, 2022
504b35a
import icons and fix rtl styles
ivoplashkov May 11, 2022
95b4e72
Merge remote-tracking branch 'origin' into rating-indicator-stars
ivoplashkov May 11, 2022
8005923
fix half star in RTL
ivoplashkov May 11, 2022
4f51ef5
apply comments in compact
ivoplashkov May 16, 2022
f2346e2
Merge remote-tracking branch 'origin/master' into rating-indicator-stars
ivoplashkov May 16, 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
57 changes: 10 additions & 47 deletions packages/main/src/RatingIndicator.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
{{#*inline "fioriSvg"}}
<svg class="ui5-rating-indicator-svg" viewBox="0 0 512 512" focusable="false" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" role="presentation" aria-hidden="true">
<defs>
<clipPath id="ui5-rating-indicator-clip-path-fiori">
<path d="M378.261 297.42q-3.992 2.993-3.992 5.987 0 .998.998 2.995l71.86 193.621q.998 1.996.998 2.995 0 2.994-2.994 5.489t-5.989 2.495q-1.996 0-3.992-.998L260.491 386.246q-1.996-1.996-4.99-1.996-1.996 0-3.992 1.996L76.849 510.004q-1.995.998-3.991.998-2.994 0-5.989-2.495t-2.994-5.49q0-.998.998-2.994l71.86-193.621q.998-1.997.998-2.995 0-3.992-3.992-5.988L3.992 205.6Q0 203.601 0 199.61q0-.998 1.497-4.491t6.487-3.493h165.677q4.99 0 7.984-4.99L248.515 4.99Q250.51 0 256 0t7.485 4.99l66.87 181.645q1.996 4.99 7.984 4.99h164.679q5.988 0 7.485 3.494T512 199.61q0 3.992-3.992 5.988z"></path>
</clipPath>
</defs>
<g role="presentation">
<path class="ui5-rating-indicator-path ui5-rating-indicator-path-fiori" d="M378.261 297.42q-3.992 2.993-3.992 5.987 0 .998.998 2.995l71.86 193.621q.998 1.996.998 2.995 0 2.994-2.994 5.489t-5.989 2.495q-1.996 0-3.992-.998L260.491 386.246q-1.996-1.996-4.99-1.996-1.996 0-3.992 1.996L76.849 510.004q-1.995.998-3.991.998-2.994 0-5.989-2.495t-2.994-5.49q0-.998.998-2.994l71.86-193.621q.998-1.997.998-2.995 0-3.992-3.992-5.988L3.992 205.6Q0 203.601 0 199.61q0-.998 1.497-4.491t6.487-3.493h165.677q4.99 0 7.984-4.99L248.515 4.99Q250.51 0 256 0t7.485 4.99l66.87 181.645q1.996 4.99 7.984 4.99h164.679q5.988 0 7.485 3.494T512 199.61q0 3.992-3.992 5.988z"></path>
</g>
</svg>
{{/inline}}

{{#*inline "horizonSvg"}}
<svg class="ui5-icon-root" viewBox="0 0 512 512" focusable="false" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" role="presentation" aria-hidden="true">
<defs>
<clipPath id="ui5-rating-indicator-clip-path-horizon">
<path d="M1 210q4-15 21-18l146-21 65-131q6-14 23-14t23 14l65 131 146 21q17 3 21 18 1 2 1 7 0 11-8 19L399 338l25 144v3q0 15-11 22-7 5-15 5-6 0-11-3l-131-68-131 68q-4 3-11 3-8 0-16-5-10-7-10-22v-3l25-144L8 236q-8-8-8-19 0-5 1-7z"></path>
</clipPath>
</defs>
<g role="presentation">
<path class="ui5-rating-indicator-path ui5-rating-indicator-path-horizon" d="M1 210q4-15 21-18l146-21 65-131q6-14 23-14t23 14l65 131 146 21q17 3 21 18 1 2 1 7 0 11-8 19L399 338l25 144v3q0 15-11 22-7 5-15 5-6 0-11-3l-131-68-131 68q-4 3-11 3-8 0-16-5-10-7-10-22v-3l25-144L8 236q-8-8-8-19 0-5 1-7z"></path>
</g>
</svg>
{{/inline}}

<div class="ui5-rating-indicator-root"
role="slider"
aria-roledescription="{{_ariaRoleDescription}}"
Expand All @@ -37,6 +11,7 @@
tabindex="{{tabIndex}}"
@focusin="{{_onfocusin}}"
@focusout="{{_onfocusout}}"
@click="{{_onclick}}"
@keydown="{{_onkeydown}}"
title="{{tooltip}}"
aria-label="{{accessibleName}}"
Expand All @@ -46,35 +21,23 @@
>
{{#each _stars}}
{{#if this.selected}}
<li @click="{{../_onclick}}" data-ui5-value="{{this.index}}" class="ui5-rating-indicator-item ui5-rating-indicator-item-sel">
<ui5-icon name="favorite"></ui5-icon>
<li data-ui5-value="{{this.index}}" class="ui5-rating-indicator-item ui5-rating-indicator-item-sel">
<ui5-icon data-ui5-value="{{this.index}}" name="favorite"></ui5-icon>
</li>
{{else if this.halfStar}}
<li @click="{{../_onclick}}" data-ui5-value="{{this.index}}" class="ui5-rating-indicator-item ui5-rating-indicator-item-half">
{{#if this.isFiori}}
{{> fioriSvg}}
{{else}}
{{> horizonSvg}}
{{/if}}
<li class="ui5-rating-indicator-item ui5-rating-indicator-item-half">
<ui5-icon data-ui5-value="{{this.index}}" name="unfavorite"></ui5-icon>
<div class="ui5-rating-indicator-half-icon-wrapper">
<ui5-icon name="favorite" class="ui5-rating-indicator-half-icon"></ui5-icon>
<ui5-icon data-ui5-value="{{this.index}}" name="favorite" class="ui5-rating-indicator-half-icon"></ui5-icon>
</div>
</li>
{{else if ../readonly}}
<li @click="{{../_onclick}}" data-ui5-value="{{this.index}}" class="ui5-rating-indicator-item ui5-rating-indicator-readonly-item-unsel">
{{#if this.isFiori}}
{{> fioriSvg}}
{{else}}
{{> horizonSvg}}
{{/if}}
<li class="ui5-rating-indicator-item ui5-rating-indicator-readonly-item-unsel">
<ui5-icon data-ui5-value="{{this.index}}" name="unfavorite"></ui5-icon>
</li>
{{else}}
<li @click="{{../_onclick}}" data-ui5-value="{{this.index}}" class="ui5-rating-indicator-item ui5-rating-indicator-item-unsel">
{{#if this.isFiori}}
{{> fioriSvg}}
{{else}}
{{> horizonSvg}}
{{/if}}
<li data-ui5-value="{{this.index}}" class="ui5-rating-indicator-item ui5-rating-indicator-item-unsel">
<ui5-icon data-ui5-value="{{this.index}}" name="unfavorite"></ui5-icon>
</li>
{{/if}}
{{/each}}
Expand Down
4 changes: 1 addition & 3 deletions packages/main/src/RatingIndicator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
isEnd,
} from "@ui5/webcomponents-base/dist/Keys.js";
import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import { getTheme } from "@ui5/webcomponents-base/dist/config/Theme.js";
import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
import Float from "@ui5/webcomponents-base/dist/types/Float.js";
import {
Expand Down Expand Up @@ -223,7 +222,6 @@ class RatingIndicator extends UI5Element {
selected: i <= tempValue,
index: i,
halfStar,
isFiori: getTheme().startsWith("sap_fiori"),
});
}
}
Expand All @@ -233,7 +231,7 @@ class RatingIndicator extends UI5Element {
return;
}

this.value = parseInt(event.currentTarget.getAttribute("data-ui5-value"));
this.value = parseInt(event.target.getAttribute("data-ui5-value"));

if (this.value === 1 && this._liveValue === 1) {
this.value = 0;
Expand Down
22 changes: 8 additions & 14 deletions packages/main/src/themes/RatingIndicator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
cursor: initial;
}

:host([readonly]) .ui5-rating-indicator-path{
fill: var(--sapContent_UnratedColor);
:host([readonly]) .ui5-rating-indicator-readonly-item-unsel {
color: var(--sapContent_UnratedColor);
}

:host(:not([readonly]):not([disabled])) .ui5-rating-indicator-root:hover {
Expand Down Expand Up @@ -59,22 +59,16 @@
user-select: none;
}

.ui5-rating-indicator-path-fiori {
stroke: var(--sapContent_UnratedColor);
stroke-width: 4rem;
fill: transparent;
clip-path: url(#ui5-rating-indicator-clip-path-fiori);
.ui5-rating-indicator-item.ui5-rating-indicator-item-sel {
color: var(--sapContent_RatedColor);
}

.ui5-rating-indicator-path-horizon {
stroke: var(--sapContent_UnratedColor);
stroke-width: 6rem;
fill: transparent;
clip-path: url(#ui5-rating-indicator-clip-path-horizon);
.ui5-rating-indicator-item.ui5-rating-indicator-item-unsel {
color: var(--sapContent_UnratedColor);
}

.ui5-rating-indicator-item.ui5-rating-indicator-item-sel {
color: var(--sapContent_RatedColor);
.ui5-rating-indicator-item.ui5-rating-indicator-item-half {
color: var(--sapContent_UnratedColor);
}

.ui5-rating-indicator-item [ui5-icon].ui5-rating-indicator-half-icon {
Expand Down