Merge pull request #1935 from nextcloud-libraries/backport/1933/stable6

[stable6] fix(FilePicker): make move primary and copy secondary

Author: susnux

lib/components/types.ts

@@ -17,10 +17,16 @@ export enum DialogSeverity {
  */
 export interface IDialogButton {
 	/** Label of the button */
-	label: string,
+	label: string
 
 	/** Callback on button click */
-	callback: () => void,
+	callback: () => void
+
+	/**
+	 * Disabled state of the button
+	 * @default false
+	 */
+	disabled?: boolean
 
 	/**
 	 * Optional Icon for the button
@@ -30,15 +36,16 @@ export interface IDialogButton {
 
 	/**
 	 * Button type
+	 * @deprecated - use `variant` instead
 	 * @see https://nextcloud-vue-components.netlify.app/#/Components/NcButton
 	 */
 	type?: 'primary' | 'secondary' | 'error' | 'warning' | 'success'
 
 	/**
-	 * Disabled state of the button
-	 * @default false
+	 * Button type
+	 * @see https://nextcloud-vue-components.netlify.app/#/Components/NcButton
 	 */
-	disabled?: boolean
+	variant?: 'primary' | 'secondary' | 'tertiary' | 'error' | 'success'
 }
 
 /**

lib/filepicker-builder.ts

@@ -224,16 +224,16 @@ export class FilePickerBuilder<IsMultiSelect extends boolean> {
 				buttons.push({
 					callback: () => {},
 					label: target ? t('Copy to {target}', { target }) : t('Copy'),
-					type: 'primary',
 					icon: IconCopy,
+					variant: type === FilePickerType.Copy ? 'primary' : 'secondary',
 				})
 			}
-			if (type === FilePickerType.Move || type === FilePickerType.CopyMove) {
+			if (type === FilePickerType.CopyMove || type === FilePickerType.Move) {
 				buttons.push({
 					callback: () => {},
 					label: target ? t('Move to {target}', { target }) : t('Move'),
-					type: type === FilePickerType.Move ? 'primary' : 'secondary',
 					icon: IconMove,
+					variant: 'primary', // move is always primary - also on copy-move
 				})
 			}
 			return buttons

package-lock.json

@@ -51,7 +51,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@nextcloud/vue": "^8.23.1",
+    "@nextcloud/vue": "^8.24.0",
     "vue": "^2.7.16"
   },
   "dependencies": {