Skip to content

[mercury] Rename "toggle" to "switch" #429

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
bsastregx merged 2 commits into from
Jan 10, 2025
Merged

[mercury] Rename "toggle" to "switch" #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9dfc80
`[switch]` Rename "toggle" to "switch"
bsastregx Jan 10, 2025
00d414e
`[showcase]` update files
bsastregx Jan 10, 2025
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
2 changes: 1 addition & 1 deletion packages/mercury/showcase/all.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/mercury/showcase/assets/scripts/bundles.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/mercury/showcase/doc-tabular-controls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ <h1 class="section__title">tabular grid controls</h1>
}, 500);

showPopoverBtn.addEventListener("click", () => {
listBoxPopover.hidden = false;
listBoxPopover.show = true;
});
</script>
</div>
Expand Down
83 changes: 42 additions & 41 deletions packages/mercury/showcase/scss/mercury.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10611,7 +10611,7 @@
}
}

%toggle-basic {
%switch-basic {
--ch-switch-track__unchecked-background-color: var(
--mer-color__neutral-gray--650
);
Expand All @@ -10621,7 +10621,8 @@
--ch-switch-thumb__unchecked-background-color: var(--mer-icon__neutral);
--ch-switch-thumb__checked-background-color: var(--mer-icon__neutral);
--ch-switch-thumb__state-transition-duration: 150ms;
font-weight: 400; // TODO: USE THE RIGHT TOKEN AND LINE-HEIGHT
font-weight: var(--mer-font__weight--regular);
line-height: var(--mer-line-height--regular);

&__track {
border-radius: var(--ch-switch-track-block-size);
Expand All @@ -10643,12 +10644,12 @@

&__caption {
&--checked {
font-weight: 600;
// Font weight shouldn't change, since it causes a subtle inline-size shift, moving surrounding elements.
}
}
}

%toggle-small {
%switch-small {
--ch-switch-track-block-size: 16px;
--ch-switch-track-inline-size: 31px;
--ch-switch-thumb-size: 9px;
Expand All @@ -10664,7 +10665,7 @@
}
}

%toggle-large {
%switch-large {
--ch-switch-track-block-size: 26px;
--ch-switch-track-inline-size: 50px;
--ch-switch-thumb-size: 16px;
Expand All @@ -10680,77 +10681,77 @@
}
}

@mixin toggle-small(
$toggle-selector: ".toggle-small",
$track-selector: ".toggle-small::part(track)",
$track--disabled-selector: ".toggle-small::part(track disabled)",
$thumb--unchecked-selector: ".toggle-small::part(thumb unchecked)",
$thumb--checked-selector: ".toggle-small::part(thumb checked)",
$caption--checked-selector: ".toggle-small::part(caption checked)",
@mixin switch-small(
$switch-selector: ".switch-small",
$track-selector: ".switch-small::part(track)",
$track--disabled-selector: ".switch-small::part(track disabled)",
$thumb--unchecked-selector: ".switch-small::part(thumb unchecked)",
$thumb--checked-selector: ".switch-small::part(thumb checked)",
$caption--checked-selector: ".switch-small::part(caption checked)",
$add--disabled: true
) {
#{$toggle-selector} {
@extend %toggle-basic;
@extend %toggle-small;
#{$switch-selector} {
@extend %switch-basic;
@extend %switch-small;
}

#{$track-selector} {
@extend %toggle-basic__track;
@extend %switch-basic__track;
}

@if $add--disabled {
#{$track--disabled-selector} {
@extend %toggle-basic__track--disabled;
@extend %switch-basic__track--disabled;
}
}

#{$thumb--unchecked-selector} {
@extend %toggle-small__thumb--unchecked;
@extend %switch-small__thumb--unchecked;
}

#{$thumb--checked-selector} {
@extend %toggle-small__thumb--checked;
@extend %switch-small__thumb--checked;
}

#{$caption--checked-selector} {
@extend %toggle-basic__caption--checked;
@extend %switch-basic__caption--checked;
}
}

@mixin toggle-large(
$toggle-selector: ".toggle-large",
$track-selector: ".toggle-large::part(track)",
$track--disabled-selector: ".toggle-large::part(track disabled)",
$thumb--unchecked-selector: ".toggle-large::part(thumb unchecked)",
$thumb--checked-selector: ".toggle-large::part(thumb checked)",
$caption--checked-selector: ".toggle-large::part(caption checked)",
@mixin switch-large(
$switch-selector: ".switch-large",
$track-selector: ".switch-large::part(track)",
$track--disabled-selector: ".switch-large::part(track disabled)",
$thumb--unchecked-selector: ".switch-large::part(thumb unchecked)",
$thumb--checked-selector: ".switch-large::part(thumb checked)",
$caption--checked-selector: ".switch-large::part(caption checked)",
$add--disabled: true
) {
#{$toggle-selector} {
@extend %toggle-basic;
@extend %toggle-large;
#{$switch-selector} {
@extend %switch-basic;
@extend %switch-large;
}

#{$track-selector} {
@extend %toggle-basic__track;
@extend %switch-basic__track;
}

@if $add--disabled {
#{$track--disabled-selector} {
@extend %toggle-basic__track--disabled;
@extend %switch-basic__track--disabled;
}
}

#{$thumb--unchecked-selector} {
@extend %toggle-large__thumb--unchecked;
@extend %switch-large__thumb--unchecked;
}

#{$thumb--checked-selector} {
@extend %toggle-large__thumb--checked;
@extend %switch-large__thumb--checked;
}

#{$caption--checked-selector} {
@extend %toggle-basic__caption--checked;
@extend %switch-basic__caption--checked;
}
}

Expand Down Expand Up @@ -11195,7 +11196,7 @@
$tab: true,
$tabular-grid: true,
$ticket-list: true,
$toggle: true,
$switch: true,
$tooltip: true,
$tree-view: true,
$widget: true
Expand Down Expand Up @@ -22974,9 +22975,9 @@
@include ticket-list();
}

@if $toggle {
@include toggle-small();
@include toggle-large();
@if $switch {
@include switch-small();
@include switch-large();
}

@if $tooltip {
Expand Down Expand Up @@ -23062,7 +23063,7 @@
$tab: false,
$tabular-grid: false,
$ticket-list: false,
$toggle: false,
$switch: false,
$tooltip: false,
$tree-view: false,
$widget: false
Expand Down Expand Up @@ -23137,7 +23138,7 @@
$tab: $tab,
$tabular-grid: $tabular-grid,
$ticket-list: $ticket-list,
$toggle: $toggle,
$switch: $switch,
$tooltip: $tooltip,
$tree-view: $tree-view,
$widget: $widget
Expand Down
2 changes: 1 addition & 1 deletion packages/mercury/src/bundles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const getThemeBundles = (basePath: string) =>
getThemeModelItem(basePath, "components/tab"),
getThemeModelItem(basePath, "components/tabular-grid"),
getThemeModelItem(basePath, "components/ticket-list"),
getThemeModelItem(basePath, "components/toggle"),
getThemeModelItem(basePath, "components/switch"),
getThemeModelItem(basePath, "components/tooltip"),
getThemeModelItem(basePath, "components/tree-view"),
getThemeModelItem(basePath, "components/widget"),
Expand Down
3 changes: 3 additions & 0 deletions packages/mercury/src/bundles/scss/components/switch.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "../../../mercury.scss";

@include mercury-only($components: true, $switch: true);
3 changes: 0 additions & 3 deletions packages/mercury/src/bundles/scss/components/toggle.scss
View file
Open in desktop

This file was deleted.

71 changes: 36 additions & 35 deletions ...src/components/toggle/_toggle-styles.scss → ...src/components/switch/_switch-styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%toggle-basic {
%switch-basic {
--ch-switch-track__unchecked-background-color: var(
--mer-color__neutral-gray--650
);
Expand All @@ -8,7 +8,8 @@
--ch-switch-thumb__unchecked-background-color: var(--mer-icon__neutral);
--ch-switch-thumb__checked-background-color: var(--mer-icon__neutral);
--ch-switch-thumb__state-transition-duration: 150ms;
font-weight: 400; // TODO: USE THE RIGHT TOKEN AND LINE-HEIGHT
font-weight: var(--mer-font__weight--regular);
line-height: var(--mer-line-height--regular);

&__track {
border-radius: var(--ch-switch-track-block-size);
Expand All @@ -30,12 +31,12 @@

&__caption {
&--checked {
font-weight: 600;
// Font weight shouldn't change, since it causes a subtle inline-size shift, moving surrounding elements.
}
}
}

%toggle-small {
%switch-small {
--ch-switch-track-block-size: 16px;
--ch-switch-track-inline-size: 31px;
--ch-switch-thumb-size: 9px;
Expand All @@ -51,7 +52,7 @@
}
}

%toggle-large {
%switch-large {
--ch-switch-track-block-size: 26px;
--ch-switch-track-inline-size: 50px;
--ch-switch-thumb-size: 16px;
Expand All @@ -67,76 +68,76 @@
}
}

@mixin toggle-small(
$toggle-selector: ".toggle-small",
$track-selector: ".toggle-small::part(track)",
$track--disabled-selector: ".toggle-small::part(track disabled)",
$thumb--unchecked-selector: ".toggle-small::part(thumb unchecked)",
$thumb--checked-selector: ".toggle-small::part(thumb checked)",
$caption--checked-selector: ".toggle-small::part(caption checked)",
@mixin switch-small(
$switch-selector: ".switch-small",
$track-selector: ".switch-small::part(track)",
$track--disabled-selector: ".switch-small::part(track disabled)",
$thumb--unchecked-selector: ".switch-small::part(thumb unchecked)",
$thumb--checked-selector: ".switch-small::part(thumb checked)",
$caption--checked-selector: ".switch-small::part(caption checked)",
$add--disabled: true
) {
#{$toggle-selector} {
@extend %toggle-basic;
@extend %toggle-small;
#{$switch-selector} {
@extend %switch-basic;
@extend %switch-small;
}

#{$track-selector} {
@extend %toggle-basic__track;
@extend %switch-basic__track;
}

@if $add--disabled {
#{$track--disabled-selector} {
@extend %toggle-basic__track--disabled;
@extend %switch-basic__track--disabled;
}
}

#{$thumb--unchecked-selector} {
@extend %toggle-small__thumb--unchecked;
@extend %switch-small__thumb--unchecked;
}

#{$thumb--checked-selector} {
@extend %toggle-small__thumb--checked;
@extend %switch-small__thumb--checked;
}

#{$caption--checked-selector} {
@extend %toggle-basic__caption--checked;
@extend %switch-basic__caption--checked;
}
}

@mixin toggle-large(
$toggle-selector: ".toggle-large",
$track-selector: ".toggle-large::part(track)",
$track--disabled-selector: ".toggle-large::part(track disabled)",
$thumb--unchecked-selector: ".toggle-large::part(thumb unchecked)",
$thumb--checked-selector: ".toggle-large::part(thumb checked)",
$caption--checked-selector: ".toggle-large::part(caption checked)",
@mixin switch-large(
$switch-selector: ".switch-large",
$track-selector: ".switch-large::part(track)",
$track--disabled-selector: ".switch-large::part(track disabled)",
$thumb--unchecked-selector: ".switch-large::part(thumb unchecked)",
$thumb--checked-selector: ".switch-large::part(thumb checked)",
$caption--checked-selector: ".switch-large::part(caption checked)",
$add--disabled: true
) {
#{$toggle-selector} {
@extend %toggle-basic;
@extend %toggle-large;
#{$switch-selector} {
@extend %switch-basic;
@extend %switch-large;
}

#{$track-selector} {
@extend %toggle-basic__track;
@extend %switch-basic__track;
}

@if $add--disabled {
#{$track--disabled-selector} {
@extend %toggle-basic__track--disabled;
@extend %switch-basic__track--disabled;
}
}

#{$thumb--unchecked-selector} {
@extend %toggle-large__thumb--unchecked;
@extend %switch-large__thumb--unchecked;
}

#{$thumb--checked-selector} {
@extend %toggle-large__thumb--checked;
@extend %switch-large__thumb--checked;
}

#{$caption--checked-selector} {
@extend %toggle-basic__caption--checked;
@extend %switch-basic__caption--checked;
}
}
Loading
Loading