Skip to content

Commit e52931f

Browse files
authored
Merge pull request #1814 from Ateina/1101-filepicker-cannot-enter-link-manually
#1101: Fix issue with adding link by typing in FilePicker "From a link" tab
2 parents 8554bec + 747ac1f commit e52931f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export default class LinkFilePickerTab extends React.Component<ILinkFilePickerTa
3434
className={styles.linkTextField}
3535
label={strings.LinkFileInstructions}
3636
ariaLabel={strings.LinkFileInstructions}
37-
defaultValue={"https://"}
3837
onGetErrorMessage={(value: string) => this._getErrorMessagePromise(value)}
3938
autoAdjustHeight={false}
4039
underlined={false}
@@ -64,7 +63,7 @@ export default class LinkFilePickerTab extends React.Component<ILinkFilePickerTa
6463
* Called as user types in a new value
6564
*/
6665
private _handleChange = (fileUrl: string): void => {
67-
const filePickerResult: IFilePickerResult = fileUrl && this._isUrl(fileUrl) ? {
66+
const filePickerResult: IFilePickerResult = fileUrl ? {
6867
fileAbsoluteUrl: fileUrl,
6968
fileName: GeneralHelper.getFileNameFromUrl(fileUrl),
7069
fileNameWithoutExtension: GeneralHelper.getFileNameWithoutExtension(fileUrl),
@@ -81,15 +80,15 @@ export default class LinkFilePickerTab extends React.Component<ILinkFilePickerTa
8180
*/
8281
private _getErrorMessagePromise = async (value: string): Promise<string> => {
8382
// DOn't give an error for blank or placeholder value, but don't make it a valid entry either
84-
if (value === undefined || value === 'https://') {
83+
if (value === undefined || value === '') {
8584
this.setState({ isValid: false });
8685
return '';
8786
}
8887

8988
// Make sure that user is typing a valid URL format
9089
if (!this._isUrl(value)) {
9190
this.setState({ isValid: false });
92-
return '';
91+
return strings.InvalidUrlError;
9392
}
9493

9594
// If we don't allow external links, verify that we're in the same domain

0 commit comments

Comments
 (0)