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

[Ingest Pipelines] Processors editor a11y focus states #79122

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
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ export interface Props {
placeholder: string;
ariaLabel: string;
onChange: (value: string) => void;
disabled: boolean;
/**
* Whether the containing element of the text input can be focused.
*
* If it cannot be focused, this component cannot switch to showing
* the text input field.
*
* Defaults to false.
*/
disabled?: boolean;
text?: string;
}

export const InlineTextInput: FunctionComponent<Props> = ({
disabled,
placeholder,
text,
ariaLabel,
disabled = false,
onChange,
}) => {
const [isShowingTextInput, setIsShowingTextInput] = useState<boolean>(false);
Expand Down Expand Up @@ -71,7 +79,11 @@ export const InlineTextInput: FunctionComponent<Props> = ({
/>
</div>
) : (
<div className={containerClasses} tabIndex={0} onFocus={() => setIsShowingTextInput(true)}>
<div
className={containerClasses}
tabIndex={disabled ? -1 : 0}
onFocus={() => setIsShowingTextInput(true)}
>
<EuiText size="s" color="subdued">
<div className="pipelineProcessorsEditor__item__description">
{text || <em>{placeholder}</em>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export const PipelineProcessorsEditorItem: FunctionComponent<Props> = memo(
color={isDimmed ? 'subdued' : undefined}
>
<EuiLink
tabIndex={isEditorNotInIdleMode ? -1 : 0}
disabled={isEditorNotInIdleMode}
onClick={() => {
editor.setMode({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
import { i18n } from '@kbn/i18n';
import React, { FunctionComponent } from 'react';
import classNames from 'classnames';
import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
import { EuiButtonIcon } from '@elastic/eui';

export interface Props {
isVisible: boolean;
isDisabled: boolean;
/**
* Useful for buttons at the very top or bottom of lists to avoid any overflow.
*/
compressed?: boolean;
onClick: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
'data-test-subj'?: string;
}
Expand All @@ -29,7 +33,7 @@ const cannotMoveHereLabel = i18n.translate(
);

export const DropZoneButton: FunctionComponent<Props> = (props) => {
const { onClick, isDisabled, isVisible } = props;
const { onClick, isDisabled, isVisible, compressed } = props;
const isUnavailable = isVisible && isDisabled;
const containerClasses = classNames({
// eslint-disable-next-line @typescript-eslint/naming-convention
Expand All @@ -40,30 +44,21 @@ export const DropZoneButton: FunctionComponent<Props> = (props) => {
const buttonClasses = classNames({
// eslint-disable-next-line @typescript-eslint/naming-convention
'pipelineProcessorsEditor__tree__dropZoneButton--visible': isVisible,
// eslint-disable-next-line @typescript-eslint/naming-convention
'pipelineProcessorsEditor__tree__dropZoneButton--compressed': compressed,
});

const content = (
return (
<div className={`pipelineProcessorsEditor__tree__dropZoneContainer ${containerClasses}`}>
<EuiButtonIcon
data-test-subj={props['data-test-subj']}
className={`pipelineProcessorsEditor__tree__dropZoneButton ${buttonClasses}`}
aria-label={moveHereLabel}
aria-label={isUnavailable ? cannotMoveHereLabel : moveHereLabel}
// We artificially disable the button so that hover and pointer events are
// still enabled
onClick={isDisabled ? () => {} : onClick}
iconType="empty"
/>
</div>
);

return isUnavailable ? (
<EuiToolTip
className="pipelineProcessorsEditor__tree__dropZoneContainer__toolTip"
content={cannotMoveHereLabel}
>
{content}
</EuiToolTip>
) : (
content
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import React, { FunctionComponent, MutableRefObject, useEffect } from 'react';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { EuiFlexGroup } from '@elastic/eui';
import { AutoSizer, List, WindowScroller } from 'react-virtualized';

import { DropSpecialLocations } from '../../../constants';
Expand Down Expand Up @@ -78,50 +78,45 @@ export const PrivateTree: FunctionComponent<PrivateProps> = ({
return (
<>
{idx === 0 ? (
<EuiFlexItem>
<DropZoneButton
data-test-subj={`dropButtonAbove-${stringifiedSelector}`}
onClick={(event) => {
event.preventDefault();
onAction({
type: 'move',
payload: {
destination: selector.concat(DropSpecialLocations.top),
source: movingProcessor!.selector,
},
});
}}
isVisible={Boolean(movingProcessor)}
isDisabled={!movingProcessor || isDropZoneAboveDisabled(info, movingProcessor)}
/>
</EuiFlexItem>
) : undefined}
<EuiFlexItem>
<TreeNode
level={level}
processor={processor}
processorInfo={info}
onAction={onAction}
movingProcessor={movingProcessor}
/>
</EuiFlexItem>
<EuiFlexItem>
<DropZoneButton
data-test-subj={`dropButtonBelow-${stringifiedSelector}`}
isVisible={Boolean(movingProcessor)}
isDisabled={!movingProcessor || isDropZoneBelowDisabled(info, movingProcessor)}
data-test-subj={`dropButtonAbove-${stringifiedSelector}`}
onClick={(event) => {
event.preventDefault();
onAction({
type: 'move',
payload: {
destination: selector.concat(String(idx + 1)),
destination: selector.concat(DropSpecialLocations.top),
source: movingProcessor!.selector,
},
});
}}
isVisible={Boolean(movingProcessor)}
isDisabled={!movingProcessor || isDropZoneAboveDisabled(info, movingProcessor)}
/>
</EuiFlexItem>
) : undefined}
<TreeNode
level={level}
processor={processor}
processorInfo={info}
onAction={onAction}
movingProcessor={movingProcessor}
/>
<DropZoneButton
compressed={level === 1 && idx + 1 === processors.length}
data-test-subj={`dropButtonBelow-${stringifiedSelector}`}
isVisible={Boolean(movingProcessor)}
isDisabled={!movingProcessor || isDropZoneBelowDisabled(info, movingProcessor)}
onClick={(event) => {
event.preventDefault();
onAction({
type: 'move',
payload: {
destination: selector.concat(String(idx + 1)),
source: movingProcessor!.selector,
},
});
}}
/>
</>
);
};
Expand All @@ -141,52 +136,50 @@ export const PrivateTree: FunctionComponent<PrivateProps> = ({
<WindowScroller ref={windowScrollerRef} scrollElement={window}>
{({ height, registerChild, isScrolling, onChildScroll, scrollTop }: any) => {
return (
<EuiFlexGroup direction="column" responsive={false} gutterSize="none">
<AutoSizer disableHeight>
{({ width }) => {
return (
<div ref={registerChild}>
<List
ref={listRef}
autoHeight
height={height}
width={width}
overScanRowCount={5}
isScrolling={isScrolling}
onChildScroll={onChildScroll}
scrollTop={scrollTop}
rowCount={processors.length}
rowHeight={({ index }) => {
const processor = processors[index];
return calculateItemHeight({
processor,
isFirstInArray: index === 0,
});
}}
rowRenderer={({ index: idx, style }) => {
const processor = processors[idx];
const above = processors[idx - 1];
const below = processors[idx + 1];
const info: ProcessorInfo = {
id: processor.id,
selector: selector.concat(String(idx)),
aboveId: above?.id,
belowId: below?.id,
};
<AutoSizer disableHeight>
{({ width }) => {
return (
<div style={{ width: '100%' }} ref={registerChild}>
<List
ref={listRef}
autoHeight
height={height}
width={width}
overScanRowCount={5}
isScrolling={isScrolling}
onChildScroll={onChildScroll}
scrollTop={scrollTop}
rowCount={processors.length}
rowHeight={({ index }) => {
const processor = processors[index];
return calculateItemHeight({
processor,
isFirstInArray: index === 0,
});
}}
rowRenderer={({ index: idx, style }) => {
const processor = processors[idx];
const above = processors[idx - 1];
const below = processors[idx + 1];
const info: ProcessorInfo = {
id: processor.id,
selector: selector.concat(String(idx)),
aboveId: above?.id,
belowId: below?.id,
};

return (
<div style={style} key={processor.id}>
{renderRow({ processor, info, idx })}
</div>
);
}}
processors={processors}
/>
</div>
);
}}
</AutoSizer>
</EuiFlexGroup>
return (
<div style={style} key={processor.id}>
{renderRow({ processor, info, idx })}
</div>
);
}}
processors={processors}
/>
</div>
);
}}
</AutoSizer>
);
}}
</WindowScroller>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@
}
}
$dropZoneButtonHeight: 60px;
$dropZoneButtonOffsetY: $dropZoneButtonHeight * -0.5;
$dropZoneButtonOffsetY: $dropZoneButtonHeight * 0.5;

&__dropZoneButton {
position: absolute;
padding: 0;
height: $dropZoneButtonHeight;
margin-top: $dropZoneButtonOffsetY;
margin-top: -$dropZoneButtonOffsetY;
width: 100%;
opacity: 0;
text-decoration: none !important;
z-index: $dropZoneZIndex;

Expand All @@ -49,6 +48,10 @@
transform: none !important;
}
}

&--compressed {
height: $dropZoneButtonOffsetY;
}
}

&__addProcessorButton {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,16 @@ export const ProcessorsTree: FunctionComponent<Props> = memo((props) => {
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup responsive={false} alignItems="flexStart" gutterSize="none">
<EuiFlexItem data-test-subj={selectorToDataTestSubject(baseSelector)} grow={false}>
{!processors.length && (
<EuiFlexGroup
data-test-subj={selectorToDataTestSubject(baseSelector)}
responsive={false}
alignItems="flexStart"
gutterSize="none"
direction="column"
>
{!processors.length && (
// We want to make this dropzone the max length of its container
<EuiFlexItem style={{ width: '100%' }}>
<DropZoneButton
data-test-subj="dropButtonEmptyTree"
isVisible={Boolean(movingProcessor)}
Expand All @@ -116,7 +123,9 @@ export const ProcessorsTree: FunctionComponent<Props> = memo((props) => {
});
}}
/>
)}
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>
<AddProcessorButton
onClick={() => {
onAction({ type: 'addProcessor', payload: { target: baseSelector } });
Expand Down