Skip to content

Fix overriding elevation-# classes. Add elevation-none to remove elevation-#. Closes #233 #236

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
techniq merged 1 commit into from
Feb 6, 2024
Merged

Fix overriding elevation-# classes. Add elevation-none to remove elevation-#. Closes #233 #236

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
5 changes: 5 additions & 0 deletions .changeset/six-drinks-smash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"svelte-ux": patch
---

Fix overriding `elevation-#` classes. Add `elevation-none` to remove `elevation-#`
4 changes: 4 additions & 0 deletions packages/svelte-ux/src/lib/plugins/tailwind/elevation.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
module.exports = function ({ addUtilities }) {
addUtilities({
// Add `elevation-#` classes
'.elevation-none': {
'box-shadow': 'none',
},

'.elevation-0': {
'box-shadow':
'0px 0px 0px 0px rgba(0,0,0,0.20), 0px 0px 0px 0px rgba(0,0,0,0.14), 0px 0px 0px 0px rgba(0,0,0,0.12)',
Expand Down
10 changes: 9 additions & 1 deletion packages/svelte-ux/src/lib/utils/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import clsx, { type ClassValue } from 'clsx';
import { extendTailwindMerge } from 'tailwind-merge';
import { range } from 'd3-array';

/**
* Convert object to style string
Expand All @@ -25,7 +26,14 @@ export function objectToString(styleObj: { [key: string]: string }) {
const twMerge = extendTailwindMerge({
extend: {
classGroups: {
shadow: ['shadow-border-l', 'shadow-border-r', 'shadow-border-t', 'shadow-border-b'],
shadow: [
'shadow-border-l',
'shadow-border-r',
'shadow-border-t',
'shadow-border-b',
'elevation-none',
...range(1, 25).map((x) => `elevation-${x}`),
],
},
},
});
Expand Down
6 changes: 6 additions & 0 deletions packages/svelte-ux/src/routes/docs/components/Card/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,9 @@
<Preview>
<Card title="Title" loading />
</Preview>

<h2>remove shadow</h2>

<Preview>
<Card class="elevation-none">Contents</Card>
</Preview>