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

MultiView: Fix search traversal of visible items during loop #28186

Merged
merged 5 commits into from
Oct 18, 2024
Merged

MultiView: Fix search traversal of visible items during loop #28186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d28b95
fix for improper step calculation for looping
nikkithelegendarypokemonster Oct 17, 2024
7a979a2
add condition for checking if item is visible
nikkithelegendarypokemonster Oct 17, 2024
8615256
refactor code based on review by anton
nikkithelegendarypokemonster Oct 17, 2024
ff2f31f
change my assertion in position checking
nikkithelegendarypokemonster Oct 17, 2024
c766100
refactor tests based on minor comments
nikkithelegendarypokemonster Oct 18, 2024
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
3 changes: 2 additions & 1 deletion packages/devextreme/js/__internal/ui/m_multi_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ const MultiView = CollectionWidget.inherit({

const step = direction > 0 ? -1 : 1;
const lastNotLoopedIndex = step === -1 ? 0 : count - 1;

while (!this._isItemVisible(index) && (loop || index !== lastNotLoopedIndex)) {
index = (index + step) % count;
index = (index + step + count) % count;
}

return index;
Expand Down
50 changes: 50 additions & 0 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,56 @@ QUnit.module('loop', {
delete this.animationStartAction;
}
}, () => {
QUnit.test('if first item is invisible and swiped right last item should be selected', function(assert) {
const $multiView = $('#multiView').dxMultiView({
items: [
{ text: '1', visible: false },
{ text: '2', visible: true },
{ text: '3', visible: true }
],
loop: true,
selectedIndex: 1
});

const instance = $multiView.dxMultiView('instance');
const $firstItem = $multiView.find(`.${MULTIVIEW_ITEM_CLASS}`).eq(1);
const $lastItem = $multiView.find(`.${MULTIVIEW_ITEM_CLASS}`).eq(2);
const pointer = pointerMock($multiView);

this.animationStartAction = function() {
assert.equal(position($firstItem), 0, 'item "2" is positioned correctly as the first visible item.');
assert.equal(position($lastItem), -800, 'item "3" is positioned correctly as the last visible item.');
};

pointer.start().swipeStart().swipe(0.1).swipeEnd(1);
assert.strictEqual(instance.option('selectedIndex'), 2, 'item "3" is selected');
});

QUnit.test('if last item is invisible and swiped left first item should be selected', function(assert) {
const $multiView = $('#multiView').dxMultiView({
items: [
{ text: '1', visible: true },
{ text: '2', visible: true },
{ text: '3', visible: false }
],
loop: true,
selectedIndex: 1
});

const instance = $multiView.dxMultiView('instance');
const $firstItem = $multiView.find(`.${MULTIVIEW_ITEM_CLASS}`).eq(0);
const $lastItem = $multiView.find(`.${MULTIVIEW_ITEM_CLASS}`).eq(1);
const pointer = pointerMock($multiView);

this.animationStartAction = function() {
assert.equal(position($firstItem), 800, 'item "1" is positioned correctly as the first visible item.');
assert.equal(position($lastItem), 0, 'item "2" is positioned correctly as the last visible item.');
};

pointer.start().swipeStart().swipe(-0.1).swipeEnd(-1);
assert.strictEqual(instance.option('selectedIndex'), 0, 'item "1" is selected');
});

QUnit.test('when only one item is visible, swipe action does not move the current visible item', function(assert) {
const $multiView = $('#multiView').dxMultiView({
items: [
Expand Down
Loading