Skip to content

[8.17] [Lens] fix drag and drop ghost after Chrome update to 134 (#213928) #214124

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

Merged
kibanamachine merged 3 commits into from
Mar 22, 2025
Merged

[8.17] [Lens] fix drag and drop ghost after Chrome update to 134 (#213928) #214124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9855637
[Lens] fix drag and drop ghost after Chrome update to 134 (#213928)
mbondyra Mar 12, 2025
5b00f29
[Lens] fix drag and drop failing test (#215439)
mbondyra Mar 21, 2025
31804a0
Merge branch '8.17' into backport/8.17/pr-213928
nickofthyme Mar 21, 2025
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 packages/kbn-dom-drag-drop/src/draggable.tsx
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,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
2 changes: 1 addition & 1 deletion x-pack/plugins/lens/public/datasources/common/field_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export function InnerFieldItem(props: FieldItemProps) {
}, [dataViewField, filters, hideDetails, indexPattern, query, services]);

return (
<li>
<li data-attr-field={field.name}>
<FieldPopover
isOpen={infoIsOpen}
closePopover={closePopover}
Expand Down
20 changes: 14 additions & 6 deletions x-pack/test/functional/page_objects/lens_page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
metaKey?: 'shift' | 'alt' | 'ctrl'
) {
const field = await find.byCssSelector(
`[data-test-subj="lnsFieldListPanelField-${fieldName}"] [data-test-subj="lnsDragDrop-keyboardHandler"]`
`[data-attr-field="${fieldName}"] [data-test-subj="lnsDragDrop-keyboardHandler"]`
);
await field.focus();
await retry.try(async () => {
Expand Down Expand Up @@ -432,17 +432,21 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
metaKey?: 'shift' | 'alt' | 'ctrl'
) {
const elements = await find.allByCssSelector(
`[data-test-subj="${group}"] [data-test-subj="lnsDragDrop-keyboardHandler"]`
`[data-test-subj="${group}"] [data-test-subj="lnsDragDrop-keyboardHandler"]`
);
const el = elements[index];
await el.focus();
await browser.pressKeys(browser.keys.ENTER);
for (let i = 0; i < steps; i++) {
// This needs to be slowed down to avoid flakiness
await common.sleep(200);
await browser.pressKeys(reverse ? browser.keys.LEFT : browser.keys.RIGHT);
}
if (metaKey) {
await this.pressMetaKey(metaKey);
}

await common.sleep(200);
await browser.pressKeys(browser.keys.ENTER);

await this.waitForLensDragDropToFinish();
Expand All @@ -464,8 +468,12 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
await el.focus();
await browser.pressKeys(browser.keys.ENTER);
for (let i = 0; i < steps; i++) {
// This needs to be slowed down to avoid flakiness
await common.sleep(200);
await browser.pressKeys(reverse ? browser.keys.ARROW_UP : browser.keys.ARROW_DOWN);
}

await common.sleep(200);
await browser.pressKeys(browser.keys.ENTER);

await this.waitForLensDragDropToFinish();
Expand Down Expand Up @@ -1528,10 +1536,10 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
*/
async assertFocusedField(name: string) {
const input = await find.activeElement();
const fieldAncestor = await input.findByXpath('./../..');
const focusedElementText = await fieldAncestor.getVisibleText();
const dataTestSubj = await fieldAncestor.getAttribute('data-test-subj');
const fieldPopover = await input.findByXpath('./..');
const focusedElementText = await fieldPopover.getVisibleText();
expect(focusedElementText).to.eql(name);
const dataTestSubj = await fieldPopover.getAttribute('data-test-subj');
expect(dataTestSubj).to.eql('lnsFieldListPanelField');
},

Expand All @@ -1542,7 +1550,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
*/
async assertFocusedDimension(name: string) {
const input = await find.activeElement();
const fieldAncestor = await input.findByXpath('./../../..');
const fieldAncestor = await input.findByXpath('./../..');
const focusedElementText = await fieldAncestor.getVisibleText();
expect(focusedElementText).to.eql(name);
},
Expand Down