diff --git a/README.md b/README.md index 7572556ff4..717c39014a 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ The DataGrid supports the following CSS variables for customization: .rdg { /* Selection */ --rdg-selection-width: 2px; - --rdg-selection-color: hsl(207, 75%, 66%); + --rdg-selection-color: light-dark(hsl(207deg 80% 42%), hsl(207deg 75% 66%)); /* Typography */ --rdg-font-size: 14px; @@ -169,8 +169,8 @@ The DataGrid supports the following CSS variables for customization: /* Rows */ --rdg-row-hover-background-color: light-dark(hsl(0deg 0% 96%), hsl(0deg 0% 9%)); - --rdg-row-selected-background-color: light-dark(hsl(207deg 76% 92%), hsl(207deg 76% 42%)); - --rdg-row-selected-hover-background-color: light-dark(hsl(207deg 76% 88%), hsl(207deg 76% 38%)); + --rdg-row-selected-background-color: light-dark(hsl(207deg 76% 92%), hsl(207deg 76% 26%)); + --rdg-row-selected-hover-background-color: light-dark(hsl(207deg 76% 88%), hsl(207deg 76% 22%)); /* Borders */ --rdg-border-width: 1px; @@ -179,7 +179,7 @@ The DataGrid supports the following CSS variables for customization: --rdg-summary-border-color: light-dark(#aaa, #555); /* Checkboxes */ - --rdg-checkbox-focus-color: hsl(207deg 100% 69%); + --rdg-checkbox-focus-color: light-dark(hsl(207deg 80% 42%), hsl(207deg 100% 69%)); /* Frozen columns */ --rdg-frozen-column-shadow-color: light-dark(rgb(0 0 0 / 15%), rgb(0 0 0 / 40%)); @@ -209,7 +209,7 @@ The DataGrid accepts standard [`className`](#classname-string--undefined) and [` columns={columns} rows={rows} className="my-grid custom-theme" - style={{ width: 800, height: 600 }} + style={{ inlineSize: 800, blockSize: 600 }} /> ``` diff --git a/src/HeaderCell.tsx b/src/HeaderCell.tsx index cbf6842a58..8fff7f8529 100644 --- a/src/HeaderCell.tsx +++ b/src/HeaderCell.tsx @@ -60,8 +60,8 @@ const cellOverClassname = `rdg-cell-drag-over ${cellDraggingOrOver}`; const dragImageClassname = css` @layer rdg.HeaderCell { border-radius: 4px; - width: fit-content; - outline: 2px solid hsl(207, 100%, 50%); + inline-size: fit-content; + outline: 2px solid hsl(207deg 100% 50%); outline-offset: -2px; } `; diff --git a/src/style/core.ts b/src/style/core.ts index a7098bd02b..7ed0c9233e 100644 --- a/src/style/core.ts +++ b/src/style/core.ts @@ -14,7 +14,7 @@ const root = css` @layer rdg.Root { --rdg-selection-width: 2px; - --rdg-selection-color: hsl(207, 75%, 66%); + --rdg-selection-color: light-dark(hsl(207deg 80% 42%), hsl(207deg 75% 66%)); --rdg-font-size: 14px; --rdg-border-width: 1px; --rdg-summary-border-width: calc(var(--rdg-border-width) * 2); @@ -25,9 +25,9 @@ const root = css` --rdg-header-background-color: light-dark(hsl(0deg 0% 97.5%), hsl(0deg 0% 10.5%)); --rdg-header-draggable-background-color: light-dark(hsl(0deg 0% 90.5%), hsl(0deg 0% 17.5%)); --rdg-row-hover-background-color: light-dark(hsl(0deg 0% 96%), hsl(0deg 0% 9%)); - --rdg-row-selected-background-color: light-dark(hsl(207deg 76% 92%), hsl(207deg 76% 42%)); - --rdg-row-selected-hover-background-color: light-dark(hsl(207deg 76% 88%), hsl(207deg 76% 38%)); - --rdg-checkbox-focus-color: hsl(207deg 100% 69%); + --rdg-row-selected-background-color: light-dark(hsl(207deg 76% 92%), hsl(207deg 76% 26%)); + --rdg-row-selected-hover-background-color: light-dark(hsl(207deg 76% 88%), hsl(207deg 76% 22%)); + --rdg-checkbox-focus-color: light-dark(hsl(207deg 80% 42%), hsl(207deg 100% 69%)); --rdg-frozen-column-shadow-color: light-dark(rgb(0 0 0 / 15%), rgb(0 0 0 / 40%)); /* forced colors mode replaces non-system colors, which would hide the drag handle */ @@ -104,7 +104,7 @@ export const viewportDraggingClassname = `rdg-viewport-dragging ${viewportDraggi const frozenColumnShadowClassname = css` @layer rdg.FrozenColumnShadow { position: sticky; - width: 10px; + inline-size: 10px; pointer-events: none; z-index: 1; opacity: 1; diff --git a/test/browser/styles.css b/test/styles.css similarity index 58% rename from test/browser/styles.css rename to test/styles.css index 742f2b657c..2f7262405c 100644 --- a/test/browser/styles.css +++ b/test/styles.css @@ -1,3 +1,7 @@ +:root { + color-scheme: light dark; +} + .rdg { block-size: 1080px; scrollbar-width: none; diff --git a/test/visual/basicGrid.test.tsx b/test/visual/basicGrid.test.tsx index 3fb0eee55d..e4e35115be 100644 --- a/test/visual/basicGrid.test.tsx +++ b/test/visual/basicGrid.test.tsx @@ -45,7 +45,7 @@ test('basic grid', async () => { rows={rows} topSummaryRows={topSummaryRows} bottomSummaryRows={bottomSummaryRows} - style={{ height: 350 }} + style={{ blockSize: 350 }} /> ); diff --git a/test/visual/forcedColors.test.tsx b/test/visual/colorSchemes.test.tsx similarity index 78% rename from test/visual/forcedColors.test.tsx rename to test/visual/colorSchemes.test.tsx index e604b871ca..f54a0f6345 100644 --- a/test/visual/forcedColors.test.tsx +++ b/test/visual/colorSchemes.test.tsx @@ -27,19 +27,24 @@ const rows: readonly Row[] = [ const selectedRows: ReadonlySet = new Set([1, 2]); -// Windows contrast themes are light or dark, so test both palettes -const palettes = [ - { colorScheme: 'light', prefix: 'forced-colors' }, - { colorScheme: 'dark', prefix: 'forced-colors-dark' } +// Windows contrast themes are light or dark too, so test both palettes in forced colors mode +const modes = [ + { colorScheme: 'light', forcedColors: 'none', prefix: 'light' }, + { colorScheme: 'dark', forcedColors: 'none', prefix: 'dark' }, + { colorScheme: 'light', forcedColors: 'active', prefix: 'forced-colors' }, + { colorScheme: 'dark', forcedColors: 'active', prefix: 'forced-colors-dark' } ] as const; -describe.each(palettes)('$colorScheme palette', ({ colorScheme, prefix }) => { +describe.each(modes)('$prefix', ({ colorScheme, forcedColors, prefix }) => { beforeEach(async ({ skip, onTestFinished }) => { // WebKit matches `(forced-colors: active)` when emulated, but does not force any colors, // and Firefox ignores the emulated color scheme in forced colors mode - skip(server.browser === 'webkit' || (server.browser === 'firefox' && colorScheme === 'dark')); + skip( + forcedColors === 'active' && + (server.browser === 'webkit' || (server.browser === 'firefox' && colorScheme === 'dark')) + ); - await commands.emulateMedia({ forcedColors: 'active', colorScheme }); + await commands.emulateMedia({ forcedColors, colorScheme }); onTestFinished(async () => { // restore the context defaults, as `null` would make the page follow the OS instead await commands.emulateMedia({ forcedColors: 'none', colorScheme: 'light' }); @@ -47,7 +52,7 @@ describe.each(palettes)('$colorScheme palette', ({ colorScheme, prefix }) => { await page.render( { groupBy={['country', 'year']} expandedGroupIds={new Set(['USA', 'USA__2020'])} onExpandedGroupIdsChange={() => {}} - style={{ height: 350 }} + style={{ blockSize: 350 }} /> ); diff --git a/vite.config.ts b/vite.config.ts index b311a21a40..80e1ea2317 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -337,7 +337,7 @@ export default defineConfig({ name: 'browser', include: ['browser/**/*.test.*', ...(isCI ? ['visual/*.test.*'] : [])], browser: { enabled: true }, - setupFiles: ['test/browser/styles.css', 'test/setupBrowser.ts', 'test/failOnConsole.ts'] + setupFiles: ['test/styles.css', 'test/setupBrowser.ts', 'test/failOnConsole.ts'] } }, { diff --git a/website/routes/Animation.tsx b/website/routes/Animation.tsx index 7eb9451f96..488c555f76 100644 --- a/website/routes/Animation.tsx +++ b/website/routes/Animation.tsx @@ -16,7 +16,7 @@ const rangeClassname = css` display: flex; align-items: center; gap: 8px; - margin-bottom: 8px; + margin-block-end: 8px; `; const transitionClassname = css` diff --git a/website/routes/CommonFeatures.tsx b/website/routes/CommonFeatures.tsx index be55d9c42d..ad6c89b424 100644 --- a/website/routes/CommonFeatures.tsx +++ b/website/routes/CommonFeatures.tsx @@ -151,7 +151,7 @@ const columns: readonly Column[] = [ &:modal { display: flex; flex-direction: column; - width: 300px; + inline-size: 300px; gap: 16px; padding: 16px; } diff --git a/website/routes/CustomizableRenderers.tsx b/website/routes/CustomizableRenderers.tsx index c5ab63808b..d775526337 100644 --- a/website/routes/CustomizableRenderers.tsx +++ b/website/routes/CustomizableRenderers.tsx @@ -33,7 +33,7 @@ const selectCellClassname = css` const sortPriorityClassname = css` color: gray; - margin-left: 2px; + margin-inline-start: 2px; `; interface Row {