Skip to content

chore: rename data-theme to data-sonner-theme #560

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
emilkowalski merged 1 commit into from
Feb 7, 2025
Merged

chore: rename data-theme to data-sonner-theme #560

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
2 changes: 1 addition & 1 deletion src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ const Toaster = forwardRef<HTMLElement, ToasterProps>(function Toaster(props, re
ref={listRef}
className={className}
data-sonner-toaster
data-theme={actualTheme}
data-sonner-theme={actualTheme}
data-y-position={y}
data-lifted={expanded && toasts.length > 1 && !expand}
data-x-position={x}
Expand Down
14 changes: 7 additions & 7 deletions src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ html[dir='rtl'],
background: rgba(0, 0, 0, 0.08);
}

[data-sonner-toast][data-theme='dark'] [data-cancel] {
[data-sonner-toast][data-sonner-theme='dark'] [data-cancel] {
background: rgba(255, 255, 255, 0.3);
}

Expand Down Expand Up @@ -454,7 +454,7 @@ html[dir='rtl'],
}
}

[data-sonner-toaster][data-theme='light'] {
[data-sonner-toaster][data-sonner-theme='light'] {
--normal-bg: #fff;
--normal-border: var(--gray4);
--normal-text: var(--gray12);
Expand All @@ -476,19 +476,19 @@ html[dir='rtl'],
--error-text: hsl(360, 100%, 45%);
}

[data-sonner-toaster][data-theme='light'] [data-sonner-toast][data-invert='true'] {
[data-sonner-toaster][data-sonner-theme='light'] [data-sonner-toast][data-invert='true'] {
--normal-bg: #000;
--normal-border: hsl(0, 0%, 20%);
--normal-text: var(--gray1);
}

[data-sonner-toaster][data-theme='dark'] [data-sonner-toast][data-invert='true'] {
[data-sonner-toaster][data-sonner-theme='dark'] [data-sonner-toast][data-invert='true'] {
--normal-bg: #fff;
--normal-border: var(--gray3);
--normal-text: var(--gray12);
}

[data-sonner-toaster][data-theme='dark'] {
[data-sonner-toaster][data-sonner-theme='dark'] {
--normal-bg: #000;
--normal-bg-hover: hsl(0, 0%, 12%);
--normal-border: hsl(0, 0%, 20%);
Expand All @@ -512,13 +512,13 @@ html[dir='rtl'],
--error-text: hsl(358, 100%, 81%);
}

[data-sonner-toaster][data-theme='dark'] [data-sonner-toast] [data-close-button] {
[data-sonner-toaster][data-sonner-theme='dark'] [data-sonner-toast] [data-close-button] {
background: var(--normal-bg);
border-color: var(--normal-border);
color: var(--normal-text);
}

[data-sonner-toaster][data-theme='dark'] [data-sonner-toast] [data-close-button]:hover {
[data-sonner-toaster][data-sonner-theme='dark'] [data-sonner-toast] [data-close-button]:hover {
background: var(--normal-bg-hover);
border-color: var(--normal-border-hover);
}
Expand Down
8 changes: 4 additions & 4 deletions test/tests/basic.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,20 @@ test.describe('Basic functionality', () => {

test("toaster's theme should be light", async ({ page }) => {
await page.getByTestId('infinity-toast').click();
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-theme', 'light');
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-sonner-theme', 'light');
});

test("toaster's theme should be dark", async ({ page }) => {
await page.goto('/?theme=dark');
await page.getByTestId('infinity-toast').click();
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-theme', 'dark');
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-sonner-theme', 'dark');
});

test("toaster's theme should be changed", async ({ page }) => {
await page.getByTestId('infinity-toast').click();
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-theme', 'light');
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-sonner-theme', 'light');
await page.getByTestId('theme-button').click();
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-theme', 'dark');
await expect(page.locator('[data-sonner-toaster]')).toHaveAttribute('data-sonner-theme', 'dark');
});

test('return focus to the previous focused element', async ({ page }) => {
Expand Down