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

feat(switch): add slot icons #5241

Merged
merged 3 commits into from
Dec 1, 2023
Merged

feat(switch): add slot icons #5241

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9255be1
feat(switch): add slot icons
mavyfaby Nov 30, 2023
3ef4b31
refactor(switch): remove unwanted spaces
mavyfaby Nov 30, 2023
7bdf63e
refactor(switch): reduce code by using `fill: currentColor`
mavyfaby Nov 30, 2023
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
19 changes: 16 additions & 3 deletions switch/internal/_icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ $_easing-standard: map.get($_md-sys-motion, 'easing-standard');
position: absolute;
inset: 0;
margin: auto;
display: flex;
align-items: center;
justify-content: center;

transition: fill 67ms linear, opacity 33ms linear,
transform 167ms $_easing-standard;
Expand All @@ -45,49 +48,59 @@ $_easing-standard: map.get($_md-sys-motion, 'easing-standard');
transform: rotate(-45deg);
}

.icon--off {
.icon--off {
mavyfaby marked this conversation as resolved.
Show resolved Hide resolved
width: var(--_icon-size);
height: var(--_icon-size);
fill: var(--_icon-color);
color: var(--_icon-color);
mavyfaby marked this conversation as resolved.
Show resolved Hide resolved
}

.unselected:hover .icon--off {
fill: var(--_hover-icon-color);
color: var(--_hover-icon-color);
}

mavyfaby marked this conversation as resolved.
Show resolved Hide resolved
.unselected:focus-within .icon--off {
fill: var(--_focus-icon-color);
color: var(--_focus-icon-color);
}

.unselected:active .icon--off {
fill: var(--_pressed-icon-color);
color: var(--_pressed-icon-color);
}

.unselected.disabled .icon--off {
fill: var(--_disabled-icon-color);
colorr: var(--_disabled-icon-color);
opacity: var(--_disabled-icon-opacity);
}

.icon--on {
width: var(--_selected-icon-size);
height: var(--_selected-icon-size);
fill: var(--_selected-icon-color);
color: var(--_selected-icon-color);
}

.selected:hover .icon--on {
fill: var(--_selected-hover-icon-color);
color: var(--_selected-hover-icon-color);
}

.selected:focus-within .icon--on {
fill: var(--_selected-focus-icon-color);
color: var(--_selected-focus-icon-color);
}

.selected:active .icon--on {
fill: var(--_selected-pressed-icon-color);
color: var(--_selected-pressed-icon-color);
}

.selected.disabled .icon--on {
fill: var(--_disabled-selected-icon-color);
color: var(--_disabled-selected-icon-color);
opacity: var(--_disabled-selected-icon-opacity);
}
}
Expand Down
20 changes: 12 additions & 8 deletions switch/internal/switch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,12 @@ export class Switch extends switchBaseClass {
*/
private renderOnIcon() {
return html`
<svg class="icon icon--on" viewBox="0 0 24 24">
<path
d="M9.55 18.2 3.65 12.3 5.275 10.675 9.55 14.95 18.725 5.775 20.35 7.4Z" />
</svg>
<slot class="icon icon--on" name="on-icon">
<svg viewBox="0 0 24 24">
<path
d="M9.55 18.2 3.65 12.3 5.275 10.675 9.55 14.95 18.725 5.775 20.35 7.4Z" />
</svg>
</slot>
`;
}

Expand All @@ -171,10 +173,12 @@ export class Switch extends switchBaseClass {
*/
private renderOffIcon() {
return html`
<svg class="icon icon--off" viewBox="0 0 24 24">
<path
d="M6.4 19.2 4.8 17.6 10.4 12 4.8 6.4 6.4 4.8 12 10.4 17.6 4.8 19.2 6.4 13.6 12 19.2 17.6 17.6 19.2 12 13.6Z" />
</svg>
<slot class="icon icon--off" name="off-icon">
<svg viewBox="0 0 24 24">
<path
d="M6.4 19.2 4.8 17.6 10.4 12 4.8 6.4 6.4 4.8 12 10.4 17.6 4.8 19.2 6.4 13.6 12 19.2 17.6 17.6 19.2 12 13.6Z" />
</svg>
</slot>
`;
}

Expand Down