Skip to content

Commit fbc21e4

Browse files
committed
label style, display label with preview as well
1 parent 81e808e commit fbc21e4

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.module.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
.localTabSinglePreview {
44
margin-bottom: 20px;
5+
display: inline-block;
6+
text-align: center;
57
}
68

79
.localTabSinglePreviewImage {
@@ -11,6 +13,10 @@
1113
image-orientation: from-image;
1214
}
1315

16+
.localTabFilename {
17+
color: $ms-color-neutralPrimary;
18+
}
19+
1420
.localTabLabel {
1521
color: $ms-color-themePrimary;
1622
cursor: pointer;

src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default class UploadFilePickerTab extends React.Component<IUploadFilePick
1919
}
2020

2121
public render(): React.ReactElement<IUploadFilePickerTabProps> {
22-
const { filePickerResult } = this.state;
22+
const { filePickerResult, filePreview } = this.state;
2323
const fileName: string = filePickerResult ? filePickerResult.fileName : null;
2424
const acceptedFilesExtensions = this.props.accepts ? this.props.accepts.join(",") : null;
2525

@@ -35,15 +35,16 @@ export default class UploadFilePickerTab extends React.Component<IUploadFilePick
3535
accept={acceptedFilesExtensions} multiple={false} onChange={(event: React.ChangeEvent<HTMLInputElement>) => this._handleFileUpload(event)}
3636
/>
3737
{
38-
fileName && this.state.filePreview &&
38+
fileName && filePreview &&
3939
/** Display image preview */
40-
<div className={styles.localTabSinglePreview}>
41-
<img className={styles.localTabSinglePreviewImage} src={this.state.filePreview} alt={this.state.filePickerResult.fileName} />
40+
<div className={styles.localTabSinglePreview}>
41+
<img className={styles.localTabSinglePreviewImage} src={filePreview} alt={filePickerResult.fileName} />
42+
<span>{fileName}</span>
4243
</div>
4344
}
4445
<div>
45-
<label className={styles.localTabLabel}>{
46-
(!this.state.filePreview ? fileName : "")
46+
<label className={styles.localTabFilename}>{
47+
(!filePreview && fileName ? fileName : "")
4748
}</label>
4849
</div>
4950
<label className={styles.localTabLabel} htmlFor="fileInput">{
@@ -53,7 +54,7 @@ export default class UploadFilePickerTab extends React.Component<IUploadFilePick
5354
<div className={styles.actionButtonsContainer}>
5455
<div className={styles.actionButtons}>
5556
<PrimaryButton
56-
disabled={!this.state.filePickerResult}
57+
disabled={!filePickerResult}
5758
onClick={() => this._handleSave()} className={styles.actionButton}>{strings.AddFileButtonLabel}</PrimaryButton>
5859
<DefaultButton onClick={() => this._handleClose()} className={styles.actionButton}>{strings.CancelButtonLabel}</DefaultButton>
5960
</div>
@@ -95,7 +96,8 @@ export default class UploadFilePickerTab extends React.Component<IUploadFilePick
9596
};
9697
}
9798
this.setState({
98-
filePickerResult
99+
filePickerResult,
100+
filePreview: undefined
99101
});
100102
}
101103

src/webparts/controlsTest/components/ControlsTest.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
10071007
<div>
10081008
<FilePicker
10091009
bingAPIKey="<BING API KEY>"
1010-
accepts={[".gif", ".jpg", ".jpeg", ".bmp", ".dib", ".tif", ".tiff", ".ico", ".png", ".jxr", ".svg"]}
1010+
//accepts={[".gif", ".jpg", ".jpeg", ".bmp", ".dib", ".tif", ".tiff", ".ico", ".png", ".jxr", ".svg"]}
10111011
buttonLabel="Upload image"
10121012
buttonIcon="FileImage"
10131013
onSave={this._onFilePickerSave}

0 commit comments

Comments
 (0)