Skip to content

Commit 9f2a76c

Browse files
authored
fix: use feature detection for iOS dnd polyfilling (#4633)
1 parent 5ea19bd commit 9f2a76c

4 files changed

Lines changed: 9 additions & 19 deletions

File tree

‎packages/grid/src/vaadin-grid-drag-and-drop-mixin.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ const DropLocation = {
1717
EMPTY: 'empty',
1818
};
1919

20+
// Detects if the browser doesn't support HTML5 Drag & Drop API (and falls back to the @vaadin/vaadin-mobile-drag-drop polyfill)
21+
const usesDnDPolyfill = !('draggable' in document.createElement('div'));
22+
2023
/**
2124
* @polymerMixin
2225
*/
@@ -133,9 +136,11 @@ export const DragAndDropMixin = (superClass) =>
133136

134137
const rowRect = row.getBoundingClientRect();
135138

136-
if (this._ios) {
139+
if (usesDnDPolyfill) {
140+
// The polyfill drag image is automatically centered so there is no need to adjust the position
137141
e.dataTransfer.setDragImage(row);
138142
} else {
143+
// The native drag image needs to be shifted manually to compensate for the touch position offset
139144
e.dataTransfer.setDragImage(row, e.clientX - rowRect.left, e.clientY - rowRect.top);
140145
}
141146

‎packages/grid/test/drag-and-drop.test.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,16 +339,9 @@ describe('drag and drop', () => {
339339
});
340340

341341
it('should generate drag image with offset', () => {
342-
grid._ios = false;
343342
const event = fireDragStart();
344343
expect(event.dataTransfer.setDragImage.getCall(0).args.length).to.equal(3);
345344
});
346-
347-
it('should generate drag image without offset', () => {
348-
grid._ios = true;
349-
const event = fireDragStart();
350-
expect(event.dataTransfer.setDragImage.getCall(0).args.length).to.equal(1);
351-
});
352345
});
353346

354347
describe('dragend', () => {

‎packages/grid/theme/lumo/vaadin-grid-styles.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,7 @@ registerStyles(
170170
border-radius: var(--lumo-border-radius-s) 0 0 var(--lumo-border-radius-s);
171171
}
172172
173-
[ios] [part~='row'][dragstart] [part~='cell'] {
174-
background: var(--lumo-primary-color-50pct);
175-
}
176-
177-
#scroller:not([ios]) [part~='row'][dragstart]:not([dragstart=''])::after {
173+
#scroller [part~='row'][dragstart]:not([dragstart=''])::after {
178174
display: block;
179175
position: absolute;
180176
left: var(--_grid-drag-start-x);

‎packages/grid/theme/material/vaadin-grid-styles.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,7 @@ registerStyles(
221221
box-shadow: none !important;
222222
}
223223
224-
[ios] [part~='row'][dragstart] [part~='cell'] {
225-
background: var(--material-primary-color);
226-
}
227-
228-
#scroller:not([ios]) [part~='row'][dragstart]:not([dragstart=''])::after {
224+
#scroller [part~='row'][dragstart]:not([dragstart=''])::after {
229225
display: block;
230226
position: absolute;
231227
left: var(--_grid-drag-start-x);
@@ -262,7 +258,7 @@ registerStyles(
262258
border-left: 1px solid var(--material-divider-color);
263259
}
264260
265-
:host([dir='rtl']) #scroller:not([ios]) [part~='row'][dragstart]:not([dragstart=''])::after {
261+
:host([dir='rtl']) #scroller [part~='row'][dragstart]:not([dragstart=''])::after {
266262
left: auto;
267263
right: var(--_grid-drag-start-x);
268264
}

0 commit comments

Comments
 (0)