Skip to content

Commit

Permalink
fix(core/group): header and item hover/active style (#453)
Browse files Browse the repository at this point in the history
  • Loading branch information
goncalosard authored Mar 24, 2023
1 parent b3dec82 commit 64cd604
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 1 deletion.
10 changes: 10 additions & 0 deletions packages/core/src/components/group-item/group-item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,21 @@
@include hover {
background-color: var(--theme-group-item--background--hover);
border-color: var(--theme-group-item--border-color--hover);

&.selected {
border-color: var(--theme-group-item--border-color--selected);
background-color: var(--theme-group-item--background--selected);
}
}

@include active {
background-color: var(--theme-group-item--background--active);
border-color: var(--theme-group-item--border-color--active);

&.selected {
border-color: var(--theme-group-item--border-color--selected);
background-color: var(--theme-group-item--background--selected);
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions packages/core/src/components/group/group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,21 @@
@include hover {
background-color: var(--theme-group-item--background--hover);
border-color: var(--theme-group-item--border-color--hover);

&.selected {
border: var(--theme-primary-bdr-2);
background-color: var(--theme-group-item--background--selected);
}
}

@include active {
background-color: var(--theme-group-item--background--active);
border-color: var(--theme-group-item--border-color--active);

&.selected {
border: var(--theme-primary-bdr-2);
background-color: var(--theme-group-item--background--selected);
}
}

@include focus-visible {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tests/group/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<title>Stencil Component Starter</title>
</head>
<body>
<ix-group header="Header text" sub-header="Subheader text">
<ix-group id="group" header="Header text" sub-header="Subheader text">
<ix-group-item text="Example text 1"></ix-group-item>
<ix-group-item text="Example text 2"></ix-group-item>
<ix-group-item text="Example text 3"></ix-group-item>
Expand Down
16 changes: 16 additions & 0 deletions packages/core/src/tests/group/group.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,21 @@ regressionTest.describe('group', () => {
});
});

regressionTest('selected', async ({ page }) => {
await page.goto('group/basic');
await page.click("[id='group']");
await page.hover("[id='group']");
expect(await page.screenshot({ fullPage: true })).toMatchSnapshot();
});

regressionTest('item selected', async ({ page }) => {
await page.goto('group/basic');
await page.locator('.btn-expand-header').click();
await page.locator('text=Example text 1').first().click();
await page.locator('text=Example text 1').first().hover();

expect(await page.screenshot({ fullPage: true })).toMatchSnapshot();
});

// ix-icon-button
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 64cd604

Please sign in to comment.