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.

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

Ensuring that drag does not move slides more than options.flickMaxPages allows #1118

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensuring that drag does not move slides more than options.flickMaxPages allows #1118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dist/js/splide-renderer.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/splide-renderer.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dist/js/splide.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Splide.js
* Version : 4.1.4
* License : MIT
* Copyright: 2022 Naotoshi Fujita
* Copyright: 2023 Naotoshi Fujita
*/
'use strict';

Expand Down Expand Up @@ -2264,7 +2264,11 @@ function Drag(Splide2, Components2, options) {
} else if (Splide2.is(SLIDE) && exceeded && rewind) {
Controller.go(exceededLimit(true) ? ">" : "<");
} else {
Controller.go(Controller.toDest(destination), true);
var sign1 = sign(velocity);
var expectedDestination = Controller.toDest(destination);
var maxPages = options.flickMaxPages || 1;
var goTo = sign1 < 0 ? min(expectedDestination, Splide2.index + maxPages) : max(expectedDestination, Splide2.index - maxPages);
Controller.go(goTo, true);
}

reduce(true);
Expand Down
8 changes: 6 additions & 2 deletions dist/js/splide.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
* Splide.js
* Version : 4.1.4
* License : MIT
* Copyright: 2022 Naotoshi Fujita
* Copyright: 2023 Naotoshi Fujita
*/
var MEDIA_PREFERS_REDUCED_MOTION = "(prefers-reduced-motion: reduce)";
var CREATED = 1;
Expand Down Expand Up @@ -2259,7 +2259,11 @@ function Drag(Splide2, Components2, options) {
} else if (Splide2.is(SLIDE) && exceeded && rewind) {
Controller.go(exceededLimit(true) ? ">" : "<");
} else {
Controller.go(Controller.toDest(destination), true);
var sign1 = sign(velocity);
var expectedDestination = Controller.toDest(destination);
var maxPages = options.flickMaxPages || 1;
var goTo = sign1 < 0 ? min(expectedDestination, Splide2.index + maxPages) : max(expectedDestination, Splide2.index - maxPages);
Controller.go(goTo, true);
}

reduce(true);
Expand Down
8 changes: 6 additions & 2 deletions dist/js/splide.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
* Splide.js
* Version : 4.1.4
* License : MIT
* Copyright: 2022 Naotoshi Fujita
* Copyright: 2023 Naotoshi Fujita
*/
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : typeof define === 'function' && define.amd ? define(factory) : (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Splide = factory());
Expand Down Expand Up @@ -2257,7 +2257,11 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
} else if (Splide2.is(SLIDE) && exceeded && rewind) {
Controller.go(exceededLimit(true) ? ">" : "<");
} else {
Controller.go(Controller.toDest(destination), true);
var sign1 = sign(velocity);
var expectedDestination = Controller.toDest(destination);
var maxPages = options.flickMaxPages || 1;
var goTo = sign1 < 0 ? min(expectedDestination, Splide2.index + maxPages) : max(expectedDestination, Splide2.index - maxPages);
Controller.go(goTo, true);
}

reduce(true);
Expand Down
4 changes: 2 additions & 2 deletions dist/js/splide.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified dist/js/splide.min.js.gz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/js/splide.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions src/js/components/Drag/Drag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { FADE, LOOP, SLIDE } from '../../constants/types';
import { EventInterface } from '../../constructors';
import { Splide } from '../../core/Splide/Splide';
import { BaseComponent, Components, Options } from '../../types';
import { abs, isObject, matches, min, noop, prevent, sign, timeOf } from '../../utils';
import { abs, isObject, matches, min, max, noop, prevent, sign, timeOf } from '../../utils';
import { FRICTION, LOG_INTERVAL, POINTER_DOWN_EVENTS, POINTER_MOVE_EVENTS, POINTER_UP_EVENTS } from './constants';


Expand Down Expand Up @@ -237,7 +237,11 @@ export function Drag( Splide: Splide, Components: Components, options: Options )
} else if ( Splide.is( SLIDE ) && exceeded && rewind ) {
Controller.go( exceededLimit( true ) ? '>' : '<' );
} else {
Controller.go( Controller.toDest( destination ), true );
const sign1 = sign( velocity );
const expectedDestination = Controller.toDest( destination );
const maxPages = options.flickMaxPages || 1;
const goTo = sign1 < 0 ? min( expectedDestination, Splide.index + maxPages ) : max( expectedDestination, Splide.index - maxPages );
Controller.go( goTo, true );
}

reduce( true );
Expand Down
14 changes: 14 additions & 0 deletions src/js/components/Drag/test/general.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ describe( 'Drag', () => {
expect( splide.index ).toBe( 0 );
} );

test.each( [ 1, 2 ] )( 'should change the slide index no longer than flickMaxPages (%s).', ( flickMaxPages ) => {
const width = 600;
const xOffset = width * flickMaxPages;
const splide = init( { speed: 0, width, flickMaxPages } );
const track = splide.Components.Elements.track;

fireWithCoord( track, 'mousedown', { x: 0, timeStamp: 1 } );
fireWithCoord( window, 'mousemove', { x: 1, timeStamp: 1 } );
fireWithCoord( window, 'mousemove', { x: -20 - xOffset, timeStamp: 100 } );
fireWithCoord( window, 'mouseup', { x: -20 - xOffset, timeStamp: 100 } );

expect( splide.index ).toBe( flickMaxPages );
} );

test( 'should start moving the slider immediately if the pointing device is a mouse.', () => {
const splide = init();
const onDrag = jest.fn();
Expand Down