Skip to content

Commit de169ed

Browse files
author
Piotr Siatka
committed
Add paged data support.
Fix OneDrive items handle. Add scrollable panel for files pane.
1 parent c6df12e commit de169ed

23 files changed

+166
-2043
lines changed

src/controls/filePicker/FilePicker.module.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,16 @@
159159
-ms-flex-positive: 2;
160160
flex-grow: 2;
161161
}
162+
.tabFiles {
163+
overflow-y: auto;
164+
-webkit-box-flex: 2;
165+
-ms-flex-positive: 2;
166+
flex-grow: 2;
167+
}
168+
.scrollablePaneWrapper {
169+
height: 75vh;
170+
position: 'relative';
171+
}
162172

163173
.actionButtonsContainer {
164174
display: -webkit-box;
@@ -172,6 +182,7 @@
172182
background-color: $ms-color-white;
173183
-ms-flex-negative: 0;
174184
flex-shrink: 0;
185+
z-index: 100;
175186
}
176187

177188
.actionButtons {

src/controls/filePicker/FilePicker.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ import UploadFilePickerTab from './UploadFilePickerTab/UploadFilePickerTab';
1818
import SiteFilePickerTab from './SiteFilePickerTab/SiteFilePickerTab';
1919
import WebSearchTab from './WebSearchTab/WebSearchTab';
2020
import RecentFilesTab from './RecentFilesTab/RecentFilesTab';
21-
import OneDriveTab from './OneDriveTab/OneDriveTab';
2221

2322
import styles from './FilePicker.module.scss';
2423
import { FileBrowserService } from '../../services/FileBrowserService';
2524
import { OneDriveFilesTab } from './OneDriveFilesTab';
2625
import { OneDriveService } from '../../services/OneDriveService';
2726

28-
2927
export class FilePicker extends React.Component<IFilePickerProps, IFilePickerState> {
3028
private fileBrowserService: FileBrowserService;
3129
private oneDriveService: OneDriveService;

src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button'
1111

1212
import styles from './OneDriveFilesTab.module.scss';
1313
import * as strings from 'ControlStrings';
14+
import { mergeStyles } from 'office-ui-fabric-react/lib/Styling';
1415

1516
export class OneDriveFilesTab extends React.Component<IOneDriveFilesTabProps, IOneDriveFilesTabState> {
1617
constructor(props: IOneDriveFilesTabProps) {
@@ -58,14 +59,18 @@ export class OneDriveFilesTab extends React.Component<IOneDriveFilesTabProps, IO
5859
}
5960

6061
public render(): React.ReactElement<IOneDriveFilesTabProps> {
62+
const listStyle = mergeStyles({
63+
flex: "1 1 auto",
64+
overflowX: "hidden",
65+
overflowY: "auto"
66+
});
6167
return (
6268
<div className={styles.tabContainer}>
6369
<div className={styles.tabHeaderContainer}>
6470
{ /** TODO: Fix breadcrumb styles */}
6571
<Breadcrumb items={this.state.breadcrumbItems} className={styles.tabHeader}/>
6672
</div>
67-
<div className={styles.tab}>
68-
73+
<div className={styles.tabFiles}>
6974
{this.state.libraryAbsolutePath !== undefined &&
7075
<FileBrowser
7176
onChange={(fileUrl: string) => this._handleSelectionChange(fileUrl)}

src/controls/filePicker/OneDriveTab/DocumentTile/DocumentTile.module.scss

Lines changed: 0 additions & 116 deletions
This file was deleted.

src/controls/filePicker/OneDriveTab/DocumentTile/DocumentTile.tsx

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/controls/filePicker/OneDriveTab/DocumentTile/IDocumentTileProps.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/controls/filePicker/OneDriveTab/DocumentTile/index.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)