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

Jump to bottom

refactor: simplify css vars usage #129

Merged
merged 6 commits into from
Feb 5, 2023
Merged

refactor: simplify css vars usage #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51a5245
fix(loader): add background overlay in overlay mode only
jd-solanki Jan 29, 2023
d00cafa
wip: using --a-layer instead of CSS property for useLayer
jd-solanki Feb 3, 2023
b0930d4
wip: loader overlay issue when button is inside card
jd-solanki Feb 3, 2023
3b6bcae
wip: use $a-surface properly
jd-solanki Feb 5, 2023
ac70b3e
test: snapshots updated
jd-solanki Feb 5, 2023
2215eca
chore: reset playground
jd-solanki Feb 5, 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
1 change: 0 additions & 1 deletion docs/components/Playground.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script lang="ts" setup>

</script>

<template>
Expand Down
2 changes: 1 addition & 1 deletion packages/anu-vue/src/components/card/ACard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ else

<template>
<div
class="a-card relative overflow-hidden bg-[hsla(var(--a-layer),var(--un-bg-opacity,1))]"
class="a-card relative overflow-hidden bg-[hsla(var(--a-surface),var(--un-bg-opacity,1))]"
:class="classes"
:style="[
...styles,
Expand Down
4 changes: 2 additions & 2 deletions packages/anu-vue/src/components/loader/ALoader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defineOptions({

const slots = useSlots()

const { styles } = useColor(toRef(props, 'color'), 'rating-color')
const { styles } = useColor(toRef(props, 'color'), 'spinner-color')

// TODO: Create composable useLazyVShow
const isShownOnce = ref(props.loading)
Expand Down Expand Up @@ -55,7 +55,7 @@ if (props.fullPage) {
]"
>
<div
style="background: var(--a-loader-overlay-bg)"
:style="{ background: props.overlay ? 'hsla(var(--a-loader-overlay-bg),var(--a-loader-overlay-bg-opacity))' : undefined }"
class="a-loader-overlay"
:class="[
(props.overlay || props.fullPage) && 'w-full h-full flex flex-col gap-3 items-center justify-center overflow-hidden',
Expand Down
2 changes: 1 addition & 1 deletion packages/anu-vue/src/components/select/ASelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ const selectedValue = computed(() => {
<ul
v-show="isOptionsVisible"
ref="refFloating"
class="a-select-options-container absolute bg-[hsl(var(--a-layer))]"
class="a-select-options-container absolute bg-[hsl(var(--a-surface))]"
:class="props.optionsWrapperClasses"
@click="closeOptions"
>
Expand Down
50 changes: 27 additions & 23 deletions packages/anu-vue/src/composables/useLayer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ export const useLayer = () => {
// ℹ️ For light variant we will keep the overlay color of `--a-layer` instead of adopting the layer color. We will add it regardless of its theme color or not.
if (propVariant === 'light') {
// Set loader typography's title & subtitle opacity to 1
classes.push('[&_.a-loader-overlay]-[--a-title-opacity:1] [&_.a-loader-overlay]-[--a-subtitle-opacity:1]')
classes.push('[&_.a-loader-overlay]-[--a-title-opacity:1] [&_.a-loader-overlay]-[--a-subtitle-opacity:1] [--a-loader-overlay-bg-opacity:.85]')

// Loader overlay
styles.push({ '--a-loader-overlay-bg': 'hsla(var(--a-layer),var(--a-loader-overlay-bg-opacity))' })
styles.push({ '--a-loader-overlay-bg': 'var(--a-theme-color)' })
}

/*
Expand All @@ -103,25 +103,26 @@ export const useLayer = () => {
*/

if (_isThemeColor) {
styles.push({ '--a-layer-hsl-color': `var(--a-${propColor})` })
styles.push({ '--a-layer': `var(--a-${propColor})` })

if (propVariant === 'fill') {
// Background
styles.push({ background: `hsla(var(--a-${propColor}),var(--un-bg-opacity))` })
classes.push('[--un-bg-opacity:1]')
styles.push({ background: 'hsla(var(--a-layer),var(--a-layer-opacity))' })
classes.push('[--a-layer-opacity:1]')

// Text
if (propColor !== undefined && propColor !== null)
classes.push('text-white')

// Loader overlay
styles.push({ '--a-loader-overlay-bg': `hsla(var(--a-${propColor}),var(--un-bg-opacity))` })
styles.push({ '--a-loader-overlay-bg': 'var(--a-layer)' })
classes.push('[--a-loader-overlay-bg-opacity:1]')
}

else if (propVariant === 'light') {
// Background
styles.push({ background: `hsla(var(--a-${propColor}),var(--un-bg-opacity))` })
classes.push('[--un-bg-opacity:0.15]')
styles.push({ background: 'hsla(var(--a-layer),var(--a-layer-opacity))' })
classes.push('[--a-layer-opacity:0.15]')

// text
if (propColor !== undefined && propColor !== null)
Expand All @@ -133,33 +134,36 @@ export const useLayer = () => {
else if (propVariant === 'outline') {
// Border
classes.push('border-width-1', 'border-solid')
styles.push({ borderColor: `hsl(var(--a-${propColor})` })
styles.push({ borderColor: 'hsl(var(--a-layer)' })

// Text
if (propColor !== undefined && propColor !== null)
classes.push(`text-${propColor}`)
classes.push('text-[hsl(var(--a-layer))]')

// Loader overlay
styles.push({ '--a-loader-overlay-bg': 'hsl(var(--a-layer))' })
styles.push({ '--a-loader-overlay-bg': 'var(--a-surface)' })
classes.push('[--a-loader-overlay-bg-opacity:1]')
}

else if (propVariant === 'text') {
// Text
if (propColor !== undefined && propColor !== null)
classes.push(`text-${propColor}`)
classes.push('text-[hsl(var(--a-layer))]')

// Loader overlay
styles.push({ '--a-loader-overlay-bg': 'hsl(var(--a-layer))' })
// styles.push({ '--a-loader-overlay-bg': 'inherit' })
classes.push('[--a-loader-overlay-bg-opacity:1]')
}
}
else if (propColor) {
const _colord = colord(propColor as string)

styles.push({ '--a-layer-hsl-color': _colord.toHslString().replace(/hsla?\(([\d\s]+,[\d\s]+%,[\d\s]+%).*/gm, '$1') })
styles.push({ '--a-layer': _colord.toHslString().replace(/hsla?\(([\d\s]+,[\d\s]+%,[\d\s]+%).*/gm, '$1') })

if (propVariant === 'fill') {
// Background
styles.push({ background: propColor })
styles.push({ background: 'hsla(var(--a-layer),var(--a-layer-opacity))' })
classes.push('[--a-layer-opacity:1]')

// Text
if (propColor !== undefined && propColor !== null)
Expand All @@ -171,34 +175,34 @@ export const useLayer = () => {
}
else if (propVariant === 'light') {
// Background
const _hslaColor = _colord.toHsl()
styles.push({ background: `hsla(${_hslaColor.h}, ${_hslaColor.s}%, ${_hslaColor.l}%, 0.15)` })
styles.push({ background: 'hsla(var(--a-layer),var(--a-layer-opacity))' })
classes.push('[--a-layer-opacity:0.15]')

// Text
if (propColor !== undefined && propColor !== null)
styles.push({ color: propColor })
styles.push({ color: 'hsl(var(--a-layer))' })

// We have set loader overlay color above (before _isThemeColor condition)
}
else if (propVariant === 'outline') {
// Border
classes.push('border-width-1', 'border-solid')
styles.push({ borderColor: propColor })
styles.push({ borderColor: 'hsl(var(--a-layer))' })

// Text
if (propColor !== undefined && propColor !== null)
styles.push({ color: propColor })
styles.push({ color: 'hsl(var(--a-layer))' })

// Loader overlay
styles.push({ '--a-loader-overlay-bg': 'hsl(var(--a-layer))' })
styles.push({ '--a-loader-overlay-bg': 'inherit' })
}
else if (propVariant === 'text') {
// Text
if (propColor !== undefined && propColor !== null)
styles.push({ color: propColor })
styles.push({ color: 'hsl(var(--a-layer))' })

// Loader overlay
styles.push({ '--a-loader-overlay-bg': 'hsl(var(--a-layer))' })
styles.push({ '--a-loader-overlay-bg': 'inherit' })
}
}

Expand Down
5 changes: 3 additions & 2 deletions packages/anu-vue/test/__snapshots__/ABtn.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1

exports[`Testing ABtn > can mount component 1`] = `
"<button tabindex=\\"0\\" style=\\"--a-title-color: white; --a-subtitle-color: white; --a-layer-hsl-color: var(--a-primary); --a-loader-overlay-bg: hsla(var(--a-primary),var(--un-bg-opacity)); --a-spacing: 1;\\" class=\\"whitespace-nowrap inline-flex justify-center items-center relative a-btn states a-title-opacity-100 a-subtitle-opacity-100 [--un-bg-opacity:1] text-white\\">
"<button tabindex=\\"0\\" style=\\"--a-title-color: white; --a-subtitle-color: white; --a-layer: var(--a-primary); --a-loader-overlay-bg: var(--a-layer); --a-spacing: 1;\\" class=\\"whitespace-nowrap inline-flex justify-center items-center relative a-btn states a-title-opacity-100 a-subtitle-opacity-100 [--a-layer-opacity:1] text-white [--a-loader-overlay-bg-opacity:1]\\">
<!--v-if-->Click me
<!--v-if-->
</button>"
Expand All @@ -18,7 +18,8 @@ exports[`Testing ABtn > has proper classes 1`] = `
"states",
"a-title-opacity-100",
"a-subtitle-opacity-100",
"[--un-bg-opacity:1]",
"[--a-layer-opacity:1]",
"text-white",
"[--a-loader-overlay-bg-opacity:1]",
]
`;
6 changes: 3 additions & 3 deletions packages/anu-vue/test/__snapshots__/ATable.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1

exports[`Testing ATable & ADataTable > mount component 1`] = `
"<div class=\\"a-card relative overflow-hidden bg-[hsla(var(--a-layer),var(--un-bg-opacity,1))] a-table a-data-table\\" style=\\"--a-spacing: 1;\\">
"<div class=\\"a-card relative overflow-hidden bg-[hsla(var(--a-surface),var(--un-bg-opacity,1))] a-table a-data-table\\" style=\\"--a-spacing: 1;\\">
<!-- 👉 Image -->
<!--v-if-->
<!-- 👉 Typography -->
Expand Down Expand Up @@ -65,9 +65,9 @@ exports[`Testing ATable & ADataTable > mount component 1`] = `
<!--teleport start-->
<!--teleport end-->
</div>
<div class=\\"a-data-table-pagination-navigation\\"><button tabindex=\\"-1\\" style=\\"--a-layer-hsl-color: var(--a-primary); --a-spacing: 1;\\" class=\\"whitespace-nowrap inline-flex justify-center items-center relative a-btn-icon-only opacity-50 pointer-events-none states a-title-opacity-100 a-subtitle-opacity-100 a-title-primary a-subtitle-primary a-data-table-paginate-previous\\" disabled=\\"\\"><i class=\\"i-bx-left-arrow-alt\\"></i>
<div class=\\"a-data-table-pagination-navigation\\"><button tabindex=\\"-1\\" style=\\"--a-layer: var(--a-primary); --a-spacing: 1;\\" class=\\"whitespace-nowrap inline-flex justify-center items-center relative a-btn-icon-only opacity-50 pointer-events-none states a-title-opacity-100 a-subtitle-opacity-100 a-title-primary a-subtitle-primary a-data-table-paginate-previous\\" disabled=\\"\\"><i class=\\"i-bx-left-arrow-alt\\"></i>
<!--v-if-->
</button><button tabindex=\\"0\\" style=\\"--a-layer-hsl-color: var(--a-primary); --a-spacing: 1;\\" class=\\"whitespace-nowrap inline-flex justify-center items-center relative a-btn-icon-only states a-title-opacity-100 a-subtitle-opacity-100 a-title-primary a-subtitle-primary a-data-table-paginate-next\\"><i class=\\"i-bx-right-arrow-alt\\"></i>
</button><button tabindex=\\"0\\" style=\\"--a-layer: var(--a-primary); --a-spacing: 1;\\" class=\\"whitespace-nowrap inline-flex justify-center items-center relative a-btn-icon-only states a-title-opacity-100 a-subtitle-opacity-100 a-title-primary a-subtitle-primary a-data-table-paginate-next\\"><i class=\\"i-bx-right-arrow-alt\\"></i>
<!--v-if-->
</button></div>
</div>
Expand Down
9 changes: 3 additions & 6 deletions packages/preset-theme-default/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,17 @@ export function presetThemeDefault(options: PresetOptions = {}): Preset {
},
},
safelist: [
...colors.map(c => `[--a-layer-color:hsla(var(--a-${c}),var(--un-bg-opacity,1))]`),
...colors.map(c => `bg-${c}`),
...colors.map(c => `hover:bg-${c}`),

...colors.map(c => `border-${c}`),
...[...colors, '$a-layer-text'].map(c => `text-${c}`),
...colors.map(c => `text-${c}`),
...colors.map(c => `shadow-${c}`),
...colors.map(c => `after:bg-${c}`),
...colors.map(c => `next:checked:bg-${c}`),
...colors.map(c => `next:checked:border-${c}`),

// Typography
...[...colors, 'layer-text', 'white'].map(c => `a-title-${c}`),
...[...colors, 'layer-text', 'white'].map(c => `a-subtitle-${c}`),
...colors.map(c => `a-title-${c}`),
...colors.map(c => `a-subtitle-${c}`),
...['top', 'right', 'bottom', 'left'].map(dir => `a-drawer-anchor-${dir}`),
],
rules,
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-theme-default/src/rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ const rules: Preset['rules'] = [

// Typography
[
/^a-(title|subtitle|text)-([-\w]+)$/,
/^a-(title|subtitle)-([-\w]+)$/,
([, type, c]: string[]) => ({
[`--a-${type}-color`]: `var(--a-${c})`,
}),
],
[
/^a-(title|subtitle|text)-opacity-(\d+)$/,
/^a-(title|subtitle)-opacity-(\d+)$/,
([, type, o]: string[]) => ({
[`--a-${type}-opacity`]: `${Number(o) * 0.01}`,
}),
Expand Down
24 changes: 17 additions & 7 deletions packages/preset-theme-default/src/scss/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,19 @@ $body-color: hsla(var(--a-base-color), 0.68);

:root {
--a-base-color: 0, 10%, 20%;
--a-layer: 0, 0%, 100%;

// ℹ️ Theme color (for now Used for light variant overlay color)
--a-theme-color: 0, 0%, 100%;

// ℹ️ Used for background on body like select options, card, etc
--a-surface: 0, 0%, 100%;

--a-border-opacity: 0.12;
--a-loader-overlay-bg: hsla(var(--a-layer),var(--a-loader-overlay-bg-opacity));
--a-loader-overlay-bg-opacity: 0.85;
--a-loader-overlay-bg: var(--a-layer);

// ℹ️ Only light variant will have 0.35 or something else
--a-loader-overlay-bg-opacity: 1;

--a-overlay-color: 0, 0%, 0%;
--a-overlay-opacity: 0.35;

Expand All @@ -23,10 +32,10 @@ $body-color: hsla(var(--a-base-color), 0.68);
--a-warning: 42.4, 100%, 50%;
--a-danger: 358.3, 100%, 64.9%;

// TODO: Add support to customize contrast color in => packages/anu-vue/src/utils/colord.ts
// Contrast colors
// --a-contrast-dark: hsla(var(--a-base-color), var(--a-text-emphasis-medium-opacity));
--a-contrast-dark: #000;
--a-contrast-light: #fff;
// --a-contrast-dark: #000;
// --a-contrast-light: #fff;

// text emphasis
--a-text-emphasis-high-opacity: 0.87;
Expand Down Expand Up @@ -72,7 +81,8 @@ $body-color: hsla(var(--a-base-color), 0.68);

:root.dark {
--a-base-color: 0, 0%, 94%;
--a-layer: 0, 0%, 12%;
--a-theme-color: 0, 0%, 0%;
--a-surface: 0, 0%, 12%;
--a-overlay-opacity: 0.5;

--a-primary: 261, 73%, 66.3%;
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-theme-default/src/shortcuts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const shortcuts: Exclude<Preset['shortcuts'], undefined | StaticShortcutMap> = [
'a-badge-dot': 'spacing:min-w-[0.666666666666667em] spacing:h-[0.666666666666667em]',

// with text-xs, outline: 0.166666666666667em => 2px
'a-badge-bordered': 'outline em:spacing:outline-width-[0.166666666666667em] outline-[hsl(var(--a-layer))]',
'a-badge-bordered': 'outline em:spacing:outline-width-[0.166666666666667em] outline-[hsl(var(--a-theme-color))]',

// 👉 Base Input
'a-base-input-root': 'em:spacing:gap-y-1',
Expand Down