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: toggle chip style refresh #247

Merged
merged 1 commit into from
Dec 26, 2024
Merged

fix: toggle chip style refresh #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
328 changes: 164 additions & 164 deletions src/app/config/enums.json
View file
Open in desktop

Large diffs are not rendered by default.

330 changes: 165 additions & 165 deletions src/app/config/models.json
View file
Open in desktop

Large diffs are not rendered by default.

468 changes: 234 additions & 234 deletions src/app/config/utils.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/components/user-input/toggle-chip/NeonToggleChip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { computed, defineComponent, useAttrs } from 'vue';
import { computed, defineComponent, ref, useAttrs } from 'vue';
import { NeonToggleChipSize } from '@/common/enums/NeonToggleChipSize';
import { NeonFunctionalColor } from '@/common/enums/NeonFunctionalColor';
import NeonIcon from '@/components/presentation/icon/NeonIcon.vue';
Expand Down Expand Up @@ -51,8 +51,11 @@ export default defineComponent({
],
setup(props, { emit }) {
const attrs = useAttrs();
const toggleChipLabel = ref<HTMLLabelElement | null>(null);

const emitInput = (value: boolean) => {
emit('update:modelValue', value);
toggleChipLabel.value?.blur();
};

const sanitizedAttributes = computed(() => {
Expand All @@ -69,6 +72,7 @@ export default defineComponent({

return {
sanitizedAttributes,
toggleChipLabel,
emitInput,
toggleChip,
};
Expand Down
1 change: 1 addition & 0 deletions src/components/user-input/toggle-chip/NeonToggleChip.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<label
ref="toggleChipLabel"
:aria-disabled="disabled"
:aria-pressed="modelValue"
:class="[
Expand Down
4 changes: 2 additions & 2 deletions src/sass/components/_chip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
$neon-chip-rgb: var(--neon-rgb-#{$color});
$neon-chip-color: var(--neon-color-#{$color});
border: var(--neon-border-width) var(--neon-border-style) $neon-chip-color;
background-color: rgba($neon-chip-rgb, var(--neon-opacity-toggle-chip));
background-color: rgba($neon-chip-rgb, var(--neon-opacity-chip));
@include svg.color-with-svg($neon-chip-color);

&:focus,
&:hover {
background-color: rgba($neon-chip-rgb, calc(2 * var(--neon-opacity-toggle-chip)));
background-color: rgba($neon-chip-rgb, calc(2 * var(--neon-opacity-chip)));
}
}

Expand Down
26 changes: 13 additions & 13 deletions src/sass/components/_toggle-chip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@
width: fit-content;
cursor: pointer;
border: var(--neon-border-width-toggle-chip) var(--neon-border-style);
border-radius: var(--neon-border-radius);
border-radius: var(--neon-border-radius-toggle-chip);
transition: width ease-in-out var(--neon-animation-speed-fast), background-color ease-in-out var(--neon-animation-speed-fast);
border-color: var(--neon-border-color-toggle-chip);
background-color: rgba(var(--neon-border-rgb-toggle-chip), var(--neon-opacity-toggle-chip));
color: rgba(var(--neon-rgb-text), 0.667);

&:not(.neon-toggle-chip--disabled) {
&:focus,
&:hover {
background-color: rgba(var(--neon-border-rgb-toggle-chip), calc(2 * var(--neon-opacity-toggle-chip-hover)));
}
}
background-color: var(--neon-background-color-toggle-chip);
font-weight: var(--neon-font-weight-toggle-chip);

@each $color in palettes.$neon-functional-colors {
&--#{$color}:not(.neon-toggle-chip--disabled) {
color: var(--neon-color-#{$color});

&:focus,
&:hover {
background-color: rgba(var(--neon-rgb-#{$color}), var(--neon-opacity-toggle-chip-hover));
}

&.neon-toggle-chip--checked {
border-color: var(--neon-color-#{$color});
background-color: rgba(var(--neon-rgb-#{$color}), var(--neon-opacity-toggle-chip));
@include svg.color-with-svg(var(--neon-color-#{$color}));
background-color: var(--neon-color-#{$color});
@include svg.color-with-svg(var(--neon-color-toggle-chip-text-checked));
}

&.neon-toggle-chip--checked {
&:focus,
&:hover {
background-color: rgba(var(--neon-rgb-#{$color}), var(--neon-opacity-toggle-chip-hover));
background-color: rgba(var(--neon-rgb-#{$color}), var(--neon-opacity-toggle-chip-hover-checked));
}
}
}
Expand Down
16 changes: 12 additions & 4 deletions src/sass/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@

/* chips */
--neon-border-radius-chip: var(--neon-border-radius);
--neon-opacity-chip: 0.23;

/* toggle chips */
--neon-font-weight-toggle-chip: var(--neon-font-weight-bold);
--neon-border-width-toggle-chip: 1rem;
--neon-border-radius-toggle-chip: 2rem;
--neon-opacity-toggle-chip-hover: 0.125;
--neon-opacity-toggle-chip-hover-checked: 0.85;

/* scrollbars */
--neon-width-scrollbar: 8rem;
Expand Down Expand Up @@ -571,8 +579,8 @@
--neon-color-toggle-chip-text: var(--neon-color-text);
--neon-border-rgb-toggle-chip: var(--neon-rgb-neutral-d3);
--neon-border-color-toggle-chip: var(--neon-color-neutral-d3);
--neon-opacity-toggle-chip: 0.23;
--neon-opacity-toggle-chip-hover: 0.33;
--neon-background-color-toggle-chip: transparent;
--neon-color-toggle-chip-text-checked: var(--neon-color-inverse);

/* slider & range slider */
--neon-color-slider-track: var(--neon-color-neutral-d3);
Expand Down Expand Up @@ -878,8 +886,8 @@
--neon-color-toggle-chip-text: var(--neon-color-text);
--neon-border-rgb-toggle-chip: var(--neon-rgb-neutral-l3);
--neon-border-color-toggle-chip: var(--neon-color-neutral-l3);
--neon-opacity-toggle-chip: 0.23;
--neon-opacity-toggle-chip-hover: 0.33;
--neon-background-color-toggle-chip: transparent;
--neon-color-toggle-chip-text-checked: var(--neon-color-inverse);

/* slider & range slider */
--neon-color-slider-track: var(--neon-color-neutral-l4);
Expand Down
Loading