Skip to content

Commit b058c63

Browse files
author
Monalisa Baltatescu
committed
Fixed folder selection on Site tab
Fixed folder selection on Recents tab -> no folder selection allowed
1 parent 70e73b5 commit b058c63

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

src/controls/filePicker/RecentFilesTab/RecentFilesTab.module.scss

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,11 @@
131131
}
132132
}
133133

134-
.gridListCell.isSelected .itemTileCheckCircle,
135-
.gridListCell:hover,
136-
.gridListCell:hover .itemTileCheckCircle {
137-
opacity: 1;
134+
.itemTile.isSelected {
135+
.itemTileCheckCircle {
136+
opacity: 1;
137+
}
138138
}
139-
140139
.itemTileNamePlate {
141140
position: absolute;
142141
bottom:0;

src/controls/filePicker/RecentFilesTab/RecentFilesTab.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ export default class RecentFilesTab extends React.Component<IRecentFilesTabProps
101101
let filePickerResults: IFilePickerResult[] = [];
102102
// Get the selected item
103103
this._selection.getSelection().map((selectedKey: IRecentFile) => {
104+
if(!selectedKey.isFolder && selectedKey.fileUrl)
104105
filePickerResults.push({
105106
fileAbsoluteUrl: selectedKey.fileUrl,
106107
fileName: GeneralHelper.getFileNameFromUrl(selectedKey.fileUrl),
@@ -161,7 +162,7 @@ export default class RecentFilesTab extends React.Component<IRecentFilesTabProps
161162
<FocusZone>
162163
<SelectionZone selection={this._selection}
163164
selectionMode={SelectionMode.multiple}
164-
onItemInvoked={(item: IRecentFile) => this._handleItemInvoked(item)}>
165+
onItemInvoked={(item: any) => this._handleItemInvoked(item)}>
165166
<List
166167
ref={this._linkElement}
167168
items={this.state.results}
@@ -235,7 +236,9 @@ export default class RecentFilesTab extends React.Component<IRecentFilesTabProps
235236
* Gets called what a file is selected.
236237
*/
237238
private _handleItemInvoked = (item: IRecentFile) => {
238-
this._selection.toggleKeySelected(item.key);
239+
if(!item.isFolder) {
240+
this._selection.toggleKeySelected(item.key);
241+
}
239242
}
240243

241244
/**

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,10 +455,7 @@ export class FileBrowser extends React.Component<IFileBrowserProps, IFileBrowser
455455
private _itemSelectionChanged = () => {
456456
let filePickerResults: IFilePickerResult[] = [];
457457
this._selection.getSelection().map((item: IFile, index: number) => {
458-
if (item.isFolder) {
459-
this._selection.toggleIndexSelected(index);
460-
}
461-
else {
458+
if (!item.isFolder) {
462459
filePickerResults.push({
463460
fileAbsoluteUrl: item.absoluteUrl,
464461
fileName: GeneralHelper.getFileNameFromUrl(item.name),

src/services/FilesSearchService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ export class FilesSearchService {
224224
key: keyCell ? keyCell.Value : null,
225225
name: titleCell ? titleCell.Value : null,
226226
fileUrl: fileUrlCell ? fileUrlCell.Value : null,
227-
editedBy: editedByCell ? editedByCell.Value : null
227+
editedBy: editedByCell ? editedByCell.Value : null,
228+
isFolder: !fileUrlCell.Value
228229
};
229230
return recentFile;
230231
}

src/services/FilesSearchService.types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ export interface IRecentFile {
33
key: string;
44
name: string;
55
editedBy: string;
6+
isFolder: boolean;
67
}
78

89
export interface BingQuerySearchParams {

0 commit comments

Comments
 (0)