Skip to content
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
36 changes: 20 additions & 16 deletions src/platform/packages/shared/kbn-dom-drag-drop/src/draggable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -345,20 +345,7 @@ const DraggableImpl = memo(function DraggableImpl({
hoveredDropTarget.dropType !== 'reorder';

return (
<div
className={classNames(className, 'domDraggable', {
'domDraggable_active--move': draggedItemProps && dragType === 'move' && !keyboardMode,
'domDraggable_dragover_keyboard--move': shouldShowGhostImageInstead,
'domDraggable_active--copy': draggedItemProps && dragType === 'copy' && !keyboardMode,
'domDraggable_dragover_keyboard--copy':
keyboardMode && draggedItemProps && hoveredDropTarget,
})}
data-test-subj={dataTestSubj || `${dataTestSubjPrefix}_domDraggable_${value.humanData.label}`}
draggable
onDragEnd={dragEnd}
onDragStart={dragStart}
onMouseDown={removeSelection}
>
<>
<EuiScreenReaderOnly showOnFocus>
<button
aria-label={value.humanData.label}
Expand Down Expand Up @@ -402,8 +389,25 @@ const DraggableImpl = memo(function DraggableImpl({
onKeyUp={modifierHandlers.onKeyUp}
/>
</EuiScreenReaderOnly>
{children}
</div>
<div
className={classNames(className, 'domDraggable', {
'domDraggable_active--move': draggedItemProps && dragType === 'move' && !keyboardMode,
'domDraggable_dragover_keyboard--move': shouldShowGhostImageInstead,
'domDraggable_active--copy': draggedItemProps && dragType === 'copy' && !keyboardMode,
'domDraggable_dragover_keyboard--copy':
keyboardMode && draggedItemProps && hoveredDropTarget,
})}
data-test-subj={
dataTestSubj || `${dataTestSubjPrefix}_domDraggable_${value.humanData.label}`
}
draggable
onDragEnd={dragEnd}
onDragStart={dragStart}
onMouseDown={removeSelection}
>
{children}
</div>
</>
);
});

Expand Down
2 changes: 1 addition & 1 deletion test/functional/page_objects/discover_page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ export class DiscoverPageObject extends FtrService {
* */
public async dragFieldWithKeyboardToTable(fieldName: string) {
const field = await this.find.byCssSelector(
`[data-test-subj="dscFieldListPanelField-${fieldName}"] [data-test-subj="domDragDrop-keyboardHandler"]`
`[data-attr-field="${fieldName}"] [data-test-subj="domDragDrop-keyboardHandler"]`
);
await field.focus();
await this.retry.try(async () => {
Expand Down