Skip to content
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.

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

Components accessibility updates & dom optimization checks #1863

Merged
merged 8 commits into from
May 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion packages/ui/src/components/va-checkbox/VaCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
ref="input"
type="checkbox"
class="va-checkbox__input"
:aria-label="$props.ariaLabel"
:id="computedId"
:name="computedName"
:tabindex="computedTabIndex"
Expand Down Expand Up @@ -90,6 +91,7 @@ export default defineComponent({
indeterminateIcon: { type: String as PropType<string>, default: 'remove' },
id: { type: String as PropType<string>, default: '' },
name: { type: String as PropType<string>, default: '' },
ariaLabel: { type: String, default: '' },
},
setup (props, { emit }) {
const elements = {
Expand Down Expand Up @@ -168,7 +170,7 @@ export default defineComponent({
toggleSelection,
onBlur,
onFocus,
computedTabIndex: computed(() => props.disabled || props.readonly ? -1 : 0),
computedTabIndex: computed(() => props.disabled ? -1 : 0),
computedId: computed(() => props.id || uniqueId.value),
computedName: computed(() => props.name || uniqueId.value),
}
Expand Down
13 changes: 10 additions & 3 deletions packages/ui/src/components/va-chip/VaChip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
@focus="$emit('focus')"
@mouseenter="onMouseEnter"
@mouseleave="onMouseLeave"
:tabindex="indexComputed"
>
<va-icon
v-if="icon"
class="va-chip__icon"
aria-hidden="true"
:name="icon"
:size="iconSize"
/>
Expand All @@ -34,6 +34,10 @@
v-if="closeable"
class="va-chip__close-icon"
name="close"
role="button"
aria-label="close"
aria-hidden="false"
:tabindex="tabIndexComputed"
:size="iconSize"
@click.stop="close"
/>
Expand All @@ -47,7 +51,6 @@ import {
getBoxShadowColor,
getHoverColor,
getFocusColor,
getTextColor,
} from '../../services/color-config/color-functions'
import { useRouterLink, useRouterLinkProps } from '../../composables/useRouterLink'
import useKeyboardOnlyFocus from '../../composables/useKeyboardOnlyFocus'
Expand Down Expand Up @@ -126,7 +129,7 @@ export default defineComponent({

iconSize: computed(() => size[props.size]),

indexComputed: computed(() => props.disabled ? -1 : 0),
tabIndexComputed: computed(() => props.disabled ? -1 : 0),

computedClass: computed(() => ({
'va-chip--small': props.size === 'small',
Expand Down Expand Up @@ -203,6 +206,10 @@ export default defineComponent({
&__close-icon {
cursor: pointer;

&:focus {
@include focus-outline;
}

@at-root {
.va-chip--disabled {
.va-chip__close-icon {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<template>
<div
class="va-color-indicator"
@click="toggleModelValue"
:class="computedClass"
:style="computedStyle"
@click="toggleModelValue"
@keydown.enter="toggleModelValue"
@keydown.space="toggleModelValue"
>
<div
class="va-color-indicator__core"
Expand Down Expand Up @@ -73,7 +75,8 @@ export default defineComponent({
border-color: $vue-darkest-blue;
}

&--hoverable &__core:hover {
&--hoverable &__core:hover,
&:focus {
transform: scale(1.1);
transition: transform 0.1s linear;
}
Expand Down
23 changes: 17 additions & 6 deletions packages/ui/src/components/va-color-input/VaColorInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,35 @@
<div class="va-color-input">
<va-color-indicator
class="va-color-input__dot"
role="button"
aria-label="open color picker"
:aria-disabled="$props.disabled"
:tabindex="tabIndexComputed"
:color="valueComputed"
:indicator="indicator"
@click="callPickerDialog"
@keydown.space="callPickerDialog"
@keydown.enter="callPickerDialog"
/>
<va-input
class="va-color-input__input"
v-model="valueComputed"
:disabled="disabled"
placeholder="input color"
v-model="valueComputed"
:tabindex="tabIndexComputed"
:disabled="$props.disabled"
/>
<input
ref="colorPicker"
type="color"
class="visually-hidden"
aria-hidden="true"
tabindex="-1"
v-model="valueComputed" />
</div>
</template>

<script lang="ts">
import { defineComponent, PropType, ref } from 'vue'
import { defineComponent, PropType, ref, computed } from 'vue'

import { useStateful, useStatefulProps, useStatefulEmits } from '../../composables/useStateful'
import VaColorIndicator from '../va-color-indicator'
Expand All @@ -36,8 +45,8 @@ export default defineComponent({
emits: useStatefulEmits,
props: {
...useStatefulProps,
modelValue: { type: String as PropType<string>, default: null },
disabled: { type: Boolean as PropType<boolean>, default: false },
modelValue: { type: String, default: null },
disabled: { type: Boolean, default: false },
indicator: {
type: String as PropType<'dot' | 'square'>,
default: 'dot',
Expand All @@ -49,8 +58,9 @@ export default defineComponent({

const colorPicker = ref<HTMLInputElement>()
const callPickerDialog = () => !props.disabled && colorPicker.value?.click()
const tabIndexComputed = computed(() => props.disabled ? -1 : 0)

return { valueComputed, callPickerDialog, colorPicker }
return { valueComputed, callPickerDialog, colorPicker, tabIndexComputed }
},
})
</script>
Expand All @@ -66,6 +76,7 @@ export default defineComponent({

&__input {
margin-bottom: 0;
margin-left: 0.25rem;
min-width: 5.6rem;

&__pointer {
Expand Down
12 changes: 10 additions & 2 deletions packages/ui/src/components/va-color-palette/VaColorPalette.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
<template>
<div class="va-color-palette">
<ul class="va-color-palette__colors">
<ul
class="va-color-palette__colors"
role="listbox"
aria-label="color selection"
>
<va-color-indicator
v-for="(color, index) in palette"
:modelValue="valueComputed === color"
:key="index"
role="option"
:aria-label="`color ${color}`"
:aria-selected="isSelected(color)"
tabindex="0"
:modelValue="isSelected(color)"
:color="color"
:square="indicator === 'square'"
@update:modelValue="valueComputed = color"
Expand Down
24 changes: 12 additions & 12 deletions packages/ui/src/components/va-counter/VaCounter.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<VaInputWrapper
class="va-counter"
aria-live="polite"
v-bind="{ ...fieldListeners, ...inputWrapperPropsComputed }"
:class="classComputed"
:style="styleComputed"
:focused="isFocused"
@click="focus()"
@keydown.up.prevent="increaseCount()"
@keydown.down.prevent="decreaseCount()"
>
Expand All @@ -17,6 +17,7 @@
<slot name="decreaseAction" v-bind="{ ...slotScope, decreaseCount }">
<va-button
class="va-counter__button-decrease"
aria-label="decrease"
v-bind="decreaseButtonProps"
@click="decreaseCount()"
/>
Expand All @@ -43,6 +44,7 @@
<slot name="increaseAction" v-bind="{ ...slotScope, increaseCount }">
<va-button
class="va-counter__button-increase"
aria-label="increase"
v-bind="increaseButtonProps"
@click="increaseCount()"
/>
Expand All @@ -69,10 +71,12 @@

<input
v-if="!$slots.content"
class="va-input__content__input"
ref="input"
class="va-input__content__input"
type="number"
inputmode="decimal"
:tabindex="tabIndexComputed"
aria-label="counter value"
v-bind="{ ...inputAttributesComputed, ...inputListeners }"
:value="valueComputed"
@input="setCountInput"
Expand Down Expand Up @@ -153,7 +157,6 @@ export default defineComponent({

const {
isFocused,
// will be useful when we resolve problem with 'withConfigTransport'
focus,
blur,
} = useFocus(input, emit)
Expand Down Expand Up @@ -205,6 +208,8 @@ export default defineComponent({
: Number(valueComputed.value) >= props.max
})

const tabIndexComputed = computed(() => props.disabled ? -1 : 0)

const isDecreaseActionDisabled = computed(() => (
isMinReached.value || props.readonly || props.disabled
))
Expand Down Expand Up @@ -304,22 +309,17 @@ export default defineComponent({
decreaseButtonProps,
increaseButtonProps,

tabIndexComputed,

colorComputed,
classComputed,
styleComputed,
marginComputed,

// while we have problem with 'withConfigTransport'
// focus,
// blur,
focus,
blur,
}
},

// we will use this while we have problem with 'withConfigTransport'
methods: {
focus () { this.input?.focus() },
blur () { this.input?.blur() },
},
})
</script>

Expand Down
25 changes: 21 additions & 4 deletions packages/ui/src/components/va-data-table/VaDataTable.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template>
<va-inner-loading
class="va-data-table"
aria-live="polite"
:class="[
{ 'va-data-table--sticky': $props.stickyHeader },
{ 'va-data-table--scroll': !!$props.height },
Expand Down Expand Up @@ -31,27 +32,31 @@
>
<th
v-if="selectable"
scope="col"
:class="['va-data-table__table-th', 'va-data-table__table-cell-select']"
>
<va-checkbox
v-if="selectMode === 'multiple'"
aria-label="select all rows"
:model-value="severalRowsSelected ? 'idl' : allRowsSelected"
:true-value="true"
:false-value="false"
:color="selectedColor"
indeterminate-value="idl"
indeterminate
@update:model-value="toggleBulkSelection"
:color="selectedColor"
/>
</th>

<th
v-for="column in columnsComputed"
:key="column.key"
scope="col"
:aria-sort="getColumnAriaSortOrder(column.key)"
:title="column.headerTitle"
@click.exact="column.sortable && toggleSorting(column)"
:style="{ ...getHeaderCSSVariables(column), ...getStyles(column.headerStyle) }"
:class="['va-data-table__table-th', ...getClasses(column.headerClasses)]"
@click.exact="column.sortable && toggleSorting(column)"
>
<div class="va-data-table__table-th-wrapper">
<span v-if="`header(${column.key})` in $slots">
Expand All @@ -65,6 +70,7 @@
<div
v-if="column.sortable"
class="va-data-table__table-th-sorting"
aria-hidden="true"
@selectstart.prevent
>
<va-icon
Expand Down Expand Up @@ -131,10 +137,11 @@
>
<va-checkbox
:model-value="isRowSelected(row)"
:color="selectedColor"
:aria-label="`select row ${row.initialIndex}`"
@click.shift.exact="shiftSelectRows(row)"
@click.ctrl.exact="ctrlSelectRow(row)"
@click.exact="ctrlSelectRow(row)"
:color="selectedColor"
/>
</td>

Expand Down Expand Up @@ -167,13 +174,14 @@
<th v-if="selectable" class="va-data-table__table-th">
<va-checkbox
v-if="selectMode === 'multiple'"
aria-label="select all rows"
:model-value="severalRowsSelected ? 'idl' : allRowsSelected"
:true-value="true"
:false-value="false"
:color="selectedColor"
indeterminate-value="idl"
indeterminate
@update:model-value="toggleBulkSelection"
:color="selectedColor"
/>
</th>

Expand Down Expand Up @@ -370,6 +378,14 @@ export default defineComponent({
...omit(attrs, ['class', 'style']),
}) as TableHTMLAttributes)

const getColumnAriaSortOrder = (columnKey: string) => {
if (sortingOrderSync.value && sortBySync.value === columnKey) {
return sortingOrderSync.value === 'asc' ? 'ascending' : 'descending'
}

return 'none'
}

return {
columnsComputed,
rows: paginatedRows,
Expand All @@ -395,6 +411,7 @@ export default defineComponent({
componentAttributes,
tableAttributes,
animationName,
getColumnAriaSortOrder,
}
},
})
Expand Down
Loading