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

Jump to bottom

fix(content-picker): prevent more selections than limit after search #3496

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

fix(content-picker): prevent more selections than limit after search #3496

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
20 changes: 18 additions & 2 deletions src/elements/content-picker/ContentPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ type State = {
rootName: string,
searchQuery: string,
selected: { [string]: BoxItem },
selectedArray: Set,
sortBy: SortBy,
sortDirection: SortDirection,
view: View,
Expand Down Expand Up @@ -233,6 +234,7 @@ class ContentPicker extends Component<Props, State> {
currentOffset: initialPageSize * (initialPage - 1),
currentPageSize: initialPageSize,
selected: {},
selectedArray: new Set(),
searchQuery: '',
view: VIEW_FOLDER,
isCreateFolderModalOpen: false,
Expand Down Expand Up @@ -345,10 +347,11 @@ class ContentPicker extends Component<Props, State> {
* @return {void}
*/
deleteSelectedKeys = (): void => {
const { selected }: State = this.state;
const { selected, selectedArray }: State = this.state;

// Clear out the selected field
Object.keys(selected).forEach(key => delete selected[key].selected);
selectedArray.clear();
};

/**
Expand Down Expand Up @@ -835,6 +838,7 @@ class ContentPicker extends Component<Props, State> {
const {
view,
selected,
selectedArray,
currentCollection: { items = [] },
}: State = this.state;
const { id, type }: BoxItem = item;
Expand All @@ -859,6 +863,7 @@ class ContentPicker extends Component<Props, State> {
// selected. Unselect it in this case. Toggle case.
delete existing.selected;
delete selected[cacheKey];
selectedArray.delete(id);
} else {
// We are selecting a new item that was never
// selected before. However if we are in a single
Expand All @@ -877,11 +882,13 @@ class ContentPicker extends Component<Props, State> {
const prior = selectedKeys[0]; // only one item
delete selected[prior].selected;
delete selected[prior];
selectedArray.clear();
}

// Select the new item
item.selected = true;
selected[cacheKey] = item;
selectedArray.add(id);

// If can set share access, fetch the shared link properties of the item
// In the case where another item is selected, any in flight XHR will get
Expand All @@ -892,12 +899,21 @@ class ContentPicker extends Component<Props, State> {
}

const focusedRow = items.findIndex((i: BoxItem) => i.id === item.id);
this.setState({ selected, focusedRow }, () => {
this.setState({ selected, selectedArray, focusedRow }, () => {
if (view === VIEW_SELECTED) {
// Need to refresh the selected view
this.showSelected();
}
});

this.state.currentCollection.items.map(collectionItem => {
if (selectedArray.has(collectionItem.id)) {
collectionItem.selected = true;
} else if (collectionItem.selected) {
delete collectionItem.selected;
}
return collectionItem;
});
};

/**
Expand Down
Loading