Skip to content

Support group header hover and regular bg #927

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support group header hover and regular bg #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a48b18
feat: support group header hover and regular bg
rferreira98 Mar 20, 2024
451f3c4
chore: remove storybook override
rferreira98 Mar 20, 2024
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
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/core/src/common/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export function makeCSSStyle(theme: Theme): Record<string, string> {
"--gdg-fg-icon-header": theme.fgIconHeader,
"--gdg-text-header": theme.textHeader,
"--gdg-text-group-header": theme.textGroupHeader ?? theme.textHeader,
"--gdg-bg-group-header": theme.bgGroupHeader ?? theme.bgHeader,
"--gdg-bg-group-header-hovered": theme.bgGroupHeaderHovered,
"--gdg-text-header-selected": theme.textHeaderSelected,
"--gdg-bg-cell": theme.bgCell,
"--gdg-bg-cell-medium": theme.bgCellMedium,
Expand Down Expand Up @@ -60,6 +62,8 @@ export interface Theme {
fgIconHeader: string;
textHeader: string;
textGroupHeader?: string;
bgGroupHeader?: string;
bgGroupHeaderHovered: string;
textHeaderSelected: string;
bgCell: string;
bgCellMedium: string;
Expand Down Expand Up @@ -101,6 +105,8 @@ const dataEditorBaseTheme: Theme = {
bgIconHeader: "#737383",
fgIconHeader: "#FFFFFF",
textHeader: "#313139",
bgGroupHeader: "#F7F7F8",
bgGroupHeaderHovered: "#EFEFF1",
textGroupHeader: "#313139BB",
textHeaderSelected: "#FFFFFF",

Expand Down
1 change: 1 addition & 0 deletions packages/core/src/docs/08-theming.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ The global theme is provided by the DataEditor by default and can be overriden b
| bgIconHeader | --gdg-bg-icon-header | string | The background color for header icons |
| fgIconHeader | --gdg-fg-icon-header | string | The foreground color for header icons |
| textHeader | --gdg-text-header | string | The header text color |
| bgGroupHeader | --gdg-bg-group-header | string \\| undefined | The group header background color, if none provided the \`bgHeader\` is used instead. |
| textGroupHeader | --gdg-text-group-header | string \\| undefined | The group header text color, if none provided the \`textHeader\` is used instead. |
| textHeaderSelected | --gdg-text-header-selected | string | The text color used for selected headers |
| bgCell | --gdg-bg-cell | string | The primary background color of the data grid. |
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/internal/data-grid/render/data-grid-render.header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ export function drawGroups(
const groupTheme =
group?.overrideTheme === undefined ? theme : mergeAndRealizeTheme(theme, group.overrideTheme);
const isHovered = hRow === -2 && hCol !== undefined && hCol >= span[0] && hCol <= span[1];

const fillColor = isHovered ? groupTheme.bgHeaderHovered : groupTheme.bgHeader;
const fillColor = isHovered ? groupTheme.bgGroupHeaderHovered : groupTheme.bgGroupHeader ?? groupTheme.bgHeader;
if (fillColor !== theme.bgHeader) {
ctx.fillStyle = fillColor;
ctx.fill();
Expand Down