secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #864 from nawordar/fix-selection

Browse Source 
Fix selection ordering
This commit is contained in:
James Barnsley
2022-09-25 12:17:46 +13:00
committed by GitHub
parent 4526b647a7 5be88223af
commit a4b9216756
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
/mopidy_iris/static/*
public_html
/dist/
/build/
/.sass-cache/
*.orig
Thumbs.db

18
src/js/components/TrackList.js
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { uniqBy } from 'lodash';
import { range, uniqBy } from 'lodash';
import Track from './Track';
import * as mopidyActions from '../services/mopidy/actions';
import * as uiActions from '../services/ui/actions';
@ -174,14 +174,18 @@ const TrackList = ({
const alreadySelected = selectionIndexByItemIndex(index);
if (e.shiftKey) {
const { index: lastSelectedIndex } = selected[selected.length-1] || { index };
const next = [...prev, { index, item }];
const { index: lastSelectedIndex } = selected[selected.length - 1] || {
index,
};
const from = lastSelectedIndex < index ? lastSelectedIndex : index;
const to = lastSelectedIndex > index ? lastSelectedIndex : index;
for (let i = from; i < to; i++) {
next.push({ index: i, item: tracks[i] });
}
return uniqBy(next, 'index');
const newSelection = range(from, to + 1).map((index) => ({
index,
item: tracks[index],
}));
return uniqBy([...prev, ...newSelection], "index");
}
if (e.ctrlKey) {
if (alreadySelected >= 0 && !sticky) {