Add quiet table setting and improve table borders
This commit is contained in:
parent
27c3be9d7e
commit
2f52f31ae4
|
@ -1579,6 +1579,11 @@
|
||||||
"value": "spectrum--large"
|
"value": "spectrum--large"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "boolean",
|
||||||
|
"label": "Quiet",
|
||||||
|
"key": "quiet"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"dataContext": {
|
"dataContext": {
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
export let columns
|
export let columns
|
||||||
export let showAutoColumns
|
export let showAutoColumns
|
||||||
export let rowCount
|
export let rowCount
|
||||||
|
export let quiet
|
||||||
|
|
||||||
const component = getContext("component")
|
const component = getContext("component")
|
||||||
const { styleable, Provider } = getContext("sdk")
|
const { styleable, Provider } = getContext("sdk")
|
||||||
|
@ -28,7 +29,7 @@
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
const actualCount = Math.min(rowCount, dataCount)
|
const actualCount = Math.min(rowCount, dataCount)
|
||||||
return `height: ${36 + actualCount * 56}px;`
|
return `height: ${35 + actualCount * 56}px;`
|
||||||
}
|
}
|
||||||
|
|
||||||
const sortRows = (rows, sortColumn, sortOrder) => {
|
const sortRows = (rows, sortColumn, sortOrder) => {
|
||||||
|
@ -72,63 +73,65 @@
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div use:styleable={$component.styles}>
|
||||||
lang="en"
|
<div
|
||||||
dir="ltr"
|
lang="en"
|
||||||
use:styleable={$component.styles}
|
dir="ltr"
|
||||||
class={`spectrum ${size || 'spectrum--medium'} ${theme || 'spectrum--light'}`}>
|
class:quiet
|
||||||
<div style={contentStyle}>
|
class={`spectrum ${size || 'spectrum--medium'} ${theme || 'spectrum--light'}`}>
|
||||||
<table class="spectrum-Table">
|
<div class="content" style={contentStyle}>
|
||||||
<thead class="spectrum-Table-head">
|
<table class="spectrum-Table" class:spectrum-Table--quiet={quiet}>
|
||||||
<tr>
|
<thead class="spectrum-Table-head">
|
||||||
{#if $component.children}
|
<tr>
|
||||||
<th class="spectrum-Table-headCell">
|
|
||||||
<div class="spectrum-Table-headCell-content" />
|
|
||||||
</th>
|
|
||||||
{/if}
|
|
||||||
{#each fields as field}
|
|
||||||
<th
|
|
||||||
class="spectrum-Table-headCell is-sortable"
|
|
||||||
class:is-sorted-desc={sortColumn === field && sortOrder === 'Descending'}
|
|
||||||
class:is-sorted-asc={sortColumn === field && sortOrder === 'Ascending'}
|
|
||||||
on:click={() => sortBy(field)}>
|
|
||||||
<div class="spectrum-Table-headCell-content">
|
|
||||||
{schema[field]?.name}
|
|
||||||
<svg
|
|
||||||
class="spectrum-Icon spectrum-UIIcon-ArrowDown100 spectrum-Table-sortedIcon"
|
|
||||||
class:visible={sortColumn === field}
|
|
||||||
focusable="false"
|
|
||||||
aria-hidden="true">
|
|
||||||
<use xlink:href="#spectrum-css-icon-Arrow100" />
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
</th>
|
|
||||||
{/each}
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody class="spectrum-Table-body">
|
|
||||||
{#each sortedRows as row}
|
|
||||||
<tr class="spectrum-Table-row">
|
|
||||||
{#if $component.children}
|
{#if $component.children}
|
||||||
<td class="spectrum-Table-cell">
|
<th class="spectrum-Table-headCell">
|
||||||
<div class="spectrum-Table-cell-content">
|
<div class="spectrum-Table-headCell-content" />
|
||||||
<Provider data={row}>
|
</th>
|
||||||
<slot />
|
|
||||||
</Provider>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
{/if}
|
{/if}
|
||||||
{#each fields as field}
|
{#each fields as field}
|
||||||
<td class="spectrum-Table-cell">
|
<th
|
||||||
<div class="spectrum-Table-cell-content">
|
class="spectrum-Table-headCell is-sortable"
|
||||||
<CellRenderer schema={schema[field]} value={row[field]} />
|
class:is-sorted-desc={sortColumn === field && sortOrder === 'Descending'}
|
||||||
|
class:is-sorted-asc={sortColumn === field && sortOrder === 'Ascending'}
|
||||||
|
on:click={() => sortBy(field)}>
|
||||||
|
<div class="spectrum-Table-headCell-content">
|
||||||
|
{schema[field]?.name}
|
||||||
|
<svg
|
||||||
|
class="spectrum-Icon spectrum-UIIcon-ArrowDown100 spectrum-Table-sortedIcon"
|
||||||
|
class:visible={sortColumn === field}
|
||||||
|
focusable="false"
|
||||||
|
aria-hidden="true">
|
||||||
|
<use xlink:href="#spectrum-css-icon-Arrow100" />
|
||||||
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</th>
|
||||||
{/each}
|
{/each}
|
||||||
</tr>
|
</tr>
|
||||||
{/each}
|
</thead>
|
||||||
</tbody>
|
<tbody class="spectrum-Table-body">
|
||||||
</table>
|
{#each sortedRows as row}
|
||||||
|
<tr class="spectrum-Table-row">
|
||||||
|
{#if $component.children}
|
||||||
|
<td class="spectrum-Table-cell spectrum-Table-cell--divider">
|
||||||
|
<div class="spectrum-Table-cell-content">
|
||||||
|
<Provider data={row}>
|
||||||
|
<slot />
|
||||||
|
</Provider>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
{/if}
|
||||||
|
{#each fields as field}
|
||||||
|
<td class="spectrum-Table-cell">
|
||||||
|
<div class="spectrum-Table-cell-content">
|
||||||
|
<CellRenderer schema={schema[field]} value={row[field]} />
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
{/each}
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -136,6 +139,11 @@
|
||||||
.spectrum {
|
.spectrum {
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
border: 1px solid
|
||||||
|
var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid)) !important;
|
||||||
|
}
|
||||||
|
.spectrum.quiet {
|
||||||
|
border: none !important;
|
||||||
}
|
}
|
||||||
table {
|
table {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -149,8 +157,6 @@
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
background-color: var(--spectrum-global-color-gray-100);
|
background-color: var(--spectrum-global-color-gray-100);
|
||||||
border-bottom: 1px solid
|
|
||||||
var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid));
|
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
.spectrum-Table-headCell-content {
|
.spectrum-Table-headCell-content {
|
||||||
|
@ -161,13 +167,23 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
.spectrum-Table-cell {
|
td {
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
border-bottom: 1px solid
|
border-bottom: none !important;
|
||||||
var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid));
|
border-left: none !important;
|
||||||
|
border-right: none !important;
|
||||||
|
border-top: 1px solid
|
||||||
|
var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid)) !important;
|
||||||
|
}
|
||||||
|
tr:first-child td {
|
||||||
border-top: none !important;
|
border-top: none !important;
|
||||||
}
|
}
|
||||||
|
.spectrum:not(.quiet) td.spectrum-Table-cell--divider {
|
||||||
|
width: 1px;
|
||||||
|
border-right: 1px solid
|
||||||
|
var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid)) !important;
|
||||||
|
}
|
||||||
.spectrum-Table-cell-content {
|
.spectrum-Table-cell-content {
|
||||||
height: 55px;
|
height: 55px;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
@ -184,4 +200,9 @@
|
||||||
.spectrum-Table-sortedIcon.visible {
|
.spectrum-Table-sortedIcon.visible {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
.spectrum,
|
||||||
|
th {
|
||||||
|
border-bottom: 1px solid
|
||||||
|
var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid)) !important;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue