Skip to content

Commit 347fec1

Browse files
VictorRomanov1986msftbot[bot]AJIXuMuK
authored
FilePicker Tile view fix (pnp#1285)
* Add `.github/fabricbot.json` * Fix issue with FilePicker Tile view and selection of file * Typo Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com> Co-authored-by: Alex Terentiev <[email protected]>
1 parent 796f5a8 commit 347fec1

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/controls/filePicker/controls/FileBrowser/FileBrowser.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export class FileBrowser extends React.Component<IFileBrowserProps, IFileBrowser
196196
/>) :
197197
(<TilesList
198198
fileBrowserService={this.props.fileBrowserService}
199-
filePickerResult={this.state.filePickerResults ? this.state.filePickerResults[0] : null}
199+
filePickerResults={this.state.filePickerResults ? this.state.filePickerResults : null}
200200
selection={this._selection}
201201
items={this.state.items}
202202
onFolderOpen={this._handleOpenFolder}
@@ -519,6 +519,8 @@ export class FileBrowser extends React.Component<IFileBrowserProps, IFileBrowser
519519
newItems.push(null);
520520
}
521521

522+
this._selection.setItems(newItems);
523+
522524
if (!concatenateResults) {
523525
// de-select anything that was previously selected
524526
this._selection.setAllSelected(false);

src/controls/filePicker/controls/TilesList/ITilesListProps.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { IFilePickerResult } from "../../FilePicker.types";
55

66
export interface ITilesListProps {
77
fileBrowserService: FileBrowserService;
8-
filePickerResult: IFilePickerResult;
8+
filePickerResults: IFilePickerResult[];
99
selection: Selection;
1010
items: IFile[];
1111

src/controls/filePicker/controls/TilesList/TilesList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class TilesList extends React.Component<ITilesListProps> {
5252
}
5353

5454
public componentDidUpdate(prevProps: ITilesListProps): void {
55-
if (this.props.filePickerResult !== prevProps.filePickerResult) {
55+
if (this.props.filePickerResults !== prevProps.filePickerResults) {
5656
this._listElem.forceUpdate();
5757
}
5858
}
@@ -163,7 +163,7 @@ export class TilesList extends React.Component<ITilesListProps> {
163163
this.props.onNextPageDataRequest();
164164
return null;
165165
}
166-
const isSelected: boolean = this.props.filePickerResult && item.absoluteUrl === this.props.filePickerResult.fileAbsoluteUrl;
166+
const isSelected: boolean = this.props.filePickerResults.filter(x => x.fileAbsoluteUrl === item.absoluteUrl).length > 0;
167167

168168
// I know this is a lot of divs and spans inside of each other, but my
169169
// goal was to mimic the HTML and style of the out-of-the-box file picker

0 commit comments

Comments
 (0)