Merge branch 'dev'

pnp · May 29, 2024 · bf61b7a · bf61b7a
2 parents 0f857b9 + f4cc5ae
commit bf61b7a
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 9 deletions.
diff --git a/CHANGELOG.json b/CHANGELOG.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "version": "3.18.1",
+      "changes": {
+        "new": [],
+        "enhancements": [],
+        "fixes": [
+          "`FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814)",
+          "Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823)"
+        ]
+      },
+      "contributions": [
+        "[Antanina Druzhkina](https://github.com/Ateina)",
+        "[Elio Struyf](https://github.com/estruyf)"
+      ]
+    },
     {
       "version": "3.18.0",
       "changes": {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Releases
 
+## 3.18.1
+
+### Fixes
+
+- `FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814)
+- Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823)
+
+### Contributors
+
+Special thanks to our contributors (in alphabetical order): [Antanina Druzhkina](https://github.com/Ateina), [Elio Struyf](https://github.com/estruyf).
+
 ## 3.18.0
 
 ### Enhancements

diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -1,5 +1,16 @@
 # Releases
 
+## 3.18.1
+
+### Fixes
+
+- `FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814)
+- Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823)
+
+### Contributors
+
+Special thanks to our contributors (in alphabetical order): [Antanina Druzhkina](https://github.com/Ateina), [Elio Struyf](https://github.com/estruyf).
+
 ## 3.18.0
 
 ### Enhancements

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnp/spfx-controls-react",
   "description": "Reusable React controls for SharePoint Framework solutions",
-  "version": "3.18.0",
+  "version": "3.18.1",
   "node": ">=16.13.0 <17.0.0 || >=18.17.1 <19.0.0",
   "scripts": {
     "build": "gulp build",

diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts
@@ -1 +1 @@
-export const version: string = "3.18.0";
+export const version: string = "3.18.1";
diff --git a/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx b/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx
@@ -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}
@@ -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),
@@ -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

diff --git a/src/loc/nl-nl.ts b/src/loc/nl-nl.ts
@@ -145,7 +145,7 @@ define([], () => {
     "HighlightColorTeal": "Taling",
     "HighlightColorDarkgreen": "Donkergroen",
     "HighlightColorPurple": "Paarse",
-    "HighlightColorMaroon": "Bosneger",
+    "HighlightColorMaroon": "Kastanjebruin",
     "HighlightColorGold": "Goud",
     "HighlightColorDarkgrey": "Donkergrijs",
     "HighlightColorGrey": "Grijs",