Merge pull request #1775 from nextcloud-libraries/fix/filepicker-pick-return

skjnldsv · web-flow · commit eba2e00ff4d7 · 2025-05-12T09:40:52.000+02:00
diff --git a/lib/filepicker-builder.ts b/lib/filepicker-builder.ts
@@ -98,9 +98,10 @@ export class FilePicker<IsMultiSelect extends boolean> {
 	public async pick(): Promise<IsMultiSelect extends true ? string[] : string> {
 		const nodes = await this.pickNodes()
 		if (this.multiSelect) {
-			return (nodes[0]?.path ?? '/') as (IsMultiSelect extends true ? string[] : string)
+			return nodes.map((node) => node.path) as (IsMultiSelect extends true ? string[] : string)
 		}
-		return nodes.map((node) => node.path) as (IsMultiSelect extends true ? string[] : string)
+		const path = nodes[0]?.path ?? '/'
+		return path as (IsMultiSelect extends true ? string[] : string)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,10 @@ export class FilePicker<IsMultiSelect extends boolean> {`
`98`	`98`	`public async pick(): Promise<IsMultiSelect extends true ? string[] : string> {`
`99`	`99`	`const nodes = await this.pickNodes()`
`100`	`100`	`if (this.multiSelect) {`
`101`		`- return (nodes[0]?.path ?? '/') as (IsMultiSelect extends true ? string[] : string)`
	`101`	`+ return nodes.map((node) => node.path) as (IsMultiSelect extends true ? string[] : string)`
`102`	`102`	`}`
`103`		`- return nodes.map((node) => node.path) as (IsMultiSelect extends true ? string[] : string)`
	`103`	`+ const path = nodes[0]?.path ?? '/'`
	`104`	`+ return path as (IsMultiSelect extends true ? string[] : string)`
`104`	`105`	`}`
`105`	`106`	`}`
`106`	`107`