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.

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

Jump to bottom

[7.x] Fix accessibility in the global query bar (#93411) #93944

Merged
merged 1 commit into from
Mar 8, 2021
Merged

[7.x] Fix accessibility in the global query bar (#93411) #93944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions src/plugins/data/public/ui/filter_bar/_global_filter_item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
flex-shrink: 1; /* 1 */
}

.euiBadge__iconButton:focus {
background-color: transparentize($euiColorPrimary, .9);
}

&:not(.globalFilterItem-isDisabled) {
@include euiFormControlDefaultShadow;
box-shadow: #{$euiFormControlBoxShadow}, inset 0 0 0 1px $kbnGlobalFilterItemBorderColor; // Make the actual border more visible
Expand Down
7 changes: 6 additions & 1 deletion src/plugins/data/public/ui/filter_bar/filter_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiPopover } from '@elastic/eui';
import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
import classNames from 'classnames';
import React, { useState } from 'react';
import React, { useState, useRef } from 'react';

import { METRIC_TYPE } from '@kbn/analytics';
import { FilterEditor } from './filter_editor';
Expand Down Expand Up @@ -39,6 +39,7 @@ interface Props {
}

function FilterBarUI(props: Props) {
const groupRef = useRef<HTMLDivElement>(null);
const [isAddFilterPopoverOpen, setIsAddFilterPopoverOpen] = useState(false);
const kibana = useKibana<IDataPluginServices>();
const { appName, usageCollection, uiSettings } = kibana.services;
Expand Down Expand Up @@ -99,6 +100,7 @@ function FilterBarUI(props: Props) {
anchorPosition="downLeft"
panelPaddingSize="none"
initialFocus=".filterEditor__hiddenItem"
ownFocus
repositionOnScroll
>
<EuiFlexItem grow={false}>
Expand Down Expand Up @@ -130,6 +132,7 @@ function FilterBarUI(props: Props) {
const filters = [...props.filters];
filters.splice(i, 1);
onFiltersUpdated(filters);
groupRef.current?.focus();
}

function onUpdate(i: number, filter: Filter) {
Expand Down Expand Up @@ -203,11 +206,13 @@ function FilterBarUI(props: Props) {

<EuiFlexItem className="globalFilterGroup__filterFlexItem">
<EuiFlexGroup
ref={groupRef}
className={classes}
wrap={true}
responsive={false}
gutterSize="xs"
alignItems="center"
tabIndex={-1}
>
{renderItems()}
{renderAddFilter()}
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/data/public/ui/filter_bar/filter_view/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ export const FilterView: FC<Props> = ({
}}
iconOnClick={iconOnClick}
iconOnClickAriaLabel={i18n.translate('data.filter.filterBar.filterItemBadgeIconAriaLabel', {
defaultMessage: 'Delete',
defaultMessage: 'Delete {filter}',
values: { filter: innerText },
})}
onClick={onClick}
onClickAriaLabel={i18n.translate('data.filter.filterBar.filterItemBadgeAriaLabel', {
Expand Down
14 changes: 14 additions & 0 deletions src/plugins/data/public/ui/query_string_input/_query_bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@
}
}

.kbnQueryBar__datePickerWrapper {
.euiDatePopoverButton-isInvalid {
background-image: euiFormControlGradient($euiColorDanger);

// @todo Remove when EUI issue is resolved.
// @see https://github.com/elastic/eui/issues/4612
&:focus {
color: $euiTextColor;
background-color: $euiFormBackgroundColor;
background-image: euiFormControlGradient($euiColorPrimary);
}
}
}

@include euiBreakpoint('xs', 's') {
.kbnQueryBar--withDatePicker {
> :first-child {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@
"data.filter.filterBar.excludeFilterButtonLabel": "結果を除外",
"data.filter.filterBar.fieldNotFound": "インデックスパターン {indexPattern} にフィールド {key} がありません",
"data.filter.filterBar.filterItemBadgeAriaLabel": "フィルターアクション",
"data.filter.filterBar.filterItemBadgeIconAriaLabel": "削除",
"data.filter.filterBar.filterItemBadgeIconAriaLabel": "削除 {filter}",
"data.filter.filterBar.includeFilterButtonLabel": "結果を含める",
"data.filter.filterBar.indexPatternSelectPlaceholder": "インデックスパターンの選択",
"data.filter.filterBar.labelErrorInfo": "インデックスパターン{indexPattern}が見つかりません",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@
"data.filter.filterBar.excludeFilterButtonLabel": "排除结果",
"data.filter.filterBar.fieldNotFound": "索引模式 {indexPattern} 中未找到字段 {key}",
"data.filter.filterBar.filterItemBadgeAriaLabel": "筛选操作",
"data.filter.filterBar.filterItemBadgeIconAriaLabel": "删除",
"data.filter.filterBar.filterItemBadgeIconAriaLabel": "删除 {filter}",
"data.filter.filterBar.includeFilterButtonLabel": "包括结果",
"data.filter.filterBar.indexPatternSelectPlaceholder": "选择索引模式",
"data.filter.filterBar.labelErrorInfo": "找不到索引模式 {indexPattern}",
Expand Down