Skip to content

Commit 7a98fcc

Browse files
tsovtsov
authored
Merge pull request #421 from zjffun/chore
chore: fix a eslint error, update waitForDragDelay params and add some LFs and docblocks
2 parents e8f6091 + 0e15a2d commit 7a98fcc

File tree

7 files changed

+66
-27
lines changed

7 files changed

+66
-27
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"watch": "node scripts/watch.js",
3535
"prepare": "yarn build:development",
3636
"prepublishOnly": "yarn build:production",
37-
"lint": "eslint ./src --max-warnings 0",
37+
"lint": "eslint ./src ./scripts --max-warnings 0",
3838
"esdoc": "esdoc -c esdoc.json",
3939
"test": "jest --config config.json",
4040
"test-ci": "jest --config config.json --coverage && codecov",

‎scripts/test/matchers/sensor.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ function toHaveTriggeredSensorEvent(received, expectedEventName, count) {
22
let triggered = false;
33
let callCount = 0;
44
function callback() {
5-
count !== undefined && (callCount = callCount + 1);
5+
if (count !== undefined) {
6+
callCount++;
7+
}
68
triggered = true;
79
}
810

‎src/Draggable/Sensors/MouseSensor/MouseSensor.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ export default class MouseSensor extends Sensor {
3232
*/
3333
this.mouseDownTimeout = null;
3434

35+
/**
36+
* Save pageX coordinates for delay drag
37+
* @property {Numbre} pageX
38+
* @private
39+
*/
40+
this.pageX = null;
41+
42+
/**
43+
* Save pageY coordinates for delay drag
44+
* @property {Numbre} pageY
45+
* @private
46+
*/
47+
this.pageY = null;
48+
3549
this[onContextMenuWhileDragging] = this[onContextMenuWhileDragging].bind(this);
3650
this[onMouseDown] = this[onMouseDown].bind(this);
3751
this[onMouseMove] = this[onMouseMove].bind(this);

‎src/Draggable/Sensors/MouseSensor/tests/MouseSensor.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ describe('MouseSensor', () => {
275275
}
276276
expect(dragFlow).toHaveTriggeredSensorEvent('drag:start', 1);
277277
});
278+
278279
it('only triggers `drag:start` sensor event once when distance is met after delay', () => {
279280
function dragFlow() {
280281
clickMouse(draggableElement);

‎src/Draggable/Sensors/TouchSensor/TouchSensor.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,20 @@ export default class TouchSensor extends Sensor {
6565
*/
6666
this.touchMoved = false;
6767

68+
/**
69+
* Save pageX coordinates for delay drag
70+
* @property {Numbre} pageX
71+
* @private
72+
*/
73+
this.pageX = null;
74+
75+
/**
76+
* Save pageY coordinates for delay drag
77+
* @property {Numbre} pageY
78+
* @private
79+
*/
80+
this.pageY = null;
81+
6882
this[onTouchStart] = this[onTouchStart].bind(this);
6983
this[onTouchEnd] = this[onTouchEnd].bind(this);
7084
this[onTouchMove] = this[onTouchMove].bind(this);

‎src/Draggable/Sensors/TouchSensor/tests/TouchSensor.test.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ describe('TouchSensor', () => {
2626
touchSensor.detach();
2727
sandbox.parentNode.removeChild(sandbox);
2828
}
29+
2930
describe('common', () => {
3031
beforeEach(setup);
32+
3133
afterEach(teardown);
34+
3235
it('cancels `drag:start` event when canceling sensor event', () => {
3336
sandbox.addEventListener('drag:start', (event) => {
3437
event.detail.cancel();
@@ -51,6 +54,7 @@ describe('TouchSensor', () => {
5154

5255
expect(dragFlow).not.toHaveTriggeredSensorEvent('drag:start');
5356
});
57+
5458
it('prevents context menu while dragging', () => {
5559
touchStart(draggableElement);
5660
let contextMenuEvent = triggerEvent(draggableElement, 'contextmenu');
@@ -94,12 +98,14 @@ describe('TouchSensor', () => {
9498
expect(touchEndEvent.defaultPrevented).toBe(true);
9599
});
96100
});
101+
97102
describe('using distance', () => {
98103
beforeEach(() => {
99104
setup({delay: 0, distance: 1});
100105
});
101106

102107
afterEach(teardown);
108+
103109
it('does not trigger `drag:start` before distance has been travelled', () => {
104110
function dragFlow() {
105111
touchStart(draggableElement);
@@ -153,6 +159,7 @@ describe('TouchSensor', () => {
153159
beforeEach(() => {
154160
setup({delay: DRAG_DELAY, distance: 0});
155161
});
162+
156163
afterEach(teardown);
157164

158165
it('does not trigger `drag:start` before delay ends', () => {
@@ -210,6 +217,7 @@ describe('TouchSensor', () => {
210217
beforeEach(() => {
211218
setup({delay: DRAG_DELAY, distance: 1});
212219
});
220+
213221
afterEach(teardown);
214222

215223
it('does not trigger `drag:start` before delay ends', () => {

‎src/Draggable/tests/Draggable.test.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ describe('Draggable', () => {
326326
triggerEvent(draggableElement, 'mousedown', {button: 0});
327327

328328
// Wait for delay
329-
waitForDragDelay(100);
329+
waitForDragDelay();
330330

331331
const containerChildren = newInstance.getDraggableElementsForContainer(draggableElement.parentNode);
332332

@@ -349,7 +349,7 @@ describe('Draggable', () => {
349349
const dynamicContainer = document.querySelector('.DynamicContainer');
350350

351351
clickMouse(draggableElement);
352-
waitForDragDelay(100);
352+
waitForDragDelay();
353353
moveMouse(dynamicContainer);
354354

355355
expect(dragOverContainerHandler).not.toHaveBeenCalled();
@@ -361,7 +361,7 @@ describe('Draggable', () => {
361361
expect(newInstance.containers).toEqual([...containers, dynamicContainer]);
362362

363363
clickMouse(draggableElement);
364-
waitForDragDelay(100);
364+
waitForDragDelay();
365365
moveMouse(dynamicContainer);
366366
expect(dragOverContainerHandler).toHaveBeenCalled();
367367

@@ -383,7 +383,7 @@ describe('Draggable', () => {
383383
const dynamicContainer = document.querySelector('.DynamicContainer');
384384

385385
clickMouse(draggableElement);
386-
waitForDragDelay(100);
386+
waitForDragDelay();
387387
moveMouse(dynamicContainer);
388388

389389
expect(dragOverContainerHandler).toHaveBeenCalled();
@@ -398,7 +398,7 @@ describe('Draggable', () => {
398398
newInstance.on('drag:over:container', dragOverContainerHandler);
399399

400400
clickMouse(draggableElement);
401-
waitForDragDelay(100);
401+
waitForDragDelay();
402402
moveMouse(dynamicContainer);
403403

404404
expect(dragOverContainerHandler).not.toHaveBeenCalled();
@@ -483,7 +483,7 @@ describe('Draggable', () => {
483483

484484
triggerEvent(draggableElement, 'mousedown', {button: 0});
485485
// Wait for delay
486-
waitForDragDelay(100);
486+
waitForDragDelay();
487487

488488
const call = callback.mock.calls[0][0];
489489

@@ -507,7 +507,7 @@ describe('Draggable', () => {
507507
triggerEvent(draggableElement, 'mousedown', {button: 0});
508508

509509
// Wait for delay
510-
waitForDragDelay(100);
510+
waitForDragDelay();
511511

512512
triggerEvent(draggableElement, 'dragstart', {button: 0});
513513

@@ -540,7 +540,7 @@ describe('Draggable', () => {
540540
triggerEvent(draggableElement, 'mousedown', {button: 0});
541541

542542
// Wait for delay
543-
waitForDragDelay(100);
543+
waitForDragDelay();
544544

545545
triggerEvent(draggableElement, 'dragstart', {button: 0});
546546

@@ -559,7 +559,7 @@ describe('Draggable', () => {
559559
triggerEvent(draggableElement, 'mousedown', {button: 0});
560560

561561
// Wait for delay
562-
waitForDragDelay(100);
562+
waitForDragDelay();
563563

564564
const callback = jest.fn();
565565
newInstance.on('drag:move', callback);
@@ -593,7 +593,7 @@ describe('Draggable', () => {
593593
triggerEvent(draggableElement, 'mousedown', {button: 0});
594594

595595
// Wait for delay
596-
waitForDragDelay(100);
596+
waitForDragDelay();
597597

598598
const callback = jest.fn();
599599
newInstance.on('drag:stop', callback);
@@ -641,7 +641,7 @@ describe('Draggable', () => {
641641
triggerEvent(draggableElement, 'mousedown', {button: 0});
642642

643643
// Wait for delay
644-
waitForDragDelay(100);
644+
waitForDragDelay();
645645

646646
expect(newInstance.source.classList).toContain('draggable-source--is-dragging');
647647

@@ -658,7 +658,7 @@ describe('Draggable', () => {
658658
triggerEvent(draggableElement, 'mousedown', {button: 0});
659659

660660
// Wait for delay
661-
waitForDragDelay(100);
661+
waitForDragDelay();
662662

663663
const source = newInstance.source;
664664

@@ -683,7 +683,7 @@ describe('Draggable', () => {
683683
triggerEvent(draggableElement, 'mousedown', {button: 0});
684684

685685
// Wait for delay
686-
waitForDragDelay(100);
686+
waitForDragDelay();
687687

688688
const source = newInstance.source;
689689

@@ -703,7 +703,7 @@ describe('Draggable', () => {
703703
triggerEvent(draggableElement, 'mousedown', {button: 0});
704704

705705
// Wait for delay
706-
waitForDragDelay(100);
706+
waitForDragDelay();
707707

708708
expect(document.body.classList).toContain('draggable--is-dragging');
709709

@@ -721,7 +721,7 @@ describe('Draggable', () => {
721721
triggerEvent(draggableElement, 'mousedown', {button: 0});
722722

723723
// Wait for delay
724-
waitForDragDelay(100);
724+
waitForDragDelay();
725725
expect(document.body.classList).toContain('draggable--is-dragging');
726726

727727
triggerEvent(document.body, 'mouseup', {button: 0});
@@ -743,7 +743,7 @@ describe('Draggable', () => {
743743
triggerEvent(draggableElement, 'mousedown', {button: 0});
744744

745745
// Wait for delay
746-
waitForDragDelay(100);
746+
waitForDragDelay();
747747

748748
expect(document.body.classList).not.toContain('draggable--is-dragging');
749749

@@ -761,7 +761,7 @@ describe('Draggable', () => {
761761
triggerEvent(draggableElement, 'mousedown', {button: 0});
762762

763763
// Wait for delay
764-
waitForDragDelay(100);
764+
waitForDragDelay();
765765

766766
triggerEvent(draggableElement, 'mouseup', {button: 0});
767767

@@ -779,7 +779,7 @@ describe('Draggable', () => {
779779
triggerEvent(draggableElement, 'mousedown', {button: 0});
780780

781781
// Wait for delay
782-
waitForDragDelay(100);
782+
waitForDragDelay();
783783

784784
triggerEvent(document.body, 'mouseup', {button: 0});
785785

@@ -802,7 +802,7 @@ describe('Draggable', () => {
802802
triggerEvent(draggableElement, 'mousedown', {button: 0});
803803

804804
// Wait for delay
805-
waitForDragDelay(100);
805+
waitForDragDelay();
806806

807807
expect(containers[0].classList).toContain('draggable-container--is-dragging');
808808

@@ -820,7 +820,7 @@ describe('Draggable', () => {
820820
triggerEvent(draggableElement, 'mousedown', {button: 0});
821821

822822
// Wait for delay
823-
waitForDragDelay(100);
823+
waitForDragDelay();
824824

825825
expect(containers[0].classList).toContain('draggable-container--is-dragging');
826826

@@ -842,7 +842,7 @@ describe('Draggable', () => {
842842
triggerEvent(draggableElement, 'mousedown', {button: 0});
843843

844844
// Wait for delay
845-
waitForDragDelay(100);
845+
waitForDragDelay();
846846

847847
expect(containers[0].classList).not.toContain('draggable-container--is-dragging');
848848

@@ -859,7 +859,7 @@ describe('Draggable', () => {
859859
triggerEvent(draggableElement, 'mousedown', {button: 0});
860860

861861
// Wait for delay
862-
waitForDragDelay(100);
862+
waitForDragDelay();
863863

864864
expect(draggableElement.classList.contains(newInstance.getClassNameFor('source:original'))).toBeTruthy();
865865

@@ -887,21 +887,21 @@ describe('Draggable', () => {
887887
triggerEvent(draggableElement, 'mousedown', {button: 0});
888888

889889
// Wait for delay
890-
waitForDragDelay(100);
890+
waitForDragDelay();
891891

892892
expect(newInstance.isDragging()).toBe(true);
893893

894894
document.elementFromPoint = () => draggableElement.nextElementSibling;
895895
triggerEvent(draggableElement.nextElementSibling, 'mousemove', {button: 0});
896896

897897
// Wait for delay
898-
waitForDragDelay(100);
898+
waitForDragDelay();
899899

900900
document.elementFromPoint = () => document.body;
901901
triggerEvent(document.body, 'mousemove', {button: 0});
902902

903903
// Wait for delay
904-
waitForDragDelay(100);
904+
waitForDragDelay();
905905

906906
triggerEvent(document.body, 'mouseup', {button: 0});
907907
});

0 commit comments

Comments
 (0)