Skip to content

Commit

Permalink
Merge pull request #1814 from Ateina/1101-filepicker-cannot-enter-lin…
Browse files Browse the repository at this point in the history
…k-manually

#1101: Fix issue with adding link by typing in FilePicker "From a link" tab
  • Loading branch information
joaojmendes authored May 19, 2024
2 parents 8554bec + 747ac1f commit e52931f
Showing 1 changed file with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export default class LinkFilePickerTab extends React.Component<ILinkFilePickerTa
className={styles.linkTextField}
label={strings.LinkFileInstructions}
ariaLabel={strings.LinkFileInstructions}
defaultValue={"https://"}
onGetErrorMessage={(value: string) => this._getErrorMessagePromise(value)}
autoAdjustHeight={false}
underlined={false}
Expand Down Expand Up @@ -64,7 +63,7 @@ export default class LinkFilePickerTab extends React.Component<ILinkFilePickerTa
* Called as user types in a new value
*/
private _handleChange = (fileUrl: string): void => {
const filePickerResult: IFilePickerResult = fileUrl && this._isUrl(fileUrl) ? {
const filePickerResult: IFilePickerResult = fileUrl ? {
fileAbsoluteUrl: fileUrl,
fileName: GeneralHelper.getFileNameFromUrl(fileUrl),
fileNameWithoutExtension: GeneralHelper.getFileNameWithoutExtension(fileUrl),
Expand All @@ -81,15 +80,15 @@ export default class LinkFilePickerTab extends React.Component<ILinkFilePickerTa
*/
private _getErrorMessagePromise = async (value: string): Promise<string> => {
// DOn't give an error for blank or placeholder value, but don't make it a valid entry either
if (value === undefined || value === 'https://') {
if (value === undefined || value === '') {
this.setState({ isValid: false });
return '';
}

// Make sure that user is typing a valid URL format
if (!this._isUrl(value)) {
this.setState({ isValid: false });
return '';
return strings.InvalidUrlError;
}

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

0 comments on commit e52931f

Please sign in to comment.