Add grid flag to stripe rows different colours

This commit is contained in:
Andrew Kingston 2023-05-16 17:09:32 +01:00
parent 834202423f
commit ba9691ee12
8 changed files with 32 additions and 10 deletions

View File

@ -11,6 +11,7 @@
export let selected export let selected
export let rowFocused export let rowFocused
export let rowIdx export let rowIdx
export let topRow = false
export let focused export let focused
export let selectedUser export let selectedUser
export let column export let column
@ -68,6 +69,7 @@
{highlighted} {highlighted}
{selected} {selected}
{rowIdx} {rowIdx}
{topRow}
{focused} {focused}
{selectedUser} {selectedUser}
{readonly} {readonly}

View File

@ -6,6 +6,7 @@
export let selectedUser = null export let selectedUser = null
export let error = null export let error = null
export let rowIdx export let rowIdx
export let topRow = false
export let defaultHeight = false export let defaultHeight = false
export let center = false export let center = false
export let readonly = false export let readonly = false
@ -31,13 +32,14 @@
class:readonly class:readonly
class:default-height={defaultHeight} class:default-height={defaultHeight}
class:selected-other={selectedUser != null} class:selected-other={selectedUser != null}
class:alt={rowIdx % 2 === 1}
class:top={topRow}
on:focus on:focus
on:mousedown on:mousedown
on:mouseup on:mouseup
on:click on:click
on:contextmenu on:contextmenu
{style} {style}
data-row={rowIdx}
> >
{#if error} {#if error}
<div class="label"> <div class="label">
@ -70,6 +72,9 @@
width: 0; width: 0;
--cell-color: transparent; --cell-color: transparent;
} }
.cell.alt {
--cell-background: var(--cell-background-alt);
}
.cell.default-height { .cell.default-height {
height: var(--default-row-height); height: var(--default-row-height);
} }
@ -98,8 +103,8 @@
.cell.selected-other:not(.focused):after { .cell.selected-other:not(.focused):after {
border-radius: 0 2px 2px 2px; border-radius: 0 2px 2px 2px;
} }
.cell[data-row="0"].error:after, .cell.top.error:after,
.cell[data-row="0"].selected-other:not(.focused):after { .cell.top.selected-other:not(.focused):after {
border-radius: 2px 2px 2px 0; border-radius: 2px 2px 2px 0;
} }
@ -152,7 +157,7 @@
overflow: hidden; overflow: hidden;
user-select: none; user-select: none;
} }
.cell[data-row="0"] .label { .cell.top .label {
bottom: auto; bottom: auto;
top: 100%; top: 100%;
border-radius: 0 2px 2px 2px; border-radius: 0 2px 2px 2px;

View File

@ -38,6 +38,7 @@
highlighted={rowFocused || rowHovered} highlighted={rowFocused || rowHovered}
selected={rowSelected} selected={rowSelected}
{defaultHeight} {defaultHeight}
rowIdx={row?.__idx}
> >
<div class="gutter"> <div class="gutter">
{#if $$slots.default} {#if $$slots.default}

View File

@ -40,6 +40,7 @@
export let allowExpandRows = true export let allowExpandRows = true
export let allowEditRows = true export let allowEditRows = true
export let allowDeleteRows = true export let allowDeleteRows = true
export let stripeRows = false
// Unique identifier for DOM nodes inside this instance // Unique identifier for DOM nodes inside this instance
const rand = Math.random() const rand = Math.random()
@ -54,6 +55,7 @@
allowExpandRows, allowExpandRows,
allowEditRows, allowEditRows,
allowDeleteRows, allowDeleteRows,
stripeRows,
}) })
// Build up context // Build up context
@ -88,6 +90,7 @@
allowExpandRows, allowExpandRows,
allowEditRows, allowEditRows,
allowDeleteRows, allowDeleteRows,
stripeRows,
}) })
// Set context for children to consume // Set context for children to consume
@ -105,6 +108,7 @@
id="grid-{rand}" id="grid-{rand}"
class:is-resizing={$isResizing} class:is-resizing={$isResizing}
class:is-reordering={$isReordering} class:is-reordering={$isReordering}
class:stripe={$config.stripeRows}
style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};" style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};"
> >
<div class="controls"> <div class="controls">
@ -167,6 +171,7 @@
/* Variables */ /* Variables */
--cell-background: var(--spectrum-global-color-gray-50); --cell-background: var(--spectrum-global-color-gray-50);
--cell-background-hover: var(--spectrum-global-color-gray-100); --cell-background-hover: var(--spectrum-global-color-gray-100);
--cell-background-alt: var(--cell-background);
--cell-padding: 8px; --cell-padding: 8px;
--cell-spacing: 4px; --cell-spacing: 4px;
--cell-border: 1px solid var(--spectrum-global-color-gray-200); --cell-border: 1px solid var(--spectrum-global-color-gray-200);
@ -183,6 +188,9 @@
.grid.is-reordering :global(*) { .grid.is-reordering :global(*) {
cursor: grabbing !important; cursor: grabbing !important;
} }
.grid.stripe {
--cell-background-alt: var(--spectrum-global-color-gray-75);
}
.grid-data-outer, .grid-data-outer,
.grid-data-inner { .grid-data-inner {

View File

@ -36,7 +36,11 @@
<div bind:this={body} class="grid-body"> <div bind:this={body} class="grid-body">
<GridScrollWrapper scrollHorizontally scrollVertically wheelInteractive> <GridScrollWrapper scrollHorizontally scrollVertically wheelInteractive>
{#each $renderedRows as row, idx} {#each $renderedRows as row, idx}
<GridRow {row} {idx} invertY={idx >= $rowVerticalInversionIndex} /> <GridRow
{row}
top={idx === 0}
invertY={idx >= $rowVerticalInversionIndex}
/>
{/each} {/each}
{#if $config.allowAddRows && $renderedColumns.length} {#if $config.allowAddRows && $renderedColumns.length}
<div <div

View File

@ -3,7 +3,7 @@
import DataCell from "../cells/DataCell.svelte" import DataCell from "../cells/DataCell.svelte"
export let row export let row
export let idx export let top = false
export let invertY = false export let invertY = false
const { const {
@ -41,7 +41,8 @@
invertX={columnIdx >= $columnHorizontalInversionIndex} invertX={columnIdx >= $columnHorizontalInversionIndex}
highlighted={rowHovered || rowFocused || reorderSource === column.name} highlighted={rowHovered || rowFocused || reorderSource === column.name}
selected={rowSelected} selected={rowSelected}
rowIdx={idx} rowIdx={row.__idx}
topRow={top}
focused={$focusedCellId === cellId} focused={$focusedCellId === cellId}
selectedUser={$selectedCellMap[cellId]} selectedUser={$selectedCellMap[cellId]}
width={column.width} width={column.width}

View File

@ -167,7 +167,7 @@
focused={$focusedCellId === cellId} focused={$focusedCellId === cellId}
width={$stickyColumn.width} width={$stickyColumn.width}
{updateValue} {updateValue}
rowIdx={0} topRow={offset === 0}
{invertY} {invertY}
> >
{#if $stickyColumn?.schema?.autocolumn} {#if $stickyColumn?.schema?.autocolumn}
@ -193,7 +193,7 @@
row={newRow} row={newRow}
focused={$focusedCellId === cellId} focused={$focusedCellId === cellId}
width={column.width} width={column.width}
rowIdx={0} topRow={offset === 0}
invertX={columnIdx >= $columnHorizontalInversionIndex} invertX={columnIdx >= $columnHorizontalInversionIndex}
{invertY} {invertY}
> >

View File

@ -82,7 +82,8 @@
{rowFocused} {rowFocused}
selected={rowSelected} selected={rowSelected}
highlighted={rowHovered || rowFocused} highlighted={rowHovered || rowFocused}
rowIdx={idx} rowIdx={row.__idx}
topRow={idx === 0}
focused={$focusedCellId === cellId} focused={$focusedCellId === cellId}
selectedUser={$selectedCellMap[cellId]} selectedUser={$selectedCellMap[cellId]}
width={$stickyColumn.width} width={$stickyColumn.width}